* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-08-31 20:49 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-08-31 20:49 UTC (permalink / raw
To: gentoo-commits
commit: ab03f47c737d10ec7def3aea88efdcb76c48e822
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 20:47:49 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 20:48:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab03f47c
app-office/libreoffice: Version bump without keywords, use http URI
Package-Manager: portage-2.2.20.1
app-office/libreoffice/Manifest | 4 ++--
app-office/libreoffice/libreoffice-4.4.5.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-4.4.9999.ebuild | 2 +-
.../{libreoffice-5.0.0.5.ebuild => libreoffice-5.0.1.2.ebuild} | 8 ++------
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
6 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2e077e6..69e2eaf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,8 +8,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-4.4.4.3.tar.xz 164365608 SHA256 31ac86daa4f842fe825c88262b99a032ba3c0620f6e01cb22a54af14bc3dda72 SHA512 fbe97d4f8db92348927dc7c8412631ad5187968357ebdc57f22936cea84c76ced3655aac4c6ebc936b0f96d3d36bafe163eea05ed2dca02e53724bd5a0396513 WHIRLPOOL a7938d94b8644cd736a7213c0c4931a9d857da7005972bc751f6157445839ce395fdb1b6b057dc6fd681cf86143cfe96c9b2126fef2d5de5ea000eb15c5bdb35
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
-DIST libreoffice-5.0.0.5.tar.xz 166444400 SHA256 9b17f5848ecbe5302ff676abaa187f49ddc35bed1a56898b7e3e0b3e152dce10 SHA512 e7dc99f5c055ef4507ba5b61e39d242cf0337f30b525d172b54f7ce1b4e2ed2c6757bb2a5a3f18b9a8593d6bd43436ea1d067ea653735918812e7820f50996e8 WHIRLPOOL 1f09eb00727c59463dab5201d0115ecb05e25c860e2486e56b679af2adddfa0ddec93fe880b8b3991a8e4139aef25dd71c6138f6e643e7ae78c8d820b6b94f2c
+DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.4.3.tar.xz 1876068 SHA256 80d2cb4c5ee1d97218741d4e65351763dd74a617df7a51fce275983bcc5e6bc9 SHA512 b3d05ab85b1c25c3cc045c7d5217fb61b8dfc54b58c54a04b442c678d2c51975e5aadf3e28ac3f17544dd7afd6770fd8115cd05e3878b80c378b8fed6bcc2b22 WHIRLPOOL 3204cfac0ef6d2cd741e2f319242da6943b46c82ba5635df45dc1f99c3049a542df00a31c4b48092bcfad1a6d6f5d4e3c1ba0a3248331c324c08d728f909cb27
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
-DIST libreoffice-help-5.0.0.5.tar.xz 1882344 SHA256 9b515f8890a19166d2193f5e2b76dea334b2399d0e976fdd355f6e3feaaa98a3 SHA512 1ddb723ba732f7b4836a3b669c1dfc8f8534d2ac7d5cf8ed2d76dffe98d82e6e5bf560aec1492b8caec1e97477f819fba124cf595d1678979d04f57730be9ba8 WHIRLPOOL 009bac04f4b3025ac82739ccd316ce92fc5dcfe7bde6d11468b09a926e345b09d16cdf1a7a6bfd0e3e44d79879c80fe5193186fbff30721309b4b0a2798b649e
+DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
diff --git a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
index 483f82c..5341429 100644
--- a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 483f82c..5341429 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
diff --git a/app-office/libreoffice/libreoffice-5.0.0.5.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
similarity index 98%
rename from app-office/libreoffice/libreoffice-5.0.0.5.ebuild
rename to app-office/libreoffice/libreoffice-5.0.1.2.ebuild
index 6dfe1c8..5cb165c 100644
--- a/app-office/libreoffice/libreoffice-5.0.0.5.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@@ -198,8 +198,7 @@ RDEPEND="${COMMON_DEPEND}
"
if [[ ${PV} != *9999* ]]; then
- #PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
- PDEPEND=">=app-office/libreoffice-l10n-4.4"
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
else
# Translations are not reliable on live ebuilds
# rather force people to use english only.
@@ -246,9 +245,6 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
- # from master branch
- "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
)
REQUIRED_USE="
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 5731d32..47bf9d1 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index eb6f83c..9588001 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@@ -104,7 +104,7 @@ COMMON_DEPEND="
>=app-text/libetonyek-0.1.2
app-text/liblangtag
>=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
+ >=app-text/libmwaw-0.3.6
>=app-text/libodfgen-0.1.0
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-09-05 17:17 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-09-05 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 90d937b85a041db37dcea3b8dd4f6d23970c14cd
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 17:15:55 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 17:17:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90d937b8
app-office/libreoffice: Restore keywords
Package-Manager: portage-2.2.20.1
app-office/libreoffice/libreoffice-5.0.1.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
index 5cb165c..47bf9d1 100644
--- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
@@ -90,8 +90,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-09-05 18:03 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2015-09-05 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 9107b1140dbc1ddecdd033411e878b442d5757af
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 18:02:40 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 18:02:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9107b114
app-office/libreoffice: amd64 stable wrt bug #559672
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
app-office/libreoffice/libreoffice-4.4.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
index 5341429..50c3137 100644
--- a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
@@ -90,7 +90,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-09-05 18:03 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2015-09-05 18:03 UTC (permalink / raw
To: gentoo-commits
commit: eef9631eb5f540943c461e8c355a0470bd2e30d7
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 18:03:23 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 18:03:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef9631e
app-office/libreoffice: x86 stable wrt bug #559672
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
app-office/libreoffice/libreoffice-4.4.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
index 50c3137..24f0563 100644
--- a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
@@ -90,7 +90,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-09-20 20:58 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-09-20 20:58 UTC (permalink / raw
To: gentoo-commits
commit: af8214da6d8f0a97db8917803ed85aaec70120df
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 19 16:37:26 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 16:37:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8214da
app-office/libreoffice: Old config flags dropped upstream; fix DEPEND
Package-Manager: portage-2.2.20.1
app-office/libreoffice/libreoffice-9999.ebuild | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9588001..f5894cc 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -161,7 +161,8 @@ COMMON_DEPEND="
)
gtk3? (
dev-libs/glib:2
- >=x11-libs/gtk+-3.2:3
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
)
gstreamer? (
media-libs/gstreamer:1.0
@@ -437,9 +438,6 @@ src_configure() {
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
# --disable-systray: quickstarter does not actually work at all so do not
# promote it
# --enable-extension-integration: enable any extension integration support
@@ -466,11 +464,8 @@ src_configure() {
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
- --disable-gnome-vfs \
--disable-gstreamer-0-10 \
--disable-report-builder \
- --disable-kdeab \
- --disable-kde \
--disable-online-update \
--disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-09-20 20:58 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-09-20 20:58 UTC (permalink / raw
To: gentoo-commits
commit: e9c3ac889395533ae89b006016e6689e29cdce7e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 19 16:52:35 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 16:55:12 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9c3ac88
app-office/libreoffice: Add 5.0.2 pre-release
Package-Manager: portage-2.2.20.1
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-5.0.9999.ebuild => libreoffice-5.0.2.2.ebuild} | 5 +++--
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 69e2eaf..4afeda9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,7 +9,9 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
DIST libreoffice-4.4.4.3.tar.xz 164365608 SHA256 31ac86daa4f842fe825c88262b99a032ba3c0620f6e01cb22a54af14bc3dda72 SHA512 fbe97d4f8db92348927dc7c8412631ad5187968357ebdc57f22936cea84c76ced3655aac4c6ebc936b0f96d3d36bafe163eea05ed2dca02e53724bd5a0396513 WHIRLPOOL a7938d94b8644cd736a7213c0c4931a9d857da7005972bc751f6157445839ce395fdb1b6b057dc6fd681cf86143cfe96c9b2126fef2d5de5ea000eb15c5bdb35
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
+DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.4.3.tar.xz 1876068 SHA256 80d2cb4c5ee1d97218741d4e65351763dd74a617df7a51fce275983bcc5e6bc9 SHA512 b3d05ab85b1c25c3cc045c7d5217fb61b8dfc54b58c54a04b442c678d2c51975e5aadf3e28ac3f17544dd7afd6770fd8115cd05e3878b80c378b8fed6bcc2b22 WHIRLPOOL 3204cfac0ef6d2cd741e2f319242da6943b46c82ba5635df45dc1f99c3049a542df00a31c4b48092bcfad1a6d6f5d4e3c1ba0a3248331c324c08d728f909cb27
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
+DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-5.0.9999.ebuild
copy to app-office/libreoffice/libreoffice-5.0.2.2.ebuild
index 47bf9d1..a6ff857 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
@@ -90,7 +90,8 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
@@ -159,7 +160,7 @@ COMMON_DEPEND="
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
)
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 47bf9d1..c361e86 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -159,7 +159,7 @@ COMMON_DEPEND="
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
)
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-09-26 21:08 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-09-26 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 521c55fbd379b7d4739ee861ea318bc29e05417c
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 21:07:15 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 21:07:15 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521c55fb
app-office/libreoffice: Remove old
Package-Manager: portage-2.2.20.1
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-4.4.4.3.ebuild | 615 ----------------------
2 files changed, 617 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4afeda9..a9bf772 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,12 +6,10 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-4.4.4.3.tar.xz 164365608 SHA256 31ac86daa4f842fe825c88262b99a032ba3c0620f6e01cb22a54af14bc3dda72 SHA512 fbe97d4f8db92348927dc7c8412631ad5187968357ebdc57f22936cea84c76ced3655aac4c6ebc936b0f96d3d36bafe163eea05ed2dca02e53724bd5a0396513 WHIRLPOOL a7938d94b8644cd736a7213c0c4931a9d857da7005972bc751f6157445839ce395fdb1b6b057dc6fd681cf86143cfe96c9b2126fef2d5de5ea000eb15c5bdb35
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-4.4.4.3.tar.xz 1876068 SHA256 80d2cb4c5ee1d97218741d4e65351763dd74a617df7a51fce275983bcc5e6bc9 SHA512 b3d05ab85b1c25c3cc045c7d5217fb61b8dfc54b58c54a04b442c678d2c51975e5aadf3e28ac3f17544dd7afd6770fd8115cd05e3878b80c378b8fed6bcc2b22 WHIRLPOOL 3204cfac0ef6d2cd741e2f319242da6943b46c82ba5635df45dc1f99c3049a542df00a31c4b48092bcfad1a6d6f5d4e3c1ba0a3248331c324c08d728f909cb27
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
diff --git a/app-office/libreoffice/libreoffice-4.4.4.3.ebuild b/app-office/libreoffice/libreoffice-4.4.4.3.ebuild
deleted file mode 100644
index dc3cec0..0000000
--- a/app-office/libreoffice/libreoffice-4.4.4.3.ebuild
+++ /dev/null
@@ -1,615 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.1
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.4
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.3*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.11.2:=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
- # from master branch
- "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
- "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
- "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
- "${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
- "${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
- "${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
-)
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
- local pgslot
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- for mod in ${MODULES}; do
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e 's#all : build unitcheck#all : build#g' \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
- -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
-
- # FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-10 9:29 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-10 9:29 UTC (permalink / raw
To: gentoo-commits
commit: 03b579da264b3afe9bd3cfea9ffe6cd44528e686
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 09:26:04 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 09:26:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b579da
app-office/libreoffice: Drop pyhton-3.3 support, add libressl support
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 7 ++++---
app-office/libreoffice/libreoffice-9999.ebuild | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index c361e86..626b19c 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -73,7 +73,7 @@ unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -122,7 +122,8 @@ COMMON_DEPEND="
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f5894cc..35ca08e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -73,7 +73,7 @@ unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
@@ -122,7 +122,8 @@ COMMON_DEPEND="
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-10 9:46 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-10 9:46 UTC (permalink / raw
To: gentoo-commits
commit: a78890b72156c3d067fc5ec305e623db495d90b1
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 09:47:56 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 09:47:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a78890b7
app-office/libreoffice: dont check for disk space in binary merge
Package-Manager: portage-2.2.22
app-office/libreoffice/libreoffice-4.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.0.1.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.0.2.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 5341429..7f3f170 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -271,7 +271,7 @@ REQUIRED_USE="
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
index 47bf9d1..a8bb49b 100644
--- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
@@ -260,7 +260,7 @@ REQUIRED_USE="
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-5.0.2.2.ebuild b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
index c361e86..beabdc7 100644
--- a/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.2.2.ebuild
@@ -260,7 +260,7 @@ REQUIRED_USE="
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 626b19c..8ddf6c3 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -261,7 +261,7 @@ REQUIRED_USE="
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 35ca08e..0f66fba 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -265,7 +265,7 @@ REQUIRED_USE="
"
CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-10 23:27 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-10 23:27 UTC (permalink / raw
To: gentoo-commits
commit: d8538816f8ba8f33cf66393e48849622655b3f65
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 10 15:11:45 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 15:11:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8538816
app-office/libreoffice: Add 5.0.3 pre-release
Package-Manager: portage-2.2.20.1
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.0.3.1.ebuild | 609 ++++++++++++++++++++++
2 files changed, 611 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a9bf772..a7c9aba 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,7 +9,9 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
+DIST libreoffice-5.0.3.1.tar.xz 166989184 SHA256 5502477772d6b986fc0486e7ec4e1fd7d99796f9bf63610d4dec84d77f165585 SHA512 0e157f2f126f530dbcf4849a78ce04e6abb92aed3308aae5d0b644377afea572869660624ef4ceeedcb29eaefb3c9e6defd1241a4e6be931dd39a7286325a288 WHIRLPOOL 3074c618bf98f88de6b21759c6b183e2c836e0f1577ed5b1af4eb2cd1de71b606abc151a29d2f491f4bdfbecd1f6df9eb3f21252c81205c4edcfbd1ae9611619
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
+DIST libreoffice-help-5.0.3.1.tar.xz 1882408 SHA256 22187900e65408f03ecb0a6463d7587ca27e32cd341d9ba0e55a99d8cdb3bc45 SHA512 25bcc9343b6df145618e6e6a6427173418243bdc066b447764999704ffae2dcafa1a295828512aa3c8362e9a843267b7634d6b2c268bb57587fdd77c03b37522 WHIRLPOOL cce758b2a8d66218bd94c4c66680a847cb5a0b9583798e8252acbd491bd18cfca56951fddc17ae270f69423346a7023f078d655bd6c07a51abef04887e0c4d51
diff --git a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
new file mode 100644
index 0000000..912f7c6
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
@@ -0,0 +1,609 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ >=app-text/libexttextcat-3.2
+ >=app-text/libebook-0.1.1
+ >=app-text/libetonyek-0.1.2
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.5
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ =app-text/libwps-0.4*
+ >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1:=
+ =dev-libs/liborcus-0.7*
+ >=dev-libs/librevenge-0.0.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ >=net-misc/curl-7.21.4
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/tomcat-servlet-api:3.0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? (
+ dev-libs/glib:2
+ >=net-libs/telepathy-glib-0.18.0
+ >=x11-libs/gtk+-2.24:2
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-0.12.0:=
+ media-libs/glm
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+ local pgslot
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+ ; then
+ eerror "Compilation with gcc older than 4.6 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} < 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod mod2 dest tmplfile tmplname mypv
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ for mod in ${MODULES}; do
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+ [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ git-r3_src_unpack
+ if [[ ${mod} != core ]]; then
+ mod2=${mod}
+ # mapping does not match on help
+ [[ ${mod} == help ]] && mod2="helpcontent2"
+ mkdir -p "${S}/${mod2}/" || die
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
+ fi
+}
+
+src_prepare() {
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ base_src_prepare
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ -i pyuno/source/module/uno.py \
+ -i pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e 's#all : build unitcheck#all : build#g' \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+ -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+ "
+ fi
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+ rm -rf "${ED}"/etc/ || die
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -rf "${ED}"/usr/share/mimelnk/
+
+ # FIXME: Hack add missing file
+ insinto /usr/$(get_libdir)/${PN}/program
+ doins "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ use java || \
+ ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-10 23:27 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-10 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 057dc2b553c7a83c1e47e2e72034906081a5874f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 10 14:54:16 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 14:54:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057dc2b5
app-office/libreoffice: DEPEND on >=app-text/libwps-0.4.2
Package-Manager: portage-2.2.20.1
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 0f66fba..e528ce1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -108,7 +108,7 @@ COMMON_DEPEND="
>=app-text/libodfgen-0.1.0
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
- =app-text/libwps-0.4*
+ >=app-text/libwps-0.4.2
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-13 22:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-13 22:16 UTC (permalink / raw
To: gentoo-commits
commit: 7e79075a7704c10a27e85e8fcb3c06866d45cf21
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Oct 12 01:20:01 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 18:21:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e79075a
app-office/libreoffice: Backport improvements to 4.4.9999, 5.0.9999
Package-Manager: portage-2.2.20.1
app-office/libreoffice/libreoffice-4.4.9999.ebuild | 153 ++++++++++-----------
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 137 +++++++++---------
2 files changed, 144 insertions(+), 146 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 7f3f170..e727334 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -27,10 +27,10 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
unset SCM_ECLASS
-DESCRIPTION="LibreOffice, a full office productivity suite"
+DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
@@ -58,15 +58,21 @@ unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
+ADDONS_SRC=(
+ "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
unset EXT_URI
@@ -172,7 +178,6 @@ COMMON_DEPEND="
dev-java/commons-httpclient:3
dev-java/commons-lang:2.1
dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
)
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
@@ -241,6 +246,19 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-util/cppunit )
"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
@@ -257,31 +275,21 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
)
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
CHECKREQS_MEMORY="512M"
if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ then
eerror "Compilation with gcc older than 4.6 is not supported"
die "Too old gcc found."
fi
@@ -291,7 +299,7 @@ pkg_pretend() {
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
+ if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
@@ -308,7 +316,7 @@ pkg_setup() {
}
src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
+ local mod
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
use branding && unpack "${BRANDING}"
@@ -320,38 +328,21 @@ src_unpack() {
unpack "${PN}-${mod}-${PV}.tar.xz"
done
else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
for mod in ${MODULES}; do
+ branch="master"
mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
fi
}
src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
@@ -360,25 +351,25 @@ src_prepare() {
epatch
fi
- base_src_prepare
+ epatch "${PATCHES[@]}"
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
- sed \
+ sed -i \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
# sed in the tests
sed -i \
- -e 's#all : build unitcheck#all : build#g' \
+ -e "s#all : build unitcheck#all : build#g" \
solenv/gbuild/Module.mk || die
sed -i \
- -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
- -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
Makefile.in || die
if use branding; then
@@ -393,6 +384,17 @@ src_configure() {
local lo_ext
local ext_opts
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
@@ -434,7 +436,6 @@ src_configure() {
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
"
fi
fi
@@ -541,7 +542,7 @@ src_compile() {
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
source "${T}/config_host.mk" 2&> /dev/null
local path="${WORKDIR}/helpcontent2/source/auxiliary/"
@@ -551,7 +552,8 @@ src_compile() {
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=icon-themes/galaxy/res/helpimg \
> "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
)
local target
@@ -571,17 +573,17 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
+ rm -rf "${ED}"etc/ || die
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -591,14 +593,14 @@ src_install() {
doins xmlhelp/util/*.xsl
# Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
+ rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
@@ -608,9 +610,6 @@ pkg_preinst() {
pkg_postinst() {
kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 8ddf6c3..4724c61 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -27,10 +27,10 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
unset SCM_ECLASS
-DESCRIPTION="LibreOffice, a full office productivity suite"
+DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
@@ -58,15 +58,21 @@ unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
+ADDONS_SRC=(
+ "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
unset EXT_URI
@@ -173,7 +179,6 @@ COMMON_DEPEND="
dev-java/commons-httpclient:3
dev-java/commons-lang:2.1
dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
)
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
@@ -242,11 +247,6 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-util/cppunit )
"
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
@@ -260,18 +260,26 @@ REQUIRED_USE="
libreoffice_extensions_wiki-publisher? ( java )
"
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
CHECKREQS_MEMORY="512M"
if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ then
eerror "Compilation with gcc older than 4.6 is not supported"
die "Too old gcc found."
fi
@@ -281,7 +289,7 @@ pkg_pretend() {
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
+ if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
@@ -298,7 +306,7 @@ pkg_setup() {
}
src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
+ local mod
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
use branding && unpack "${BRANDING}"
@@ -310,38 +318,21 @@ src_unpack() {
unpack "${PN}-${mod}-${PV}.tar.xz"
done
else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
for mod in ${MODULES}; do
+ branch="master"
mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
fi
}
src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
@@ -350,25 +341,25 @@ src_prepare() {
epatch
fi
- base_src_prepare
+ epatch "${PATCHES[@]}"
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
- sed \
+ sed -i \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
# sed in the tests
sed -i \
- -e 's#all : build unitcheck#all : build#g' \
+ -e "s#all : build unitcheck#all : build#g" \
solenv/gbuild/Module.mk || die
sed -i \
- -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
- -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
Makefile.in || die
if use branding; then
@@ -383,6 +374,17 @@ src_configure() {
local lo_ext
local ext_opts
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
@@ -424,7 +426,6 @@ src_configure() {
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
"
fi
fi
@@ -531,7 +532,7 @@ src_compile() {
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
source "${T}/config_host.mk" 2&> /dev/null
local path="${WORKDIR}/helpcontent2/source/auxiliary/"
@@ -541,7 +542,8 @@ src_compile() {
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=icon-themes/galaxy/res/helpimg \
> "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
)
local target
@@ -561,17 +563,17 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
+ rm -rf "${ED}"etc/ || die
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -581,14 +583,14 @@ src_install() {
doins xmlhelp/util/*.xsl
# Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
+ rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
@@ -598,9 +600,6 @@ pkg_preinst() {
pkg_postinst() {
kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-13 22:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-13 22:16 UTC (permalink / raw
To: gentoo-commits
commit: afc8683077541722704146f7e99b3c19e55a8738
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Oct 12 00:07:50 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 18:19:43 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc86830
app-office/libreoffice: Drop apache-commons deps, raise min GCC to 4.7
Removal of apache-commons see also upstream commit 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16
GCC support: upstream commit e4b24c7399352642aeaeb412394d6230562d04d2
Package-Manager: portage-2.2.20.1
app-office/libreoffice/libreoffice-9999.ebuild | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c93b1e9..7528c3c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -178,12 +178,6 @@ COMMON_DEPEND="
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- )
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
telepathy? (
@@ -282,9 +276,9 @@ pkg_pretend() {
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
then
- eerror "Compilation with gcc older than 4.6 is not supported"
+ eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
fi
@@ -423,15 +417,6 @@ src_configure() {
use libreoffice_extensions_scripting-javascript && \
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
fi
# system headers/libs/...: enforce using system packages
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-13 22:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-13 22:16 UTC (permalink / raw
To: gentoo-commits
commit: 16050455be2244cfa54fac6eff098c3e7b8a0c8e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Oct 11 12:42:53 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 18:19:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16050455
app-office/libreoffice: Improve ebuild
Removal of servlet-api see also upstream commit 2c92030ff07aff9b10e49844343390925b81545c
Package-Manager: portage-2.2.20.1
app-office/libreoffice/libreoffice-9999.ebuild | 137 ++++++++++++-------------
1 file changed, 68 insertions(+), 69 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e528ce1..c93b1e9 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -27,10 +27,10 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
unset SCM_ECLASS
-DESCRIPTION="LibreOffice, a full office productivity suite"
+DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
@@ -58,15 +58,21 @@ unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
+ADDONS_SRC=(
+ "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
unset EXT_URI
@@ -177,7 +183,6 @@ COMMON_DEPEND="
dev-java/commons-httpclient:3
dev-java/commons-lang:2.1
dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
)
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
@@ -246,11 +251,6 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-util/cppunit )
"
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
@@ -264,18 +264,26 @@ REQUIRED_USE="
libreoffice_extensions_wiki-publisher? ( java )
"
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
CHECKREQS_MEMORY="512M"
if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ then
eerror "Compilation with gcc older than 4.6 is not supported"
die "Too old gcc found."
fi
@@ -285,7 +293,7 @@ pkg_pretend() {
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
+ if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
@@ -302,7 +310,7 @@ pkg_setup() {
}
src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
+ local mod
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
use branding && unpack "${BRANDING}"
@@ -314,38 +322,21 @@ src_unpack() {
unpack "${PN}-${mod}-${PV}.tar.xz"
done
else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
for mod in ${MODULES}; do
+ branch="master"
mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
fi
}
src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
@@ -354,25 +345,25 @@ src_prepare() {
epatch
fi
- base_src_prepare
+ epatch "${PATCHES[@]}"
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
- sed \
+ sed -i \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
# sed in the tests
sed -i \
- -e 's#all : build unitcheck#all : build#g' \
+ -e "s#all : build unitcheck#all : build#g" \
solenv/gbuild/Module.mk || die
sed -i \
- -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
- -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
Makefile.in || die
if use branding; then
@@ -387,6 +378,17 @@ src_configure() {
local lo_ext
local ext_opts
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
@@ -428,7 +430,6 @@ src_configure() {
--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
"
fi
fi
@@ -529,7 +530,7 @@ src_compile() {
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
source "${T}/config_host.mk" 2&> /dev/null
local path="${WORKDIR}/helpcontent2/source/auxiliary/"
@@ -539,7 +540,8 @@ src_compile() {
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=icon-themes/galaxy/res/helpimg \
> "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
)
local target
@@ -559,17 +561,17 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
+ rm -rf "${ED}"etc/ || die
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -579,14 +581,14 @@ src_install() {
doins xmlhelp/util/*.xsl
# Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
+ rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
@@ -596,9 +598,6 @@ pkg_preinst() {
pkg_postinst() {
kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-23 20:01 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-23 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 9edfd83745079960bb8a8dc227c1a1fed45e1f63
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 20:02:21 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 20:02:21 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9edfd837
app-office/libreoffice: LO 5.0.3 works fine with Python 3.5. Tested by Arfrever.
Package-Manager: portage-2.2.23
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 4724c61..bfc62fb 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-30 0:05 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-30 0:05 UTC (permalink / raw
To: gentoo-commits
commit: a7fb3d0bedbbd070b77b473760fcae688a281312
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Oct 26 23:38:49 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 22:09:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fb3d0b
app-office/libreoffice: Drop gconf integration, python2_7 support
gconf: see commit 3cf557c12d27f1b2250e69a543136da098112d80
Package-Manager: portage-2.2.23
app-office/libreoffice/libreoffice-9999.ebuild | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7528c3c..ede2028 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -161,7 +161,7 @@ COMMON_DEPEND="
eds? ( gnome-extra/evolution-data-server )
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
+ gnome? ( dev-libs/glib:2 )
gtk? (
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
@@ -180,11 +180,7 @@ COMMON_DEPEND="
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
+ telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
"
RDEPEND="${COMMON_DEPEND}
@@ -249,9 +245,9 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
- gnome? ( gtk )
eds? ( gnome )
- telepathy? ( gtk )
+ gnome? ( gtk )
+ telepathy? ( gnome )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -374,7 +370,7 @@ src_configure() {
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
+ # System python enablement:
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
@@ -481,9 +477,7 @@ src_configure() {
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
- $(use_enable gnome gconf) \
$(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-30 0:24 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-30 0:24 UTC (permalink / raw
To: gentoo-commits
commit: f368810e9ce3ddc95876e7e7f84dca9dbf71dc28
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 00:23:55 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 00:23:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f368810e
app-office/libreoffice: Version bump, without keywords until official release
Package-Manager: portage-2.2.23
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.0.3.2.ebuild | 608 ++++++++++++++++++++++
2 files changed, 610 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a7c9aba..fefc264 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,8 +10,10 @@ DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690
DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
DIST libreoffice-5.0.3.1.tar.xz 166989184 SHA256 5502477772d6b986fc0486e7ec4e1fd7d99796f9bf63610d4dec84d77f165585 SHA512 0e157f2f126f530dbcf4849a78ce04e6abb92aed3308aae5d0b644377afea572869660624ef4ceeedcb29eaefb3c9e6defd1241a4e6be931dd39a7286325a288 WHIRLPOOL 3074c618bf98f88de6b21759c6b183e2c836e0f1577ed5b1af4eb2cd1de71b606abc151a29d2f491f4bdfbecd1f6df9eb3f21252c81205c4edcfbd1ae9611619
+DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
DIST libreoffice-help-5.0.3.1.tar.xz 1882408 SHA256 22187900e65408f03ecb0a6463d7587ca27e32cd341d9ba0e55a99d8cdb3bc45 SHA512 25bcc9343b6df145618e6e6a6427173418243bdc066b447764999704ffae2dcafa1a295828512aa3c8362e9a843267b7634d6b2c268bb57587fdd77c03b37522 WHIRLPOOL cce758b2a8d66218bd94c4c66680a847cb5a0b9583798e8252acbd491bd18cfca56951fddc17ae270f69423346a7023f078d655bd6c07a51abef04887e0c4d51
+DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
new file mode 100644
index 0000000..7765a00
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ >=app-text/libexttextcat-3.2
+ >=app-text/libebook-0.1.1
+ >=app-text/libetonyek-0.1.2
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.5
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ =app-text/libwps-0.4*
+ >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1:=
+ =dev-libs/liborcus-0.7*
+ >=dev-libs/librevenge-0.0.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ >=net-misc/curl-7.21.4
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? (
+ dev-libs/glib:2
+ >=net-libs/telepathy-glib-0.18.0
+ >=x11-libs/gtk+-2.24:2
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-0.12.0:=
+ media-libs/glm
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+ local pgslot
+
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ then
+ eerror "Compilation with gcc older than 4.6 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ epatch "${PATCHES[@]}"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ "
+ fi
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+ rm -rf "${ED}"etc/ || die
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ # FIXME: Hack add missing file
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-31 13:04 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-31 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 25337bdde0fb80ed8823b52f9a4c1fac6d35da0d
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 13:04:26 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 13:04:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25337bdd
app-office/libreoffice: drop xpdf-headers use flag requirement on poppler, the flag has been gone for three years now
Package-Manager: portage-2.2.23
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index bfc62fb..79f1fe4 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
=app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=app-text/poppler-0.16:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ede2028..a8aafcf 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4.2
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=app-text/poppler-0.16:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-10-31 19:42 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-10-31 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 9ce0ac388e81a50585f3da25ce779dd3f2137473
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 19:40:38 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 19:42:36 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce0ac38
app-office/libreoffice: Remove old
Package-Manager: portage-2.2.23
app-office/libreoffice/Manifest | 4 -
app-office/libreoffice/libreoffice-5.0.1.2.ebuild | 607 ---------------------
app-office/libreoffice/libreoffice-5.0.3.1.ebuild | 609 ----------------------
3 files changed, 1220 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fefc264..d8db86e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,13 +7,9 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
-DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
-DIST libreoffice-5.0.3.1.tar.xz 166989184 SHA256 5502477772d6b986fc0486e7ec4e1fd7d99796f9bf63610d4dec84d77f165585 SHA512 0e157f2f126f530dbcf4849a78ce04e6abb92aed3308aae5d0b644377afea572869660624ef4ceeedcb29eaefb3c9e6defd1241a4e6be931dd39a7286325a288 WHIRLPOOL 3074c618bf98f88de6b21759c6b183e2c836e0f1577ed5b1af4eb2cd1de71b606abc151a29d2f491f4bdfbecd1f6df9eb3f21252c81205c4edcfbd1ae9611619
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
-DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
-DIST libreoffice-help-5.0.3.1.tar.xz 1882408 SHA256 22187900e65408f03ecb0a6463d7587ca27e32cd341d9ba0e55a99d8cdb3bc45 SHA512 25bcc9343b6df145618e6e6a6427173418243bdc066b447764999704ffae2dcafa1a295828512aa3c8362e9a843267b7634d6b2c268bb57587fdd77c03b37522 WHIRLPOOL cce758b2a8d66218bd94c4c66680a847cb5a0b9583798e8252acbd491bd18cfca56951fddc17ae270f69423346a7023f078d655bd6c07a51abef04887e0c4d51
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
diff --git a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
deleted file mode 100644
index a8bb49b..0000000
--- a/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
+++ /dev/null
@@ -1,607 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- for mod in ${MODULES}; do
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e 's#all : build unitcheck#all : build#g' \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
- -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
-
- # FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
deleted file mode 100644
index 912f7c6..0000000
--- a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
+++ /dev/null
@@ -1,609 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- for mod in ${MODULES}; do
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e 's#all : build unitcheck#all : build#g' \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
- -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
-
- # FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-11-08 11:07 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-11-08 11:07 UTC (permalink / raw
To: gentoo-commits
commit: 83e95a202c23e914e8ccbe73394a7c319b7a3c0b
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Nov 1 13:04:16 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 18:14:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e95a20
app-office/libreoffice: epatch_user
Package-Manager: portage-2.2.20.1
app-office/libreoffice/libreoffice-4.4.9999.ebuild | 1 +
app-office/libreoffice/libreoffice-5.0.3.2.ebuild | 1 +
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index e727334..863f7c9 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -352,6 +352,7 @@ src_prepare() {
fi
epatch "${PATCHES[@]}"
+ epatch_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 7765a00..45dc032 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -343,6 +343,7 @@ src_prepare() {
fi
epatch "${PATCHES[@]}"
+ epatch_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 79f1fe4..4cc1a49 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -342,6 +342,7 @@ src_prepare() {
fi
epatch "${PATCHES[@]}"
+ epatch_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a8aafcf..3907338 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -336,6 +336,7 @@ src_prepare() {
fi
epatch "${PATCHES[@]}"
+ epatch_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-11-08 11:07 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-11-08 11:07 UTC (permalink / raw
To: gentoo-commits
commit: b6e6b150747773773b55016e5dfee6a3304ec337
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Oct 26 02:08:35 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 18:14:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e6b150
app-office/libreoffice: Version bump to 4.4.6.3 final release
Package-Manager: portage-2.2.23
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-4.4.6.3.ebuild | 618 ++++++++++++++++++++++
2 files changed, 620 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d8db86e..cf5d401 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,9 +7,11 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
+DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd WHIRLPOOL 9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
+DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
diff --git a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
new file mode 100644
index 0000000..863f7c9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
@@ -0,0 +1,618 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ >=app-text/libexttextcat-3.2
+ >=app-text/libebook-0.1.1
+ >=app-text/libetonyek-0.1.1
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.4
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ =app-text/libwps-0.3*
+ >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1:=
+ =dev-libs/liborcus-0.7*
+ >=dev-libs/librevenge-0.0.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ >=dev-libs/openssl-1.0.0d:0
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ >=net-misc/curl-7.21.4
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? ( >=x11-libs/gtk+-3.2:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? (
+ dev-libs/glib:2
+ >=net-libs/telepathy-glib-0.18.0
+ >=x11-libs/gtk+-2.24:2
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-0.11.2:=
+ media-libs/glm
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+
+ # from 5.0 branch
+ "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
+ "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
+ "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
+ "${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
+ "${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
+ "${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
+
+ # from master branch
+ "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+ local pgslot
+
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ then
+ eerror "Compilation with gcc older than 4.6 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ epatch "${PATCHES[@]}"
+ epatch_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ "
+ fi
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+ rm -rf "${ED}"etc/ || die
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ # FIXME: Hack add missing file
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-11-24 23:12 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2015-11-24 23:12 UTC (permalink / raw
To: gentoo-commits
commit: 652a2fafc71f022430d88bd5d7563e125aef24ad
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 23:12:24 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 23:12:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=652a2faf
app-office/libreoffice: amd64 stable wrt bug #565026
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
app-office/libreoffice/libreoffice-5.0.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 0c4db0e..1350538 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -96,7 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-11-24 23:13 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2015-11-24 23:13 UTC (permalink / raw
To: gentoo-commits
commit: 4d757c4e18caff612308120536dcbf2c0803c5f3
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 23:13:20 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 23:13:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d757c4e
app-office/libreoffice: x86 stable wrt bug #565026
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
app-office/libreoffice/libreoffice-5.0.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 1350538..15d59be 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -96,7 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2015-12-19 2:51 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2015-12-19 2:51 UTC (permalink / raw
To: gentoo-commits
commit: b71af47148b9b8cb0f3e971508206735bac48d00
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 01:14:31 2015 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 02:49:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71af471
app-office/libreoffice: Version bump
Package-Manager: portage-2.2.26
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.0.4.2.ebuild | 608 ++++++++++++++++++++++
2 files changed, 610 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6b7786a..8788035 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,6 +8,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd WHIRLPOOL 9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
+DIST libreoffice-5.0.4.2.tar.xz 167305516 SHA256 647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8 SHA512 729403edaec752bbb933548e15bf1d417a307e58e0cc6db045bfb97eb99c65b29ae785d207a2611c25b2a55a1fa25e3f0905adbb6500f571fb2f345ccfa53be8 WHIRLPOOL e903d2a218416051002103a7670febca384db8e1e3d6d3e25bbe116629b24534e99d5571ecf4663a8aefe81d3d7211b9f2ec0604fa9c2b861487ed615fc5afc2
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
+DIST libreoffice-help-5.0.4.2.tar.xz 1882964 SHA256 5d3c20037a8c2abc04aa3d5991a956538a8dad6669ce0ee0de56d78ebce5b200 SHA512 42c6c8361ec2c8b7d1652110818dcf162ad2508e17f8152713fe4a28439a103346144500a569c9b993ad7edab18637006c8787984756931ab8953868fc97cb44 WHIRLPOOL 238511d7a0ef16c22a774bbcb732da180e8d5d56a3d952a30c0da1cb1cf2154ece7efbe993409a9e6bcae8c2e5ebba049dcf68058a8c151a967f0d6df1dce93b
diff --git a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
new file mode 100644
index 0000000..4cc1a49
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ >=app-text/libexttextcat-3.2
+ >=app-text/libebook-0.1.1
+ >=app-text/libetonyek-0.1.2
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.5
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ =app-text/libwps-0.4*
+ >=app-text/poppler-0.16:=[cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1:=
+ =dev-libs/liborcus-0.7*
+ >=dev-libs/librevenge-0.0.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ >=net-misc/curl-7.21.4
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? (
+ dev-libs/glib:2
+ >=net-libs/telepathy-glib-0.18.0
+ >=x11-libs/gtk+-2.24:2
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-0.12.0:=
+ media-libs/glm
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+ local pgslot
+
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ then
+ eerror "Compilation with gcc older than 4.6 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ epatch "${PATCHES[@]}"
+ epatch_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ "
+ fi
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+ rm -rf "${ED}"etc/ || die
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ # FIXME: Hack add missing file
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-02-19 22:05 Lars Wendler
0 siblings, 0 replies; 588+ messages in thread
From: Lars Wendler @ 2016-02-19 22:05 UTC (permalink / raw
To: gentoo-commits
commit: a13ce8dfaafda87d34a2e1e87821c861dbf01f96
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 22:02:49 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 22:04:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a13ce8df
app-office/libreoffice: Security bump (bug #575152).
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.0.5.2.ebuild | 608 ++++++++++++++++++++++
2 files changed, 610 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8788035..0d52bf3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,7 +9,9 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd WHIRLPOOL 9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-5.0.4.2.tar.xz 167305516 SHA256 647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8 SHA512 729403edaec752bbb933548e15bf1d417a307e58e0cc6db045bfb97eb99c65b29ae785d207a2611c25b2a55a1fa25e3f0905adbb6500f571fb2f345ccfa53be8 WHIRLPOOL e903d2a218416051002103a7670febca384db8e1e3d6d3e25bbe116629b24534e99d5571ecf4663a8aefe81d3d7211b9f2ec0604fa9c2b861487ed615fc5afc2
+DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
DIST libreoffice-help-5.0.4.2.tar.xz 1882964 SHA256 5d3c20037a8c2abc04aa3d5991a956538a8dad6669ce0ee0de56d78ebce5b200 SHA512 42c6c8361ec2c8b7d1652110818dcf162ad2508e17f8152713fe4a28439a103346144500a569c9b993ad7edab18637006c8787984756931ab8953868fc97cb44 WHIRLPOOL 238511d7a0ef16c22a774bbcb732da180e8d5d56a3d952a30c0da1cb1cf2154ece7efbe993409a9e6bcae8c2e5ebba049dcf68058a8c151a967f0d6df1dce93b
+DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
new file mode 100644
index 0000000..4cc1a49
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
@@ -0,0 +1,608 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ >=app-text/libexttextcat-3.2
+ >=app-text/libebook-0.1.1
+ >=app-text/libetonyek-0.1.2
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.5
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ =app-text/libwps-0.4*
+ >=app-text/poppler-0.16:=[cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1:=
+ =dev-libs/liborcus-0.7*
+ >=dev-libs/librevenge-0.0.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ >=net-misc/curl-7.21.4
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? (
+ dev-libs/glib:2
+ >=net-libs/telepathy-glib-0.18.0
+ >=x11-libs/gtk+-2.24:2
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-0.12.0:=
+ media-libs/glm
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+ local pgslot
+
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+ then
+ eerror "Compilation with gcc older than 4.6 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ epatch "${PATCHES[@]}"
+ epatch_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ "
+ fi
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+ rm -rf "${ED}"etc/ || die
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ # FIXME: Hack add missing file
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-02-25 5:00 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-02-25 5:00 UTC (permalink / raw
To: gentoo-commits
commit: a750ea01493c46ad5f244f89b324b3d6a5e146ac
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 04:56:51 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 04:56:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a750ea01
app-office/libreoffice: Restore keywords
Package-Manager: portage-2.2.27
app-office/libreoffice/libreoffice-5.1.0.3.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
index bc07327..18d7177 100644
--- a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
@@ -96,8 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-02-28 22:10 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-02-28 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 4d3d2f6f8048e08b8fb5ae3b6345815f021984eb
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 22:09:46 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 22:09:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3d2f6f
app-office/libreoffice: Drop old
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 4 -
app-office/libreoffice/libreoffice-4.4.6.3.ebuild | 618 ---------------------
app-office/libreoffice/libreoffice-4.4.9999.ebuild | 618 ---------------------
app-office/libreoffice/libreoffice-5.0.4.2.ebuild | 608 --------------------
4 files changed, 1848 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5364ce9..2687867 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,14 +6,10 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd WHIRLPOOL 9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
-DIST libreoffice-5.0.4.2.tar.xz 167305516 SHA256 647440b70fc190a43a3373cfe5b06a87558ee07711e3d74cab8fb9d8cbac6dc8 SHA512 729403edaec752bbb933548e15bf1d417a307e58e0cc6db045bfb97eb99c65b29ae785d207a2611c25b2a55a1fa25e3f0905adbb6500f571fb2f345ccfa53be8 WHIRLPOOL e903d2a218416051002103a7670febca384db8e1e3d6d3e25bbe116629b24534e99d5571ecf4663a8aefe81d3d7211b9f2ec0604fa9c2b861487ed615fc5afc2
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c WHIRLPOOL 2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
-DIST libreoffice-help-5.0.4.2.tar.xz 1882964 SHA256 5d3c20037a8c2abc04aa3d5991a956538a8dad6669ce0ee0de56d78ebce5b200 SHA512 42c6c8361ec2c8b7d1652110818dcf162ad2508e17f8152713fe4a28439a103346144500a569c9b993ad7edab18637006c8787984756931ab8953868fc97cb44 WHIRLPOOL 238511d7a0ef16c22a774bbcb732da180e8d5d56a3d952a30c0da1cb1cf2154ece7efbe993409a9e6bcae8c2e5ebba049dcf68058a8c151a967f0d6df1dce93b
DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
DIST libreoffice-help-5.1.0.3.tar.xz 1903996 SHA256 c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447 SHA512 5a7f9b59d14aa8b3f760abc835f7541d2458b6c2239a42653db91681d82a8f90bfc5c593c74ed086a64de8078eea6367ecd27f0ba07ce37fb13f6dd935f5a438 WHIRLPOOL 6d650f0faf230184a2db7e20440e755b0d05bbda1374bb4fc1bb3ed832d89b4f115bda4fad9f0a280d91d12aec1730b5b9dd76ef1d6acb417a03f7d3f6c4f320
diff --git a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild b/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
deleted file mode 100644
index 1dad190..0000000
--- a/app-office/libreoffice/libreoffice-4.4.6.3.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.1
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.4
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.3*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.11.2:0=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
- # from 5.0 branch
- "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
- "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
- "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
- "${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
- "${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
- "${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
-
- # from master branch
- "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
deleted file mode 100644
index 1dad190..0000000
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.1
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.4
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.3*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.11.2:0=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
- # from 5.0 branch
- "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
- "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
- "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
- "${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
- "${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
- "${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
-
- # from master branch
- "${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild b/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
deleted file mode 100644
index 1cf15be..0000000
--- a/app-office/libreoffice/libreoffice-5.0.4.2.ebuild
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-02-28 23:06 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-02-28 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 6c6b69973ac6668148f643d5a604cd897c371202
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 23:05:25 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 23:05:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6b6997
app-office/libreoffice: Require cairo with xlib acceleration because of bug 490056
Package-Manager: portage-2.2.27
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.1.0.3.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index abeb761..666755f9 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -147,7 +147,7 @@ COMMON_DEPEND="
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
+ >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
index fe6e54d..f9f9a97 100644
--- a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
@@ -147,7 +147,7 @@ COMMON_DEPEND="
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
+ >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index fe6e54d..f9f9a97 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -147,7 +147,7 @@ COMMON_DEPEND="
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
+ >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9e2bd12..a16a8b7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -146,7 +146,7 @@ COMMON_DEPEND="
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
+ >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-02-29 13:10 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-02-29 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 997b0ca354c20a32c7b9813163f7ac69d62852be
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 13:09:48 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 13:10:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=997b0ca3
app-office/libreoffice: Drop redundant @system deps, bug 574368
Package-Manager: portage-2.2.27
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 4 +---
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 4 +---
app-office/libreoffice/libreoffice-9999.ebuild | 4 +---
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 666755f9..eae32ae 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -224,12 +224,10 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/mdds-0.12.0:0=
media-libs/glm
net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
sys-devel/bison
- sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
- >=sys-devel/make-3.82
+ !<sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index f9f9a97..82abbfe 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -220,12 +220,10 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/mdds-0.12.0:0=
media-libs/glm
net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
sys-devel/bison
- sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
- >=sys-devel/make-3.82
+ !<sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a16a8b7..6c2e2f7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -218,12 +218,10 @@ DEPEND="${COMMON_DEPEND}
dev-util/intltool
dev-util/mdds:1=
media-libs/glm
- >=sys-apps/findutils-4.4.2
sys-devel/bison
- sys-apps/coreutils
sys-devel/flex
sys-devel/gettext
- >=sys-devel/make-3.82
+ !<sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-03-01 14:53 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-03-01 14:53 UTC (permalink / raw
To: gentoo-commits
commit: 3aacf429775ec5e7cd979bd9c5f5c910cd8e2f0e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 27 14:05:06 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 01:06:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aacf429
app-office/libreoffice: 5.1.1.3 pre-release version bump
Added back python2_7 compat since it was fixed upstream.
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-5.1.9999.ebuild => libreoffice-5.1.1.3.ebuild} | 5 +++--
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2687867..15956fa 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,7 +9,9 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
+DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
DIST libreoffice-help-5.1.0.3.tar.xz 1903996 SHA256 c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447 SHA512 5a7f9b59d14aa8b3f760abc835f7541d2458b6c2239a42653db91681d82a8f90bfc5c593c74ed086a64de8078eea6367ecd27f0ba07ce37fb13f6dd935f5a438 WHIRLPOOL 6d650f0faf230184a2db7e20440e755b0d05bbda1374bb4fc1bb3ed832d89b4f115bda4fad9f0a280d91d12aec1730b5b9dd76ef1d6acb417a03f7d3f6c4f320
+DIST libreoffice-help-5.1.1.3.tar.xz 1904764 SHA256 ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9 SHA512 2d2400850e0e734df8eb884df2edfabd6dd31c1ef8f43652feca3cc573c1acf6d73716eadf3ded39e2b15f010ec486835830f020aec7b47529064d5cdab4fde0 WHIRLPOOL 1a39adf1b424876b58a5ad8c3e3e625c0e54ad525d93d309698fed33549c40cae00543311f68fe22e39b9f871587811b6867633e741724d61e994d6ad8518cb2
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-5.1.9999.ebuild
copy to app-office/libreoffice/libreoffice-5.1.1.3.ebuild
index 82abbfe..903ff34 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -96,7 +96,8 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 82abbfe..11c9a86 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6c2e2f7..9593c32 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-03-02 17:05 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2016-03-02 17:05 UTC (permalink / raw
To: gentoo-commits
commit: fd1c1af218d388b1f5d4170cb6fd5ce825dba25c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 17:04:38 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 17:04:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd1c1af2
app-office/libreoffice: amd64 stable wrt bug #575152
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.0.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
index abeb761..8833505 100644
--- a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
@@ -96,7 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-03-02 17:05 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2016-03-02 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 59a5f13cec1b21e5d4224854e977616d0f99c3a2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 17:05:29 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 17:05:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a5f13c
app-office/libreoffice: x86 stable wrt bug #575152
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.0.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
index 8833505..2766ac5 100644
--- a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
@@ -96,7 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-03-03 0:43 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-03-03 0:43 UTC (permalink / raw
To: gentoo-commits
commit: 436b14d6398d1bbf871e12517cced3697ccb6926
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 3 00:43:11 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 3 00:43:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436b14d6
app-office/libreoffice: Remove old
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-5.0.3.2.ebuild | 608 ----------------------
2 files changed, 610 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 15956fa..9e10669 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,12 +6,10 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
DIST libreoffice-help-5.1.0.3.tar.xz 1903996 SHA256 c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447 SHA512 5a7f9b59d14aa8b3f760abc835f7541d2458b6c2239a42653db91681d82a8f90bfc5c593c74ed086a64de8078eea6367ecd27f0ba07ce37fb13f6dd935f5a438 WHIRLPOOL 6d650f0faf230184a2db7e20440e755b0d05bbda1374bb4fc1bb3ed832d89b4f115bda4fad9f0a280d91d12aec1730b5b9dd76ef1d6acb417a03f7d3f6c4f320
DIST libreoffice-help-5.1.1.3.tar.xz 1904764 SHA256 ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9 SHA512 2d2400850e0e734df8eb884df2edfabd6dd31c1ef8f43652feca3cc573c1acf6d73716eadf3ded39e2b15f010ec486835830f020aec7b47529064d5cdab4fde0 WHIRLPOOL 1a39adf1b424876b58a5ad8c3e3e625c0e54ad525d93d309698fed33549c40cae00543311f68fe22e39b9f871587811b6867633e741724d61e994d6ad8518cb2
diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
deleted file mode 100644
index 6b99676..0000000
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-03-19 21:39 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-03-19 21:39 UTC (permalink / raw
To: gentoo-commits
commit: c0ca3909b9036cfe7ee7154160a052819c79ed42
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Mar 12 15:10:16 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 21:39:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ca3909
app-office/libreoffice: Fix liborcus DEPEND, bashcomp, xmlsec tarball
- >=dev-libs/liborcus-0.11.1
- bashcomp: bug 575974
- xmlsec-1.2.16.tar.gz: bug 577278
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9e10669..b46329c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,4 +1,5 @@
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
+DIST 17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz 1803092 SHA256 f62df3315b87d61544d7733e99ceccece046c813b60b898109d98808ca8bd88c SHA512 95a7e4b958ae3a4bdb5118d0ca530dacbd371f408657289f23e5e9995ac6032b9b015fae78b2ee746c4cbad3edba8f8be812457a67ec7cabf3b13fac16db4898 WHIRLPOOL 1784d2526587564fbf3bd564ef801c1c0173ee1533fa5ed3406b41e764f256fa36f6ffc3834a1c748fafe4b0fa3bd909ae18befe5b82f409bc358237de82106c
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9593c32..4686600 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -59,7 +59,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "${ADDONS_URI}/17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -122,7 +122,7 @@ COMMON_DEPEND="
dev-libs/expat
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1:=
- >=dev-libs/liborcus-0.9.0
+ >=dev-libs/liborcus-0.11.1
>=dev-libs/librevenge-0.0.1
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
@@ -529,11 +529,10 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-03-25 20:46 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-03-25 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 34e546f17994826f0c52c5b82ada29a7ed5426df
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 20:46:14 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 20:46:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e546f1
app-office/libreoffice: Check for more disk space if building with debug info, bug 563286
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.1.3.ebuild | 7 ++++++-
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 7 ++++++-
app-office/libreoffice/libreoffice-9999.ebuild | 7 ++++++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
index 56ec419..5abaa47 100644
--- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
@@ -266,7 +266,12 @@ PATCHES=(
)
CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+elif [[ ${MERGE_TYPE} != binary ]] ; then
+ CHECKREQS_DISK_BUILD="6G"
+fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 11c9a86..940c4be 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -263,7 +263,12 @@ PATCHES=(
)
CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+elif [[ ${MERGE_TYPE} != binary ]] ; then
+ CHECKREQS_DISK_BUILD="6G"
+fi
pkg_pretend() {
local pgslot
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4686600..f61e42c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -258,7 +258,12 @@ PATCHES=(
)
CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+elif [[ ${MERGE_TYPE} != binary ]] ; then
+ CHECKREQS_DISK_BUILD="6G"
+fi
pkg_pretend() {
local pgslot
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-03-27 21:02 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-03-27 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 8cdd77244802bfbe63eaa7df333ce6d2e44b25ff
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Mar 25 16:16:50 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 21:02:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdd7724
app-office/libreoffice: Bump libxmlsec tarball to 1.2.17
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b46329c..632d578 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,11 +1,11 @@
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
-DIST 17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz 1803092 SHA256 f62df3315b87d61544d7733e99ceccece046c813b60b898109d98808ca8bd88c SHA512 95a7e4b958ae3a4bdb5118d0ca530dacbd371f408657289f23e5e9995ac6032b9b015fae78b2ee746c4cbad3edba8f8be812457a67ec7cabf3b13fac16db4898 WHIRLPOOL 1784d2526587564fbf3bd564ef801c1c0173ee1533fa5ed3406b41e764f256fa36f6ffc3834a1c748fafe4b0fa3bd909ae18befe5b82f409bc358237de82106c
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
+DIST d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz 1731324 SHA256 f2d96dab0f4b0ebc505506a7a53bf0a621b7af815b67d2f4e07ef0f657c1f13f SHA512 f2575c82ba3a9c2341a78f80bc83869141a626337558538d4c044d920b6dbbda206aab533fff04183ff7f8bcb50495dbc0d3522fddf0a0d4589f60bf052ed45d WHIRLPOOL 273032ed4edefdff2fb8ffb63ae00418913d9bbac9a08ae2cfdbd8eaa81e69f19f18cdce2a88923a1d8ef326c246141e766422da34ea8ddadef9358ed56a0544
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f61e42c..bd14745 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -59,7 +59,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz" # modifies source code
+ "${ADDONS_URI}/d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-04-08 22:01 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-04-08 22:01 UTC (permalink / raw
To: gentoo-commits
commit: fee6dd556df4964b79f164be8022691df05a2940
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Apr 6 23:22:38 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 21:58:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee6dd55
app-office/libreoffice: Bump libxmlsec tarball to 1.2.19
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 61ed909..42f5b11 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,8 +5,8 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
-DIST d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz 1731324 SHA256 f2d96dab0f4b0ebc505506a7a53bf0a621b7af815b67d2f4e07ef0f657c1f13f SHA512 f2575c82ba3a9c2341a78f80bc83869141a626337558538d4c044d920b6dbbda206aab533fff04183ff7f8bcb50495dbc0d3522fddf0a0d4589f60bf052ed45d WHIRLPOOL 273032ed4edefdff2fb8ffb63ae00418913d9bbac9a08ae2cfdbd8eaa81e69f19f18cdce2a88923a1d8ef326c246141e766422da34ea8ddadef9358ed56a0544
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
+DIST fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz 1766298 SHA256 2fc8f7c9fadb0f6c565bf304de798a875fc719005c20169f8e88028b20c8aac0 SHA512 9d391658902e163261a61474fc0415ee0f25732dc4a98d2012459294674f7984212607febc10cdf5f5b6255932c4ad51a23d0a7b868990439812f5e276fd1a89 WHIRLPOOL 57795d4ac05727867680f7f81d50203fe7603d4a804650db7fafcbe48f8af1c5ef10a021218b3edaebc1dcc06653536f8545d2601a61e32c699701716e3353c5
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
DIST libreoffice-5.1.2.2.tar.xz 173763036 SHA256 54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781 SHA512 0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8 WHIRLPOOL 059f6f558c5cf3881b2ce5fee1c9ef0286c315481fd17dc7129aaf8ede97ca1759c8b821c1575ad4457e670e54241409e48e54bd1e8d62c8401cf5067ef81226
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 80adfc8..f07ecf8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -59,7 +59,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz" # modifies source code
+ "${ADDONS_URI}/fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-04-08 22:01 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-04-08 22:01 UTC (permalink / raw
To: gentoo-commits
commit: ac5f3edcd3b476551f1b83216cfc549dfef88511
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Apr 6 23:21:15 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 21:58:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac5f3edc
app-office/libreoffice: 5.1.2.2 version bump, EAPI=6
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 2 ++
...-5.1.9999.ebuild => libreoffice-5.1.2.2.ebuild} | 23 +++++-----------------
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 23 +++++-----------------
app-office/libreoffice/libreoffice-9999.ebuild | 20 +++++--------------
4 files changed, 17 insertions(+), 51 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 64d08f4..61ed909 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,6 +9,8 @@ DIST d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz 1731324 SHA256 f2d96
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
+DIST libreoffice-5.1.2.2.tar.xz 173763036 SHA256 54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781 SHA512 0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8 WHIRLPOOL 059f6f558c5cf3881b2ce5fee1c9ef0286c315481fd17dc7129aaf8ede97ca1759c8b821c1575ad4457e670e54241409e48e54bd1e8d62c8401cf5067ef81226
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
DIST libreoffice-help-5.1.1.3.tar.xz 1904764 SHA256 ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9 SHA512 2d2400850e0e734df8eb884df2edfabd6dd31c1ef8f43652feca3cc573c1acf6d73716eadf3ded39e2b15f010ec486835830f020aec7b47529064d5cdab4fde0 WHIRLPOOL 1a39adf1b424876b58a5ad8c3e3e625c0e54ad525d93d309698fed33549c40cae00543311f68fe22e39b9f871587811b6867633e741724d61e994d6ad8518cb2
+DIST libreoffice-help-5.1.2.2.tar.xz 1900736 SHA256 dc4d9fd6ca78ad89069ca1f0187f274c9cd83fb8849716193d25bce6ca072953 SHA512 5868e9ec51ac841372cdc8aa7b257082d04269ecd3c2724ddd9f6da36a1a0549eb6bedc2e71a205543f8a23b36df7cebd937a316b22c2be778a1d2f7e4d9df41 WHIRLPOOL c7565974995b4a95894b59263595f82c6980c2c8e4b3aa37fb787c4ad369774b128062a32dcf14c4f1dc60339c469e47acc9ba3b193ea6e2de6a1d4e38cc21a6
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
similarity index 98%
copy from app-office/libreoffice/libreoffice-5.1.9999.ebuild
copy to app-office/libreoffice/libreoffice-5.1.2.2.ebuild
index 940c4be..213fd4e 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
@@ -255,9 +255,6 @@ REQUIRED_USE="
"
PATCHES=(
- # submitted upstream
- "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
-
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
)
@@ -271,8 +268,6 @@ elif [[ ${MERGE_TYPE} != binary ]] ; then
fi
pkg_pretend() {
- local pgslot
-
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
@@ -290,7 +285,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -335,16 +330,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -374,7 +362,6 @@ src_prepare() {
src_configure() {
local java_opts
local internal_libs
- local lo_ext
local ext_opts
# optimization flags
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 940c4be..213fd4e 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
@@ -255,9 +255,6 @@ REQUIRED_USE="
"
PATCHES=(
- # submitted upstream
- "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
-
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
)
@@ -271,8 +268,6 @@ elif [[ ${MERGE_TYPE} != binary ]] ; then
fi
pkg_pretend() {
- local pgslot
-
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
@@ -290,7 +285,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -335,16 +330,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -374,7 +362,6 @@ src_prepare() {
src_configure() {
local java_opts
local internal_libs
- local lo_ext
local ext_opts
# optimization flags
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index bd14745..80adfc8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
@@ -266,8 +266,6 @@ elif [[ ${MERGE_TYPE} != binary ]] ; then
fi
pkg_pretend() {
- local pgslot
-
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
@@ -285,7 +283,7 @@ pkg_pretend() {
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
+ local pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
@@ -330,16 +328,9 @@ src_unpack() {
}
src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -368,7 +359,6 @@ src_prepare() {
src_configure() {
local java_opts
- local lo_ext
local ext_opts
# optimization flags
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-04-16 20:18 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-04-16 20:18 UTC (permalink / raw
To: gentoo-commits
commit: 2dd7abee32a50382aa9db9416f5ea27d886e7b3d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Apr 16 16:40:26 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 20:18:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd7abee
app-office/libreoffice: Bump libxmlsec tarball to 1.2.20
Gentoo-bug: 577278
Package-Manager: portage-2.2.27
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 42f5b11..c09ce6c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,8 +5,8 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
+DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz 1766298 SHA256 2fc8f7c9fadb0f6c565bf304de798a875fc719005c20169f8e88028b20c8aac0 SHA512 9d391658902e163261a61474fc0415ee0f25732dc4a98d2012459294674f7984212607febc10cdf5f5b6255932c4ad51a23d0a7b868990439812f5e276fd1a89 WHIRLPOOL 57795d4ac05727867680f7f81d50203fe7603d4a804650db7fafcbe48f8af1c5ef10a021218b3edaebc1dcc06653536f8545d2601a61e32c699701716e3353c5
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
DIST libreoffice-5.1.2.2.tar.xz 173763036 SHA256 54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781 SHA512 0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8 WHIRLPOOL 059f6f558c5cf3881b2ce5fee1c9ef0286c315481fd17dc7129aaf8ede97ca1759c8b821c1575ad4457e670e54241409e48e54bd1e8d62c8401cf5067ef81226
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f07ecf8..91f2789 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -59,7 +59,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz" # modifies source code
+ "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-05-04 22:21 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-05-04 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 863d598a9ffc1f2e7ac6c73102d84766f1cd355e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 22:21:16 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed May 4 22:21:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=863d598a
app-office/libreoffice: Remove use-flag requirement on gdk-pixbuf, bug 582090
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index eae32ae..7851fad 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="
gltf? ( media-libs/libgltf )
gnome? ( gnome-base/gconf:2 )
gtk? (
- x11-libs/gdk-pixbuf[X]
+ x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
)
gtk3? ( >=x11-libs/gtk+-3.8:3 )
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 213fd4e..eccb5d3 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -165,7 +165,7 @@ COMMON_DEPEND="
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
gtk? (
- x11-libs/gdk-pixbuf[X]
+ x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
)
gtk3? (
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 91f2789..d82a8a0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -164,7 +164,7 @@ COMMON_DEPEND="
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
gtk? (
- x11-libs/gdk-pixbuf[X]
+ x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
)
gtk3? (
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-05-07 11:52 Pacho Ramos
0 siblings, 0 replies; 588+ messages in thread
From: Pacho Ramos @ 2016-05-07 11:52 UTC (permalink / raw
To: gentoo-commits
commit: c6171ab7124c61ff5d93c1a755fb20c22d95fc0b
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 11:49:20 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat May 7 11:51:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6171ab7
app-office/libreoffice: amd64 stable, bug #580672
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.2.2.ebuild b/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
index 213fd4e..c6a98b9 100644
--- a/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
@@ -96,7 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-06-03 12:50 Lars Wendler
0 siblings, 0 replies; 588+ messages in thread
From: Lars Wendler @ 2016-06-03 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 8a189bc9a1e06e366563e89dd793d611fb37cecc
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu May 5 13:52:33 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 12:49:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a189bc9
app-office/libreoffice: Version bump to 5.1.3.2
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
...-5.1.9999.ebuild => libreoffice-5.1.3.2.ebuild} | 44 ++++++++++------------
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 44 ++++++++++------------
app-office/libreoffice/libreoffice-9999.ebuild | 44 ++++++++++------------
4 files changed, 62 insertions(+), 72 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 133ecf4..3b46dae 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,6 +9,8 @@ DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 32215
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.2.2.tar.xz 173763036 SHA256 54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781 SHA512 0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8 WHIRLPOOL 059f6f558c5cf3881b2ce5fee1c9ef0286c315481fd17dc7129aaf8ede97ca1759c8b821c1575ad4457e670e54241409e48e54bd1e8d62c8401cf5067ef81226
+DIST libreoffice-5.1.3.2.tar.xz 176087264 SHA256 cd5a1ca7c9ea100f811f8f12dc9bae29e71a6a65b127be6de5e14f223e3c07c4 SHA512 4f9d8076247c792d55bcbd1ce2ae66a96fced8bb9e0f4fe2190b880dd2bfc6ae82b36a97368fd15676666f97d8ad5c42d2cc00c32360f7fd86823997e094b688 WHIRLPOOL c04fb3d41ace8b5bc2b6c70d6ab257a643f14c68dd243cb8ebde76cddfce3cead35bbae5d911edab7bb1223acc56c9cee6e56e5bb04c7ba50e43dff16fde11a8
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
DIST libreoffice-help-5.1.2.2.tar.xz 1900736 SHA256 dc4d9fd6ca78ad89069ca1f0187f274c9cd83fb8849716193d25bce6ca072953 SHA512 5868e9ec51ac841372cdc8aa7b257082d04269ecd3c2724ddd9f6da36a1a0549eb6bedc2e71a205543f8a23b36df7cebd937a316b22c2be778a1d2f7e4d9df41 WHIRLPOOL c7565974995b4a95894b59263595f82c6980c2c8e4b3aa37fb787c4ad369774b128062a32dcf14c4f1dc60339c469e47acc9ba3b193ea6e2de6a1d4e38cc21a6
+DIST libreoffice-help-5.1.3.2.tar.xz 1904908 SHA256 f58def670340d67027d8cd52ef07669fbe7db05d1c6e490700dde8b53fe6093b SHA512 3f660af8971ab40fd63dbe70a0759e6c66ac98b4885dda9937797876dba3db2e3f0b604018d7edfe90043ad2e9f4652c1df2f8d331b89dd430a2095ba3270d17 WHIRLPOOL 3c129235a20d9217d232685e960ec1ae598254e95179a315b63f8a706b5df73e8bf7a32922095f4a1acd96e7d3de8e09f3d517cc6a781b94643466f04727ff9d
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.3.2.ebuild
similarity index 96%
copy from app-office/libreoffice/libreoffice-5.1.9999.ebuild
copy to app-office/libreoffice/libreoffice-5.1.3.2.ebuild
index eccb5d3..9d7daf4 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.3.2.ebuild
@@ -78,20 +78,17 @@ unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
# numbertext, typo, validator, watch-window: ^^
# oooblogger: no homepage or anything
# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
@@ -102,10 +99,10 @@ COMMON_DEPEND="
${PYTHON_DEPS}
app-arch/zip
app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
+ app-text/hunspell
app-text/mythes
>=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.4.4
+ app-text/libexttextcat
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
app-text/liblangtag
@@ -115,24 +112,24 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
- >=app-text/poppler-0.16:=[cxx]
+ app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
>=dev-libs/boost-1.55:=
dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
+ dev-libs/hyphen
+ dev-libs/icu:=
=dev-libs/liborcus-0.9*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
>=dev-lang/perl-5.0
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
+ media-libs/fontconfig
media-libs/freetype:2
>=media-libs/glew-1.10
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
@@ -142,12 +139,12 @@ COMMON_DEPEND="
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
+ net-misc/curl
net-libs/neon
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
@@ -157,7 +154,7 @@ COMMON_DEPEND="
coinmp? ( sci-libs/coinor-mp )
collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
+ dbus? ( dev-libs/dbus-glib )
eds? (
dev-libs/glib:2
gnome-extra/evolution-data-server
@@ -178,17 +175,16 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0
)
jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ mysql? ( dev-db/mysql-connector-c++ )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
+ telepathy? ( net-libs/telepathy-glib )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine
media-fonts/liberation-fonts
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index eccb5d3..9d7daf4 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -78,20 +78,17 @@ unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
# numbertext, typo, validator, watch-window: ^^
# oooblogger: no homepage or anything
# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
@@ -102,10 +99,10 @@ COMMON_DEPEND="
${PYTHON_DEPS}
app-arch/zip
app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
+ app-text/hunspell
app-text/mythes
>=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.4.4
+ app-text/libexttextcat
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
app-text/liblangtag
@@ -115,24 +112,24 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
- >=app-text/poppler-0.16:=[cxx]
+ app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
>=dev-libs/boost-1.55:=
dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
+ dev-libs/hyphen
+ dev-libs/icu:=
=dev-libs/liborcus-0.9*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
>=dev-lang/perl-5.0
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
+ media-libs/fontconfig
media-libs/freetype:2
>=media-libs/glew-1.10
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
@@ -142,12 +139,12 @@ COMMON_DEPEND="
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
+ net-misc/curl
net-libs/neon
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
@@ -157,7 +154,7 @@ COMMON_DEPEND="
coinmp? ( sci-libs/coinor-mp )
collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
+ dbus? ( dev-libs/dbus-glib )
eds? (
dev-libs/glib:2
gnome-extra/evolution-data-server
@@ -178,17 +175,16 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0
)
jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ mysql? ( dev-db/mysql-connector-c++ )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
+ telepathy? ( net-libs/telepathy-glib )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine
media-fonts/liberation-fonts
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d82a8a0..8023db1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -77,20 +77,17 @@ unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
# numbertext, typo, validator, watch-window: ^^
# oooblogger: no homepage or anything
# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
@@ -101,10 +98,10 @@ COMMON_DEPEND="
${PYTHON_DEPS}
app-arch/zip
app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
+ app-text/hunspell
app-text/mythes
>=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.4.4
+ app-text/libexttextcat
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
app-text/liblangtag
@@ -114,24 +111,24 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
- >=app-text/poppler-0.16:=[cxx]
+ app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
>=dev-libs/boost-1.55:=
dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
+ dev-libs/hyphen
+ dev-libs/icu:=
>=dev-libs/liborcus-0.11.1
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
>=dev-lang/perl-5.0
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
+ media-libs/fontconfig
media-libs/freetype:2
>=media-libs/glew-1.10
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
@@ -141,12 +138,12 @@ COMMON_DEPEND="
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
+ net-misc/curl
net-libs/neon
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
@@ -156,7 +153,7 @@ COMMON_DEPEND="
coinmp? ( sci-libs/coinor-mp )
collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
+ dbus? ( dev-libs/dbus-glib )
eds? (
dev-libs/glib:2
gnome-extra/evolution-data-server
@@ -177,17 +174,16 @@ COMMON_DEPEND="
media-libs/gst-plugins-base:1.0
)
jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ mysql? ( dev-db/mysql-connector-c++ )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
+ telepathy? ( net-libs/telepathy-glib )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine
media-fonts/liberation-fonts
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-06-03 12:50 Lars Wendler
0 siblings, 0 replies; 588+ messages in thread
From: Lars Wendler @ 2016-06-03 12:50 UTC (permalink / raw
To: gentoo-commits
commit: dc5f9f8546a289f646c5c3d1d243547bc4542fe9
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri May 13 21:21:08 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 12:49:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc5f9f85
app-office/libreoffice: Update dependencies for 9999
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 8023db1..31a01d6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -119,7 +119,7 @@ COMMON_DEPEND="
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- >=dev-libs/liborcus-0.11.1
+ >=dev-libs/liborcus-0.11.2
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
@@ -212,7 +212,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
- dev-util/mdds:1=
+ >=dev-util/mdds-1.2.0:1=
media-libs/glm
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-06-03 12:50 Lars Wendler
0 siblings, 0 replies; 588+ messages in thread
From: Lars Wendler @ 2016-06-03 12:50 UTC (permalink / raw
To: gentoo-commits
commit: ff3fe3fc9e194b261f3e9a2b949f875d5d867136
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed May 25 23:25:47 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 12:50:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3fe3fc
app-office/libreoffice: Drop 5.0 stable branch
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 606 ---------------------
1 file changed, 606 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
deleted file mode 100644
index 7851fad..0000000
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ /dev/null
@@ -1,606 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- !<sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-06-03 12:50 Lars Wendler
0 siblings, 0 replies; 588+ messages in thread
From: Lars Wendler @ 2016-06-03 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 2131f78679b3b625c3da2a15cf314b932cdfcb7f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed May 25 22:55:06 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 12:50:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2131f786
app-office/libreoffice: Add 5.2 stable branch
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 563 +++++++++++++++++++++
1 file changed, 563 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
new file mode 100644
index 0000000..31a01d6
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -0,0 +1,563 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ app-text/hunspell
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ app-text/libexttextcat
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/poppler:=[cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ >=dev-libs/liborcus-0.11.2
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-lang/perl-5.0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ net-misc/curl
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
+ )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.0:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ !<sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+
+if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+elif [[ ${MERGE_TYPE} != binary ]] ; then
+ CHECKREQS_DISK_BUILD="6G"
+fi
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
+ then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ # FIXME: Hack add missing file
+ exeinto /usr/$(get_libdir)/${PN}/program
+ doexe "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-02 21:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-02 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 89ec37fafb07e352a63157c08e1fbead95888059
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jun 7 18:05:10 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 21:15:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ec37fa
app-office/libreoffice: Add USE=google, GAPI auth for gdrive integration
Existing ID and secret taken from www-client/chromium
Gentoo-bug: 584168
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 12 ++++++++++--
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 12 ++++++++++--
app-office/libreoffice/libreoffice-9999.ebuild | 12 ++++++++++--
app-office/libreoffice/metadata.xml | 1 +
4 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 3111ec9..aba9c40 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -85,8 +85,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -357,6 +357,12 @@ src_configure() {
local internal_libs
local ext_opts
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
@@ -479,6 +485,8 @@ src_configure() {
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
+ $(use_with google gdrive-client-id ${google_default_client_id}) \
+ $(use_with google gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 7ae6ee1..40ef04b 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -84,8 +84,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -354,6 +354,12 @@ src_configure() {
local java_opts
local ext_opts
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
@@ -468,6 +474,8 @@ src_configure() {
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
+ $(use_with google gdrive-client-id ${google_default_client_id}) \
+ $(use_with google gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7ae6ee1..40ef04b 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -84,8 +84,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -354,6 +354,12 @@ src_configure() {
local java_opts
local ext_opts
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
@@ -468,6 +474,8 @@ src_configure() {
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
+ $(use_with google gdrive-client-id ${google_default_client_id}) \
+ $(use_with google gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 2c92bb7..f2a30d6 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,6 +14,7 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
<flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
+ <flag name="google">Enable support for remote files on Google Drive</flag>
<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-02 21:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-02 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 4e14521c09a396a9af32d303fc9fe342fb82eb74
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 12 19:00:24 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 21:15:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e14521c
app-office/libreoffice: Old crashdump option removed in master
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-9999.ebuild | 11 ++++++-----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 9b090c0..09797cc 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -406,10 +406,10 @@ src_configure() {
# not linked or anything else, worthless to depend on
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
--with-system-headers \
- --with-system-libs \
--with-system-jars \
- --with-system-dicts \
+ --with-system-libs \
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
@@ -418,15 +418,15 @@ src_configure() {
--enable-python=system \
--enable-randr \
--enable-release-build \
- --disable-hardlink-deliver \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gstreamer-0-10 \
- --disable-report-builder \
+ --disable-hardlink-deliver \
--disable-online-update \
+ --disable-report-builder \
--disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9b090c0..a1000be 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -392,6 +392,7 @@ src_configure() {
fi
# system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
# --enable-*-link: link to the library rather than just dlopen on runtime
@@ -406,10 +407,10 @@ src_configure() {
# not linked or anything else, worthless to depend on
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
--with-system-headers \
- --with-system-libs \
--with-system-jars \
- --with-system-dicts \
+ --with-system-libs \
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
@@ -418,15 +419,15 @@ src_configure() {
--enable-python=system \
--enable-randr \
--enable-release-build \
- --disable-hardlink-deliver \
+ --disable-breakpad \
--disable-ccache \
- --disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gstreamer-0-10 \
- --disable-report-builder \
+ --disable-hardlink-deliver \
--disable-online-update \
+ --disable-report-builder \
--disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-02 21:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-02 21:16 UTC (permalink / raw
To: gentoo-commits
commit: d3ddc1717eeba73b65220b70f6d681d6533bbf4e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jun 7 23:26:14 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 21:15:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3ddc171
app-office/libreoffice: Drop EXT_URI and old comment
That stuff was apparently last used in 3.4.4.2, URI works but contains
downloads that haven't been updated in 5 years.
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 7 -------
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 7 -------
app-office/libreoffice/libreoffice-9999.ebuild | 7 -------
3 files changed, 21 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index aba9c40..26d1209 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -19,7 +19,6 @@ DEV_URI="
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
@@ -74,14 +73,8 @@ ADDONS_SRC=(
SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
-unset EXT_URI
unset ADDONS_SRC
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 40ef04b..4792129 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -19,7 +19,6 @@ DEV_URI="
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
@@ -73,14 +72,8 @@ ADDONS_SRC=(
SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
-unset EXT_URI
unset ADDONS_SRC
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 40ef04b..4792129 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -19,7 +19,6 @@ DEV_URI="
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
@@ -73,14 +72,8 @@ ADDONS_SRC=(
SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
-unset EXT_URI
unset ADDONS_SRC
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-02 21:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-02 21:16 UTC (permalink / raw
To: gentoo-commits
commit: c6bfd1025fed3403492d28630625d2ae3b484380
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 4 19:06:43 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 21:15:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6bfd102
app-office/libreoffice: Sort and cleanup *DEPENDs
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 35 ++++++++++------------
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 35 ++++++++++------------
app-office/libreoffice/libreoffice-9999.ebuild | 35 ++++++++++------------
3 files changed, 48 insertions(+), 57 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 9d7daf4..3111ec9 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
@@ -95,16 +94,14 @@ SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
+COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
+ app-arch/zip
app-text/hunspell
- app-text/mythes
>=app-text/libabw-0.1.0
- app-text/libexttextcat
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
+ app-text/libexttextcat
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
@@ -112,10 +109,12 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
+ app-text/mythes
app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
+ dev-lang/perl
>=dev-libs/boost-1.55:=
dev-libs/expat
dev-libs/hyphen
@@ -124,7 +123,6 @@ COMMON_DEPEND="
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- >=dev-lang/perl-5.0
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
@@ -134,13 +132,13 @@ COMMON_DEPEND="
>=media-libs/glew-1.10
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
>=media-libs/libcdr-0.1.0
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
- net-misc/curl
net-libs/neon
+ net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
@@ -161,6 +159,10 @@ COMMON_DEPEND="
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
gtk? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
@@ -170,10 +172,6 @@ COMMON_DEPEND="
dev-libs/gobject-introspection
>=x11-libs/gtk+-3.8:3
)
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
@@ -186,8 +184,8 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice
- media-fonts/libertine
media-fonts/liberation-fonts
+ media-fonts/libertine
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
kde? ( $(add_kdeapps_dep kioclient) )
@@ -206,6 +204,7 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
@@ -219,7 +218,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/bison
sys-devel/flex
sys-devel/gettext
- !<sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
@@ -230,15 +228,14 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xineramaproto
x11-proto/xproto
java? (
+ dev-java/ant-core
>=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
)
odk? ( >=app-doc/doxygen-1.8.4 )
test? ( dev-util/cppunit )
"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
eds? ( gnome )
@@ -551,7 +548,7 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- # Remove desktop files for support to old installs that can't parse mime
+ # Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 31a01d6..7ae6ee1 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
@@ -94,16 +93,14 @@ SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
+COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
+ app-arch/zip
app-text/hunspell
- app-text/mythes
>=app-text/libabw-0.1.0
- app-text/libexttextcat
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
+ app-text/libexttextcat
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
@@ -111,10 +108,12 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
+ app-text/mythes
app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
+ dev-lang/perl
>=dev-libs/boost-1.55:=
dev-libs/expat
dev-libs/hyphen
@@ -123,7 +122,6 @@ COMMON_DEPEND="
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- >=dev-lang/perl-5.0
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
@@ -133,13 +131,13 @@ COMMON_DEPEND="
>=media-libs/glew-1.10
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
>=media-libs/libcdr-0.1.0
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
- net-misc/curl
net-libs/neon
+ net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
@@ -160,6 +158,10 @@ COMMON_DEPEND="
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
gtk? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
@@ -169,10 +171,6 @@ COMMON_DEPEND="
dev-libs/gobject-introspection
>=x11-libs/gtk+-3.8:3
)
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
@@ -185,8 +183,8 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice
- media-fonts/libertine
media-fonts/liberation-fonts
+ media-fonts/libertine
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
kde? ( $(add_kdeapps_dep kioclient) )
@@ -205,6 +203,7 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
@@ -217,7 +216,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/bison
sys-devel/flex
sys-devel/gettext
- !<sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
@@ -228,15 +226,14 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xineramaproto
x11-proto/xproto
java? (
+ dev-java/ant-core
>=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
)
odk? ( >=app-doc/doxygen-1.8.4 )
test? ( dev-util/cppunit )
"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
eds? ( gnome )
@@ -538,7 +535,7 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- # Remove desktop files for support to old installs that can't parse mime
+ # Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 31a01d6..7ae6ee1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -5,7 +5,6 @@
EAPI=6
KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
@@ -94,16 +93,14 @@ SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
+COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
+ app-arch/zip
app-text/hunspell
- app-text/mythes
>=app-text/libabw-0.1.0
- app-text/libexttextcat
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
+ app-text/libexttextcat
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
@@ -111,10 +108,12 @@ COMMON_DEPEND="
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
+ app-text/mythes
app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
+ dev-lang/perl
>=dev-libs/boost-1.55:=
dev-libs/expat
dev-libs/hyphen
@@ -123,7 +122,6 @@ COMMON_DEPEND="
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- >=dev-lang/perl-5.0
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
@@ -133,13 +131,13 @@ COMMON_DEPEND="
>=media-libs/glew-1.10
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
>=media-libs/libcdr-0.1.0
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
- net-misc/curl
net-libs/neon
+ net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
@@ -160,6 +158,10 @@ COMMON_DEPEND="
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
gtk? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
@@ -169,10 +171,6 @@ COMMON_DEPEND="
dev-libs/gobject-introspection
>=x11-libs/gtk+-3.8:3
)
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
@@ -185,8 +183,8 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice
- media-fonts/libertine
media-fonts/liberation-fonts
+ media-fonts/libertine
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
kde? ( $(add_kdeapps_dep kioclient) )
@@ -205,6 +203,7 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
@@ -217,7 +216,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/bison
sys-devel/flex
sys-devel/gettext
- !<sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
@@ -228,15 +226,14 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xineramaproto
x11-proto/xproto
java? (
+ dev-java/ant-core
>=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
)
odk? ( >=app-doc/doxygen-1.8.4 )
test? ( dev-util/cppunit )
"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
eds? ( gnome )
@@ -538,7 +535,7 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- # Remove desktop files for support to old installs that can't parse mime
+ # Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-02 21:16 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-02 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 2ed0f7a6012687058661e1cb93b51bb599719b98
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Jun 7 23:43:33 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 21:15:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed0f7a6
app-office/libreoffice: Exclude clang from GCC version check
Gentoo-bug: 460902
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 7 ++++---
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 7 ++++---
app-office/libreoffice/libreoffice-9999.ebuild | 7 ++++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 26d1209..5320fe3 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -260,9 +260,10 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 4792129..9b090c0 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -258,9 +258,10 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4792129..9b090c0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -258,9 +258,10 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
+ if [[ $(tc-getCC) == clang ]] ; then
+ : # ignore clang, which works
+ elif [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-02 22:14 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-02 22:14 UTC (permalink / raw
To: gentoo-commits
commit: c967fe9af85a548b4e4e852dbcceb16f67ee647c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 22:12:42 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 22:12:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c967fe9a
app-office/libreoffice: Fix automagic dependency on gnome-base/dconf, bug 582632
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 2 ++
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 2 ++
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 2 ++
app-office/libreoffice/libreoffice-9999.ebuild | 2 ++
4 files changed, 8 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index 5320fe3..22da8a7 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -152,6 +152,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -467,6 +468,7 @@ src_configure() {
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
$(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 5320fe3..22da8a7 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -152,6 +152,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -467,6 +468,7 @@ src_configure() {
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
$(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 09797cc..8f34304 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -151,6 +151,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -456,6 +457,7 @@ src_configure() {
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
$(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a1000be..dd67838 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -151,6 +151,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -457,6 +458,7 @@ src_configure() {
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
$(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-03 18:45 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-03 18:45 UTC (permalink / raw
To: gentoo-commits
commit: 9da5ff70bba24428a31bfe7f4b42fbebde15ca83
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 3 18:45:22 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 18:45:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da5ff70
app-office/libreoffice: Optionally enable the system tray quickstarter, bug 561842
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 6 ++----
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 6 ++----
app-office/libreoffice/libreoffice-9999.ebuild | 6 ++----
app-office/libreoffice/metadata.xml | 1 +
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 22da8a7..164ac1e 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -79,7 +79,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -411,8 +411,6 @@ src_configure() {
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
# --enable-extension-integration: enable any extension integration support
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --disable-report-builder: too much java packages pulled in without pkgs
@@ -440,7 +438,6 @@ src_configure() {
--disable-gstreamer-0-10 \
--disable-report-builder \
--disable-online-update \
- --disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -476,6 +473,7 @@ src_configure() {
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
$(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 8f34304..7c0b3e4 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -398,8 +398,6 @@ src_configure() {
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
# --enable-extension-integration: enable any extension integration support
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --disable-report-builder: too much java packages pulled in without pkgs
@@ -428,7 +426,6 @@ src_configure() {
--disable-hardlink-deliver \
--disable-online-update \
--disable-report-builder \
- --disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -465,6 +462,7 @@ src_configure() {
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
$(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index dd67838..94771b7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -399,8 +399,6 @@ src_configure() {
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
# --enable-extension-integration: enable any extension integration support
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --disable-report-builder: too much java packages pulled in without pkgs
@@ -429,7 +427,6 @@ src_configure() {
--disable-hardlink-deliver \
--disable-online-update \
--disable-report-builder \
- --disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -466,6 +463,7 @@ src_configure() {
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
$(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index f2a30d6..e1f2f47 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -18,6 +18,7 @@ version</longdescription>
<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
+ <flag name="quickstarter">Build the system tray quickstarter</flag>
<flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
</use>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-05 22:46 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-05 22:46 UTC (permalink / raw
To: gentoo-commits
commit: 5542859cc01ca3d9dfb0c0c7a68024ed1b6df971
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 5 22:44:15 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 5 22:45:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5542859c
app-office/libreoffice: Optionally enable quickstarter in 5.1.4.2 already
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index ca9fc14..52653526 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -79,7 +79,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -414,8 +414,6 @@ src_configure() {
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
# --enable-extension-integration: enable any extension integration support
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --disable-report-builder: too much java packages pulled in without pkgs
@@ -443,7 +441,6 @@ src_configure() {
--disable-gstreamer-0-10 \
--disable-report-builder \
--disable-online-update \
- --disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
@@ -479,6 +476,7 @@ src_configure() {
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
$(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-28 8:43 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2016-07-28 8:43 UTC (permalink / raw
To: gentoo-commits
commit: 10c2f12754710b0c60fd4e93e2680a02ed3a0580
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 08:41:50 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 08:41:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c2f127
app-office/libreoffice: amd64 stable wrt bug #589284
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index c0c2792..38cf0c3 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -85,7 +85,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-28 14:08 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2016-07-28 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 7431cce342b9eb6ef3d6a685bd59b3caf136cbef
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 14:07:18 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 14:07:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7431cce3
app-office/libreoffice: x86 stable wrt bug #589284
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index 38cf0c3..e30b28f 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -85,7 +85,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-28 15:18 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-07-28 15:18 UTC (permalink / raw
To: gentoo-commits
commit: 2182a5dfa828ddd30d74b5170a8946e03d309091
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 15:16:10 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 15:16:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2182a5df
app-office/libreoffice: Remove old
Package-Manager: portage-2.3.0
app-office/libreoffice/Manifest | 6 -
app-office/libreoffice/libreoffice-5.0.5.2.ebuild | 608 ----------------------
app-office/libreoffice/libreoffice-5.1.2.2.ebuild | 580 ---------------------
app-office/libreoffice/libreoffice-5.1.3.2.ebuild | 576 --------------------
4 files changed, 1770 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 88d057c..60572d8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,12 +7,6 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
-DIST libreoffice-5.1.2.2.tar.xz 173763036 SHA256 54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781 SHA512 0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8 WHIRLPOOL 059f6f558c5cf3881b2ce5fee1c9ef0286c315481fd17dc7129aaf8ede97ca1759c8b821c1575ad4457e670e54241409e48e54bd1e8d62c8401cf5067ef81226
-DIST libreoffice-5.1.3.2.tar.xz 176087264 SHA256 cd5a1ca7c9ea100f811f8f12dc9bae29e71a6a65b127be6de5e14f223e3c07c4 SHA512 4f9d8076247c792d55bcbd1ce2ae66a96fced8bb9e0f4fe2190b880dd2bfc6ae82b36a97368fd15676666f97d8ad5c42d2cc00c32360f7fd86823997e094b688 WHIRLPOOL c04fb3d41ace8b5bc2b6c70d6ab257a643f14c68dd243cb8ebde76cddfce3cead35bbae5d911edab7bb1223acc56c9cee6e56e5bb04c7ba50e43dff16fde11a8
DIST libreoffice-5.1.4.2.tar.xz 176233960 SHA256 cae54a79ed858ad92044179b5c33bd29c5770a8eccde04ed80c5ebfd92078385 SHA512 80e79b6a20f85e295fead9fc5f9578d846a889fe6bc7a0f51b76117408ee6c8e7fbddf99c22e2caaac3253f10907121ed3508cefab2fb1b2ccaa90c4cf52c33a WHIRLPOOL 2005e5321b6e25196db535a786c50b66c635b07d1482e562f1595f3f84fbf0c702717d934d50e319822f194f1bdc9d15da1885658042d277ae8535f75f9856ba
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
-DIST libreoffice-help-5.1.2.2.tar.xz 1900736 SHA256 dc4d9fd6ca78ad89069ca1f0187f274c9cd83fb8849716193d25bce6ca072953 SHA512 5868e9ec51ac841372cdc8aa7b257082d04269ecd3c2724ddd9f6da36a1a0549eb6bedc2e71a205543f8a23b36df7cebd937a316b22c2be778a1d2f7e4d9df41 WHIRLPOOL c7565974995b4a95894b59263595f82c6980c2c8e4b3aa37fb787c4ad369774b128062a32dcf14c4f1dc60339c469e47acc9ba3b193ea6e2de6a1d4e38cc21a6
-DIST libreoffice-help-5.1.3.2.tar.xz 1904908 SHA256 f58def670340d67027d8cd52ef07669fbe7db05d1c6e490700dde8b53fe6093b SHA512 3f660af8971ab40fd63dbe70a0759e6c66ac98b4885dda9937797876dba3db2e3f0b604018d7edfe90043ad2e9f4652c1df2f8d331b89dd430a2095ba3270d17 WHIRLPOOL 3c129235a20d9217d232685e960ec1ae598254e95179a315b63f8a706b5df73e8bf7a32922095f4a1acd96e7d3de8e09f3d517cc6a781b94643466f04727ff9d
DIST libreoffice-help-5.1.4.2.tar.xz 1905160 SHA256 60356c3e3a8e5ba8216c18e127cfa2b7d0eb55c69e50f056e8f78a7d9dc735cc SHA512 a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe WHIRLPOOL 2e195dac9e6d2280ec3ac36243c4c62010e04763c5510a1f5e06f39e2f6e44aad555b460f72b2f09aba43a9571b3d20b50d6caf4a028e3e6acfe4e37d7598b70
diff --git a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild b/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
deleted file mode 100644
index 2766ac5..0000000
--- a/app-office/libreoffice/libreoffice-5.0.5.2.ebuild
+++ /dev/null
@@ -1,608 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.2
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.5
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- =app-text/libwps-0.4*
- >=app-text/poppler-0.16:=[cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.7*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.8:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
-
-pkg_pretend() {
- local pgslot
-
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
- then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${PATCHES[@]}"
- epatch_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.1.2.2.ebuild b/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
deleted file mode 100644
index c6a98b9..0000000
--- a/app-office/libreoffice/libreoffice-5.1.2.2.ebuild
+++ /dev/null
@@ -1,580 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.4.4
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- >=app-text/poppler-0.16:=[cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- =dev-libs/liborcus-0.9*
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- !<sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.1.3.2.ebuild b/app-office/libreoffice/libreoffice-5.1.3.2.ebuild
deleted file mode 100644
index 9d7daf4..0000000
--- a/app-office/libreoffice/libreoffice-5.1.3.2.ebuild
+++ /dev/null
@@ -1,576 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- app-text/hunspell
- app-text/mythes
- >=app-text/libabw-0.1.0
- app-text/libexttextcat
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/poppler:=[cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.9*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- >=dev-lang/perl-5.0
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- net-misc/curl
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- !<sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
- then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local ext_opts
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-07-29 16:11 Lars Wendler
0 siblings, 0 replies; 588+ messages in thread
From: Lars Wendler @ 2016-07-29 16:11 UTC (permalink / raw
To: gentoo-commits
commit: ea40cb4edd366cfc4bb4828c7e00539ba0d96fd0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 16:11:26 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 16:11:42 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea40cb4e
app-office/libreoffice: Added subslot dependency for media-libs/glew.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index e30b28f..ac6f331 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -122,7 +122,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/glew-1.10
+ >=media-libs/glew-1.10:=
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 52653526..1bd67a8 100644
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -122,7 +122,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/glew-1.10
+ >=media-libs/glew-1.10:=
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 7c0b3e4..86c4a85 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -121,7 +121,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/glew-1.10
+ >=media-libs/glew-1.10:=
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 94771b7..1e137d5 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -121,7 +121,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/glew-1.10
+ >=media-libs/glew-1.10:=
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-09-17 21:32 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-09-17 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 34bdd64bb7c039a459f0442af74eb128e5600498
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug 31 19:57:22 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34bdd64b
app-office/libreoffice: Really exclude clang from GCC version check
Gentoo-bug: 589948
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 4 +---
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 4 +---
app-office/libreoffice/libreoffice-9999.ebuild | 4 +---
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index 49088e73..e8cee34 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -265,9 +265,7 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(tc-getCC) == clang ]] ; then
- : # ignore clang, which works
- elif [[ $(gcc-major-version) -lt 4 ]] || {
+ if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 68e7b73..d249412 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -259,9 +259,7 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(tc-getCC) == clang ]] ; then
- : # ignore clang, which works
- elif [[ $(gcc-major-version) -lt 4 ]] || {
+ if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b95de74..7dff9ae 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -259,9 +259,7 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
- if [[ $(tc-getCC) == clang ]] ; then
- : # ignore clang, which works
- elif [[ $(gcc-major-version) -lt 4 ]] || {
+ if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-09-17 21:32 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-09-17 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 6e385693666818496d96a78db411b11a9286ed2e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 22:21:16 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e385693
app-office/libreoffice: Drop mergelibs hack
Gentoo-bug: 590596
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 4 ----
app-office/libreoffice/libreoffice-9999.ebuild | 4 ----
2 files changed, 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 5151dab..68e7b73 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -541,10 +541,6 @@ src_install() {
# Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2259e14..b95de74 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -540,10 +540,6 @@ src_install() {
# Remove desktop files to support old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-09-17 21:32 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-09-17 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 7ff865248303c34beb0117954ed1758dbf06cb44
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 08:56:19 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff86524
app-office/libreoffice: Drop 5.1 stable branch
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 578 ---------------------
1 file changed, 578 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
deleted file mode 100644
index 1bd67a8..00000000
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- app-text/poppler:=[cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.9*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.12.0:0=
- media-libs/glm
- net-misc/npapi-sdk
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from 5.2 branch
- "${FILESDIR}/${PN}-5.1.4.2-gcc6.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-)
-
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(tc-getCC) == clang ]] ; then
- : # ignore clang, which works
- elif [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-online-update \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with google gdrive-client-id ${google_default_client_id}) \
- $(use_with google gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- # FIXME: Hack add missing file
- exeinto /usr/$(get_libdir)/${PN}/program
- doexe "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-09-17 21:32 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-09-17 21:32 UTC (permalink / raw
To: gentoo-commits
commit: fb45cae322309e3f41cba413be2923136b8c5bab
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 08:48:08 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb45cae3
app-office/libreoffice: Use xdg-utils.eclass to cleanup XDG_* env
...causing sandbox violation.
Gentoo-bug: 588158
Package-Manager: portage-2.2.28
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 3 ++-
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 3 ++-
app-office/libreoffice/libreoffice-9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index ac6f331..49088e73 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -290,6 +290,7 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python-single-r1_pkg_setup
+ xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 86c4a85..5151dab 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -284,6 +284,7 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python-single-r1_pkg_setup
+ xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1cea506..2259e14 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -284,6 +284,7 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python-single-r1_pkg_setup
+ xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-09-17 22:00 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-09-17 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 5ac5916f6e712383849d73ca83ed15509a558a0c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 21:59:49 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:59:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac5916f
app-office/libreoffice: PDF import is optional again. Yay...
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-5.2.1.2.ebuild | 5 +++--
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 5 +++--
app-office/libreoffice/libreoffice-9999.ebuild | 5 +++--
app-office/libreoffice/metadata.xml | 1 +
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.1.2.ebuild b/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
index d249412..1c44941 100644
--- a/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/libwpg:0.3
>=app-text/libwps-0.4
app-text/mythes
- app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
@@ -169,6 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
telepathy? ( net-libs/telepathy-glib )
"
@@ -460,6 +460,7 @@ src_configure() {
$(use_enable kde kde4) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
+ $(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable quickstarter systray) \
$(use_enable telepathy) \
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 553b8c2..8247cdf 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/libwpg:0.3
>=app-text/libwps-0.4
app-text/mythes
- app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
@@ -169,6 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
telepathy? ( net-libs/telepathy-glib )
"
@@ -460,6 +460,7 @@ src_configure() {
$(use_enable kde kde4) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
+ $(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable quickstarter systray) \
$(use_enable telepathy) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f6b680c..e4088db 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -78,7 +78,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/libwpg:0.3
>=app-text/libwps-0.4
app-text/mythes
- app-text/poppler:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
@@ -169,6 +168,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
telepathy? ( net-libs/telepathy-glib )
"
@@ -459,6 +459,7 @@ src_configure() {
$(use_enable kde kde4) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
+ $(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable quickstarter systray) \
$(use_enable telepathy) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 5959c48..5c463ae 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -19,6 +19,7 @@ version</longdescription>
<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
+ <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
<flag name="quickstarter">Build the system tray quickstarter</flag>
<flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-09-17 22:00 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-09-17 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 1583c43bb19240215976dab469ba117a6c22ce1a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 21:52:31 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:52:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1583c43b
app-office/libreoffice: Rename useflag for Google Drive integration to googledrive in future versions
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
app-office/libreoffice/metadata.xml | 3 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index d249412..553b8c2 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -77,7 +77,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -467,8 +467,8 @@ src_configure() {
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
- $(use_with google gdrive-client-id ${google_default_client_id}) \
- $(use_with google gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7dff9ae..f6b680c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -77,7 +77,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome google
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -466,8 +466,8 @@ src_configure() {
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
- $(use_with google gdrive-client-id ${google_default_client_id}) \
- $(use_with google gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index e1f2f47..5959c48 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,7 +14,8 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
<flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
- <flag name="google">Enable support for remote files on Google Drive</flag>
+ <flag name="google">Enable support for remote files on Google Drive (LibreOffice 5.2.1 and earlier)</flag>
+ <flag name="googledrive">Enable support for remote files on Google Drive</flag>
<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-10-01 22:08 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-10-01 22:08 UTC (permalink / raw
To: gentoo-commits
commit: bbf2a74a5b6226be733b008b1d09b015398e24c8
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Sep 25 20:58:07 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 22:08:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf2a74a
app-office/libreoffice: Version bump to 5.2.2.2
Package-Manager: portage-2.3.0
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.2.2.2.ebuild | 558 ++++++++++++++++++++++
2 files changed, 560 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2683f67..3de50e3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,6 +10,8 @@ DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 32215
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
DIST libreoffice-5.1.4.2.tar.xz 176233960 SHA256 cae54a79ed858ad92044179b5c33bd29c5770a8eccde04ed80c5ebfd92078385 SHA512 80e79b6a20f85e295fead9fc5f9578d846a889fe6bc7a0f51b76117408ee6c8e7fbddf99c22e2caaac3253f10907121ed3508cefab2fb1b2ccaa90c4cf52c33a WHIRLPOOL 2005e5321b6e25196db535a786c50b66c635b07d1482e562f1595f3f84fbf0c702717d934d50e319822f194f1bdc9d15da1885658042d277ae8535f75f9856ba
DIST libreoffice-5.2.1.2.tar.xz 183525816 SHA256 81399c823a554bfae416a32e06f074cda4cec38747e764587d7a93162fefe291 SHA512 f68923ec3937ffabb322ac318ea161eb44ce7c1c84918882b915ddb29cc3f3e4d7ff688bc6d727213334dc968ddce0ec8159c364a8d70e7c21f575b084e061ed WHIRLPOOL dce20534110c564ad65aaa96d9838bf0eec40a53c531a6928b56dd20ad6bcf017c9c317111c12250f3de04fdda6bfacbf36744571e4e49f57b84690bc6d4138c
+DIST libreoffice-5.2.2.2.tar.xz 182258452 SHA256 5952eaa0b06a0659cf7cca397f95c00e73f0f410f14310deb363985746dad9e0 SHA512 1b59a0b8e28471a9ea97334b4e383d177f6cd6624dd2dad6541aa87fd836188a1c26a8755aef22510e53c2cf1b7b711a647867e07bde6e86ea8692a61b4679c8 WHIRLPOOL 0b9a1e59f6211a3196f6efb3f445f9b1c841e6ed640c2023c0791820de3b3166e99ad4d6b74e0abb24b35fa849fbf0a32dae4f630bb723d2af1b4e84d0c36855
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.1.4.2.tar.xz 1905160 SHA256 60356c3e3a8e5ba8216c18e127cfa2b7d0eb55c69e50f056e8f78a7d9dc735cc SHA512 a8af619dff4b873574afd4b6cfc930543ab58a449a5cfa4b76a0edf242e18a885b6cba1f1a660e9a07e902c367f1a305c2c525f2b0a70e99f56ae5303abef5fe WHIRLPOOL 2e195dac9e6d2280ec3ac36243c4c62010e04763c5510a1f5e06f39e2f6e44aad555b460f72b2f09aba43a9571b3d20b50d6caf4a028e3e6acfe4e37d7598b70
DIST libreoffice-help-5.2.1.2.tar.xz 1936316 SHA256 0721618b93b2377ac53d049f08e8646037c2acb4b3f0440823f3b0e1710d9656 SHA512 c758f62870c06b76c1ea600ad8e50a9318ac42203a0bd1ff3b1ed1f49bda4eca83eeaabf1973f9be86e27d63d310d13460d333657eeb157d40dddfb8c1d2ef31 WHIRLPOOL 808d427f9fe1422ebbf96c8e7656279ca9dbcfec35e63c17450d43f65f2c2a0bf6a97d3d8da312589af2cdf7477ece03946d6207a6f517de9e18f644404d3ec7
+DIST libreoffice-help-5.2.2.2.tar.xz 1919792 SHA256 01c639223d9a31b58480935e1fef4f1bc7b82306f5fac8b6269541ab411ca2be SHA512 3691d843d84d21aae8be2d9dfe88f47e83fb13d0b92f9158e55bdfa40193c5102bafef40f048757d35c5c4b9660740c87614b5140760293e069ec01934b02223 WHIRLPOOL c0b29a181fa9b6df5299b77032908d88842f41ff2a66ca84af7f02ddbf2540b668649ea3e8be205cbc6ccde70fe30e548a38dd43877ea394be0e7fcd467b50cb
diff --git a/app-office/libreoffice/libreoffice-5.2.2.2.ebuild b/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
new file mode 100644
index 00000000..238d588
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-text/hunspell
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ =dev-libs/liborcus-0.11*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10:=
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.0:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+)
+
+CHECKREQS_MEMORY="512M"
+
+if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+elif [[ ${MERGE_TYPE} != binary ]] ; then
+ CHECKREQS_DISK_BUILD="6G"
+fi
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-hardlink-deliver \
+ --disable-online-update \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-10-01 22:08 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-10-01 22:08 UTC (permalink / raw
To: gentoo-commits
commit: d9056c0b6a00f74416feff9b7f7569c0efd34f8e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 24 20:51:11 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 22:08:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9056c0b
app-office/libreoffice: Add new dependencies
Gentoo-bug: 587980
Gentoo-bug: 592354
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-9999.ebuild | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e4088db..4e3d00d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -98,6 +98,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
>=app-text/libodfgen-0.1.0
+ app-text/libstaroffice
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
@@ -106,11 +107,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
dev-lang/perl
- >=dev-libs/boost-1.55:=
+ dev-libs/boost:=
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- >=dev-libs/liborcus-0.11.2
+ >=dev-libs/liborcus-0.12.1
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
@@ -128,6 +129,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
+ media-libs/libzmf
net-libs/neon
net-misc/curl
net-nds/openldap
@@ -141,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ collada? ( media-libs/opencollada )
cups? ( net-print/cups )
dbus? ( dev-libs/dbus-glib )
eds? (
@@ -162,7 +164,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
+ x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
@@ -205,7 +207,7 @@ DEPEND="${COMMON_DEPEND}
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
+ >=dev-util/mdds-1.2.2:1=
media-libs/glm
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-10-01 22:08 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-10-01 22:08 UTC (permalink / raw
To: gentoo-commits
commit: f35c7b6b2f665ba6ec61e9a9e7a808bd8d9c03b6
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep 24 20:52:51 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 22:08:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35c7b6b
app-office/libreoffice: Pin DEPEND to =liborcus-0.11*
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-5.2.1.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.1.2.ebuild b/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
index 1c44941..82f3586 100644
--- a/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.1.2.ebuild
@@ -110,7 +110,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- >=dev-libs/liborcus-0.11.2
+ =dev-libs/liborcus-0.11*
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 8247cdf..238d588 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -110,7 +110,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- >=dev-libs/liborcus-0.11.2
+ =dev-libs/liborcus-0.11*
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-05 21:00 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-05 21:00 UTC (permalink / raw
To: gentoo-commits
commit: a7927d6ddd8eca9ae7583198c0c0788ab9b1e01e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Oct 25 21:01:18 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 21:00:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7927d6d
app-office/libreoffice: Add media-libs/harfbuzz[graphite] to DEPEND
Upstream commit 69c40bbebd063c04affa21d3112e7ccf2943cc69
Bump libxmlsec tarball to 1.2.23
Gentoo-bug: 577278
Package-Manager: portage-2.3.0
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3de50e3..ecfdbab 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,10 +1,10 @@
-DIST 0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz 1792363 SHA256 8c06bf161c565b907a499e6d906f0b640f063b2b4efd2b471048ac5b3c1ad527 SHA512 69ea729cc8e3154e0644b076c8217905920b7e5ef0360640a750f73d90c8a1d8bf139c6400571a7940727c85413a8f69b2204801d2fe97796ff944eb09bbbb69 WHIRLPOOL a443c0542cf19d1491db86bb0e12970c6d6fc80b4ba9f98cb5caecd2cd1c290809b2756f8a95daabe6493bed8f4ae39991288552bece1599eb218c43da9f6efe
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
+DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4e3d00d..13dd853 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -57,7 +57,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz" # modifies source code
+ "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -122,7 +122,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype:2
>=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/harfbuzz:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
>=media-libs/libfreehand-0.1.0
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-06 20:36 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-06 20:36 UTC (permalink / raw
To: gentoo-commits
commit: b4c4ae70df8044954c65d62e650df83819ed3c5c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 20:36:04 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 20:36:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c4ae70
app-office/libreoffice: 5.1 and 5.2.2 are not patched for ICU 58
Package-Manager: portage-2.3.2
app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.2.2.2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index e8cee34..ddada96 100644
--- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
@@ -111,7 +111,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.55:=
dev-libs/expat
dev-libs/hyphen
- dev-libs/icu:=
+ <dev-libs/icu-58:=
=dev-libs/liborcus-0.9*
dev-libs/librevenge
dev-libs/nspr
diff --git a/app-office/libreoffice/libreoffice-5.2.2.2.ebuild b/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
index 238d588..6ebd947 100644
--- a/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.2.2.ebuild
@@ -109,7 +109,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-libs/boost-1.55:=
dev-libs/expat
dev-libs/hyphen
- dev-libs/icu:=
+ <dev-libs/icu-58:=
=dev-libs/liborcus-0.11*
dev-libs/librevenge
dev-libs/nspr
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-13 0:15 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-13 0:15 UTC (permalink / raw
To: gentoo-commits
commit: fe6e536c6a5c4ac3c49ca11f475eb065aa1be2f2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 00:15:31 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 00:15:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe6e536c
app-office/libreoffice: Force Qt4 moc and qmake, bug 599076
Package-Manager: portage-2.3.2
app-office/libreoffice/libreoffice-5.2.3.3.ebuild | 8 +++++++-
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 8 +++++++-
app-office/libreoffice/libreoffice-9999.ebuild | 8 +++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
index 49e4081..96fefc7 100644
--- a/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.3.3.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -394,6 +394,12 @@ src_configure() {
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
# system headers/libs/...: enforce using system packages
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 49e4081..96fefc7 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -394,6 +394,12 @@ src_configure() {
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
# system headers/libs/...: enforce using system packages
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 13dd853..87acbbc 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -25,7 +25,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -393,6 +393,12 @@ src_configure() {
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-17 23:24 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-17 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 6f1fafdad4cd5f2d4993691a580dc5c6e952540f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 23:23:34 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:23:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1fafda
app-office/libreoffice: Fix bash-completion installation, bug 448878
Package-Manager: portage-2.3.2
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 8 ++++++--
app-office/libreoffice/libreoffice-9999.ebuild | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 96fefc7..663d010 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -341,6 +341,11 @@ src_prepare() {
-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
Makefile.in || die
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
if use branding; then
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
@@ -527,8 +532,7 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
- # Fix bash completion placement
- newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
+ # bash completion aliases
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 87acbbc..ebc28aa 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -340,6 +340,11 @@ src_prepare() {
-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
Makefile.in || die
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
if use branding; then
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
@@ -525,8 +530,7 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
- # Fix bash completion placement
- newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
+ # bash completion aliases
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-19 22:41 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-19 22:41 UTC (permalink / raw
To: gentoo-commits
commit: e62775916f1ef4bb75b3683dd4af90f2044ada8a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 22:40:04 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 22:41:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6277591
app-office/libreoffice: do not call is-flagq in global scope, bug 593424
Package-Manager: portage-2.3.2
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 25 ++++++++++++++--------
app-office/libreoffice/libreoffice-9999.ebuild | 25 ++++++++++++++--------
2 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 663d010..f71cc06 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -247,19 +247,18 @@ PATCHES=(
"${FILESDIR}/${PN}-5.2-system-pyuno.patch"
)
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
pkg_pretend() {
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
check-reqs_pkg_pretend
if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
@@ -287,7 +286,15 @@ pkg_setup() {
python-single-r1_pkg_setup
xdg_environment_reset
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
}
src_unpack() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ebc28aa..d43f7ea 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -246,19 +246,18 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3-system-pyuno.patch"
)
-CHECKREQS_MEMORY="512M"
-
-if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
-elif [[ ${MERGE_TYPE} != binary ]] ; then
- CHECKREQS_DISK_BUILD="6G"
-fi
-
pkg_pretend() {
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
check-reqs_pkg_pretend
if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
@@ -286,7 +285,15 @@ pkg_setup() {
python-single-r1_pkg_setup
xdg_environment_reset
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
}
src_unpack() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-19 23:11 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-19 23:11 UTC (permalink / raw
To: gentoo-commits
commit: f468a35402af54a919267658370bb61461e67bfc
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 23:11:15 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 23:11:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f468a354
app-office/libreoffice: add symlink for gnome-documents, bug 593514
Package-Manager: portage-2.3.2
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 6 ++++++
app-office/libreoffice/libreoffice-9999.ebuild | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index f71cc06..1202118 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -539,6 +539,12 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
# bash completion aliases
bashcomp_alias \
libreoffice \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d43f7ea..6dcbd21 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -537,6 +537,12 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
# bash completion aliases
bashcomp_alias \
libreoffice \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-26 19:18 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-26 19:18 UTC (permalink / raw
To: gentoo-commits
commit: 433a18fc47dc540b0ec35777edd3f20447016700
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 19:18:14 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 19:18:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433a18fc
app-office/libreoffice: Add revision bump (stable candidate with bugfixes)
Package-Manager: portage-2.3.2
.../libreoffice/libreoffice-5.2.3.3-r1.ebuild | 584 +++++++++++++++++++++
1 file changed, 584 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
new file mode 100644
index 00000000..1202118
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-text/hunspell
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ =dev-libs/liborcus-0.11*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10:=
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.0:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # from master branch
+ "${FILESDIR}/${PN}-5.2-icu58.patch"
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+
+ if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-hardlink-deliver \
+ --disable-online-update \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-29 18:40 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2016-11-29 18:40 UTC (permalink / raw
To: gentoo-commits
commit: 26ba5ebb877ea076485f2bb0fc1b518c0bd51181
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 18:39:31 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 18:39:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ba5ebb
app-office/libreoffice: amd64 stable wrt bug #600038
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
index 1202118..dea8a62 100644
--- a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
@@ -84,7 +84,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-29 18:41 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2016-11-29 18:41 UTC (permalink / raw
To: gentoo-commits
commit: 3ac6d89f0d74838db393c3303e5fec11c4331565
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 18:41:24 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 18:41:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac6d89f
app-office/libreoffice: x86 stable wrt bug #600038
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
index dea8a62..b39d3e3 100644
--- a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
@@ -84,7 +84,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-11-29 20:57 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-11-29 20:57 UTC (permalink / raw
To: gentoo-commits
commit: d63c4a915a79af4c6e8894f8e9ccca10b5cb322b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 20:57:21 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 20:57:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63c4a91
app-office/libreoffice: Remove now-unused useflag from metadata
Package-Manager: portage-2.3.2
app-office/libreoffice/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 5c463ae..7900bfe 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,7 +14,6 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
<flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
- <flag name="google">Enable support for remote files on Google Drive (LibreOffice 5.2.1 and earlier)</flag>
<flag name="googledrive">Enable support for remote files on Google Drive</flag>
<flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-12-17 15:57 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-12-17 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 7c7b6c4c6d0caec201604f9d1587320504c6a6ef
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov 24 23:02:44 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 15:55:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c7b6c4c
app-office/libreoffice: Add 5.3 stable branch
Package-Manager: portage-2.3.0
.../{libreoffice-9999.ebuild => libreoffice-5.3.9999.ebuild} | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
similarity index 100%
copy from app-office/libreoffice/libreoffice-9999.ebuild
copy to app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 6dcbd21..732c963 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -134,12 +134,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
- virtual/jpeg:0
x11-libs/cairo[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
virtual/glu
+ virtual/jpeg:0
virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6dcbd21..732c963 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -134,12 +134,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
- virtual/jpeg:0
x11-libs/cairo[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
virtual/glu
+ virtual/jpeg:0
virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-12-17 15:57 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-12-17 15:57 UTC (permalink / raw
To: gentoo-commits
commit: a047b47c27d60ba0e456578a9aa84135c61416e1
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 26 10:38:33 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 15:56:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a047b47c
app-office/libreoffice: Fix DEPENDs, drop --enable-graphite
Option turned mandatory. Upstream commits:
67936ee7ed717eb385b608d7eedcefa61fe13295
b9fe5dc791f56df55495d171ae901a246907c68b
glew -> epoxy
Upstream commit 482d7ce61b423600b41b459eb26a2cc221cd0acf
Package-Manager: portage-2.3.0
app-office/libreoffice/libreoffice-9999.ebuild | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 732c963..c9bad32 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -121,10 +121,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
- >=media-libs/glew-1.10:=
- media-libs/harfbuzz:=[graphite,icu]
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
@@ -151,7 +151,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
+ gltf? ( >=media-libs/libgltf-0.1.0 )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
@@ -414,7 +414,6 @@ src_configure() {
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
@@ -424,13 +423,12 @@ src_configure() {
# --without-system-sane: just sane.h header that is used for scan in writer,
# not linked or anything else, worthless to depend on
econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-dicts \
+ --with-system-epoxy \
--with-system-headers \
--with-system-jars \
--with-system-libs \
--enable-cairo-canvas \
- --enable-graphite \
--enable-largefile \
--enable-mergelibs \
--enable-neon \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-12-17 15:57 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-12-17 15:57 UTC (permalink / raw
To: gentoo-commits
commit: c49f43b531872d1c7c69258c1372cab464a053aa
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Dec 15 20:18:02 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 15:56:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49f43b5
app-office/libreoffice: 5.2.4.2 version bump
Package-Manager: portage-2.3.0
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.2.4.2.ebuild | 584 ++++++++++++++++++++++
2 files changed, 586 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d9ff85e..3b4e57e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,5 +7,7 @@ DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d46
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
+DIST libreoffice-5.2.4.2.tar.xz 182536912 SHA256 8b73d1afa6a1ff6bc153ab1f31afc86c42cc8d0e5831bf82e66a8df0fcf6eb10 SHA512 17b892f7c6b43189a08e5b2f8844cec486293daaa9b22afe4b9a0b8e3747cc9646018eb976c80af1a8eea34c29077fb945ff724d8d0f6ee20cebbce94e5ded5b WHIRLPOOL 5fa230bc98d2a3696bad0aba5598db763f98d1a632d871e47ceb308ee566fdda99c531516671a126fd376ca08bc74e801afc316d80e1f1a1bb2c73ae6589866c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
+DIST libreoffice-help-5.2.4.2.tar.xz 1918520 SHA256 fef3a7699d20e198ac66267f50ffce5bcbef48617434af477de8887340ebe182 SHA512 f0ad65a01c589e3a2377130221d42497848a8407b71fe6450b1dd4bd7978c66ee42281f0da5a881c7317750804af5108ec50cf79707b2910a0b879039e487d0b WHIRLPOOL 7532f6cae8432c14c8e2be18bb3bf9193a63bd20ca7992187da8f4e68004de4b32b9f8eb8ee6f3b4c6436eaf8d89fae1717335b2b0eb43856d929d1dbccce064
diff --git a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
new file mode 100644
index 00000000..1202118
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
@@ -0,0 +1,584 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-text/hunspell
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ =dev-libs/liborcus-0.11*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10:=
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.0:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # from master branch
+ "${FILESDIR}/${PN}-5.2-icu58.patch"
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+
+ if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-hardlink-deliver \
+ --disable-online-update \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2016-12-19 22:09 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2016-12-19 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 9a694b5574557dacd48aa87c7eea4f232a74116e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 22:08:39 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 22:08:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a694b55
app-office/libreoffice: Fix clang check, bug 601504
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.2.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
index 1202118..76e383a 100644
--- a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
@@ -261,7 +261,7 @@ pkg_pretend() {
fi
check-reqs_pkg_pretend
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 1202118..76e383a 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -261,7 +261,7 @@ pkg_pretend() {
fi
check-reqs_pkg_pretend
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 732c963..f1761be 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -260,7 +260,7 @@ pkg_pretend() {
fi
check-reqs_pkg_pretend
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c9bad32..af0a7dc 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -260,7 +260,7 @@ pkg_pretend() {
fi
check-reqs_pkg_pretend
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-02-01 2:30 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-02-01 2:30 UTC (permalink / raw
To: gentoo-commits
commit: 4bdbda7475a375679eeae7074a401f6b4d1e0f95
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 1 02:28:53 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 1 02:28:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdbda74
app-office/libreoffice: Fix libreoffice-draw.desktop if ! use pdfimport
Gentoo-bug: 605464
Package-Manager: portage-2.3.3
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 10 +++++++++-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 10 +++++++++-
app-office/libreoffice/libreoffice-9999.ebuild | 10 +++++++++-
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 76e383a..d104014 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -357,6 +357,14 @@ src_prepare() {
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
}
src_configure() {
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index f1761be..b8cd07d 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -356,6 +356,14 @@ src_prepare() {
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
}
src_configure() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index af0a7dc..cc07983 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -356,6 +356,14 @@ src_prepare() {
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-02-03 18:22 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-02-03 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 8af8af45c6f5ac08015d4b3af966708af2214e00
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 23:08:45 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 18:17:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af8af45
app-office/libreoffice: DEPEND on app-crypt/gpgme
Package-Manager: portage-2.3.3
app-office/libreoffice/libreoffice-9999.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cc07983..e0e9d61 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -89,6 +89,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
+ app-crypt/gpgme
app-text/hunspell
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
@@ -467,6 +468,7 @@ src_configure() {
--without-myspell-dicts \
--without-help \
--with-helppack-integration \
+ --with-system-gpgme \
--without-system-sane \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-02-26 20:47 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-02-26 20:47 UTC (permalink / raw
To: gentoo-commits
commit: a44a568d974de12793fb9d750dd68a0dcbe20ec1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 20:45:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 20:47:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44a568d
app-office/libreoffice: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-5.2.4.2.ebuild | 584 ----------------------
2 files changed, 586 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 902de61099..6de28208a3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,11 +7,9 @@ DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d46
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
-DIST libreoffice-5.2.4.2.tar.xz 182536912 SHA256 8b73d1afa6a1ff6bc153ab1f31afc86c42cc8d0e5831bf82e66a8df0fcf6eb10 SHA512 17b892f7c6b43189a08e5b2f8844cec486293daaa9b22afe4b9a0b8e3747cc9646018eb976c80af1a8eea34c29077fb945ff724d8d0f6ee20cebbce94e5ded5b WHIRLPOOL 5fa230bc98d2a3696bad0aba5598db763f98d1a632d871e47ceb308ee566fdda99c531516671a126fd376ca08bc74e801afc316d80e1f1a1bb2c73ae6589866c
DIST libreoffice-5.2.5.1.tar.xz 184242832 SHA256 9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300 SHA512 72b88fc44bc440def7be8971a6976b87de41562eaa968eeb40bc5b9bd2d3ce4fb8581fc070ade804a8f7257e350df2cc8f2ac42c9d3241bd65d2a89c35602c00 WHIRLPOOL 776845b4b34afd42c7b65179c2d77449e7f2917b4a475b93434ff0817688cbecc69f946640408750221cdd950f6982c4a3f9a9ce370c977a6d10613c61f5d494
DIST libreoffice-5.3.0.3.tar.xz 168797580 SHA256 04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e SHA512 06cf8a59c2b08f6aaf5012347aeae482ecccc4587c67fc6d3f267572f236999ec6fe1f1290926830ebe5631c705cf4e938b65a5765e99556c8d19178e0fece45 WHIRLPOOL 4591366575e5e8da7f892d6549d0ae0cdae7e0afcd8e1c1d771fe735e73de901ae26f8b95ca589ffeba1d3b73830853aea14a84e26a94a5465b872583ed0519d
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
-DIST libreoffice-help-5.2.4.2.tar.xz 1918520 SHA256 fef3a7699d20e198ac66267f50ffce5bcbef48617434af477de8887340ebe182 SHA512 f0ad65a01c589e3a2377130221d42497848a8407b71fe6450b1dd4bd7978c66ee42281f0da5a881c7317750804af5108ec50cf79707b2910a0b879039e487d0b WHIRLPOOL 7532f6cae8432c14c8e2be18bb3bf9193a63bd20ca7992187da8f4e68004de4b32b9f8eb8ee6f3b4c6436eaf8d89fae1717335b2b0eb43856d929d1dbccce064
DIST libreoffice-help-5.2.5.1.tar.xz 1936260 SHA256 11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4 SHA512 2319784da7733eb21a15fba4dab4b74a1aff89c89634727e6d5013b4ca14bd65d0951bdaff569a79544a8c44ff494e92eb0573e11391ec88e2cb811e47689cf9 WHIRLPOOL 714d6bfe696f4fc69203f5cd3e9a2914d2d73cc78c06f6ef4ae860f52b5c1c34305e1c7330eff380d73b8006e2c47e3f033ec6fdefe14e65c8e11289aa75364e
DIST libreoffice-help-5.3.0.3.tar.xz 1615344 SHA256 df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f SHA512 c575b19beb42ec44fe8d63d72df31853d224e78ca14bf8bd6d5b81bfebfda71c17943fd0b59c019548910bb76ea269340436d54375121f559bdb1d38d6b3296f WHIRLPOOL cd662dcfe8e6eaa63872820b42a68aa4e0913c4fb4688db1f1c611169f9ba1e7f05e77dba5786d42cb738b353a2df81caa417c60e525a073c04beee0f2bbcfa0
diff --git a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild b/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
deleted file mode 100644
index 76e383a195..0000000000
--- a/app-office/libreoffice/libreoffice-5.2.4.2.ebuild
+++ /dev/null
@@ -1,584 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.11*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from master branch
- "${FILESDIR}/${PN}-5.2-icu58.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-02-28 18:24 Matt Turner
0 siblings, 0 replies; 588+ messages in thread
From: Matt Turner @ 2017-02-28 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 9c496ce7b0b73a96562a8d07d438efcf53fb7387
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 18:23:44 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 18:24:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c496ce7
app-office/libreoffice: Fix cairo[-xlib-xcb] dependency.
Bug: https://bugs.gentoo.org/611178
app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild | 4 ++--
app-office/libreoffice/libreoffice-5.2.5.1.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.0.3.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
index b39d3e36ff..3f32d31b2d 100644
--- a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -133,7 +133,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb(-)]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
index 4da4a96eb6..89c487827d 100644
--- a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
@@ -133,7 +133,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb(-)]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 4da4a96eb6..89c487827d 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -133,7 +133,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb(-)]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
index 9dc3f33d8a..dd1e01cf47 100644
--- a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
@@ -136,7 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb(-)]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 187b52ebe9..f45171599b 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -134,7 +134,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb(-)]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c2b9b736ca..9a05017ea4 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -137,7 +137,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb]
+ x11-libs/cairo[X,-xlib-xcb(-)]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-02-28 19:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-02-28 19:48 UTC (permalink / raw
To: gentoo-commits
commit: a79ad26addc2af783af670075cc769b14edbaf98
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 19:26:24 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 19:48:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79ad26a
app-office/libreoffice: Drop 5.2 stable branch
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 595 ---------------------
1 file changed, 595 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
deleted file mode 100644
index 89c487827d..0000000000
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ /dev/null
@@ -1,595 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.11*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from master branch
- "${FILESDIR}/${PN}-5.2-icu58.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-02-28 19:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-02-28 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 4bd015139e9a37ac798183946eedb5e2012ad95c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 19:25:09 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 19:48:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd01513
app-office/libreoffice: 5.2.6.2 version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.2.6.2.ebuild | 596 ++++++++++++++++++++++
2 files changed, 598 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6de28208a3..ff59c62d69 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,8 +8,10 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
DIST libreoffice-5.2.5.1.tar.xz 184242832 SHA256 9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300 SHA512 72b88fc44bc440def7be8971a6976b87de41562eaa968eeb40bc5b9bd2d3ce4fb8581fc070ade804a8f7257e350df2cc8f2ac42c9d3241bd65d2a89c35602c00 WHIRLPOOL 776845b4b34afd42c7b65179c2d77449e7f2917b4a475b93434ff0817688cbecc69f946640408750221cdd950f6982c4a3f9a9ce370c977a6d10613c61f5d494
+DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
DIST libreoffice-5.3.0.3.tar.xz 168797580 SHA256 04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e SHA512 06cf8a59c2b08f6aaf5012347aeae482ecccc4587c67fc6d3f267572f236999ec6fe1f1290926830ebe5631c705cf4e938b65a5765e99556c8d19178e0fece45 WHIRLPOOL 4591366575e5e8da7f892d6549d0ae0cdae7e0afcd8e1c1d771fe735e73de901ae26f8b95ca589ffeba1d3b73830853aea14a84e26a94a5465b872583ed0519d
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
DIST libreoffice-help-5.2.5.1.tar.xz 1936260 SHA256 11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4 SHA512 2319784da7733eb21a15fba4dab4b74a1aff89c89634727e6d5013b4ca14bd65d0951bdaff569a79544a8c44ff494e92eb0573e11391ec88e2cb811e47689cf9 WHIRLPOOL 714d6bfe696f4fc69203f5cd3e9a2914d2d73cc78c06f6ef4ae860f52b5c1c34305e1c7330eff380d73b8006e2c47e3f033ec6fdefe14e65c8e11289aa75364e
+DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.3.0.3.tar.xz 1615344 SHA256 df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f SHA512 c575b19beb42ec44fe8d63d72df31853d224e78ca14bf8bd6d5b81bfebfda71c17943fd0b59c019548910bb76ea269340436d54375121f559bdb1d38d6b3296f WHIRLPOOL cd662dcfe8e6eaa63872820b42a68aa4e0913c4fb4688db1f1c611169f9ba1e7f05e77dba5786d42cb738b353a2df81caa417c60e525a073c04beee0f2bbcfa0
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
new file mode 100644
index 0000000000..f696f9548a
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
@@ -0,0 +1,596 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-text/hunspell
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ =dev-libs/liborcus-0.11*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10:=
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ x11-libs/cairo[X,-xlib-xcb(-)]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ >=x11-libs/gtk+-3.8:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.0:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # from master branch
+ "${FILESDIR}/${PN}-5.2-icu58.patch"
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-hardlink-deliver \
+ --disable-online-update \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-03-08 19:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-03-08 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 88b0b6efbb45bf49d0dd5d72146d2ca9981d5e65
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 23:21:33 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 19:42:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b0b6ef
app-office/libreoffice: 5.3.1.2 version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.3.1.2.ebuild | 593 ++++++++++++++++++++++
2 files changed, 595 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ff59c62d69f..3269bd1b065 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,8 +10,10 @@ DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46c
DIST libreoffice-5.2.5.1.tar.xz 184242832 SHA256 9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300 SHA512 72b88fc44bc440def7be8971a6976b87de41562eaa968eeb40bc5b9bd2d3ce4fb8581fc070ade804a8f7257e350df2cc8f2ac42c9d3241bd65d2a89c35602c00 WHIRLPOOL 776845b4b34afd42c7b65179c2d77449e7f2917b4a475b93434ff0817688cbecc69f946640408750221cdd950f6982c4a3f9a9ce370c977a6d10613c61f5d494
DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
DIST libreoffice-5.3.0.3.tar.xz 168797580 SHA256 04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e SHA512 06cf8a59c2b08f6aaf5012347aeae482ecccc4587c67fc6d3f267572f236999ec6fe1f1290926830ebe5631c705cf4e938b65a5765e99556c8d19178e0fece45 WHIRLPOOL 4591366575e5e8da7f892d6549d0ae0cdae7e0afcd8e1c1d771fe735e73de901ae26f8b95ca589ffeba1d3b73830853aea14a84e26a94a5465b872583ed0519d
+DIST libreoffice-5.3.1.2.tar.xz 189706056 SHA256 5746cd7ccaf64e51eb0fc07128e75cf145a32b318d572aba18855f14c10754ff SHA512 f35a037eb823603295187f958bab290a51dd3d189ab5bf10b087a7900bad50de5cb477c5a0cf2ca5e5190e9c31b0e7f382980cc03d139014f3b706b4cd4082b0 WHIRLPOOL a4a697ee460f3a96cf8b406645d77f11b2ce9814245ad2b8c191d6b362e0f2fef571b46c64e9b34cc304545740af8807ad77087b6c613e83c50898755f738a29
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
DIST libreoffice-help-5.2.5.1.tar.xz 1936260 SHA256 11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4 SHA512 2319784da7733eb21a15fba4dab4b74a1aff89c89634727e6d5013b4ca14bd65d0951bdaff569a79544a8c44ff494e92eb0573e11391ec88e2cb811e47689cf9 WHIRLPOOL 714d6bfe696f4fc69203f5cd3e9a2914d2d73cc78c06f6ef4ae860f52b5c1c34305e1c7330eff380d73b8006e2c47e3f033ec6fdefe14e65c8e11289aa75364e
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.3.0.3.tar.xz 1615344 SHA256 df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f SHA512 c575b19beb42ec44fe8d63d72df31853d224e78ca14bf8bd6d5b81bfebfda71c17943fd0b59c019548910bb76ea269340436d54375121f559bdb1d38d6b3296f WHIRLPOOL cd662dcfe8e6eaa63872820b42a68aa4e0913c4fb4688db1f1c611169f9ba1e7f05e77dba5786d42cb738b353a2df81caa417c60e525a073c04beee0f2bbcfa0
+DIST libreoffice-help-5.3.1.2.tar.xz 2127368 SHA256 df49c7bf1caa872f542a69875b44b450b724644585fc847f41e549f88da4c20e SHA512 a6fc9912c67e485a01a71fa85c09eca464f6ae37024e7ae96e92d9f9582390955df069c3ef633b5df83eb6cd96c3654bd22eab728a58961a08dda7b18f754391 WHIRLPOOL 0746f8a5be49bd67b8eff536c97c1b398e2490794dd3f8147ba33adafc887c550bf4a446f81bf5fec427970ec377774e6baf7ab6d1ba4d12e80653d8e087825f
diff --git a/app-office/libreoffice/libreoffice-5.3.1.2.ebuild b/app-office/libreoffice/libreoffice-5.3.1.2.ebuild
new file mode 100644
index 00000000000..b6479dabcbb
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.3.1.2.ebuild
@@ -0,0 +1,593 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-text/hunspell
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ >=dev-libs/liborcus-0.12.1
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10:=
+ media-libs/harfbuzz:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ x11-libs/cairo[X,-xlib-xcb(-)]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( media-libs/opencollada )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ x11-libs/gtk+:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.2:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-breakpad \
+ --disable-ccache \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-online-update \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-03-08 19:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-03-08 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 476da1e27be3e650ca90ff446a939750857395c5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 8 19:18:56 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 19:42:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476da1e2
app-office/libreoffice: Restore keywords on 5.2.6.2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.2.6.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
index 504a63dfd89..65dc7d55a84 100644
--- a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
@@ -83,8 +83,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-03-29 17:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-03-29 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 264dea6b6a9a2aeb88fb32320b1d516ff53f882d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 16:18:37 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 17:46:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264dea6b
app-office/libreoffice: 5.3.2.1 version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-5.3.2.1.ebuild | 594 ++++++++++++++++++++++
2 files changed, 596 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3269bd1b065..f0050169297 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -11,9 +11,11 @@ DIST libreoffice-5.2.5.1.tar.xz 184242832 SHA256 9756a322a497aa83d096fa0ac554162
DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
DIST libreoffice-5.3.0.3.tar.xz 168797580 SHA256 04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e SHA512 06cf8a59c2b08f6aaf5012347aeae482ecccc4587c67fc6d3f267572f236999ec6fe1f1290926830ebe5631c705cf4e938b65a5765e99556c8d19178e0fece45 WHIRLPOOL 4591366575e5e8da7f892d6549d0ae0cdae7e0afcd8e1c1d771fe735e73de901ae26f8b95ca589ffeba1d3b73830853aea14a84e26a94a5465b872583ed0519d
DIST libreoffice-5.3.1.2.tar.xz 189706056 SHA256 5746cd7ccaf64e51eb0fc07128e75cf145a32b318d572aba18855f14c10754ff SHA512 f35a037eb823603295187f958bab290a51dd3d189ab5bf10b087a7900bad50de5cb477c5a0cf2ca5e5190e9c31b0e7f382980cc03d139014f3b706b4cd4082b0 WHIRLPOOL a4a697ee460f3a96cf8b406645d77f11b2ce9814245ad2b8c191d6b362e0f2fef571b46c64e9b34cc304545740af8807ad77087b6c613e83c50898755f738a29
+DIST libreoffice-5.3.2.1.tar.xz 189746408 SHA256 07052dccc52e427c2898bc5768c7f55d181aa0f79ffcd827dc8dd1f17e844e55 SHA512 7a59a5c3e5b4436c5c9d99c9941fb1d2dc7d8e12bcda87976edfda59a2278351341f61ffc03c13fcf20a5aa8a3e7c14aee711f9edad3dd01e5cf53245547c781 WHIRLPOOL 003fe59c3aa5e117cd8bb74af3abad84651300e7b6dd979c00480f1add973226e0bfcb564f04b163c921dad013a7430cb2ab23e4f93fd3a0c002fa2c0ef908d0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
DIST libreoffice-help-5.2.5.1.tar.xz 1936260 SHA256 11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4 SHA512 2319784da7733eb21a15fba4dab4b74a1aff89c89634727e6d5013b4ca14bd65d0951bdaff569a79544a8c44ff494e92eb0573e11391ec88e2cb811e47689cf9 WHIRLPOOL 714d6bfe696f4fc69203f5cd3e9a2914d2d73cc78c06f6ef4ae860f52b5c1c34305e1c7330eff380d73b8006e2c47e3f033ec6fdefe14e65c8e11289aa75364e
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.3.0.3.tar.xz 1615344 SHA256 df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f SHA512 c575b19beb42ec44fe8d63d72df31853d224e78ca14bf8bd6d5b81bfebfda71c17943fd0b59c019548910bb76ea269340436d54375121f559bdb1d38d6b3296f WHIRLPOOL cd662dcfe8e6eaa63872820b42a68aa4e0913c4fb4688db1f1c611169f9ba1e7f05e77dba5786d42cb738b353a2df81caa417c60e525a073c04beee0f2bbcfa0
DIST libreoffice-help-5.3.1.2.tar.xz 2127368 SHA256 df49c7bf1caa872f542a69875b44b450b724644585fc847f41e549f88da4c20e SHA512 a6fc9912c67e485a01a71fa85c09eca464f6ae37024e7ae96e92d9f9582390955df069c3ef633b5df83eb6cd96c3654bd22eab728a58961a08dda7b18f754391 WHIRLPOOL 0746f8a5be49bd67b8eff536c97c1b398e2490794dd3f8147ba33adafc887c550bf4a446f81bf5fec427970ec377774e6baf7ab6d1ba4d12e80653d8e087825f
+DIST libreoffice-help-5.3.2.1.tar.xz 2127012 SHA256 a462e6f1a575eb9185dfeffac37f77878454d5bee5bf9eb7ce5f6b6ae38dc622 SHA512 110feb04a6654ceeb1de1c7246f6297a7eba30af37aee07b4d621432b1f20529dbc74f3edcb104948c0b1d54cd9d5b7f945fdaa0d4ccd6372f198b44cad3118a WHIRLPOOL 5e3e666b7d359e6b2cf87e72014be43bbb355046a4e1cb5e6dcdf9a3462bfd2b77c5b041a825e33068a59abcf23158b22aa84bf91055017c66404d879c9a9dd5
diff --git a/app-office/libreoffice/libreoffice-5.3.2.1.ebuild b/app-office/libreoffice/libreoffice-5.3.2.1.ebuild
new file mode 100644
index 00000000000..1912f85e148
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.3.2.1.ebuild
@@ -0,0 +1,594 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+# TODO: not packaged: firebird? ( >=dev-db/firebird-3.0 )
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-text/hunspell
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ >=dev-libs/liborcus-0.12.1
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/glew-1.10:=
+ media-libs/harfbuzz:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ x11-libs/cairo[X,-xlib-xcb(-)]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( media-libs/opencollada )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ x11-libs/gtk+:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.2:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+
+ if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
+ [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
+ eerror "Compilation with gcc older than 4.7 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ local pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} -lt 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # TODO: $(use_enable firebird firebird-sdbc)
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-dicts \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-breakpad \
+ --disable-ccache \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-firebird-sdbc \
+ --disable-gstreamer-0-10 \
+ --disable-online-update \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-03-29 17:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-03-29 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 9b2e17eaa79d4b54628f756eba61e7b1b78fafc7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 16:19:23 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 17:46:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2e17ea
app-office/libreoffice: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 4 -
app-office/libreoffice/libreoffice-5.2.5.1.ebuild | 594 ----------------------
app-office/libreoffice/libreoffice-5.3.0.3.ebuild | 594 ----------------------
3 files changed, 1192 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f0050169297..32b24cae627 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,15 +7,11 @@ DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d46
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
-DIST libreoffice-5.2.5.1.tar.xz 184242832 SHA256 9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300 SHA512 72b88fc44bc440def7be8971a6976b87de41562eaa968eeb40bc5b9bd2d3ce4fb8581fc070ade804a8f7257e350df2cc8f2ac42c9d3241bd65d2a89c35602c00 WHIRLPOOL 776845b4b34afd42c7b65179c2d77449e7f2917b4a475b93434ff0817688cbecc69f946640408750221cdd950f6982c4a3f9a9ce370c977a6d10613c61f5d494
DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
-DIST libreoffice-5.3.0.3.tar.xz 168797580 SHA256 04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e SHA512 06cf8a59c2b08f6aaf5012347aeae482ecccc4587c67fc6d3f267572f236999ec6fe1f1290926830ebe5631c705cf4e938b65a5765e99556c8d19178e0fece45 WHIRLPOOL 4591366575e5e8da7f892d6549d0ae0cdae7e0afcd8e1c1d771fe735e73de901ae26f8b95ca589ffeba1d3b73830853aea14a84e26a94a5465b872583ed0519d
DIST libreoffice-5.3.1.2.tar.xz 189706056 SHA256 5746cd7ccaf64e51eb0fc07128e75cf145a32b318d572aba18855f14c10754ff SHA512 f35a037eb823603295187f958bab290a51dd3d189ab5bf10b087a7900bad50de5cb477c5a0cf2ca5e5190e9c31b0e7f382980cc03d139014f3b706b4cd4082b0 WHIRLPOOL a4a697ee460f3a96cf8b406645d77f11b2ce9814245ad2b8c191d6b362e0f2fef571b46c64e9b34cc304545740af8807ad77087b6c613e83c50898755f738a29
DIST libreoffice-5.3.2.1.tar.xz 189746408 SHA256 07052dccc52e427c2898bc5768c7f55d181aa0f79ffcd827dc8dd1f17e844e55 SHA512 7a59a5c3e5b4436c5c9d99c9941fb1d2dc7d8e12bcda87976edfda59a2278351341f61ffc03c13fcf20a5aa8a3e7c14aee711f9edad3dd01e5cf53245547c781 WHIRLPOOL 003fe59c3aa5e117cd8bb74af3abad84651300e7b6dd979c00480f1add973226e0bfcb564f04b163c921dad013a7430cb2ab23e4f93fd3a0c002fa2c0ef908d0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
-DIST libreoffice-help-5.2.5.1.tar.xz 1936260 SHA256 11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4 SHA512 2319784da7733eb21a15fba4dab4b74a1aff89c89634727e6d5013b4ca14bd65d0951bdaff569a79544a8c44ff494e92eb0573e11391ec88e2cb811e47689cf9 WHIRLPOOL 714d6bfe696f4fc69203f5cd3e9a2914d2d73cc78c06f6ef4ae860f52b5c1c34305e1c7330eff380d73b8006e2c47e3f033ec6fdefe14e65c8e11289aa75364e
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
-DIST libreoffice-help-5.3.0.3.tar.xz 1615344 SHA256 df58d501b9514160767810df0b0e4b44a01262244f81f83df8654b0ccd4b1a7f SHA512 c575b19beb42ec44fe8d63d72df31853d224e78ca14bf8bd6d5b81bfebfda71c17943fd0b59c019548910bb76ea269340436d54375121f559bdb1d38d6b3296f WHIRLPOOL cd662dcfe8e6eaa63872820b42a68aa4e0913c4fb4688db1f1c611169f9ba1e7f05e77dba5786d42cb738b353a2df81caa417c60e525a073c04beee0f2bbcfa0
DIST libreoffice-help-5.3.1.2.tar.xz 2127368 SHA256 df49c7bf1caa872f542a69875b44b450b724644585fc847f41e549f88da4c20e SHA512 a6fc9912c67e485a01a71fa85c09eca464f6ae37024e7ae96e92d9f9582390955df069c3ef633b5df83eb6cd96c3654bd22eab728a58961a08dda7b18f754391 WHIRLPOOL 0746f8a5be49bd67b8eff536c97c1b398e2490794dd3f8147ba33adafc887c550bf4a446f81bf5fec427970ec377774e6baf7ab6d1ba4d12e80653d8e087825f
DIST libreoffice-help-5.3.2.1.tar.xz 2127012 SHA256 a462e6f1a575eb9185dfeffac37f77878454d5bee5bf9eb7ce5f6b6ae38dc622 SHA512 110feb04a6654ceeb1de1c7246f6297a7eba30af37aee07b4d621432b1f20529dbc74f3edcb104948c0b1d54cd9d5b7f945fdaa0d4ccd6372f198b44cad3118a WHIRLPOOL 5e3e666b7d359e6b2cf87e72014be43bbb355046a4e1cb5e6dcdf9a3462bfd2b77c5b041a825e33068a59abcf23158b22aa84bf91055017c66404d879c9a9dd5
diff --git a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild b/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
deleted file mode 100644
index 65dc7d55a84..00000000000
--- a/app-office/libreoffice/libreoffice-5.2.5.1.ebuild
+++ /dev/null
@@ -1,594 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.11*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from master branch
- "${FILESDIR}/${PN}-5.2-icu58.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild b/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
deleted file mode 100644
index 143f06d774f..00000000000
--- a/app-office/libreoffice/libreoffice-5.3.0.3.ebuild
+++ /dev/null
@@ -1,594 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-# TODO: not packaged: firebird? ( >=dev-db/firebird-3.0 )
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- >=dev-libs/liborcus-0.12.1
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- media-libs/harfbuzz:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # TODO: $(use_enable firebird firebird-sdbc) \
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-firebird-sdbc \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-03-30 22:43 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-03-30 22:43 UTC (permalink / raw
To: gentoo-commits
commit: e551325e1d7c4326fa9d76bdf4d6723460768a64
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 22:39:37 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 22:43:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e551325e
app-office/libreoffice: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 4 -
app-office/libreoffice/libreoffice-5.3.1.2.ebuild | 593 ---------------------
app-office/libreoffice/libreoffice-5.3.2.1.ebuild | 594 ----------------------
3 files changed, 1191 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b000dd81b6e..2aea3c7e48f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,12 +8,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
-DIST libreoffice-5.3.1.2.tar.xz 189706056 SHA256 5746cd7ccaf64e51eb0fc07128e75cf145a32b318d572aba18855f14c10754ff SHA512 f35a037eb823603295187f958bab290a51dd3d189ab5bf10b087a7900bad50de5cb477c5a0cf2ca5e5190e9c31b0e7f382980cc03d139014f3b706b4cd4082b0 WHIRLPOOL a4a697ee460f3a96cf8b406645d77f11b2ce9814245ad2b8c191d6b362e0f2fef571b46c64e9b34cc304545740af8807ad77087b6c613e83c50898755f738a29
-DIST libreoffice-5.3.2.1.tar.xz 189746408 SHA256 07052dccc52e427c2898bc5768c7f55d181aa0f79ffcd827dc8dd1f17e844e55 SHA512 7a59a5c3e5b4436c5c9d99c9941fb1d2dc7d8e12bcda87976edfda59a2278351341f61ffc03c13fcf20a5aa8a3e7c14aee711f9edad3dd01e5cf53245547c781 WHIRLPOOL 003fe59c3aa5e117cd8bb74af3abad84651300e7b6dd979c00480f1add973226e0bfcb564f04b163c921dad013a7430cb2ab23e4f93fd3a0c002fa2c0ef908d0
DIST libreoffice-5.3.2.2.tar.xz 189737884 SHA256 8811a95eb9298cc89603bccd22bcf7196dcef8543b5e66dae5aa47263a0f9ead SHA512 6d073f6fcfb34b1aad2545c6e418029bf82a2d14358d567fac853fbf432a427f43edea714fb2a2de3f4cd2bf2b3e0d3d0523c3dc490b80c1e867d74ac2841ffb WHIRLPOOL 381f91ce8f4e9d792019aa5e6c5fdac5c378843a84d7cb406599704bda04bc4df88a97efb310c347cd8d4eaeeb817aad0344aa61efad9276505f7b24e315cdff
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
-DIST libreoffice-help-5.3.1.2.tar.xz 2127368 SHA256 df49c7bf1caa872f542a69875b44b450b724644585fc847f41e549f88da4c20e SHA512 a6fc9912c67e485a01a71fa85c09eca464f6ae37024e7ae96e92d9f9582390955df069c3ef633b5df83eb6cd96c3654bd22eab728a58961a08dda7b18f754391 WHIRLPOOL 0746f8a5be49bd67b8eff536c97c1b398e2490794dd3f8147ba33adafc887c550bf4a446f81bf5fec427970ec377774e6baf7ab6d1ba4d12e80653d8e087825f
-DIST libreoffice-help-5.3.2.1.tar.xz 2127012 SHA256 a462e6f1a575eb9185dfeffac37f77878454d5bee5bf9eb7ce5f6b6ae38dc622 SHA512 110feb04a6654ceeb1de1c7246f6297a7eba30af37aee07b4d621432b1f20529dbc74f3edcb104948c0b1d54cd9d5b7f945fdaa0d4ccd6372f198b44cad3118a WHIRLPOOL 5e3e666b7d359e6b2cf87e72014be43bbb355046a4e1cb5e6dcdf9a3462bfd2b77c5b041a825e33068a59abcf23158b22aa84bf91055017c66404d879c9a9dd5
DIST libreoffice-help-5.3.2.2.tar.xz 2127516 SHA256 29b24202ee6ca0e1f6cd81a3c1ad98fa226225e7f2d6d4162936943c01656087 SHA512 2bd9dc680c13506fcc66a885b589e4a65a9fe3d5c3bcdeda97f2f0eddfa6b699ed8377c3d53c8750f2a8ca56594e9ec06504888f3a7e9bcdc01d0375169fe131 WHIRLPOOL 58ffd8c8efca17ef32bcb59d2bd8dc473d13a9e552966430c4b1b2aef5b21991e900de727333681c55899a0ee878bd5c4b571ba384f3a2c3b4dc85974c523168
diff --git a/app-office/libreoffice/libreoffice-5.3.1.2.ebuild b/app-office/libreoffice/libreoffice-5.3.1.2.ebuild
deleted file mode 100644
index b6479dabcbb..00000000000
--- a/app-office/libreoffice/libreoffice-5.3.1.2.ebuild
+++ /dev/null
@@ -1,593 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- >=dev-libs/liborcus-0.12.1
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- media-libs/harfbuzz:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/libreoffice-5.3.2.1.ebuild b/app-office/libreoffice/libreoffice-5.3.2.1.ebuild
deleted file mode 100644
index 1912f85e148..00000000000
--- a/app-office/libreoffice/libreoffice-5.3.2.1.ebuild
+++ /dev/null
@@ -1,594 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-# TODO: not packaged: firebird? ( >=dev-db/firebird-3.0 )
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- >=dev-libs/liborcus-0.12.1
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- media-libs/harfbuzz:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # TODO: $(use_enable firebird firebird-sdbc)
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-firebird-sdbc \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-03-30 22:43 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-03-30 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 9663aa65b311df421ca57c32b59b42606cc2f054
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 22:25:51 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 22:43:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9663aa65
app-office/libreoffice: 5.3.2.2 version bump, python3_6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 2 ++
...ibreoffice-5.3.9999.ebuild => libreoffice-5.3.2.2.ebuild} | 12 +++++++-----
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 32b24cae627..b000dd81b6e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -10,8 +10,10 @@ DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46c
DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
DIST libreoffice-5.3.1.2.tar.xz 189706056 SHA256 5746cd7ccaf64e51eb0fc07128e75cf145a32b318d572aba18855f14c10754ff SHA512 f35a037eb823603295187f958bab290a51dd3d189ab5bf10b087a7900bad50de5cb477c5a0cf2ca5e5190e9c31b0e7f382980cc03d139014f3b706b4cd4082b0 WHIRLPOOL a4a697ee460f3a96cf8b406645d77f11b2ce9814245ad2b8c191d6b362e0f2fef571b46c64e9b34cc304545740af8807ad77087b6c613e83c50898755f738a29
DIST libreoffice-5.3.2.1.tar.xz 189746408 SHA256 07052dccc52e427c2898bc5768c7f55d181aa0f79ffcd827dc8dd1f17e844e55 SHA512 7a59a5c3e5b4436c5c9d99c9941fb1d2dc7d8e12bcda87976edfda59a2278351341f61ffc03c13fcf20a5aa8a3e7c14aee711f9edad3dd01e5cf53245547c781 WHIRLPOOL 003fe59c3aa5e117cd8bb74af3abad84651300e7b6dd979c00480f1add973226e0bfcb564f04b163c921dad013a7430cb2ab23e4f93fd3a0c002fa2c0ef908d0
+DIST libreoffice-5.3.2.2.tar.xz 189737884 SHA256 8811a95eb9298cc89603bccd22bcf7196dcef8543b5e66dae5aa47263a0f9ead SHA512 6d073f6fcfb34b1aad2545c6e418029bf82a2d14358d567fac853fbf432a427f43edea714fb2a2de3f4cd2bf2b3e0d3d0523c3dc490b80c1e867d74ac2841ffb WHIRLPOOL 381f91ce8f4e9d792019aa5e6c5fdac5c378843a84d7cb406599704bda04bc4df88a97efb310c347cd8d4eaeeb817aad0344aa61efad9276505f7b24e315cdff
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.3.1.2.tar.xz 2127368 SHA256 df49c7bf1caa872f542a69875b44b450b724644585fc847f41e549f88da4c20e SHA512 a6fc9912c67e485a01a71fa85c09eca464f6ae37024e7ae96e92d9f9582390955df069c3ef633b5df83eb6cd96c3654bd22eab728a58961a08dda7b18f754391 WHIRLPOOL 0746f8a5be49bd67b8eff536c97c1b398e2490794dd3f8147ba33adafc887c550bf4a446f81bf5fec427970ec377774e6baf7ab6d1ba4d12e80653d8e087825f
DIST libreoffice-help-5.3.2.1.tar.xz 2127012 SHA256 a462e6f1a575eb9185dfeffac37f77878454d5bee5bf9eb7ce5f6b6ae38dc622 SHA512 110feb04a6654ceeb1de1c7246f6297a7eba30af37aee07b4d621432b1f20529dbc74f3edcb104948c0b1d54cd9d5b7f945fdaa0d4ccd6372f198b44cad3118a WHIRLPOOL 5e3e666b7d359e6b2cf87e72014be43bbb355046a4e1cb5e6dcdf9a3462bfd2b77c5b041a825e33068a59abcf23158b22aa84bf91055017c66404d879c9a9dd5
+DIST libreoffice-help-5.3.2.2.tar.xz 2127516 SHA256 29b24202ee6ca0e1f6cd81a3c1ad98fa226225e7f2d6d4162936943c01656087 SHA512 2bd9dc680c13506fcc66a885b589e4a65a9fe3d5c3bcdeda97f2f0eddfa6b699ed8377c3d53c8750f2a8ca56594e9ec06504888f3a7e9bcdc01d0375169fe131 WHIRLPOOL 58ffd8c8efca17ef32bcb59d2bd8dc473d13a9e552966430c4b1b2aef5b21991e900de727333681c55899a0ee878bd5c4b571ba384f3a2c3b4dc85974c523168
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
similarity index 98%
copy from app-office/libreoffice/libreoffice-5.3.9999.ebuild
copy to app-office/libreoffice/libreoffice-5.3.2.2.ebuild
index eae461c4748..823039013d1 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
@@ -7,7 +7,7 @@ KDE_REQUIRED="optional"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
@@ -76,15 +76,17 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+# TODO: not packaged: firebird? ( >=dev-db/firebird-3.0 )
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -149,7 +151,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
gnome-extra/evolution-data-server
)
- firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
gnome? ( gnome-base/dconf )
gstreamer? (
@@ -433,6 +434,7 @@ src_configure() {
# --disable-report-builder: too much java packages pulled in without pkgs
# --without-system-sane: just sane.h header that is used for scan in writer,
# not linked or anything else, worthless to depend on
+ # TODO: $(use_enable firebird firebird-sdbc)
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-dicts \
@@ -452,6 +454,7 @@ src_configure() {
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
+ --disable-firebird-sdbc \
--disable-gstreamer-0-10 \
--disable-online-update \
--disable-report-builder \
@@ -479,7 +482,6 @@ src_configure() {
$(use_enable debug) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
$(use_enable gnome gio) \
$(use_enable gnome dconf) \
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index eae461c4748..ff2ced4f1f3 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -7,7 +7,7 @@ KDE_REQUIRED="optional"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9c6c4e937d8..c7209d0021c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -7,7 +7,7 @@ KDE_REQUIRED="optional"
KDE_SCM="git"
CMAKE_REQUIRED="never"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-03-31 19:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-03-31 19:31 UTC (permalink / raw
To: gentoo-commits
commit: bd21abd383074e163dba7516e65c62593750cb51
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 19:31:00 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 19:31:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd21abd3
app-office/libreoffice: Pin down liborcus dep to 0.12
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.3.2.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.2.2.ebuild b/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
index 823039013d1..09696746068 100644
--- a/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
@@ -112,7 +112,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- >=dev-libs/liborcus-0.12.1
+ =dev-libs/liborcus-0.12*
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index ff2ced4f1f3..f8edcb99ef4 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -110,7 +110,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- >=dev-libs/liborcus-0.12.1
+ =dev-libs/liborcus-0.12*
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c7209d0021c..15011c92006 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -113,7 +113,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.12.1
+ =dev-libs/liborcus-0.12*
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-04-02 10:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-04-02 10:08 UTC (permalink / raw
To: gentoo-commits
commit: aa60c8b1f626d8dd9256fd95b6cc1d3d34519af3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 2 10:06:28 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 2 10:07:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa60c8b1
app-office/libreoffice: Add missing subslot operator on app-text/hunspell
Reported-by: Arfrever
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.2.6.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.2.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
index 65dc7d55a84..e9dbf7396a7 100644
--- a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
@@ -88,7 +88,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-text/hunspell
+ app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
diff --git a/app-office/libreoffice/libreoffice-5.3.2.2.ebuild b/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
index 09696746068..62c861f096b 100644
--- a/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.2.2.ebuild
@@ -90,7 +90,7 @@ KEYWORDS=""
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-text/hunspell
+ app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index f8edcb99ef4..41325dea243 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -88,7 +88,7 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-text/hunspell
+ app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 15011c92006..f1a1ec0898f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -89,7 +89,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
app-crypt/gpgme[cxx]
- app-text/hunspell
+ app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-04-23 12:40 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2017-04-23 12:40 UTC (permalink / raw
To: gentoo-commits
commit: 524a5708ddff43fe4a893c62801818833b5b6f89
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 12:39:17 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 12:39:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524a5708
app-office/libreoffice: amd64 stable wrt bug #615474
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.2.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
index e9dbf7396a7..b2e11463109 100644
--- a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
@@ -83,7 +83,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-04-27 18:15 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-04-27 18:15 UTC (permalink / raw
To: gentoo-commits
commit: acf6854e365506853b6c34b17665480e5ce4f011
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 18:09:49 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 18:14:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf6854e
app-office/libreoffice: Drop 5.2.3.3
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-office/libreoffice/Manifest | 2 -
.../libreoffice/libreoffice-5.2.3.3-r1.ebuild | 583 ---------------------
2 files changed, 585 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2aea3c7e48f..499b63f0257 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,10 +6,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
-DIST libreoffice-5.2.3.3.tar.xz 183870036 SHA256 a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1 SHA512 8628a820ad620ca946457adf0b0ed9741f13c67aa061761d04b743340d13ef498f23e75e6183206b34ce7154b1ec3096f8afcb69b2ab02e17c6ef00155e1b084 WHIRLPOOL 17edc4dd47938db71a5b5ec3ba318d02fbcab7c389bdb51432d36f1f018667c58b1ec3b38b09610542653c9442b65950e0daa062149cfeb7e35e699c6c9f89eb
DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
DIST libreoffice-5.3.2.2.tar.xz 189737884 SHA256 8811a95eb9298cc89603bccd22bcf7196dcef8543b5e66dae5aa47263a0f9ead SHA512 6d073f6fcfb34b1aad2545c6e418029bf82a2d14358d567fac853fbf432a427f43edea714fb2a2de3f4cd2bf2b3e0d3d0523c3dc490b80c1e867d74ac2841ffb WHIRLPOOL 381f91ce8f4e9d792019aa5e6c5fdac5c378843a84d7cb406599704bda04bc4df88a97efb310c347cd8d4eaeeb817aad0344aa61efad9276505f7b24e315cdff
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.2.3.3.tar.xz 1936920 SHA256 443be26b35c6b454d5d1ca17c58cc33ae90946f8e1003a98118467b49989cd3a SHA512 927421887d2d41538ba79d6d584bf84ad3fd7a58d3b9d95801cf67a0dcce61421934cd273a38803b5519c434232d1aaeb88d52cab391ae7292809ebbb3b501f9 WHIRLPOOL 36da9c200c0174f745827afb099530d06f6489f8be4a521b7dd37441fc2a1f9691a7d4a07e2914dec0f57845f96e4e143133105e5a730eebeb2e1c5c3283d3bb
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.3.2.2.tar.xz 2127516 SHA256 29b24202ee6ca0e1f6cd81a3c1ad98fa226225e7f2d6d4162936943c01656087 SHA512 2bd9dc680c13506fcc66a885b589e4a65a9fe3d5c3bcdeda97f2f0eddfa6b699ed8377c3d53c8750f2a8ca56594e9ec06504888f3a7e9bcdc01d0375169fe131 WHIRLPOOL 58ffd8c8efca17ef32bcb59d2bd8dc473d13a9e552966430c4b1b2aef5b21991e900de727333681c55899a0ee878bd5c4b571ba384f3a2c3b4dc85974c523168
diff --git a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
deleted file mode 100644
index 3975df2e3d0..00000000000
--- a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.11*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from master branch
- "${FILESDIR}/${PN}-5.2-icu58.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || {
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-05-06 15:29 Ulrich Müller
0 siblings, 0 replies; 588+ messages in thread
From: Ulrich Müller @ 2017-05-06 15:29 UTC (permalink / raw
To: gentoo-commits
commit: d665858ff3ae60a16d967292b0b6802e4872dc08
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 15:26:37 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat May 6 15:28:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d665858f
app-office/libreoffice: [QA] Convert absolute symlink to relative.
Bug: 615594
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 41325dea243..c1a22c6ae1b 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -549,7 +549,7 @@ src_install() {
# bug 593514
if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f1a1ec0898f..3a4baec1e3b 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -553,7 +553,7 @@ src_install() {
# bug 593514
if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-05-22 5:54 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-05-22 5:54 UTC (permalink / raw
To: gentoo-commits
commit: 02947d04ff5b14c2bdeee74fb2117039134f0dc3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 05:47:45 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 22 05:53:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02947d04
app-office/libreoffice: Add USE=firebird upgrade ewarn
Bump live LO xmlsec tarball to 1.2.24
Raise live LO required dev-util/cppunit to 1.14.0
Package-Manager: Portage-2.3.5, Repoman-2.3.1
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 8 +++++++-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 8 +++++++-
app-office/libreoffice/libreoffice-9999.ebuild | 12 +++++++++---
4 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 930824ed0c6..354fd0f1757 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,3 +13,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e06
DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6
DIST libreoffice-help-5.3.3.2.tar.xz 2127200 SHA256 f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 SHA512 5c73997cf95e4d5acb2693560ac49aef5f589cee22ce22de1ee8f0e0fa2189d8893afe70790895160feb832049943cfc5e1d322bbd9fd7c7d0bbf3b11a8d9a25 WHIRLPOOL fd3c3afc070cb4fe1145ac631e80bbea3333a36c1d10a43b5a16d1dbdee5e78a614617e6290b961ad951b639410205cc5bdadbefe8b55639046ec9633ff269c8
+DIST xmlsec1-1.2.24.tar.gz 1835762 SHA256 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc SHA512 a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4 WHIRLPOOL d6fbaf232c10a589a2dbe608ad1a29ebc7b80b535e1036a66b75fbdf3d7154e7297b901b035fdd31b992684b4006050a6421dcd9a9f7c1ea2e4b11d83544bf73
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index d3a6ef3a984..9bf8c1bf067 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -251,7 +251,13 @@ PATCHES=(
pkg_pretend() {
use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
if [[ ${MERGE_TYPE} != binary ]]; then
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index c1a22c6ae1b..812746ad3bf 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -250,7 +250,13 @@ PATCHES=(
pkg_pretend() {
use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
if [[ ${MERGE_TYPE} != binary ]]; then
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3a4baec1e3b..9fa466f0118 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -56,7 +56,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
+ "${ADDONS_URI}/xmlsec1-1.2.24.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -206,7 +206,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
dev-perl/Archive-Zip
- dev-util/cppunit
+ >=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
dev-util/intltool
>=dev-util/mdds-1.2.2:1=
@@ -253,7 +253,13 @@ PATCHES=(
pkg_pretend() {
use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
if [[ ${MERGE_TYPE} != binary ]]; then
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-05-22 5:54 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-05-22 5:54 UTC (permalink / raw
To: gentoo-commits
commit: 380f4cdb08eddf0ba97d70a36064265c0363a789
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 14:50:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 22 05:53:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=380f4cdb
app-office/libreoffice: Re-add USE=firebird
Package-Manager: Portage-2.3.5, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 62c861f096b..d3a6ef3a984 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -76,7 +76,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds gltf gnome googledrive
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -86,7 +86,6 @@ SLOT="0"
KEYWORDS=""
#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-# TODO: not packaged: firebird? ( >=dev-db/firebird-3.0 )
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -151,6 +150,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
gnome-extra/evolution-data-server
)
+ firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
gnome? ( gnome-base/dconf )
gstreamer? (
@@ -434,7 +434,6 @@ src_configure() {
# --disable-report-builder: too much java packages pulled in without pkgs
# --without-system-sane: just sane.h header that is used for scan in writer,
# not linked or anything else, worthless to depend on
- # TODO: $(use_enable firebird firebird-sdbc)
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-dicts \
@@ -454,7 +453,6 @@ src_configure() {
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
- --disable-firebird-sdbc \
--disable-gstreamer-0-10 \
--disable-online-update \
--disable-report-builder \
@@ -482,6 +480,7 @@ src_configure() {
$(use_enable debug) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
$(use_enable gnome gio) \
$(use_enable gnome dconf) \
@@ -551,7 +550,7 @@ src_install() {
# bug 593514
if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
+ dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-05-22 6:49 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2017-05-22 6:49 UTC (permalink / raw
To: gentoo-commits
commit: 6a5ee0164b0fb450244b2c62eaef4a01b084be37
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 06:49:24 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 22 06:49:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5ee016
app-office/libreoffice: amd64 stable wrt bug #616472
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.2.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
index e9dbf7396a7..b2e11463109 100644
--- a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
@@ -83,7 +83,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-05-26 14:39 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2017-05-26 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 01b092a4dcfe5f42dda6d518c6a7b055be5b7ded
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:36:59 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:36:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b092a4
app-office/libreoffice: Remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-5.2.6.2.ebuild | 594 ----------------------
2 files changed, 596 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 354fd0f1757..5e34e78723e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,11 +6,9 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
-DIST libreoffice-5.2.6.2.tar.xz 164804780 SHA256 3d49e339631114652820b890859eef85601d1aeda2acb1309f0de24009f53570 SHA512 b84420a773739162555b28700a5588771a1fa7131d82a5861799f402df65f84a17715f80b8ba9aa793c1fed78c7e38b8bfbff2c3b9e0e8f119c9b453a8e6edc9 WHIRLPOOL fe6e739c78172add6fb1235c5ddcffc7d62767008ca5acafd2d95ba143367b26bae94c7f295527d55312ecec4bee47d53daab8b2f2ac159f8d581c7532e3ee48
DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f WHIRLPOOL 28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8
DIST libreoffice-5.3.3.2.tar.xz 190216268 SHA256 9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a SHA512 ff7ffb5a74d51305d098bf34196ff97ae9b4087119bb06929245facc345499896fbc15e9b99b1c7ac22e85b5d461192b3a4e8cdee7238fd1efae74197cbd8338 WHIRLPOOL e93a6f8b181f4578d2447a50c402b4177add6861db8e7cadb76c412611b5bc49118064eb4cce57506cd4e934ce5d729d458972781f3bf8212a886c4fcb0a46d4
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.2.6.2.tar.xz 1446048 SHA256 c0cd648d9994814925083d1a891b63b5e5233718eb8f8782810bb602c0fdb88b SHA512 10568ffb0d7fbd1a01681e52e594b39f120802e8fd70d12824a2be0185bdf491c28818fc8a9fe16fed8533fa61119b90d6f0a1a8f9488a83b33f6a6be2d75e37 WHIRLPOOL e3921ba0b64819b19cd278f7a87dec4313e6cd9df58108170e2d438b0c08644395ac568f7cc601e88ff466e78fa6bbd426fdc9b4a704d3d8693b8c0cb1537ab8
DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6
DIST libreoffice-help-5.3.3.2.tar.xz 2127200 SHA256 f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 SHA512 5c73997cf95e4d5acb2693560ac49aef5f589cee22ce22de1ee8f0e0fa2189d8893afe70790895160feb832049943cfc5e1d322bbd9fd7c7d0bbf3b11a8d9a25 WHIRLPOOL fd3c3afc070cb4fe1145ac631e80bbea3333a36c1d10a43b5a16d1dbdee5e78a614617e6290b961ad951b639410205cc5bdadbefe8b55639046ec9633ff269c8
DIST xmlsec1-1.2.24.tar.gz 1835762 SHA256 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc SHA512 a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4 WHIRLPOOL d6fbaf232c10a589a2dbe608ad1a29ebc7b80b535e1036a66b75fbdf3d7154e7297b901b035fdd31b992684b4006050a6421dcd9a9f7c1ea2e4b11d83544bf73
diff --git a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild b/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
deleted file mode 100644
index 64fe06ef00a..00000000000
--- a/app-office/libreoffice/libreoffice-5.2.6.2.ebuild
+++ /dev/null
@@ -1,594 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.11*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- >=x11-libs/gtk+-3.8:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.0:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # from master branch
- "${FILESDIR}/${PN}-5.2-icu58.patch"
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.2-system-pyuno.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-hardlink-deliver \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym /usr/$(get_libdir)/libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-05-26 19:18 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2017-05-26 19:18 UTC (permalink / raw
To: gentoo-commits
commit: 49cf76018e08afec68fba738141641256ab4b9a3
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 19:15:40 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 26 19:17:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49cf7601
app-office/libreoffice: Restore keywords
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 9bf8c1bf067..812746ad3bf 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -83,8 +83,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-05-26 19:24 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2017-05-26 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 3e19c165e4806418a046582e6bf450347999449c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 19:23:44 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 26 19:23:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e19c165
app-office/libreoffice: Fix minimal firebird version
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 812746ad3bf..5f6ac8e8e0d 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -149,7 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
gnome-extra/evolution-data-server
)
- firebird? ( >=dev-db/firebird-2.5 )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
gltf? ( media-libs/libgltf )
gnome? ( gnome-base/dconf )
gstreamer? (
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 812746ad3bf..5f6ac8e8e0d 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -149,7 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
gnome-extra/evolution-data-server
)
- firebird? ( >=dev-db/firebird-2.5 )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
gltf? ( media-libs/libgltf )
gnome? ( gnome-base/dconf )
gstreamer? (
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9fa466f0118..ccb30f204f7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -152,7 +152,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
gnome-extra/evolution-data-server
)
- firebird? ( >=dev-db/firebird-2.5 )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
gltf? ( >=media-libs/libgltf-0.1.0 )
gnome? ( gnome-base/dconf )
gstreamer? (
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-06-25 21:54 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-06-25 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 0fc5e6a4ddb0aa71e6e5cef12ea7cffb12747fe7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 23:23:39 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 21:52:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc5e6a4
app-office/libreoffice: Drop obsolete checks
- <GCC-4.9 is masked
- <PostgreSQL-9.1 not in tree
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-9999.ebuild | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ca3407b6f01..5576dcd1146 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -271,23 +271,6 @@ pkg_pretend() {
CHECKREQS_DISK_BUILD="6G"
fi
check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
fi
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-06-25 21:54 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-06-25 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 8d2acbea18d185f1bea1c6901f13eb7f3982ea83
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 21:47:46 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 21:52:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d2acbea
app-office/libreoffice: Drop media-fonts/urw-fonts from RDEPEND
Upstream commit 48304cb5b4d8df71463837e2e48aa7c4d9594df9
Reported-by: Klaus Kusche <klaus.kusche <AT> computerix.info>
Gentoo-bug: 621098
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 1 -
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 186bd71a3a3..914e59272c2 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -180,7 +180,6 @@ RDEPEND="${COMMON_DEPEND}
!app-office/openoffice
media-fonts/liberation-fonts
media-fonts/libertine
- media-fonts/urw-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
java? ( >=virtual/jre-1.6 )
vlc? ( media-video/vlc )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 5576dcd1146..cd11bb0a497 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -183,7 +183,6 @@ RDEPEND="${COMMON_DEPEND}
!app-office/openoffice
media-fonts/liberation-fonts
media-fonts/libertine
- media-fonts/urw-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
java? ( >=virtual/jre-1.6 )
vlc? ( media-video/vlc )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-06-25 23:49 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-06-25 23:49 UTC (permalink / raw
To: gentoo-commits
commit: ea7ffd87beaa7391ba50b61cda9c53b3ac50371f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 23:21:37 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 23:32:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7ffd87
app-office/libreoffice: Add 5.4 stable branch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 585 +++++++++++++++++++++
1 file changed, 585 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
new file mode 100644
index 00000000000..cd11bb0a497
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -0,0 +1,585 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_REQUIRED="optional"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "${ADDONS_URI}/xmlsec1-1.2.24.tar.gz" # modifies source code
+ "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.12*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ x11-libs/cairo[X,-xlib-xcb(-)]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( media-libs/opencollada )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
+ gltf? ( >=media-libs/libgltf-0.1.0 )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ x11-libs/gtk+:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? ( net-libs/telepathy-glib )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
+ java? ( >=virtual/jre-1.6 )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.2:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ eds? ( gnome )
+ gnome? ( gtk )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ local mod
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ local base_uri branch checkout mypv
+ base_uri="git://anongit.freedesktop.org"
+ for mod in ${MODULES}; do
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+ [[ ${mod} != core ]] && checkout="${S}/${mod}"
+ [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+ git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
+ done
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ econf \
+ --with-system-dicts \
+ --with-system-epoxy \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-breakpad \
+ --disable-ccache \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-online-update \
+ --disable-pdfium \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --with-system-gpgmepp \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable quickstarter systray) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files to support old installs that can't parse mime
+ rm -r "${ED}"usr/share/mimelnk/ || die
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-06-25 23:49 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-06-25 23:49 UTC (permalink / raw
To: gentoo-commits
commit: 4f77b83217063508073eda9167eaf1bd7977c010
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 23:48:11 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 23:48:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f77b832
app-office/libreoffice: DEPEND on dev-libs/xmlsec[nss] instead of bundled
Reported-by: jospezial <jospezial <AT> gmx.de>
Gentoo-bug: 577278
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cd11bb0a497..e259b7d60d0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -56,7 +56,6 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/xmlsec1-1.2.24.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -120,6 +119,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-06-26 21:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-06-26 21:59 UTC (permalink / raw
To: gentoo-commits
commit: c551266c530dd58819ed4c50b1926d10c947d110
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 21:58:14 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 21:58:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c551266c
app-office/libreoffice: Drop USE=quickstarter, USE=telepathy
- Telepathy Tubes interface is removed in 5.4 branch already
- Linux Quickstarter is deprecated and will be removed in next release
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 5 +----
app-office/libreoffice/libreoffice-9999.ebuild | 6 +-----
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index cd11bb0a497..a6a36670b1c 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -77,7 +77,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -174,7 +174,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
mysql? ( dev-db/mysql-connector-c++ )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
"
RDEPEND="${COMMON_DEPEND}
@@ -235,7 +234,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
collada? ( gltf )
eds? ( gnome )
gnome? ( gtk )
- telepathy? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -485,7 +483,6 @@ src_configure() {
$(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable quickstarter systray) \
- $(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e259b7d60d0..4a5023013ae 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -76,7 +76,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -174,7 +174,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
mysql? ( dev-db/mysql-connector-c++ )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
"
RDEPEND="${COMMON_DEPEND}
@@ -235,7 +234,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
collada? ( gltf )
eds? ( gnome )
gnome? ( gtk )
- telepathy? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -484,8 +482,6 @@ src_configure() {
$(use_enable odk) \
$(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-06-27 16:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-06-27 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 195cd95f931f552afe628263084704bccde34cba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 16:34:41 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 16:42:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195cd95f
app-office/libreoffice: Fix USE=gltf version DEPEND
Reported-by: Ulenrich <eulenreich <AT> gmx.de>
Gentoo-bug: 622814
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.2.7.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
index 64fe06ef00a..09257a8dab2 100644
--- a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
@@ -148,7 +148,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
+ gltf? ( =media-libs/libgltf-0.0* )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
index 5f6ac8e8e0d..3c949a8daea 100644
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
@@ -150,7 +150,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( media-libs/libgltf )
+ gltf? ( =media-libs/libgltf-0.0* )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
diff --git a/app-office/libreoffice/libreoffice-5.3.4.2.ebuild b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
index 914e59272c2..2fca4af8309 100644
--- a/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
@@ -150,7 +150,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( media-libs/libgltf )
+ gltf? ( =media-libs/libgltf-0.0* )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
index 914e59272c2..2fca4af8309 100644
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
@@ -150,7 +150,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( media-libs/libgltf )
+ gltf? ( =media-libs/libgltf-0.0* )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-07-12 20:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-07-12 20:57 UTC (permalink / raw
To: gentoo-commits
commit: 0ec2c16304f92630f06735f779a1d2d680cb1e3b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 20:44:44 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 20:57:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec2c163
app-office/libreoffice: DEPEND on dev-libs/xmlsec[nss] instead of bundled
Upstream picked from master branch.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/Manifest | 1 -
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 883d7097e9b..f59fa251c0b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,4 +13,3 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e06
DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6
DIST libreoffice-help-5.3.3.2.tar.xz 2127200 SHA256 f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 SHA512 5c73997cf95e4d5acb2693560ac49aef5f589cee22ce22de1ee8f0e0fa2189d8893afe70790895160feb832049943cfc5e1d322bbd9fd7c7d0bbf3b11a8d9a25 WHIRLPOOL fd3c3afc070cb4fe1145ac631e80bbea3333a36c1d10a43b5a16d1dbdee5e78a614617e6290b961ad951b639410205cc5bdadbefe8b55639046ec9633ff269c8
DIST libreoffice-help-5.3.4.2.tar.xz 2108116 SHA256 ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a SHA512 c4785e7e1b99806adc6b354f8ebf5d81a76b1f802628f0453fc365989ed07c5ba039145ea1ebbfbd0340815157c6638040953afad1c1c9f80bc3271257137d7c WHIRLPOOL fe229a3bd9b99067d33ab4d53ae6502578fff4ee3e184b0096e9da3c458534a35751cc6809b77351c011730a91d94c2bf9be94abaa026852ab67b3b6c50cdc7c
-DIST xmlsec1-1.2.24.tar.gz 1835762 SHA256 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc SHA512 a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4 WHIRLPOOL d6fbaf232c10a589a2dbe608ad1a29ebc7b80b535e1036a66b75fbdf3d7154e7297b901b035fdd31b992684b4006050a6421dcd9a9f7c1ea2e4b11d83544bf73
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index a6a36670b1c..9c6e44c9b0b 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -56,7 +56,6 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/xmlsec1-1.2.24.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -120,6 +119,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-07-12 20:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-07-12 20:57 UTC (permalink / raw
To: gentoo-commits
commit: bed6763c896157c025d12a8bb564ac7191199e2c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 20:51:05 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 20:57:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed6763c
app-office/libreoffice: Add media-fonts/dejavu to dependencies
Upstream expects it for tests, may as well expect it at runtime.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 6 +++++-
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 9c6e44c9b0b..d75f002e04a 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -180,6 +180,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice
+ media-fonts/dejavu
media-fonts/liberation-fonts
media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
@@ -226,7 +227,10 @@ DEPEND="${COMMON_DEPEND}
>=virtual/jdk-1.6
)
odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
+ test? (
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4a5023013ae..0c6b270fe2e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -180,6 +180,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice
+ media-fonts/dejavu
media-fonts/liberation-fonts
media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
@@ -226,7 +227,10 @@ DEPEND="${COMMON_DEPEND}
>=virtual/jdk-1.6
)
odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
+ test? (
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-07-12 21:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-07-12 21:40 UTC (permalink / raw
To: gentoo-commits
commit: d25c4cac815ce5f23eb5f23992c45fe4f1f743d8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 21:38:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 21:40:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25c4cac
app-office/libreoffice: Drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-5.3.3.2.ebuild | 598 ----------------------
2 files changed, 600 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f59fa251c0b..0d990c3ca3d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,9 +7,7 @@ DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d46
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f WHIRLPOOL 28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8
-DIST libreoffice-5.3.3.2.tar.xz 190216268 SHA256 9632956926d9d5c9049ce5b81c2673f298ae73b873d53cce8cfaea8ee243619a SHA512 ff7ffb5a74d51305d098bf34196ff97ae9b4087119bb06929245facc345499896fbc15e9b99b1c7ac22e85b5d461192b3a4e8cdee7238fd1efae74197cbd8338 WHIRLPOOL e93a6f8b181f4578d2447a50c402b4177add6861db8e7cadb76c412611b5bc49118064eb4cce57506cd4e934ce5d729d458972781f3bf8212a886c4fcb0a46d4
DIST libreoffice-5.3.4.2.tar.xz 188762904 SHA256 1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379 SHA512 ac3b0a0615577faf6c2529b7ec888fd7969d32f38d8b83a3747535bc408e8d2ef2e724f5b1840ae79a219bb855584be87f10ab26ef101afe04dd15d224e6ebc0 WHIRLPOOL 4b314f2df7ee8bd80049cc6ad04e65df11a46a20853f0a285389cf2c72006dd122f1826ae0080c7efc41faa251b77a48f839f345451d993b48bc673d6e450aed
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.2.7.2.tar.xz 1940516 SHA256 f7d35c460da96ed2d52cf97baef159382b38e5ce4579c34e65480ff2911cac4b SHA512 c86bc17448fcd1da01e13d3e9fee739610fde390abaf0635cc4593755d102da08a5eea0533076e1a0f8d89f0b32ba5086b155b9b388f317a5e4c669bf17769e1 WHIRLPOOL 4da96a14b70be718109eda5ced62cec85b96e9028fcf65d729a99604598de81edc097bc06577f3ce7958de1316b04d2d2f1f2782c6504a487ffc6ebaaf7feca6
-DIST libreoffice-help-5.3.3.2.tar.xz 2127200 SHA256 f9b4fef5f449cdbbcb5796908d0536576585c511173bfccf2ca049b5dcbb0dc7 SHA512 5c73997cf95e4d5acb2693560ac49aef5f589cee22ce22de1ee8f0e0fa2189d8893afe70790895160feb832049943cfc5e1d322bbd9fd7c7d0bbf3b11a8d9a25 WHIRLPOOL fd3c3afc070cb4fe1145ac631e80bbea3333a36c1d10a43b5a16d1dbdee5e78a614617e6290b961ad951b639410205cc5bdadbefe8b55639046ec9633ff269c8
DIST libreoffice-help-5.3.4.2.tar.xz 2108116 SHA256 ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a SHA512 c4785e7e1b99806adc6b354f8ebf5d81a76b1f802628f0453fc365989ed07c5ba039145ea1ebbfbd0340815157c6638040953afad1c1c9f80bc3271257137d7c WHIRLPOOL fe229a3bd9b99067d33ab4d53ae6502578fff4ee3e184b0096e9da3c458534a35751cc6809b77351c011730a91d94c2bf9be94abaa026852ab67b3b6c50cdc7c
diff --git a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild b/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
deleted file mode 100644
index 3c949a8daea..00000000000
--- a/app-office/libreoffice/libreoffice-5.3.3.2.ebuild
+++ /dev/null
@@ -1,598 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.12*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- media-libs/harfbuzz:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( =media-libs/libgltf-0.0* )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( $(add_kdeapps_dep kioclient) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-08-06 9:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-08-06 9:20 UTC (permalink / raw
To: gentoo-commits
commit: ae48174200ead55a0bcf5eefadd6a7f5415d5398
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 09:17:29 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 09:20:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae481742
app-office/libreoffice: Drop 5.3 stable branch
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.3.9999.ebuild | 598 ---------------------
1 file changed, 598 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.9999.ebuild b/app-office/libreoffice/libreoffice-5.3.9999.ebuild
deleted file mode 100644
index 2fca4af8309..00000000000
--- a/app-office/libreoffice/libreoffice-5.3.9999.ebuild
+++ /dev/null
@@ -1,598 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "${ADDONS_URI}/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz" # modifies source code
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter telepathy test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- =dev-libs/liborcus-0.12*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/glew-1.10:=
- media-libs/harfbuzz:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- x11-libs/cairo[X,-xlib-xcb(-)]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( =media-libs/libgltf-0.0* )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- telepathy? ( net-libs/telepathy-glib )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
- java? ( >=virtual/jre-1.6 )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- local mod
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-dicts \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-08-06 12:41 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-08-06 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 2348ec2b634435ce5d2dffeb428df6caab97e32f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 12:40:01 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 12:40:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2348ec2b
app-office/libreoffice: Drop obsolete checks
Gentoo-bug: 625372
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-office/libreoffice/libreoffice-5.3.4.2.ebuild | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.3.4.2.ebuild b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
index 2fca4af8309..c16e3878181 100644
--- a/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
@@ -267,23 +267,6 @@ pkg_pretend() {
CHECKREQS_DISK_BUILD="6G"
fi
check-reqs_pkg_pretend
-
- if ! $(tc-is-clang) && { [[ $(gcc-major-version) -lt 4 ]] ||
- [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then
- eerror "Compilation with gcc older than 4.7 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- local pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} -lt 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
fi
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-08-17 17:06 Michał Górny
0 siblings, 0 replies; 588+ messages in thread
From: Michał Górny @ 2017-08-17 17:06 UTC (permalink / raw
To: gentoo-commits
commit: 7bba63efadf2a76e3c98805d8a49b80b53960ea0
Author: David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Mon Jul 31 13:35:23 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 17:05:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bba63ef
app-office/libreoffice: use HTTPS for GitHub, HOMEPAGE, SRC_URI and other URLs
Package-Manager: Portage-2.3.6, Repoman-2.3.3
app-office/libreoffice/libreoffice-5.2.7.2.ebuild | 16 ++++++++--------
app-office/libreoffice/libreoffice-5.3.4.2.ebuild | 16 ++++++++--------
app-office/libreoffice/libreoffice-5.4.0.3.ebuild | 16 ++++++++--------
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 16 ++++++++--------
app-office/libreoffice/libreoffice-9999.ebuild | 16 ++++++++--------
5 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
index 09257a8dab2..b1d9c22b342 100644
--- a/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.7.2.ebuild
@@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@@ -313,7 +313,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
+ base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@@ -373,7 +373,7 @@ src_configure() {
local java_opts
local ext_opts
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"
diff --git a/app-office/libreoffice/libreoffice-5.3.4.2.ebuild b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
index c16e3878181..ed828990e57 100644
--- a/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.3.4.2.ebuild
@@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@@ -301,7 +301,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
+ base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@@ -361,7 +361,7 @@ src_configure() {
local java_opts
local ext_opts
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"
diff --git a/app-office/libreoffice/libreoffice-5.4.0.3.ebuild b/app-office/libreoffice/libreoffice-5.4.0.3.ebuild
index f42886e5f29..779eb66a494 100644
--- a/app-office/libreoffice/libreoffice-5.4.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.0.3.ebuild
@@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@@ -306,7 +306,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
+ base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@@ -366,7 +366,7 @@ src_configure() {
local java_opts
local ext_opts
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index f42886e5f29..779eb66a494 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@@ -306,7 +306,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
+ base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@@ -366,7 +366,7 @@ src_configure() {
local java_opts
local ext_opts
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 856e18f6f00..2e6d5a92f86 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@@ -306,7 +306,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
- base_uri="git://anongit.freedesktop.org"
+ base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@@ -366,7 +366,7 @@ src_configure() {
local java_opts
local ext_opts
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-08-19 20:21 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-08-19 20:21 UTC (permalink / raw
To: gentoo-commits
commit: 2a810e625f099a7c300e536ce944c43d7284130a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 19:12:36 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 20:20:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a810e62
app-office/libreoffice: Fix src_install after mimelnk removal
Upstream commit b72766bc4d9be138063bedda00a7b98573505784
Gentoo-bug: 628314
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-office/libreoffice/libreoffice-9999.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2e6d5a92f86..29426fea497 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -564,9 +564,6 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-08-27 9:35 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-08-27 9:35 UTC (permalink / raw
To: gentoo-commits
commit: 40dc5c2b5d1d11521311279c624640590bc02970
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 20:52:40 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 09:35:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40dc5c2b
app-office/libreoffice: http->https, simplify MODULES, fix install, deps
Gentoo-bug: 628138
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 43 ++++++++-------------
app-office/libreoffice/libreoffice-9999.ebuild | 45 ++++++++--------------
3 files changed, 33 insertions(+), 56 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 91cd6ac5dcd..b8ed7088cd5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST 86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
+DIST libepubgen-0.0.1.tar.bz2 376956 SHA256 eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2 SHA512 1665e5f4708b4c296b9075fa7ab250b3571ebcb42e51c4d195f63eb1969b9014e7490cc2a80dda608eb21e0b127cf7eb8911ed3e5aaa46a89dcad8748618f62a WHIRLPOOL 5b2a7e3878f87e5ca1c353f9ca82daf01946699eb974d3f4092157c916117716ba4ba4969c05da02ad8f08fdd4324dae585fefe332814e004b40cd56b8ef0df1
DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f WHIRLPOOL 28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8
DIST libreoffice-5.3.4.2.tar.xz 188762904 SHA256 1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379 SHA512 ac3b0a0615577faf6c2529b7ec888fd7969d32f38d8b83a3747535bc408e8d2ef2e724f5b1840ae79a219bb855584be87f10ab26ef101afe04dd15d224e6ebc0 WHIRLPOOL 4b314f2df7ee8bd80049cc6ad04e65df11a46a20853f0a285389cf2c72006dd122f1826ae0080c7efc41faa251b77a48f839f345451d993b48bc673d6e450aed
DIST libreoffice-5.4.0.3.tar.xz 192134108 SHA256 17b29d05349b0db15f606f2d630e84c0969c89af6bd06aad8d75a074ee2add94 SHA512 53d081c937acd48c17a9a1f04c55e2e7a420765251c4b507aaf52467b5c2538683c810ba0559598c24ddb6475ee2f5eebb9a1bf97fd805bb72e61b84fb6638f9 WHIRLPOOL e8cd3068a9cdd43028757044b08f2d5628f408136966a15ce58f50217e555cf0613128cc6c3f9ecde28dcab0fdd0a2d2c907573d1d73d319b98eebb61e0296ea
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 779eb66a494..f21643f11e4 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -24,7 +24,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -35,18 +35,11 @@ SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
# Split modules following git/tarballs
# Core MUST be first!
# Help is used for the image generator
-MODULES="core help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
done
unset i
fi
@@ -183,7 +176,7 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/dejavu
media-fonts/liberation-fonts
media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
vlc? ( media-video/vlc )
"
@@ -293,29 +286,23 @@ pkg_setup() {
}
src_unpack() {
- local mod
-
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
use branding && unpack "${BRANDING}"
if [[ ${PV} != *9999* ]]; then
unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
+ unpack "${PN}-help-${PV}.tar.xz"
else
- local base_uri branch checkout mypv
- base_uri="https://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
fi
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 29426fea497..dd53bce04bb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -24,7 +24,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -35,18 +35,11 @@ SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
# Split modules following git/tarballs
# Core MUST be first!
# Help is used for the image generator
-MODULES="core help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
done
unset i
fi
@@ -56,6 +49,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ "${ADDONS_URI}/libepubgen-0.0.1.tar.bz2"
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -183,7 +177,7 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/dejavu
media-fonts/liberation-fonts
media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools $(add_kdeapps_dep kioclient) )
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
vlc? ( media-video/vlc )
"
@@ -293,29 +287,23 @@ pkg_setup() {
}
src_unpack() {
- local mod
-
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
use branding && unpack "${BRANDING}"
if [[ ${PV} != *9999* ]]; then
unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
+ unpack "${PN}-help-${PV}.tar.xz"
else
- local base_uri branch checkout mypv
- base_uri="https://anongit.freedesktop.org"
- for mod in ${MODULES}; do
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
- [[ ${mod} != core ]] && checkout="${S}/${mod}"
- [[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
- git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
- done
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
fi
}
@@ -466,6 +454,7 @@ src_configure() {
--without-help \
--with-helppack-integration \
--with-system-gpgmepp \
+ --without-system-libepubgen \
--without-system-sane \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-10-21 19:45 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-10-21 19:45 UTC (permalink / raw
To: gentoo-commits
commit: f4cd49a81da1177f2ec7aa8903e4bbe45998b7bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 19:40:21 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 19:45:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cd49a8
app-office/libreoffice: Add new DEPENDs, drop bundled libepubgen
Package-Manager: Portage-2.3.12, Repoman-2.3.3
app-office/libreoffice/Manifest | 1 -
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 49349ce18c0..d1b3ef4de6b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,7 +5,6 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz 1769329 SHA256 3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305 SHA512 2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5 WHIRLPOOL 29ddaef03d46fe08aa2dba200be755817f8e77de3bbbb3ed86dae65e891239f3051f79fdfadec6ae56023197e32e1c44a94385a1ce306081f3bf94be6226f8c7
-DIST libepubgen-0.0.1.tar.bz2 376956 SHA256 eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2 SHA512 1665e5f4708b4c296b9075fa7ab250b3571ebcb42e51c4d195f63eb1969b9014e7490cc2a80dda608eb21e0b127cf7eb8911ed3e5aaa46a89dcad8748618f62a WHIRLPOOL 5b2a7e3878f87e5ca1c353f9ca82daf01946699eb974d3f4092157c916117716ba4ba4969c05da02ad8f08fdd4324dae585fefe332814e004b40cd56b8ef0df1
DIST libreoffice-5.2.7.2.tar.xz 184589464 SHA256 106154a72a329605166a49bfa31c6d1cc03133d600ad0ef340b45e4e2a92891d SHA512 f7414a0d0d654d1d9bd6c5524ff2acf2f21c544dd6ed79f4f2d22f79db46264f95f7ca8dd482027f7a573d2d491ea6c8d9875b262d5e2b917dfddb749a3ea95f WHIRLPOOL 28d7f9531190a16bdea14c5dcc710ef593085fddca1b4d7d0cd6107d5f93e4b94a1ae035a626376ab7abfcd926a263b1437de1e52011bb96aa6d87b046a38da8
DIST libreoffice-5.4.2.2.tar.xz 192795940 SHA256 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c WHIRLPOOL 1d2f55af8da2d1c8f2998cc3ab6346be7f6e2e524fef664281ba585910a9e98914c9e07612d597a89c77ab6dc25beffc4dcb1b4575f314752a892d18ea15415d
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4be2836950f..69cf20f437e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -49,7 +49,6 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/libepubgen-0.0.1.tar.bz2"
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -85,12 +84,14 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
+ app-text/libepubgen
>=app-text/libetonyek-0.1
app-text/libexttextcat
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
>=app-text/libodfgen-0.1.0
+ app-text/libqxp
app-text/libstaroffice
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
@@ -454,7 +455,6 @@ src_configure() {
--without-help \
--with-helppack-integration \
--with-system-gpgmepp \
- --without-system-libepubgen \
--without-system-sane \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-08 8:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-08 8:55 UTC (permalink / raw
To: gentoo-commits
commit: d5f1ecd3cebcc93af50f12e50d2436fd0a7ac4fd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 22:19:54 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 08:51:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f1ecd3
app-office/libreoffice: DEPEND on >=dev-util/mdds-1.2.3
Upstream commit 581f748e1e8056f08eb803638a4ffb118a57e911
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 69cf20f437e..ec64f6c2929 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -203,7 +203,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
+ >=dev-util/mdds-1.2.3:1=
media-libs/glm
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-08 8:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-08 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 0e45fcea2e3396ff7874a8ed646a3f7df5e5dd95
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 22:06:53 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 08:53:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e45fcea
app-office/libreoffice: Drop USE=collada,gltf
Feature dropped by upstream commit:
08a43cc97ccf88faa9d3a04afc3aacd2c885a2d1
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-office/libreoffice/libreoffice-9999.ebuild | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ec64f6c2929..2797550c1c7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -49,7 +49,6 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -68,7 +67,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -140,7 +139,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
cups? ( net-print/cups )
dbus? ( dev-libs/dbus-glib )
eds? (
@@ -148,7 +146,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( >=media-libs/libgltf-0.1.0 )
gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
@@ -230,7 +227,6 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- collada? ( gltf )
eds? ( gnome )
gnome? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
@@ -367,11 +363,6 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
# libreoffice extensions handling
for lo_xt in ${LO_EXTS}; do
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
@@ -458,13 +449,11 @@ src_configure() {
--without-system-sane \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \
- $(use_enable collada) \
$(use_enable cups) \
$(use_enable debug) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
$(use_enable gnome gio) \
$(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
@@ -477,8 +466,6 @@ src_configure() {
$(use_enable postgres postgresql-sdbc) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
$(use_with java) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-09 15:16 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-09 15:16 UTC (permalink / raw
To: gentoo-commits
commit: cf7d58a754f7b0d926f28a7e902139d0efff1df9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 20:57:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 9 15:16:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf7d58a7
app-office/libreoffice: Drop kde4-base.eclass
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 27 ++++++++++++----------
app-office/libreoffice/libreoffice-9999.ebuild | 27 ++++++++++++----------
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 8ff7aa789a8..64b2995821f 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -3,10 +3,6 @@
EAPI=6
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
@@ -24,7 +20,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -162,6 +158,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
+ kde? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde-frameworks/kdelibs
+ )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
@@ -178,6 +179,7 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/oxygen-icons:* )
vlc? ( media-video/vlc )
"
@@ -270,7 +272,6 @@ pkg_pretend() {
pkg_setup() {
java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
python-single-r1_pkg_setup
xdg_environment_reset
@@ -308,8 +309,7 @@ src_unpack() {
src_prepare() {
[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
+ default
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -560,14 +560,17 @@ src_install() {
}
pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
+ gnome2_icon_savelist
}
pkg_postinst() {
- kde4-base_pkg_postinst
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
pkg_postrm() {
- kde4-base_pkg_postrm
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2797550c1c7..6d100d432db 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,10 +3,6 @@
EAPI=6
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
@@ -24,7 +20,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -161,6 +157,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
+ kde? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde-frameworks/kdelibs
+ )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
@@ -177,6 +178,7 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/oxygen-icons:* )
vlc? ( media-video/vlc )
"
@@ -268,7 +270,6 @@ pkg_pretend() {
pkg_setup() {
java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
python-single-r1_pkg_setup
xdg_environment_reset
@@ -306,8 +307,7 @@ src_unpack() {
src_prepare() {
[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
+ default
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
@@ -545,14 +545,17 @@ src_install() {
}
pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
+ gnome2_icon_savelist
}
pkg_postinst() {
- kde4-base_pkg_postinst
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
pkg_postrm() {
- kde4-base_pkg_postrm
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-10 19:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-10 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 3d7bca54da1332c0a8c80f95b1e3681b378bb14b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 10 19:16:44 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 10 19:20:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d7bca54
app-office/libreoffice: Restore ~arm64 keyword
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-office/libreoffice/libreoffice-5.4.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.3.2.ebuild b/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
index 64b2995821f..40a018f99dc 100644
--- a/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 64b2995821f..40a018f99dc 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6d100d432db..2125f380146 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-14 13:28 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2017-11-14 13:28 UTC (permalink / raw
To: gentoo-commits
commit: 217a7ad071cce142554a2c8bc69387f59bc6dcff
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 13:27:36 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 13:28:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217a7ad0
app-office/libreoffice: amd64 stable wrt bug #623646
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-5.4.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
index ae65059e208..b51ebcacc52 100644
--- a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
@@ -75,7 +75,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-15 23:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-15 23:31 UTC (permalink / raw
To: gentoo-commits
commit: 47092007862525d557490731b85c257b32255813
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 20:42:40 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 23:31:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47092007
app-office/libreoffice: Add USE=qt4,qt5
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-office/libreoffice/libreoffice-9999.ebuild | 31 ++++++++++++++++++--------
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2125f380146..f2184e67ea3 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -157,16 +157,21 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
- kde? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- kde-frameworks/kdelibs
- )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde-frameworks/kdelibs
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kcoreaddons:5
+ )
"
RDEPEND="${COMMON_DEPEND}
@@ -231,10 +236,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
eds? ( gnome )
gnome? ( gtk )
+ kde? ( || ( qt4 qt5 ) )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
+ qt4? ( kde )
"
PATCHES=(
@@ -389,12 +396,17 @@ src_configure() {
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
- if use kde; then
+ if use qt4; then
# bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export QMAKE4="$(qt4_get_bindir)/qmake"
export MOCQT4="$(qt4_get_bindir)/moc"
fi
+ if use qt5; then
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
@@ -459,11 +471,12 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
- $(use_enable kde kde4) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
+ $(use_enable qt4 kde4) \
+ $(use_enable qt5) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-16 1:36 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2017-11-16 1:36 UTC (permalink / raw
To: gentoo-commits
commit: a2e9a789dec9787efd178de2726a7a0144cbd793
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 01:34:47 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 01:34:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e9a789
app-office/libreoffice: x86 stable (bug #623646)
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-office/libreoffice/libreoffice-5.4.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
index b51ebcacc52..c168d213bd2 100644
--- a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
@@ -75,7 +75,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-19 0:38 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-19 0:38 UTC (permalink / raw
To: gentoo-commits
commit: ad6f92e5b4ecae7e5c7da25db35e023690319681
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 00:27:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 00:27:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad6f92e5
app-office/libreoffice: Raise to dev-libs/liborcus-0.13 DEPEND
Upstream commit 5c5fd9b86c8177403ab73c77fbb047a9ccad19f1
Package-Manager: Portage-2.3.14, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f2184e67ea3..7631bb0a5bc 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- =dev-libs/liborcus-0.12*
+ =dev-libs/liborcus-0.13*
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-28 19:04 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-28 19:04 UTC (permalink / raw
To: gentoo-commits
commit: b9ef97d4196c1eb63ec53522581da00bb9a7557c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 18:41:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 19:04:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ef97d4
app-office/libreoffice: Depends on libepoxy[X]
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-office/libreoffice/Manifest | 4 ++--
app-office/libreoffice/libreoffice-5.4.2.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.4.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b37cdd7166a..3ae8e0dc6a2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,4 +1,4 @@
-DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
+DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
@@ -6,6 +6,6 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
DIST libreoffice-5.4.2.2.tar.xz 192795940 SHA256 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c WHIRLPOOL 1d2f55af8da2d1c8f2998cc3ab6346be7f6e2e524fef664281ba585910a9e98914c9e07612d597a89c77ab6dc25beffc4dcb1b4575f314752a892d18ea15415d
DIST libreoffice-5.4.3.2.tar.xz 192920640 SHA256 d59526dc6adf96c53cd7ed3c0235d9a876cbd1af07ab653456395ea94479d931 SHA512 5996d8abc7f28df7de8f527fac6120955d673bb50f3691ff8a3606c216f049dd19a57bdd23faed1e169fcbdf3369350ea4519ed73d1a172661f7eaab6239649a WHIRLPOOL 38176055247f0210aea5d8e0c6f93bdd36a0bc190ea64a1953f5196089ed2a95cd1c170bde0dcd5c09f779e4d457643d07799ae61838e556bfd3246cf5cf0311
-DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
+DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.2.2.tar.xz 2343504 SHA256 5fc740dbe77876b96ed731f0a6ce793925a9a4a4ba983b5a3506ab24beb73057 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 WHIRLPOOL f5c81288d7d6f608a47f59fe6ae75b6d90b30383fc7fafbc398394c3274014c29fc6933c7b09c517e033e2477355584cb8970f55cf925d645bee57b935e1d253
DIST libreoffice-help-5.4.3.2.tar.xz 2343476 SHA256 85dd76aabc205e8b30f9622bc5300156df6debf4ac0364eb732ced92932d30e4 SHA512 eb74eae6ef624deabe23784dbad6bf9e22341c2f2728cc8f8109c239c6a3f0ed008ac0600b3c8cab10944d2c471695c3925592980265b2fc67415f9981898452 WHIRLPOOL e1fff7683d62203f9aedc41b919ff9f93a165107a2fd63692c0f39f0b29fb9e33344a7e254e03698b63a6d8b32f9f7554fe5e1b55bc35c4ab704a2aa6eb453d3
diff --git a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
index c168d213bd2..f6e74874df0 100644
--- a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
@@ -119,7 +119,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1
+ >=media-libs/libepoxy-1.3.1[X]
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
diff --git a/app-office/libreoffice/libreoffice-5.4.3.2.ebuild b/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
index 40a018f99dc..92815ff4ba5 100644
--- a/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1
+ >=media-libs/libepoxy-1.3.1[X]
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 40a018f99dc..92815ff4ba5 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -115,7 +115,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1
+ >=media-libs/libepoxy-1.3.1[X]
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7631bb0a5bc..a9461079bcb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -116,7 +116,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1
+ >=media-libs/libepoxy-1.3.1[X]
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-11-28 19:04 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-11-28 19:04 UTC (permalink / raw
To: gentoo-commits
commit: d1630d2f0f5ef4f7890f533d9eb96e302f4353f4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 18:58:28 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 19:04:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1630d2f
app-office/libreoffice: Add 6.0 stable branch
Package-Manager: Portage-2.3.16, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 574 +++++++++++++++++++++
1 file changed, 574 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
new file mode 100644
index 00000000000..a9461079bcb
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -0,0 +1,574 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.13*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
+ gnome? ( gnome-base/dconf )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ x11-libs/gtk+:3
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ kde-frameworks/kdelibs
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kcoreaddons:5
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/oxygen-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.3:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ eds? ( gnome )
+ gnome? ( gtk )
+ kde? ( || ( qt4 qt5 ) )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+ qt4? ( kde )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ unpack "${PN}-help-${PV}.tar.xz"
+ else
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
+ default
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local ext_opts
+
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+ fi
+
+ if use qt4; then
+ # bug 544108, bug 599076
+ export QMAKE4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ if use qt5; then
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ econf \
+ --with-system-dicts \
+ --with-system-epoxy \
+ --with-system-headers \
+ --with-system-jars \
+ --with-system-libs \
+ --enable-cairo-canvas \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-release-build \
+ --disable-breakpad \
+ --disable-ccache \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gstreamer-0-10 \
+ --disable-online-update \
+ --disable-pdfium \
+ --disable-report-builder \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --with-system-gpgmepp \
+ --without-system-sane \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome dconf) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable pdfimport) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable qt4 kde4) \
+ $(use_enable qt5) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk3; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-12-09 15:52 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-12-09 15:52 UTC (permalink / raw
To: gentoo-commits
commit: 025869b527860b938e2ca7a9edd9b909b4eda648
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 15:50:28 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 15:52:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025869b5
app-office/libreoffice: Merge USE=gnome into gtk3
It makes no sense to keep them split. Simplifies REQUIRED_USE.
No difference for USE=eds users in terms of dependencies.
Negligible depgraph change for USE=gtk3 users.
Bug: https://bugs.gentoo.org/638012
Package-Manager: Portage-2.3.17, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 17 ++++++++---------
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 17 ++++++++---------
app-office/libreoffice/libreoffice-9999.ebuild | 17 ++++++++---------
3 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 92815ff4ba5..201395b5c80 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -125,13 +125,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
x11-libs/cairo[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
collada? ( media-libs/opencollada )
@@ -143,7 +143,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
gltf? ( >=media-libs/libgltf-0.1.0 )
- gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -155,6 +154,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
+ gnome-base/dconf
x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
@@ -231,8 +231,7 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
+ eds? ( gtk3 )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -463,11 +462,11 @@ src_configure() {
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
+ $(use_enable gtk3 dconf) \
+ $(use_enable gtk3 gio) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index a9461079bcb..6033b315d7e 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
x11-libs/cairo[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
@@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
+ gnome-base/dconf
x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
@@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- eds? ( gnome )
- gnome? ( gtk )
+ eds? ( gtk3 )
kde? ( || ( qt4 qt5 ) )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
@@ -466,11 +465,11 @@ src_configure() {
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
+ $(use_enable gtk3 dconf) \
+ $(use_enable gtk3 gio) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable pdfimport) \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a9461079bcb..6033b315d7e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
x11-libs/cairo[X]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
@@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gnome? ( gnome-base/dconf )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
+ gnome-base/dconf
x11-libs/gtk+:3
)
jemalloc? ( dev-libs/jemalloc )
@@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- eds? ( gnome )
- gnome? ( gtk )
+ eds? ( gtk3 )
kde? ( || ( qt4 qt5 ) )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
@@ -466,11 +465,11 @@ src_configure() {
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
+ $(use_enable gtk3 dconf) \
+ $(use_enable gtk3 gio) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable pdfimport) \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-12-13 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-12-13 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 2d79721b639c9a5870f808685c9a2c0a367ed9f9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 21:18:37 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 23:18:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d79721b
app-office/libreoffice: Add gnome-base/dconf to USE=eds as well
It simplifies REQUIRED_USE further, esp. with gtk3 still not being stable.
Package-Manager: Portage-2.3.18, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 18 +++++++++++-------
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 18 +++++++++++-------
app-office/libreoffice/libreoffice-9999.ebuild | 18 +++++++++++-------
3 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 201395b5c80..7215809cdb3 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -139,6 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( dev-libs/dbus-glib )
eds? (
dev-libs/glib:2
+ gnome-base/dconf
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
@@ -231,7 +232,6 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
- eds? ( gtk3 )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -349,8 +349,7 @@ src_prepare() {
}
src_configure() {
- local java_opts
- local ext_opts
+ local ext_opts gtk_opts java_opts
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
@@ -378,6 +377,12 @@ src_configure() {
fi
done
+ if use eds || use gtk3; then
+ gtk_opts=( --enable-dconf --enable-gio )
+ else
+ gtk_opts=( --disable-dconf --disable-gio )
+ fi
+
if use java; then
# hsqldb: system one is too new
java_opts="
@@ -465,8 +470,6 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
- $(use_enable gtk3 dconf) \
- $(use_enable gtk3 gio) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
@@ -482,8 +485,9 @@ src_configure() {
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
+ ${ext_opts} \
+ ${gtk_opts[@]} \
+ ${java_opts}
}
src_compile() {
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 6033b315d7e..e489cde34e3 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -139,6 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( dev-libs/dbus-glib )
eds? (
dev-libs/glib:2
+ gnome-base/dconf
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
@@ -234,7 +235,6 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- eds? ( gtk3 )
kde? ( || ( qt4 qt5 ) )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
@@ -354,8 +354,7 @@ src_prepare() {
}
src_configure() {
- local java_opts
- local ext_opts
+ local ext_opts gtk_opts java_opts
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
@@ -378,6 +377,12 @@ src_configure() {
fi
done
+ if use eds || use gtk3; then
+ gtk_opts=( --enable-dconf --enable-gio )
+ else
+ gtk_opts=( --disable-dconf --disable-gio )
+ fi
+
if use java; then
# hsqldb: system one is too new
java_opts="
@@ -468,8 +473,6 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
- $(use_enable gtk3 dconf) \
- $(use_enable gtk3 gio) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable pdfimport) \
@@ -483,8 +486,9 @@ src_configure() {
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
+ ${ext_opts} \
+ ${gtk_opts[@]} \
+ ${java_opts}
}
src_compile() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6033b315d7e..e489cde34e3 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -139,6 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( dev-libs/dbus-glib )
eds? (
dev-libs/glib:2
+ gnome-base/dconf
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
@@ -234,7 +235,6 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- eds? ( gtk3 )
kde? ( || ( qt4 qt5 ) )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
@@ -354,8 +354,7 @@ src_prepare() {
}
src_configure() {
- local java_opts
- local ext_opts
+ local ext_opts gtk_opts java_opts
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
@@ -378,6 +377,12 @@ src_configure() {
fi
done
+ if use eds || use gtk3; then
+ gtk_opts=( --enable-dconf --enable-gio )
+ else
+ gtk_opts=( --disable-dconf --disable-gio )
+ fi
+
if use java; then
# hsqldb: system one is too new
java_opts="
@@ -468,8 +473,6 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
- $(use_enable gtk3 dconf) \
- $(use_enable gtk3 gio) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable pdfimport) \
@@ -483,8 +486,9 @@ src_configure() {
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
+ ${ext_opts} \
+ ${gtk_opts[@]} \
+ ${java_opts}
}
src_compile() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-12-13 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-12-13 23:19 UTC (permalink / raw
To: gentoo-commits
commit: f4e8b9e02198c9c3227c96d8532db4e0e2f5e85e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 21:51:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 23:18:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e8b9e0
app-office/libreoffice: Switch src_configure to myeconfargs array
Package-Manager: Portage-2.3.18, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 202 ++++++++++-----------
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 198 ++++++++++----------
app-office/libreoffice/libreoffice-9999.ebuild | 198 ++++++++++----------
3 files changed, 296 insertions(+), 302 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 7215809cdb3..542f04bac54 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -349,8 +349,6 @@ src_prepare() {
}
src_configure() {
- local ext_opts gtk_opts java_opts
-
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
@@ -368,126 +366,126 @@ src_configure() {
export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
fi
+ if use kde; then
+ # bug 544108, bug 599076
+ export QMAKEQT4="$(qt4_get_bindir)/qmake"
+ export MOCQT4="$(qt4_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable collada)
+ $(use_enable cups)
+ $(use_enable debug)
+ $(use_enable dbus)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gltf)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk)
+ $(use_enable gtk3)
+ $(use_enable kde kde4)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable quickstarter systray)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with collada system-opencollada)
+ $(use_with gltf system-libgltf)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk3; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
# libreoffice extensions handling
for lo_xt in ${LO_EXTS}; do
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
fi
done
- if use eds || use gtk3; then
- gtk_opts=( --enable-dconf --enable-gio )
- else
- gtk_opts=( --disable-dconf --disable-gio )
- fi
-
if use java; then
# hsqldb: system one is too new
- java_opts="
+ myeconfargs+=(
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-jvm-path="${EPREFIX}/usr/lib/"
- "
+ )
use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
fi
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- econf \
- --with-system-dicts \
- --with-system-epoxy \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-pdfium \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --with-system-gpgmepp \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${ext_opts} \
- ${gtk_opts[@]} \
- ${java_opts}
+ econf "${myeconfargs[@]}"
}
src_compile() {
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index e489cde34e3..6422eb9c9f8 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -354,8 +354,6 @@ src_prepare() {
}
src_configure() {
- local ext_opts gtk_opts java_opts
-
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
@@ -368,38 +366,6 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use eds || use gtk3; then
- gtk_opts=( --enable-dconf --enable-gio )
- else
- gtk_opts=( --disable-dconf --disable-gio )
- fi
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
if use qt4; then
# bug 544108, bug 599076
export QMAKE4="$(qt4_get_bindir)/qmake"
@@ -423,72 +389,104 @@ src_configure() {
# --without-system-sane: just sane.h header that is used for scan in writer,
# not linked or anything else, worthless to depend on
# --disable-pdfium: not yet packaged
- econf \
- --with-system-dicts \
- --with-system-epoxy \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-pdfium \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --with-system-gpgmepp \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable qt4 kde4) \
- $(use_enable qt5) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${ext_opts} \
- ${gtk_opts[@]} \
- ${java_opts}
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable debug)
+ $(use_enable dbus)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk)
+ $(use_enable gtk3)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable qt4 kde4)
+ $(use_enable qt5)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk3; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ econf "${myeconfargs[@]}"
}
src_compile() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e489cde34e3..6422eb9c9f8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -354,8 +354,6 @@ src_prepare() {
}
src_configure() {
- local ext_opts gtk_opts java_opts
-
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
@@ -368,38 +366,6 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use eds || use gtk3; then
- gtk_opts=( --enable-dconf --enable-gio )
- else
- gtk_opts=( --disable-dconf --disable-gio )
- fi
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
if use qt4; then
# bug 544108, bug 599076
export QMAKE4="$(qt4_get_bindir)/qmake"
@@ -423,72 +389,104 @@ src_configure() {
# --without-system-sane: just sane.h header that is used for scan in writer,
# not linked or anything else, worthless to depend on
# --disable-pdfium: not yet packaged
- econf \
- --with-system-dicts \
- --with-system-epoxy \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-pdfium \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --with-system-gpgmepp \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable qt4 kde4) \
- $(use_enable qt5) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${ext_opts} \
- ${gtk_opts[@]} \
- ${java_opts}
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable debug)
+ $(use_enable dbus)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk)
+ $(use_enable gtk3)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable qt4 kde4)
+ $(use_enable qt5)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk3; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ econf "${myeconfargs[@]}"
}
src_compile() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-12-13 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-12-13 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 5a2580630d7da08361bca09e86df2c2664c2f605
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 21:56:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 23:18:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a258063
app-office/libreoffice: Use $(get_libdir) instead of hardcoded
Package-Manager: Portage-2.3.18, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 542f04bac54..f9f51d5951b 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -475,7 +475,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 6422eb9c9f8..46cbbf6aec2 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -476,7 +476,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6422eb9c9f8..46cbbf6aec2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -476,7 +476,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
)
use libreoffice_extensions_scripting-beanshell && \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-12-13 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-12-13 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 0cf56689f283f4eea96519a8e6b22e109e0a677b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 22:27:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 23:18:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf56689
app-office/libreoffice: Add a stern USE=qt5 warning
Package-Manager: Portage-2.3.18, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 4 +++-
app-office/libreoffice/libreoffice-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 46cbbf6aec2..006b828eaf2 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -253,6 +253,9 @@ PATCHES=(
)
pkg_pretend() {
+ use qt5 && \
+ ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!"
+
use java || \
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
@@ -263,7 +266,6 @@ pkg_pretend() {
fi
if [[ ${MERGE_TYPE} != binary ]]; then
-
CHECKREQS_MEMORY="512M"
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
CHECKREQS_DISK_BUILD="22G"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 46cbbf6aec2..006b828eaf2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -253,6 +253,9 @@ PATCHES=(
)
pkg_pretend() {
+ use qt5 && \
+ ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!"
+
use java || \
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
@@ -263,7 +266,6 @@ pkg_pretend() {
fi
if [[ ${MERGE_TYPE} != binary ]]; then
-
CHECKREQS_MEMORY="512M"
if is-flagq "-g*" && ! is-flagq "-g*0" ; then
CHECKREQS_DISK_BUILD="22G"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-12-20 23:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-12-20 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 047aa3bce55bd5499c98558bc4b99ed2513dc063
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 20:57:01 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 23:07:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=047aa3bc
app-office/libreoffice: Drop 5.4.3.2
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-5.4.3.2.ebuild | 576 ----------------------
2 files changed, 578 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 021b4f1c0ff..83d7c49cecb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,9 +5,7 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c
-DIST libreoffice-5.4.3.2.tar.xz 192920640 BLAKE2B 5bca1ede11009ab9ba8da0ba13033ab9d4582840879f9d158bde4c47224eb3bb588270420a12b2a2e53632f2cf753dc273460140aeaf289337e4ec4b1e3ba6f0 SHA512 5996d8abc7f28df7de8f527fac6120955d673bb50f3691ff8a3606c216f049dd19a57bdd23faed1e169fcbdf3369350ea4519ed73d1a172661f7eaab6239649a
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112
-DIST libreoffice-help-5.4.3.2.tar.xz 2343476 BLAKE2B 794ef2b9bc8cd8b0d33875113642d01756f6f34fca89a67e8a5d3198db6fdc1bc2bef8515867684231ce68c50e0c8e40792cee7c6a9de4b513450b020973564c SHA512 eb74eae6ef624deabe23784dbad6bf9e22341c2f2728cc8f8109c239c6a3f0ed008ac0600b3c8cab10944d2c471695c3925592980265b2fc67415f9981898452
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
diff --git a/app-office/libreoffice/libreoffice-5.4.3.2.ebuild b/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
deleted file mode 100644
index 92815ff4ba5..00000000000
--- a/app-office/libreoffice/libreoffice-5.4.3.2.ebuild
+++ /dev/null
@@ -1,576 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.12*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( >=media-libs/libgltf-0.1.0 )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- kde? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- kde-frameworks/kdelibs
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/oxygen-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- unpack "${PN}-help-${PV}.tar.xz"
- else
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- default
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- econf \
- --with-system-dicts \
- --with-system-epoxy \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-pdfium \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --with-system-gpgmepp \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2017-12-28 19:35 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2017-12-28 19:35 UTC (permalink / raw
To: gentoo-commits
commit: dc0ab178b2ee72b4503faf897dcbddd6534667ed
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 19:32:30 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 19:34:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0ab178
app-office/libreoffice: Revert Use $(get_libdir) instead of hardcoded
This reverts commit 5a2580630d7da08361bca09e86df2c2664c2f605.
Thanks-to: James Le Cuirot <chewi <AT> gentoo.org>
Bug: https://bugs.gentoo.org/641826
app-office/libreoffice/libreoffice-5.4.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index 666dc122a41..303d903bcb7 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -476,7 +476,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index f9f51d5951b..542f04bac54 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -475,7 +475,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 006b828eaf2..9b35442a6de 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -478,7 +478,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 006b828eaf2..9b35442a6de 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -478,7 +478,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-05 0:35 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-05 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 27a83a252dcdf19df21da8a2ed842a9212120f48
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 00:33:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 00:34:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a83a25
app-office/libreoffice: Drop USE=jemalloc
'Support for tcmalloc and jemalloc is long dead',
upstream commit 494bdd3dc32287cc01ea4e0d81438a9266425726
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9b35442a6de..664bacbda8e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -157,7 +157,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
x11-libs/gtk+:3
)
- jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
@@ -413,7 +412,7 @@ src_configure() {
--disable-online-update
--disable-pdfium
--disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-alloc=system
--with-build-version="Gentoo official package"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: e78c849e93a233b6db6fd501c364f285e967c20c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 15:19:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:27:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78c849e
app-office/libreoffice: Drop USE=qt5 from 6.0.x
So unusable it does not make sense just yet, simplifies ebuild.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 25 +++++-----------------
1 file changed, 5 insertions(+), 20 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 5fca4ae10c0..5b58caa856a 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -163,16 +163,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
mysql? ( dev-db/mysql-connector-c++ )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- qt4? (
+ kde? (
dev-qt/qtcore:4
dev-qt/qtgui:4
kde-frameworks/kdelibs
)
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtwidgets:5
- kde-frameworks/kcoreaddons:5
- )
"
RDEPEND="${COMMON_DEPEND}
@@ -235,12 +230,10 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- kde? ( || ( qt4 qt5 ) )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
- qt4? ( kde )
"
PATCHES=(
@@ -254,9 +247,6 @@ PATCHES=(
)
pkg_pretend() {
- use qt5 && \
- ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!"
-
use java || \
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
@@ -369,17 +359,12 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- if use qt4; then
+ if use kde; then
# bug 544108, bug 599076
export QMAKE4="$(qt4_get_bindir)/qmake"
export MOCQT4="$(qt4_get_bindir)/moc"
fi
- if use qt5; then
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
@@ -413,6 +398,7 @@ src_configure() {
--disable-gstreamer-0-10
--disable-online-update
--disable-pdfium
+ --disable-qt5
--disable-report-builder
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
--with-build-version="Gentoo official package"
@@ -446,8 +432,7 @@ src_configure() {
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
- $(use_enable qt4 kde4)
- $(use_enable qt5)
+ $(use_enable kde kde4)
$(use_enable vlc)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-09 17:33 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-09 17:33 UTC (permalink / raw
To: gentoo-commits
commit: ef48ff1aa2ef0bc7721873662267d57732e4bb39
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 14:56:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 17:27:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef48ff1a
app-office/libreoffice: poppler-0.62 support fixed upstream
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ba7d38f7d30..664bacbda8e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -249,7 +249,6 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-24 12:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-24 12:46 UTC (permalink / raw
To: gentoo-commits
commit: d62361188a04ef2b62d358f1028d8372148a6bf4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 11:50:44 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 12:46:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6236118
app-office/libreoffice: Raise minimim boost dep to >=1.65.0
Upstreamc commit b23c6a2e32bef14a2e55c78329f7c660ef619929
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a48c1bc39d3..013b04366aa 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
dev-lang/perl
- dev-libs/boost:=
+ >=dev-libs/boost-1.65.0:=
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-24 12:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-24 12:46 UTC (permalink / raw
To: gentoo-commits
commit: e82b4313d11aceba23245ee0c1fde15f21e57018
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:56:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 12:46:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82b4313
app-office/libreoffice: Switch default gtk+ frontend to gtk+3
It is no longer declared experimental in >=6.0.
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 18 +++++++++---------
app-office/libreoffice/libreoffice-9999.ebuild | 18 +++++++++---------
app-office/libreoffice/metadata.xml | 3 ++-
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 5b58caa856a..90f72941a9b 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/gst-plugins-base:1.0
)
gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
x11-libs/gtk+:3
)
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
@@ -426,8 +426,8 @@ src_configure() {
$(use_enable eds evolution2)
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk)
- $(use_enable gtk3)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
@@ -442,7 +442,7 @@ src_configure() {
$(use_with odk doxygen)
)
- if use eds || use gtk3; then
+ if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
myeconfargs+=( --disable-dconf --disable-gio )
@@ -519,7 +519,7 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# bug 593514
- if use gtk3; then
+ if use gtk; then
dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 664bacbda8e..7bfe88d60c1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/gst-plugins-base:1.0
)
gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
x11-libs/gtk+:3
)
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
@@ -438,8 +438,8 @@ src_configure() {
$(use_enable eds evolution2)
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk)
- $(use_enable gtk3)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
@@ -455,7 +455,7 @@ src_configure() {
$(use_with odk doxygen)
)
- if use eds || use gtk3; then
+ if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
myeconfargs+=( --disable-dconf --disable-gio )
@@ -532,7 +532,7 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# bug 593514
- if use gtk3; then
+ if use gtk; then
dosym libreoffice/program/liblibreofficekitgtk.so \
/usr/$(get_libdir)/liblibreofficekitgtk.so
fi
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 1d3010d4130..f72d5cc7d18 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -15,7 +15,8 @@ version</longdescription>
<flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
<flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
<flag name="googledrive">Enable support for remote files on Google Drive</flag>
- <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
+ <flag name="gtk2">Enable legacy gtk2 frontend</flag>
+ <flag name="gtk3">Enable experimental gtk3 frontend</flag>
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
<flag name="odk">Build the Office Development Kit</flag>
<flag name="pdfimport">Enable PDF import via the Poppler library</flag>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-24 12:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-24 12:46 UTC (permalink / raw
To: gentoo-commits
commit: e814585c08669667797163d74e22717c10e1c554
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 11:40:07 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 12:46:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e814585c
app-office/libreoffice: Workaround buildsystem deficit w/ QT_SELECT=5
Bug: https://bugs.gentoo.org/639620
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a9f9652d40c..a48c1bc39d3 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -359,6 +359,7 @@ src_configure() {
export PYTHON_LIBS=$(python_get_LIBS)
if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
export QT5DIR="$(qt5_get_bindir)/../"
export MOC5="$(qt5_get_bindir)/moc"
fi
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-24 12:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-24 12:46 UTC (permalink / raw
To: gentoo-commits
commit: b21b8546554f5684dba5d53b9da8a94e4badb19c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:48:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 12:46:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21b8546
app-office/libreoffice: Enable gtk3-kde5 (sic!) vcl-plugin
Upstream commit ecb5fcff336c8b0e5ad2503f0880c439a6c323a5
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 36 ++++++++------------------
1 file changed, 11 insertions(+), 25 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7bfe88d60c1..a9f9652d40c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -157,21 +157,16 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
)
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kcoreaddons:5
+ )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- kde-frameworks/kdelibs
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtwidgets:5
- kde-frameworks/kcoreaddons:5
- )
"
RDEPEND="${COMMON_DEPEND}
@@ -234,12 +229,11 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- kde? ( || ( qt4 qt5 ) )
+ kde? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
- qt4? ( kde )
"
PATCHES=(
@@ -252,9 +246,6 @@ PATCHES=(
)
pkg_pretend() {
- use qt5 && \
- ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!"
-
use java || \
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
@@ -367,13 +358,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- if use qt4; then
- # bug 544108, bug 599076
- export QMAKE4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- if use qt5; then
+ if use kde; then
export QT5DIR="$(qt5_get_bindir)/../"
export MOC5="$(qt5_get_bindir)/moc"
fi
@@ -440,12 +425,13 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0)
$(use_enable gtk gtk3)
$(use_enable gtk2 gtk)
+ $(use_enable kde qt5)
+ $(use_enable kde kde5)
+ $(use_enable kde gtk3-kde5)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
- $(use_enable qt4 kde4)
- $(use_enable qt5)
$(use_enable vlc)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-24 16:24 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-24 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 4e3970110cd0b968c1ea2605e048e762a42a3b45
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 14:07:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 16:24:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e397011
app-office/libreoffice: Add missing USE=kde dependencies
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 013b04366aa..1142e018d21 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -159,8 +159,14 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
kde? (
dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-27 20:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-27 20:29 UTC (permalink / raw
To: gentoo-commits
commit: be2eb05a29eb649a7760b17add71632e18d601d0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 19:12:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 20:27:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2eb05a
app-office/libreoffice: Revert raise minimim boost dep to >=1.65.0
Upstream commit cbf0c689d41ba11f37e557c10db7976f8318d43c
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1142e018d21..3b3a7ad4a07 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
dev-lang/perl
- >=dev-libs/boost-1.65.0:=
+ dev-libs/boost:=
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-28 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-28 23:19 UTC (permalink / raw
To: gentoo-commits
commit: b4ee378213f13b2bd7ede5ee2d3d24e6366b9245
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 20:21:20 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 23:18:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ee3782
app-office/libreoffice: 6.0.0.3 version bump, no keywords
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.0.0.3.ebuild | 569 ++++++++++++++++++++++
2 files changed, 571 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ca35e8495a0..e41c90ed889 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
+DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
+DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0
diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
new file mode 100644
index 00000000000..c42d12a1a85
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
@@ -0,0 +1,569 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.13*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ x11-libs/gtk+:3
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/oxygen-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.3:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
+
+ # gtk3-kde5 vcl plugin backported from master
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
+ ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ default
+
+ if [[ ${PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable kde qt5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-28 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-28 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 5c817e1b0bcc1f067390ff409feff4e8ffd605d6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 19:27:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 23:18:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c817e1b
app-office/libreoffice: Add 6.0 patchset for gtk3-kde5 vcl plugin
Switches 6.0 branch USE=kde away from kdelibs4.
Thanks-to: Andrius Štikonas <andrius <AT> stikonas.eu>
Bug: https://bugs.gentoo.org/645558
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 45 ++++++++++++----------
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 83d7c49cecb..ca35e8495a0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
+DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 90f72941a9b..4ef05313f50 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -17,7 +17,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
@@ -26,7 +26,7 @@ unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
# Split modules following git/tarballs
# Core MUST be first!
@@ -157,17 +157,23 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
)
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
- kde? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- kde-frameworks/kdelibs
- )
"
RDEPEND="${COMMON_DEPEND}
@@ -230,6 +236,7 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
+ kde? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -244,6 +251,9 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
"${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
+
+ # gtk3-kde5 vcl plugin backported from master
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
)
pkg_pretend() {
@@ -284,13 +294,9 @@ pkg_setup() {
}
src_unpack() {
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
+ default
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- unpack "${PN}-help-${PV}.tar.xz"
- else
+ if [[ ${PV} = *9999* ]]; then
local base_uri branch mypv
base_uri="https://anongit.freedesktop.org/git"
branch="master"
@@ -305,7 +311,6 @@ src_unpack() {
}
src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
default
AT_M4DIR="m4" eautoreconf
@@ -360,9 +365,9 @@ src_configure() {
export PYTHON_LIBS=$(python_get_LIBS)
if use kde; then
- # bug 544108, bug 599076
- export QMAKE4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
fi
# system headers/libs/...: enforce using system packages
@@ -398,7 +403,6 @@ src_configure() {
--disable-gstreamer-0-10
--disable-online-update
--disable-pdfium
- --disable-qt5
--disable-report-builder
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
--with-build-version="Gentoo official package"
@@ -421,18 +425,19 @@ src_configure() {
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
$(use_enable cups)
- $(use_enable debug)
$(use_enable dbus)
+ $(use_enable debug)
$(use_enable eds evolution2)
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
$(use_enable gtk gtk3)
$(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable kde qt5)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
- $(use_enable kde kde4)
$(use_enable vlc)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-01-28 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-01-28 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 3961a215058b8c479555d58991e438cfc81a9541
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 22:19:21 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 23:18:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3961a215
app-office/libreoffice: Simplify src_unpack()
Package-Manager: Portage-2.3.20, Repoman-2.3.6
app-office/libreoffice/libreoffice-9999.ebuild | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3b3a7ad4a07..4869257cf96 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -243,6 +243,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
"
PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
@@ -289,13 +291,9 @@ pkg_setup() {
}
src_unpack() {
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
+ default
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- unpack "${PN}-help-${PV}.tar.xz"
- else
+ if [[ ${PV} = *9999* ]]; then
local base_uri branch mypv
base_uri="https://anongit.freedesktop.org/git"
branch="master"
@@ -310,7 +308,6 @@ src_unpack() {
}
src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
default
AT_M4DIR="m4" eautoreconf
@@ -425,8 +422,8 @@ src_configure() {
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
$(use_enable cups)
- $(use_enable debug)
$(use_enable dbus)
+ $(use_enable debug)
$(use_enable eds evolution2)
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-01 16:14 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-02-01 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 0135640a3e1a95d70acf185bfd303ed246049e55
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 1 12:21:20 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 1 16:13:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0135640a
app-office/libreoffice: Drop poppler-0.62 patch from 6.0 branch
Upstream commit 02680aaa7b86998718d6ab25177d8adc420c5c42
Package-Manager: Portage-2.3.22, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 4ef05313f50..9890bb1bf83 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -250,7 +250,6 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
# gtk3-kde5 vcl plugin backported from master
"${WORKDIR}"/${PATCHSET/.tar.xz/}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-01 20:37 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2018-02-01 20:37 UTC (permalink / raw
To: gentoo-commits
commit: f3f736cbceaef4c9fc5e2f3223745a094f831450
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 1 20:35:29 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 1 20:37:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f736cb
app-office/libreoffice: x86 stable (bug #644800)
Package-Manager: Portage-2.3.21, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index 2e4b24caa4b..cfeb8bc1a4a 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-03 13:37 Michael Palimaka
0 siblings, 0 replies; 588+ messages in thread
From: Michael Palimaka @ 2018-02-03 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 38695ff542ef323aa0c25d7f1f06a3a50428d9e2
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 13:30:32 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 13:36:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38695ff5
app-office/libreoffice: stabilise 5.4.4.2 for amd64
Bug: https://bugs.gentoo.org/644800
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index cfeb8bc1a4a..bef92e433b7 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-03 19:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-02-03 19:34 UTC (permalink / raw
To: gentoo-commits
commit: f6051ebeb4fa78990365b08ef3e393a44ae20cb6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 19:21:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 19:34:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6051ebe
app-office/libreoffice: Restore keywords, drop ~arm, ~arm64
Requires keywording of:
app-text/libqxp
app-text/libepubgen
Bug: https://bugs.gentoo.org/646506
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.0.3.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
index c42d12a1a85..fb3e9b376d0 100644
--- a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild
@@ -70,8 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-03 19:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-02-03 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 8758b6946481b38625478fce400f036a927f7639
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 19:23:28 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 19:34:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8758b694
app-office/libreoffice: Drop 5.4.2.2
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-5.4.2.2.ebuild | 573 ----------------------
2 files changed, 575 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e41c90ed889..923a2ad780c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,11 +4,9 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 BLAKE2B dd66515fb2835c40905f91338a89921608f6aa96f0df2a0f2396d8ce397c2fd76173e1f72eff437d0167d5f831b3dd6b3050d5590ed88131921d269d0c63a8d2 SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0
diff --git a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
deleted file mode 100644
index f6e74874df0..00000000000
--- a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
+++ /dev/null
@@ -1,573 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.12*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( >=media-libs/libgltf-0.1.0 )
- gnome? ( gnome-base/dconf )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- eds? ( gnome )
- gnome? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- unpack "${PN}-help-${PV}.tar.xz"
- else
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- eapply "${PATCHES[@]}"
- eapply_user
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- local java_opts
- local ext_opts
-
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- econf \
- --with-system-dicts \
- --with-system-epoxy \
- --with-system-headers \
- --with-system-jars \
- --with-system-libs \
- --enable-cairo-canvas \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-release-build \
- --disable-breakpad \
- --disable-ccache \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gstreamer-0-10 \
- --disable-online-update \
- --disable-pdfium \
- --disable-report-builder \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --with-system-gpgmepp \
- --without-system-sane \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gio) \
- $(use_enable gnome dconf) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable pdfimport) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable quickstarter systray) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with googledrive gdrive-client-id ${google_default_client_id}) \
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-09 23:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-02-09 23:08 UTC (permalink / raw
To: gentoo-commits
commit: f230d6966808ccdbbfe4555d56153d5522e85999
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 09:46:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 23:08:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f230d696
app-office/libreoffice: 6.0.1.1 version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-6.0.9999.ebuild => libreoffice-6.0.1.1.ebuild} | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 923a2ad780c..44fd5d30cdc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882
DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62
+DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0
+DIST libreoffice-help-6.0.1.1.tar.xz 1009 BLAKE2B b91ece81445b84d8ad06108c7a06ee6618ae96a36f11900ec46019c66f159f6e8f32a10677153201992c1b69bbfd6c323ab9d43f544471e373277bf6281ffcd1 SHA512 3437e1cd6063183a5786acdff677180540285ca1a56fcb6690e6c3c6a6b432811c2a0b6b4667cc18acb45020fce7982e43cc3ef0db42aa6303f841da964b8914
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.1.1.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-6.0.9999.ebuild
copy to app-office/libreoffice/libreoffice-6.0.1.1.ebuild
index e8f137c5599..73e251cb02e 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.1.1.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index e8f137c5599..73e251cb02e 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-09 23:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-02-09 23:08 UTC (permalink / raw
To: gentoo-commits
commit: c5e46d000969def333b8265e2569079ce443c0ce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 09:35:05 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 23:08:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e46d00
app-office/libreoffice: DEPEND on dev-libs/boost[nls]
Closes: https://bugs.gentoo.org/646564
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 95d104f0bb3..e8f137c5599 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
dev-lang/perl
- dev-libs/boost:=
+ dev-libs/boost:=[nls]
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 59c64ab8a1c..319eeddd277 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
dev-lang/perl
- dev-libs/boost:=
+ dev-libs/boost:=[nls]
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-12 21:36 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2018-02-12 21:36 UTC (permalink / raw
To: gentoo-commits
commit: acdc91c2929b732f7baeb312f7e381fc805a089d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 21:28:14 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 21:28:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acdc91c2
app-office/libreoffice: x86 stable (bug #647186)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
index 9ebcfd8ed95..23319cb4713 100644
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-16 11:41 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2018-02-16 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 30c4755e36d3bbce5cb5ba89323c92333040f281
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 11:40:40 2018 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 11:41:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c4755e
app-office/libreoffice: amd64 stable wrt bug #647186
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"
app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
index 23319cb4713..44a81c8561e 100644
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
@@ -71,7 +71,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-17 0:18 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-02-17 0:18 UTC (permalink / raw
To: gentoo-commits
commit: a86cc98b65da7b9d6174aa0fb0edfdf36f272940
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 00:16:28 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 00:17:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86cc98b
app-office/libreoffice: Drop 5.4 stable branch
We don't plan any more releases from there.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 578 ---------------------
1 file changed, 578 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
deleted file mode 100644
index d6e9a757db6..00000000000
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.12*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( media-libs/opencollada )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gltf? ( >=media-libs/libgltf-0.1.0 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- x11-libs/gtk+:3
- )
- jemalloc? ( dev-libs/jemalloc )
- kde? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- kde-frameworks/kdelibs
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/oxygen-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.2:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
- ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
-
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- unpack "${PN}-help-${PV}.tar.xz"
- else
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
- default
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- if use kde; then
- # bug 544108, bug 599076
- export QMAKEQT4="$(qt4_get_bindir)/qmake"
- export MOCQT4="$(qt4_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable collada)
- $(use_enable cups)
- $(use_enable debug)
- $(use_enable dbus)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gltf)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk)
- $(use_enable gtk3)
- $(use_enable kde kde4)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable quickstarter systray)
- $(use_enable vlc)
- $(use_with coinmp system-coinmp)
- $(use_with collada system-opencollada)
- $(use_with gltf system-libgltf)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk3; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk3; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files to support old installs that can't parse mime
- rm -r "${ED}"usr/share/mimelnk/ || die
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-02-17 0:18 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-02-17 0:18 UTC (permalink / raw
To: gentoo-commits
commit: e5a9628d853c69c81093af08c28c88e8acc583f7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 00:13:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 00:17:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5a9628d
app-office/libreoffice: Re-add gtk3-no-gtk-build.patch for 5.4.5.1
Closes: https://bugs.gentoo.org/647896
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
index 44a81c8561e..2b32a98e6ca 100644
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
@@ -245,6 +245,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+ "${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
"${FILESDIR}/${P}-pyuno-crash.patch" # 5.4.5 branch commit after release
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-03-01 15:44 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-03-01 15:44 UTC (permalink / raw
To: gentoo-commits
commit: eddb824956c2b4d6da262ab4bfac1b9876c8649e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 1 13:59:31 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 1 15:44:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eddb8249
app-office/libreoffice: Fix SRC_URI (really DEV_URI)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 73e251cb02e..84d7690158f 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -12,7 +12,7 @@ PYTHON_REQ_USE="threads,xml"
DEV_URI="
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://download.documentfoundation.org/libreoffice/old/${PV}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 319eeddd277..eca7b36b89a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -12,7 +12,7 @@ PYTHON_REQ_USE="threads,xml"
DEV_URI="
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://download.documentfoundation.org/libreoffice/old/${PV}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-03-01 15:44 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-03-01 15:44 UTC (permalink / raw
To: gentoo-commits
commit: a27f4140b317a2cb1df1f03a8a6c7a14757c4845
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 1 14:35:07 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 1 15:44:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27f4140
app-office/libreoffice: 6.0.2.1 version bump
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/Manifest | 3 +++
.../{libreoffice-6.0.9999.ebuild => libreoffice-6.0.2.1.ebuild} | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 722e9bbc2ee..e01e1cd02dd 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855
+DIST libreoffice-6.0.2.1-patchset-01.tar.xz 33752 BLAKE2B 0b5c5400332bb4e99076794c6bbee80ee6f16d350bbb5232b3b328ea52a2b9af3d0e6f2ccaddd4e9f8519a9d06585dd8a1f37b4b993cb3a83ec13585c9a712cf SHA512 d05f12ad773b67324d7ca10f005f7211013e90b0a689e943adebf89c5050c8e920269ee5b9ec9e275b4634430b964e2de9a77a980daa18cfa55b18e94fabebf0
+DIST libreoffice-6.0.2.1.tar.xz 203783632 BLAKE2B 5a4128d6a7caa9571ddf7b37e77a65b05867738953299b0aef006a704a1d29140f020a9d9a275b86a3bf54083be2c1f15e20b7286a088b1ab4e04d7482389e93 SHA512 cb477391d1d3af544d084820d1bb51edeb553b3792ec31889ac1b2c979c311aeb02f810a2e71f3b7d23990cd9335c2a06fc562913538fc700a4df6630a04e3de
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336
+DIST libreoffice-help-6.0.2.1.tar.xz 2994936 BLAKE2B 69660e50ac871aa890cb5567ac1ebdf4ea9a7ff724b0f86bb44cf29dd475fc35bc9192068a5a8cbaebd1b11042a14d55fa39ecd270e2b0737ed57fe13621d599 SHA512 1e0b3a22bfa36288538cdb420780fe7c0eca59482606f36aa197dd5c0eed1c81d6214e872a3c1b968306300888e959f2d66deded6f491b2c4585164806b06b27
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-6.0.9999.ebuild
copy to app-office/libreoffice/libreoffice-6.0.2.1.ebuild
index 84d7690158f..73cd46b4e1a 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
@@ -17,7 +17,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
+PATCHSET="${PN}-6.0.2.1-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 84d7690158f..73cd46b4e1a 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -17,7 +17,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
+PATCHSET="${PN}-6.0.2.1-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-03-03 0:06 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-03-03 0:06 UTC (permalink / raw
To: gentoo-commits
commit: e6ecbaf1579d61de7e3d7a0e854c28f2ac49f870
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 2 23:49:40 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 3 00:06:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ecbaf1
app-office/libreoffice: Drop 6.0.1.1
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/Manifest | 3 -
app-office/libreoffice/libreoffice-6.0.1.1.ebuild | 567 ----------------------
2 files changed, 570 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e01e1cd02dd..bcd5832f4ec 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,11 +5,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
-DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
-DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855
DIST libreoffice-6.0.2.1-patchset-01.tar.xz 33752 BLAKE2B 0b5c5400332bb4e99076794c6bbee80ee6f16d350bbb5232b3b328ea52a2b9af3d0e6f2ccaddd4e9f8519a9d06585dd8a1f37b4b993cb3a83ec13585c9a712cf SHA512 d05f12ad773b67324d7ca10f005f7211013e90b0a689e943adebf89c5050c8e920269ee5b9ec9e275b4634430b964e2de9a77a980daa18cfa55b18e94fabebf0
DIST libreoffice-6.0.2.1.tar.xz 203783632 BLAKE2B 5a4128d6a7caa9571ddf7b37e77a65b05867738953299b0aef006a704a1d29140f020a9d9a275b86a3bf54083be2c1f15e20b7286a088b1ab4e04d7482389e93 SHA512 cb477391d1d3af544d084820d1bb51edeb553b3792ec31889ac1b2c979c311aeb02f810a2e71f3b7d23990cd9335c2a06fc562913538fc700a4df6630a04e3de
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
-DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336
DIST libreoffice-help-6.0.2.1.tar.xz 2994936 BLAKE2B 69660e50ac871aa890cb5567ac1ebdf4ea9a7ff724b0f86bb44cf29dd475fc35bc9192068a5a8cbaebd1b11042a14d55fa39ecd270e2b0737ed57fe13621d599 SHA512 1e0b3a22bfa36288538cdb420780fe7c0eca59482606f36aa197dd5c0eed1c81d6214e872a3c1b968306300888e959f2d66deded6f491b2c4585164806b06b27
diff --git a/app-office/libreoffice/libreoffice-6.0.1.1.ebuild b/app-office/libreoffice/libreoffice-6.0.1.1.ebuild
deleted file mode 100644
index 73e251cb02e..00000000000
--- a/app-office/libreoffice/libreoffice-6.0.1.1.ebuild
+++ /dev/null
@@ -1,567 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- x11-libs/gtk+:3
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/oxygen-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- default
-
- if [[ ${PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-03-07 12:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-03-07 12:58 UTC (permalink / raw
To: gentoo-commits
commit: bbd141f5e863c63ea0d432eea62f8e8d334fc64c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 7 11:25:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 7 12:57:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd141f5
app-office/libreoffice: Disable running kf5-config
We don't need it, and it is causing sandbox violations.
Closes: https://bugs.gentoo.org/646406
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.2.1.ebuild | 5 +++++
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 5 +++++
app-office/libreoffice/libreoffice-9999.ebuild | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.0.2.1.ebuild b/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
index 73cd46b4e1a..b5671c6317c 100644
--- a/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
@@ -312,6 +312,11 @@ src_unpack() {
src_prepare() {
default
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 73cd46b4e1a..b5671c6317c 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -312,6 +312,11 @@ src_unpack() {
src_prepare() {
default
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index eca7b36b89a..ec4bf5552b6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -310,6 +310,11 @@ src_unpack() {
src_prepare() {
default
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-03-15 15:14 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-03-15 15:14 UTC (permalink / raw
To: gentoo-commits
commit: c68827e90e43fd13c8f42533e0a3982fe89b5861
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 15:11:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 15:14:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68827e9
app-office/libreoffice: Switch to kde-frameworks/breeze-icons
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index b5671c6317c..4b468aa1e1e 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -185,7 +185,7 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/oxygen-icons:* )
+ kde? ( kde-frameworks/breeze-icons:* )
vlc? ( media-video/vlc )
"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ec4bf5552b6..f59d7ee1c8a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -184,7 +184,7 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/oxygen-icons:* )
+ kde? ( kde-frameworks/breeze-icons:* )
vlc? ( media-video/vlc )
"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-05 15:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-04-05 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 5203acf4b8e5b12b309cc526bc284a04d7a30f4f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 5 15:09:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 15:54:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5203acf4
app-office/libreoffice: Update patchset to 6.0.3.2
Package-Manager: Portage-2.3.28, Repoman-2.3.9
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index bcd5832f4ec..06b499f47d3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
DIST libreoffice-6.0.2.1-patchset-01.tar.xz 33752 BLAKE2B 0b5c5400332bb4e99076794c6bbee80ee6f16d350bbb5232b3b328ea52a2b9af3d0e6f2ccaddd4e9f8519a9d06585dd8a1f37b4b993cb3a83ec13585c9a712cf SHA512 d05f12ad773b67324d7ca10f005f7211013e90b0a689e943adebf89c5050c8e920269ee5b9ec9e275b4634430b964e2de9a77a980daa18cfa55b18e94fabebf0
DIST libreoffice-6.0.2.1.tar.xz 203783632 BLAKE2B 5a4128d6a7caa9571ddf7b37e77a65b05867738953299b0aef006a704a1d29140f020a9d9a275b86a3bf54083be2c1f15e20b7286a088b1ab4e04d7482389e93 SHA512 cb477391d1d3af544d084820d1bb51edeb553b3792ec31889ac1b2c979c311aeb02f810a2e71f3b7d23990cd9335c2a06fc562913538fc700a4df6630a04e3de
+DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
DIST libreoffice-help-6.0.2.1.tar.xz 2994936 BLAKE2B 69660e50ac871aa890cb5567ac1ebdf4ea9a7ff724b0f86bb44cf29dd475fc35bc9192068a5a8cbaebd1b11042a14d55fa39ecd270e2b0737ed57fe13621d599 SHA512 1e0b3a22bfa36288538cdb420780fe7c0eca59482606f36aa197dd5c0eed1c81d6214e872a3c1b968306300888e959f2d66deded6f491b2c4585164806b06b27
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 7b989b3abd1..10a786515f4 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -17,7 +17,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.2.1-patchset-01.tar.xz"
+PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-05 15:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-04-05 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 16a86095cfe92d75206c39aa1883c6b5c2858a46
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 5 14:51:39 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 15:54:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a86095
app-office/libreoffice: DEPEND on dev-db/firebird[server]
Reported-by: Christopher Head <chead <AT> chead.ca>
Bug: https://bugs.gentoo.org/652354
Package-Manager: Portage-2.3.28, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 4b468aa1e1e..dcbfe6a9d25 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
gnome-extra/evolution-data-server
)
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f59d7ee1c8a..23aa3d2795c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
gnome-extra/evolution-data-server
)
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-05 15:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-04-05 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 448467a41fcaf8c70413e45cba5b91b988c26154
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 5 15:08:00 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 15:54:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448467a4
app-office/libreoffice: Fix build with -flto*
Closes: https://bugs.gentoo.org/650208
Package-Manager: Portage-2.3.28, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 ++
app-office/libreoffice/libreoffice-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index dcbfe6a9d25..7b989b3abd1 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -483,6 +483,8 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
fi
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
econf "${myeconfargs[@]}"
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 23aa3d2795c..271f47c5cc6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -482,6 +482,8 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
fi
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
econf "${myeconfargs[@]}"
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-05 15:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-04-05 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 897eef5b6e3087754bc8e61ad79d8e17f28e5e2a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 5 15:24:45 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 5 15:54:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897eef5b
app-office/libreoffice: 6.0.3.2 version bump
Package-Manager: Portage-2.3.28, Repoman-2.3.9
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 574 ++++++++++++++++++++++
2 files changed, 576 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 06b499f47d3..fcd08ea5dac 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,6 +8,8 @@ DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e
DIST libreoffice-6.0.2.1-patchset-01.tar.xz 33752 BLAKE2B 0b5c5400332bb4e99076794c6bbee80ee6f16d350bbb5232b3b328ea52a2b9af3d0e6f2ccaddd4e9f8519a9d06585dd8a1f37b4b993cb3a83ec13585c9a712cf SHA512 d05f12ad773b67324d7ca10f005f7211013e90b0a689e943adebf89c5050c8e920269ee5b9ec9e275b4634430b964e2de9a77a980daa18cfa55b18e94fabebf0
DIST libreoffice-6.0.2.1.tar.xz 203783632 BLAKE2B 5a4128d6a7caa9571ddf7b37e77a65b05867738953299b0aef006a704a1d29140f020a9d9a275b86a3bf54083be2c1f15e20b7286a088b1ab4e04d7482389e93 SHA512 cb477391d1d3af544d084820d1bb51edeb553b3792ec31889ac1b2c979c311aeb02f810a2e71f3b7d23990cd9335c2a06fc562913538fc700a4df6630a04e3de
DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
+DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
DIST libreoffice-help-6.0.2.1.tar.xz 2994936 BLAKE2B 69660e50ac871aa890cb5567ac1ebdf4ea9a7ff724b0f86bb44cf29dd475fc35bc9192068a5a8cbaebd1b11042a14d55fa39ecd270e2b0737ed57fe13621d599 SHA512 1e0b3a22bfa36288538cdb420780fe7c0eca59482606f36aa197dd5c0eed1c81d6214e872a3c1b968306300888e959f2d66deded6f491b2c4585164806b06b27
+DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
new file mode 100644
index 00000000000..10a786515f4
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -0,0 +1,574 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.13*
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ x11-libs/gtk+:3
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.3:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+
+ # gtk3-kde5 vcl plugin backported from master
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+)
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ default
+
+ if [[ ${PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable kde qt5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-22 16:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-04-22 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 74c51c03e23ba00bbaad6a99eab292d920d6a9f7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 16:49:52 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 16:51:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c51c03
app-office/libreoffice: Drop 6.0.2.1
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-office/libreoffice/Manifest | 3 -
app-office/libreoffice/libreoffice-6.0.2.1.ebuild | 572 ----------------------
2 files changed, 575 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fcd08ea5dac..b9c41dd67e4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,11 +5,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
-DIST libreoffice-6.0.2.1-patchset-01.tar.xz 33752 BLAKE2B 0b5c5400332bb4e99076794c6bbee80ee6f16d350bbb5232b3b328ea52a2b9af3d0e6f2ccaddd4e9f8519a9d06585dd8a1f37b4b993cb3a83ec13585c9a712cf SHA512 d05f12ad773b67324d7ca10f005f7211013e90b0a689e943adebf89c5050c8e920269ee5b9ec9e275b4634430b964e2de9a77a980daa18cfa55b18e94fabebf0
-DIST libreoffice-6.0.2.1.tar.xz 203783632 BLAKE2B 5a4128d6a7caa9571ddf7b37e77a65b05867738953299b0aef006a704a1d29140f020a9d9a275b86a3bf54083be2c1f15e20b7286a088b1ab4e04d7482389e93 SHA512 cb477391d1d3af544d084820d1bb51edeb553b3792ec31889ac1b2c979c311aeb02f810a2e71f3b7d23990cd9335c2a06fc562913538fc700a4df6630a04e3de
DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
-DIST libreoffice-help-6.0.2.1.tar.xz 2994936 BLAKE2B 69660e50ac871aa890cb5567ac1ebdf4ea9a7ff724b0f86bb44cf29dd475fc35bc9192068a5a8cbaebd1b11042a14d55fa39ecd270e2b0737ed57fe13621d599 SHA512 1e0b3a22bfa36288538cdb420780fe7c0eca59482606f36aa197dd5c0eed1c81d6214e872a3c1b968306300888e959f2d66deded6f491b2c4585164806b06b27
DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
diff --git a/app-office/libreoffice/libreoffice-6.0.2.1.ebuild b/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
deleted file mode 100644
index b5671c6317c..00000000000
--- a/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.2.1-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- x11-libs/gtk+:3
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/oxygen-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- default
-
- if [[ ${PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-25 15:33 Andreas Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Hüttel @ 2018-04-25 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 009c37ca0223683f296525e7c0a67d9d544285b9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 15:31:54 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 15:31:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=009c37ca
app-office/libreoffice: Fix liborcus dependency
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 10a786515f4..9ac42f54a68 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
+ >=dev-libs/liborcus-0.13.3
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 10a786515f4..9ac42f54a68 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
+ >=dev-libs/liborcus-0.13.3
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 271f47c5cc6..491edb6043a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -102,7 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
+ >=dev-libs/liborcus-0.13.3
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-25 16:30 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-04-25 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 903d868911899fe03dfa8e0865aa529957d6fb86
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 16:29:50 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 16:29:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903d8689
app-office/libreoffice: Fix accidentally changed Manifest
Closes: https://bugs.gentoo.org/654086
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-office/libreoffice/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3b6fd2b2796..b9c41dd67e4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,4 +9,4 @@ DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157da
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
-DIST libreoffice-help-6.0.3.2.tar.xz 593680 BLAKE2B 940657b776913772267c8c37d80238206b7c921993091085e5042348a50a9cf8aaa4ed225a2f1a364693dd68aa4690381c1dd206155e56fb4e1200b6d4afd30b SHA512 e19a896fa50a9a26280a9c1b0ce0cbac9dc5e9dfc58481b6b4c17cf6094c3d717570184497117f8486b2ad5f2706c11eeb9d70bb261d7cc6587b4c44ee95bb66
+DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-04-28 11:44 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2018-04-28 11:44 UTC (permalink / raw
To: gentoo-commits
commit: 32874cf0eb8b23b0334efaacbb978d04e906b85e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 11:44:08 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 11:44:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32874cf0
Add ~arm keyword (bug #646506)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index fd1f349a9f7..e149e834e18 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-03 12:51 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-05-03 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 5b4e5d83e39462483c93ccf22f1438d1375db548
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 3 12:47:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 3 12:51:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4e5d83
app-office/libreoffice: versionator -> eapi7-ver.eclass, some cleanup
Package-Manager: Portage-2.3.33, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 86 ++++++++++----------
app-office/libreoffice/libreoffice-9999.ebuild | 92 +++++++++++-----------
2 files changed, 87 insertions(+), 91 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index edf22ead40d..c29d9ffa33d 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -6,21 +6,22 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
+# Usually the tarballs are moved a lot so this should make everyone happy.
DEV_URI="
https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
@@ -28,14 +29,13 @@ HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-# Split modules following git/tarballs
-# Core MUST be first!
+# Split modules following git/tarballs; Core MUST be first!
# Help is used for the image generator
# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
+if [[ ${MY_PV} != *9999* ]]; then
for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
done
unset i
fi
@@ -67,9 +67,18 @@ IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-[[ ${PV} == *9999* ]] || \
+[[ ${MY_PV} == *9999* ]] || \
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
@@ -151,12 +160,14 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
+ media-libs/mesa[egl]
x11-libs/gtk+:3
)
gtk2? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
)
+ jemalloc? ( dev-libs/jemalloc )
kde? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -168,7 +179,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kio:5
kde-frameworks/kwindowsystem:5
)
- jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( dev-db/mysql-connector-c++ )
@@ -189,8 +199,8 @@ RDEPEND="${COMMON_DEPEND}
vlc? ( media-video/vlc )
"
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
else
# Translations are not reliable on live ebuilds
# rather force people to use english only.
@@ -231,15 +241,6 @@ DEPEND="${COMMON_DEPEND}
)
"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
@@ -252,6 +253,17 @@ PATCHES=(
"${WORKDIR}"/${PATCHSET/.tar.xz/}
)
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+}
+
pkg_pretend() {
use java || \
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
@@ -263,12 +275,7 @@ pkg_pretend() {
fi
if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
+ _check_reqs
check-reqs_pkg_pretend
fi
}
@@ -279,12 +286,7 @@ pkg_setup() {
xdg_environment_reset
if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
+ _check_reqs
check-reqs_pkg_setup
fi
}
@@ -292,12 +294,12 @@ pkg_setup() {
src_unpack() {
default
- if [[ ${PV} = *9999* ]]; then
+ if [[ ${MY_PV} = *9999* ]]; then
local base_uri branch mypv
base_uri="https://anongit.freedesktop.org/git"
branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
git-r3_checkout "${base_uri}/${PN}/core"
@@ -340,7 +342,7 @@ src_prepare() {
if use branding; then
# hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
fi
# Don't list pdfimport support in desktop when built with none, bug # 605464
@@ -554,10 +556,6 @@ src_install() {
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
gnome2_icon_cache_update
xdg_desktop_database_update
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3799a7815c0..45222450d1f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -6,36 +6,36 @@ EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads,xml"
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
+# Usually the tarballs are moved a lot so this should make everyone happy.
DEV_URI="
https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-# Split modules following git/tarballs
-# Core MUST be first!
+# Split modules following git/tarballs; Core MUST be first!
# Help is used for the image generator
# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
+if [[ ${MY_PV} != *9999* ]]; then
for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${P}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
done
unset i
fi
@@ -67,10 +67,19 @@ IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -151,6 +160,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
+ media-libs/mesa[egl]
x11-libs/gtk+:3
)
gtk2? (
@@ -188,8 +198,8 @@ RDEPEND="${COMMON_DEPEND}
vlc? ( media-video/vlc )
"
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
else
# Translations are not reliable on live ebuilds
# rather force people to use english only.
@@ -230,15 +240,6 @@ DEPEND="${COMMON_DEPEND}
)
"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
PATCHES=(
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
@@ -250,6 +251,17 @@ PATCHES=(
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+}
+
pkg_pretend() {
use java || \
ewarn "If you plan to use Base application you should enable java or you will get various crashes."
@@ -261,12 +273,7 @@ pkg_pretend() {
fi
if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
+ _check_reqs
check-reqs_pkg_pretend
fi
}
@@ -277,12 +284,7 @@ pkg_setup() {
xdg_environment_reset
if [[ ${MERGE_TYPE} != binary ]]; then
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
+ _check_reqs
check-reqs_pkg_setup
fi
}
@@ -290,12 +292,12 @@ pkg_setup() {
src_unpack() {
default
- if [[ ${PV} = *9999* ]]; then
+ if [[ ${MY_PV} = *9999* ]]; then
local base_uri branch mypv
base_uri="https://anongit.freedesktop.org/git"
branch="master"
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
git-r3_checkout "${base_uri}/${PN}/core"
@@ -338,7 +340,7 @@ src_prepare() {
if use branding; then
# hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
fi
# Don't list pdfimport support in desktop when built with none, bug # 605464
@@ -431,9 +433,9 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0)
$(use_enable gtk gtk3)
$(use_enable gtk2 gtk)
- $(use_enable kde qt5)
- $(use_enable kde kde5)
$(use_enable kde gtk3-kde5)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
@@ -553,10 +555,6 @@ src_install() {
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
gnome2_icon_cache_update
xdg_desktop_database_update
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-10 8:01 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-05-10 8:01 UTC (permalink / raw
To: gentoo-commits
commit: ae2379a356188514dc24c54e58c492ac0f609fe1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 05:55:15 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 10 08:01:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2379a3
app-office/libreoffice: 6.0.4.2 version bump
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 569 ++++++++++++++++++++++
2 files changed, 571 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b9c41dd67e4..93cd8272193 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
+DIST libreoffice-6.0.4.2.tar.xz 204556512 BLAKE2B 2131fb0f810c81803f9905bc1f3f9bfa04615deceb8eb443644a35d6b4226f6876ffdbb8ef00c9ffe8e5a677877513b3c2adb40b3f87ddcdb46946c5bf3d6183 SHA512 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
+DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
new file mode 100644
index 00000000000..c29d9ffa33d
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -0,0 +1,569 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.0.3.2-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.13.3
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.3:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+
+ # gtk3-kde5 vcl plugin backported from master
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _check_reqs
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _check_reqs
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable kde qt5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-22 16:42 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2018-05-22 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 63ed172d1a8e37d4545e2e23e2109df47adda2e4
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 16:41:49 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May 22 16:42:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ed172d
app-office/libreoffice: amd64 stable wrt bug #652638
Package-Manager: Portage-2.3.24, Repoman-2.3.6
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index e149e834e18..f2f3c1674e6 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-27 7:16 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-05-27 7:16 UTC (permalink / raw
To: gentoo-commits
commit: 5d7657563808e6eb889e3ec8c341abe7287b4864
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 07:13:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 27 07:13:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d765756
app-office/libreoffice: Fix accidentally broken Manifest
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9001ff98b4c..fd4255c15c3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,4 +13,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
-DIST libreoffice-help-6.0.4.2.tar.xz 699430 BLAKE2B b7ddf775f31efa9e5b033d9cd09d944b8104a1781699d87a7e90a83c94812fbc8ce33f588d3ec2bebede114bc69e57b91ecaabdb3f1e6212637f6ca888e46481 SHA512 20fe01479e13a493f264d441830be902534fbf57dcdcde66787512534d15df29519e88bb69da8781a7d95e81a72f9bb2dd94a435fcff9ca7ded346fcd6f1b090
+DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-27 7:16 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-05-27 7:16 UTC (permalink / raw
To: gentoo-commits
commit: 8e61420731d69663139372c89c16733d6ab5ae78
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 07:15:30 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 27 07:15:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e614207
app-office/libreoffice: Fix new intro.png location
Reported-by: jospezial <jospezial <AT> gmx.de>
Closes: https://bugs.gentoo.org/656120
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 45222450d1f..558cf0dce7d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -340,7 +340,7 @@ src_prepare() {
if use branding; then
# hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
fi
# Don't list pdfimport support in desktop when built with none, bug # 605464
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-27 21:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-05-27 21:34 UTC (permalink / raw
To: gentoo-commits
commit: 8375630a36f2c2dec6f2352e293c7e1a2d762705
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 21:17:46 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 27 21:34:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8375630a
app-office/libreoffice: Add 6.1 stable branch
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 570 +++++++++++++++++++++
1 file changed, 570 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
new file mode 100644
index 00000000000..cc4c2bc8ce1
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -0,0 +1,570 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
+gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.13.3
+ dev-libs/librevenge
+ dev-libs/nspr
+ dev-libs/nss
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ !<sys-devel/make-3.82
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.2.3:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _check_reqs
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _check_reqs
+ check-reqs_pkg_setup
+ fi
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-pdfium
+ --disable-report-builder
+ --with-alloc=system
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-27 21:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-05-27 21:34 UTC (permalink / raw
To: gentoo-commits
commit: 6d1dbf2a26f064c1de2a6e43879956b838572656
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 20:58:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 27 21:34:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d1dbf2a
app-office/libreoffice: Add missing DEPEND
Bug: https://bugs.gentoo.org/656124
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/libreoffice-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 232eaa56a6b..cc4c2bc8ce1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -94,6 +94,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
>=app-text/libodfgen-0.1.0
app-text/libqxp
app-text/libstaroffice
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-05-29 11:17 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2018-05-29 11:17 UTC (permalink / raw
To: gentoo-commits
commit: 2611032412e33c803a18f209d4aa2aa5ed8c1ae6
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 11:09:48 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May 29 11:09:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26110324
app-office/libreoffice: x86 stable (bug #652638)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 3c8a7c4dac3..a7d6373ce84 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-06-06 22:43 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-06-06 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 7cde9bcbf24dfe73b312a22b32752f3c1a828eaf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 22:42:54 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 22:43:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cde9bcb
app-office/libreoffice: Re-add ~arm keyword
It was lost between 6.0.3.2 and the 6.0.4.2 bump for no reason.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index a7f087f49e2..b1c28905c33 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index a7f087f49e2..b1c28905c33 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index cc4c2bc8ce1..ae37700e0e3 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-06-11 18:45 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-06-11 18:45 UTC (permalink / raw
To: gentoo-commits
commit: f35c610d7919a72eb4f1840b9225255c5305640f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 18:45:04 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 18:45:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f35c610d
app-office/libreoffice: Drop upstreamed patch from 6.0 stable branch
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 58a7a8a3240..b1c28905c33 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -247,8 +247,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
- # 6.1 branch
- "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
# TODO: upstream
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-12 6:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-12 6:50 UTC (permalink / raw
To: gentoo-commits
commit: b6867e7d160cda9b0537d2006c385c6ec011457b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 21:31:39 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 06:50:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6867e7d
app-office/libreoffice: Add upstream fix for ICU 61
Closes: https://bugs.gentoo.org/651702
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-6.0.5.2.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fa36b63ddf5..1a7ea0406ec 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,7 @@ DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953
DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
+DIST libreoffice-6.0.5.2-patchset-02.tar.xz 43072 BLAKE2B bcd6406b06bef83ac26e227bc77fed76b67e11f0150a23015e8c83c7092b8efd6f35ec8bbac12bbfda6c597ebaa1782391a624b10a7af0bface6b480b6603802 SHA512 fe764e02cff85a064f8b25e34b3f3558a9fc65051da154e94654c2322e8f50487a97b699a6ab886ec9db00d31a8ca544aaf0b93794e03d17fbbe90b83b44124d
DIST libreoffice-6.0.5.2.tar.xz 204795724 BLAKE2B d027e83dc5f3908af25975354f8d0ef9a4a9a4fb601dada54d04cdc5bc6d0a0dbedda89ac0cf5bbe88da29382431bddfd331e56b63b88e9f5a23b9299c65b61a SHA512 796ce4b54adc2b1b032f1f125425141a1c584a9f7dd145ed677916ba7a28c11e895a34ff8bf34cc208d15408cb3ea0c0942546300d1be6309bd9ad6544400684
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
index f8ee3a7fc14..6c40315ba08 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-02.tar.xz"
[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-13 9:14 Mart Raudsepp
0 siblings, 0 replies; 588+ messages in thread
From: Mart Raudsepp @ 2018-07-13 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 308628ec2426e1818fd0e4afbf883dc869f053dc
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 09:14:18 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 09:14:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308628ec
app-office/libreoffice-6.0.5.2: added ~arm64 keyword
Tested-by: Roy Bamford <neddyseagoon <AT> gentoo.org>
Closes: https://bugs.gentoo.org/646506
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="arm64"
app-office/libreoffice/libreoffice-6.0.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
index 6c40315ba08..2ad74e6847a 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 97542d0da163bbaee95eecea82eed43efda0531d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 19:17:27 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97542d0d
app-office/libreoffice: Drop old
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.5.2.ebuild | 572 ----------------------
1 file changed, 572 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
deleted file mode 100644
index 2ad74e6847a..00000000000
--- a/app-office/libreoffice/libreoffice-6.0.5.2.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-02.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.13.3
- dev-libs/librevenge
- dev-libs/nspr
- dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- )
- jemalloc? ( dev-libs/jemalloc )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_setup
- fi
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 3dbeda142170212cfca19d1f5d6a1d116767452e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 07:00:34 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dbeda14
app-office/libreoffice: Make sure NSS is used for TLS, disable OpenSSL
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 6 +++---
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 1ed29b9c997..4f4550757b5 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -115,8 +115,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
@@ -411,6 +409,7 @@ src_configure() {
--disable-fetch-external
--disable-gstreamer-0-10
--disable-online-update
+ --disable-openssl
--disable-pdfium
--disable-report-builder
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
@@ -423,6 +422,7 @@ src_configure() {
--with-lang=""
--with-parallelism=$(makeopts_jobs)
--with-system-ucpp
+ --with-tls=nss
--with-vendor="Gentoo Foundation"
--with-x
--without-fonts
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 3df147edf4c..e79889f91ee 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -115,8 +115,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
@@ -408,6 +406,7 @@ src_configure() {
--disable-fetch-external
--disable-gstreamer-0-10
--disable-online-update
+ --disable-openssl
--disable-pdfium
--disable-report-builder
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
@@ -420,6 +419,7 @@ src_configure() {
--with-lang=""
--with-parallelism=$(makeopts_jobs)
--with-system-ucpp
+ --with-tls=nss
--with-vendor="Gentoo Foundation"
--with-x
--without-fonts
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index ae37700e0e3..e8d1f1a6c1a 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -116,8 +116,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
@@ -405,6 +403,7 @@ src_configure() {
--disable-fetch-external
--disable-gstreamer-0-10
--disable-online-update
+ --disable-openssl
--disable-pdfium
--disable-report-builder
--with-alloc=system
@@ -417,6 +416,7 @@ src_configure() {
--with-lang=""
--with-parallelism=$(makeopts_jobs)
--with-system-ucpp
+ --with-tls=nss
--with-vendor="Gentoo Foundation"
--with-x
--without-fonts
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cc4c2bc8ce1..e470a725458 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -64,7 +64,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc
+gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -116,8 +116,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/librevenge
dev-libs/nspr
dev-libs/nss
- !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
- libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.24[nss]
media-gfx/graphite2
@@ -405,6 +403,7 @@ src_configure() {
--disable-fetch-external
--disable-gstreamer-0-10
--disable-online-update
+ --disable-openssl
--disable-pdfium
--disable-report-builder
--with-alloc=system
@@ -417,6 +416,7 @@ src_configure() {
--with-lang=""
--with-parallelism=$(makeopts_jobs)
--with-system-ucpp
+ --with-tls=nss
--with-vendor="Gentoo Foundation"
--with-x
--without-fonts
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: b49e3843de25891b87105420ccee4da559714897
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 07:09:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b49e3843
app-office/libreoffice: Drop obsolete blocker
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 1 -
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 1 -
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 1 -
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
4 files changed, 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 4f4550757b5..383dfdd8a99 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -209,7 +209,6 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index e79889f91ee..c8aabf7c905 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -209,7 +209,6 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index e8d1f1a6c1a..e887936e67f 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -209,7 +209,6 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e470a725458..c578ddf3023 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -209,7 +209,6 @@ fi
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
- !<sys-devel/make-3.82
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 6a77b6e583fcadcba8e3c72eb6af444b645f7c03
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 07:38:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a77b6e5
app-office/libreoffice: Fix DEPENDs
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 6 +++---
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 383dfdd8a99..f1a8586df01 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -113,6 +113,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libgpg-error
>=dev-libs/liborcus-0.13.3
dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
@@ -133,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ sys-libs/zlib:=
virtual/glu
virtual/jpeg:0
virtual/opengl
@@ -210,8 +213,6 @@ fi
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/flex
sys-devel/gettext
sys-devel/ucpp
- sys-libs/zlib
virtual/pkgconfig
x11-base/xorg-proto
x11-libs/libXt
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index c8aabf7c905..c3904450efc 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -113,6 +113,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libgpg-error
>=dev-libs/liborcus-0.13.3
dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
@@ -133,6 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ sys-libs/zlib:=
virtual/glu
virtual/jpeg:0
virtual/opengl
@@ -210,8 +213,6 @@ fi
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/flex
sys-devel/gettext
sys-devel/ucpp
- sys-libs/zlib
virtual/pkgconfig
x11-base/xorg-proto
x11-libs/libXt
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index e887936e67f..d3b626eef82 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -114,6 +114,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libgpg-error
>=dev-libs/liborcus-0.13.3
dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
@@ -134,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ sys-libs/zlib:=
virtual/glu
virtual/jpeg:0
virtual/opengl
@@ -210,8 +213,6 @@ fi
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/flex
sys-devel/gettext
sys-devel/ucpp
- sys-libs/zlib
virtual/pkgconfig
x11-base/xorg-proto
x11-libs/libXt
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c578ddf3023..556bbaf02b1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -114,6 +114,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/libgpg-error
>=dev-libs/liborcus-0.13.3
dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
@@ -134,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
+ sys-libs/zlib:=
virtual/glu
virtual/jpeg:0
virtual/opengl
@@ -210,8 +213,6 @@ fi
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
@@ -222,7 +223,6 @@ DEPEND="${COMMON_DEPEND}
sys-devel/flex
sys-devel/gettext
sys-devel/ucpp
- sys-libs/zlib
virtual/pkgconfig
x11-base/xorg-proto
x11-libs/libXt
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 42ec070a080b303663b3907a5ecc9d3bccdc5da4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 08:17:20 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ec070a
app-office/libreoffice: Sync *9999 KEYWORDS
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index bf036e62038..b25f7e8074b 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index bbda7a7e6a7..1a45077dea2 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9152c3b3b0e..1a45077dea2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-14 8:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 4c8ef83a630a1fa678334ecf9acb0902dc2eef85
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 07:56:22 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 08:20:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8ef83a
app-office/libreoffice: Add missing x11-libs/pango DEPEND
Package-Manager: Portage-2.3.42, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 2 ++
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 ++
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 2 ++
app-office/libreoffice/libreoffice-9999.ebuild | 2 ++
4 files changed, 8 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index f1a8586df01..8d2c709d099 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -163,10 +163,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
media-libs/mesa[egl]
x11-libs/gtk+:3
+ x11-libs/pango
)
gtk2? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
+ x11-libs/pango
)
jemalloc? ( dev-libs/jemalloc )
kde? (
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index c3904450efc..bf036e62038 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -163,10 +163,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
media-libs/mesa[egl]
x11-libs/gtk+:3
+ x11-libs/pango
)
gtk2? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
+ x11-libs/pango
)
jemalloc? ( dev-libs/jemalloc )
kde? (
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index d3b626eef82..bbda7a7e6a7 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -164,10 +164,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
media-libs/mesa[egl]
x11-libs/gtk+:3
+ x11-libs/pango
)
gtk2? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
+ x11-libs/pango
)
kde? (
dev-qt/qtcore:5
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 556bbaf02b1..9152c3b3b0e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -164,10 +164,12 @@ COMMON_DEPEND="${PYTHON_DEPS}
gnome-base/dconf
media-libs/mesa[egl]
x11-libs/gtk+:3
+ x11-libs/pango
)
gtk2? (
x11-libs/gdk-pixbuf
>=x11-libs/gtk+-2.24:2
+ x11-libs/pango
)
kde? (
dev-qt/qtcore:5
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-07-14 16:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-07-14 16:19 UTC (permalink / raw
To: gentoo-commits
commit: e13af6858b4c65a6a1bdd54d8b05160655958bd8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 16:18:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 16:18:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13af685
app-office/libreoffice: Simpler check-reqs
Package-Manager: Portage-2.3.41, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 11 +++--------
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 11 +++--------
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 11 +++--------
app-office/libreoffice/libreoffice-9999.ebuild | 11 +++--------
4 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
index 8d2c709d099..df31a0f84f8 100644
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild
@@ -267,6 +267,7 @@ _check_reqs() {
else
CHECKREQS_DISK_BUILD="6G"
fi
+ check-reqs_$1
}
pkg_pretend() {
@@ -279,10 +280,7 @@ pkg_pretend() {
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_pretend
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
pkg_setup() {
@@ -290,10 +288,7 @@ pkg_setup() {
python-single-r1_pkg_setup
xdg_environment_reset
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_setup
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
src_unpack() {
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index b25f7e8074b..7fa72b5977b 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -264,6 +264,7 @@ _check_reqs() {
else
CHECKREQS_DISK_BUILD="6G"
fi
+ check-reqs_$1
}
pkg_pretend() {
@@ -276,10 +277,7 @@ pkg_pretend() {
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_pretend
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
pkg_setup() {
@@ -287,10 +285,7 @@ pkg_setup() {
python-single-r1_pkg_setup
xdg_environment_reset
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_setup
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
src_unpack() {
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 1a45077dea2..46abef27e98 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -261,6 +261,7 @@ _check_reqs() {
else
CHECKREQS_DISK_BUILD="6G"
fi
+ check-reqs_$1
}
pkg_pretend() {
@@ -273,10 +274,7 @@ pkg_pretend() {
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_pretend
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
pkg_setup() {
@@ -284,10 +282,7 @@ pkg_setup() {
python-single-r1_pkg_setup
xdg_environment_reset
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_setup
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
src_unpack() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1a45077dea2..46abef27e98 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -261,6 +261,7 @@ _check_reqs() {
else
CHECKREQS_DISK_BUILD="6G"
fi
+ check-reqs_$1
}
pkg_pretend() {
@@ -273,10 +274,7 @@ pkg_pretend() {
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
fi
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_pretend
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
pkg_setup() {
@@ -284,10 +282,7 @@ pkg_setup() {
python-single-r1_pkg_setup
xdg_environment_reset
- if [[ ${MERGE_TYPE} != binary ]]; then
- _check_reqs
- check-reqs_pkg_setup
- fi
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
src_unpack() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-09 21:39 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-08-09 21:39 UTC (permalink / raw
To: gentoo-commits
commit: 3225128041cd11a9f349a7c300dfc26b82b65f9d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 9 21:10:04 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 9 21:39:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32251280
app-office/libreoffice: Drop obsolete config option
Upstream commit 0e2a8bbfa16f9b7fff370b2e7f4ecf9abdd25e66
Package-Manager: Portage-2.3.45, Repoman-2.3.10
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 46abef27e98..00692c44abb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -402,7 +402,6 @@ src_configure() {
--disable-openssl
--disable-pdfium
--disable-report-builder
- --with-alloc=system
--with-build-version="Gentoo official package"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-09 21:39 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-08-09 21:39 UTC (permalink / raw
To: gentoo-commits
commit: e32e965ebab82578704fae63dc3991ff6bf408bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 9 21:36:59 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 9 21:39:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32e965e
app-office/libreoffice: Switch USE=dbus to sys-apps/dbus
Upstream commit 02addb3618f026acd72ece76fc726b9473cc5940
Package-Manager: Portage-2.3.45, Repoman-2.3.10
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 00692c44abb..8654bb522fb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -144,10 +144,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
+ dbus? ( sys-apps/dbus )
eds? (
dev-libs/glib:2
gnome-base/dconf
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-13 21:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-08-13 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 60653d96ada5f6e351a7e4c1835b67a80be83a1c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 21:47:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 21:47:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60653d96
app-office/libreoffice: Drop 6.0 stable branch
Package-Manager: Portage-2.3.46, Repoman-2.3.10
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 568 ---------------------
1 file changed, 568 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
deleted file mode 100644
index 7fa72b5977b..00000000000
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.5.2-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.13.3
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib:=
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- jemalloc? ( dev-libs/jemalloc )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
- "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-
- # gtk3-kde5 vcl plugin backported from master
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-24 1:40 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2018-08-24 1:40 UTC (permalink / raw
To: gentoo-commits
commit: 7ca489b14b1a6256571972eac30a1a1c1ccd7385
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 01:20:15 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 01:20:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca489b1
app-office/libreoffice: x86 stable (bug #659024)
Package-Manager: Portage-2.3.48, Repoman-2.3.10
app-office/libreoffice/libreoffice-6.0.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
index 7fa72b5977b..f655322cf28 100644
--- a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-24 4:38 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2018-08-24 4:38 UTC (permalink / raw
To: gentoo-commits
commit: e08cf7167c3cd054755de41a9701762f90ecc02b
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 04:38:06 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 04:38:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08cf716
app-office/libreoffice: amd64 stable wrt bug #659024
Package-Manager: Portage-2.3.40, Repoman-2.3.9
app-office/libreoffice/libreoffice-6.0.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
index f655322cf28..a05ea79b58b 100644
--- a/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.6.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-29 10:49 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-08-29 10:49 UTC (permalink / raw
To: gentoo-commits
commit: d2c93326a680975f701413502439115802576078
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 10:49:03 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 10:49:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c93326
app-office/libreoffice: Fix build with USE=kde
Disable qt5/kde5 build switches for 6.1 stable branch, gtk3-kde5 now builds
without them. Only 6.2 branch receives work towards real qt5/kf5 support.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 46abef27e98..11cbcd4c3e8 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -398,9 +398,11 @@ src_configure() {
--disable-epm
--disable-fetch-external
--disable-gstreamer-0-10
+ --disable-kde5
--disable-online-update
--disable-openssl
--disable-pdfium
+ --disable-qt5
--disable-report-builder
--with-alloc=system
--with-build-version="Gentoo official package"
@@ -432,8 +434,6 @@ src_configure() {
$(use_enable gtk gtk3)
$(use_enable gtk2 gtk)
$(use_enable kde gtk3-kde5)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
$(use_enable mysql ext-mariadb-connector)
$(use_enable odk)
$(use_enable pdfimport)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-29 11:02 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-08-29 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 77d3323740bcbc150d8a4273cedc96a86f2c0861
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 11:01:19 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 11:02:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d33237
app-office/libreoffice: Decouple gtk3-kde5 from USE=kde
But let it build if USE=gtk,kde are selected.
USE=kde will only enable qt5/kde5 VCLs from now on.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
app-office/libreoffice/libreoffice-9999.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 8654bb522fb..d081a3a350e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -69,7 +69,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
- kde? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -433,7 +432,6 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0)
$(use_enable gtk gtk3)
$(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
$(use_enable kde kde5)
$(use_enable kde qt5)
$(use_enable mysql ext-mariadb-connector)
@@ -449,6 +447,10 @@ src_configure() {
$(use_with odk doxygen)
)
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-29 13:11 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-08-29 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 37c9e82804cb2d913f28274f1979b035f95839a7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 11:45:42 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 13:11:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c9e828
app-office/libreoffice: Add missing DEPEND and build switch
Thanks-to: jospezial <jospezial <AT> gmx.de>
Closes: https://bugs.gentoo.org/661714
Package-Manager: Portage-2.3.48, Repoman-2.3.10
app-office/libreoffice/libreoffice-9999.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 29150ced37c..fa678928f90 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -119,6 +119,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nss
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
media-gfx/graphite2
media-libs/fontconfig
media-libs/freetype:2
@@ -387,6 +388,7 @@ src_configure() {
--with-system-headers
--with-system-jars
--with-system-libs
+ --enable-build-opensymbol
--enable-cairo-canvas
--enable-largefile
--enable-mergelibs
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-08-29 13:11 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-08-29 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 27f088f77a90a2a2871afe005f9be28fc1445985
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 11:43:13 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 13:11:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f088f7
app-office/libreoffice: Raise dev-util/mdds min version to 1.4.1
Package-Manager: Portage-2.3.48, Repoman-2.3.10
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d081a3a350e..29150ced37c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -221,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
+ >=dev-util/mdds-1.4.1:1=
media-libs/glm
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-09-12 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-09-12 21:13 UTC (permalink / raw
To: gentoo-commits
commit: a5843b840052a632bdbaec451725d1a74975ecad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 21:13:09 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 21:13:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5843b84
app-office/libreoffice: Raise dev-libs/liborcus min version to 0.14.0
Package-Manager: Portage-2.3.49, Repoman-2.3.10
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index fa678928f90..95989401be9 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -111,7 +111,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.13.3
+ >=dev-libs/liborcus-0.14.0
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-09-16 22:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 24c3dd9c596f385ef3c56b3852a0808857ef933f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 22:14:31 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 22:29:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c3dd9c
app-office/libreoffice: 6.1.1.2 version bump (dropped ~arm64 keyword)
Bug: https://bugs.gentoo.org/661398
Package-Manager: Portage-2.3.49, Repoman-2.3.10
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-6.1.9999.ebuild => libreoffice-6.1.1.2.ebuild} | 2 +-
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 27cd54fc0d0..54ee7ef00ab 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,8 @@ DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157da
DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
+DIST libreoffice-6.1.1.2.tar.xz 207211808 BLAKE2B 9c60f6153a82903252102056d27ae412350200fcdb8dfc8cbefeb92bd50eebfbd11bda06e20f35d19320591f9cfdfa53c9f1fda8c66d2bee66c59c37f27753be SHA512 c3429fbd247c4b17f4e140751fcb1e593705aa60911556c4dfc960ebaa6fe50a39d933d14bfc3c89cdd92619f41611eb1aa0090fe9d391d84989d206005af3ea
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
+DIST libreoffice-help-6.1.1.2.tar.xz 15757536 BLAKE2B 5e93bb65c6e42f924bd1c782e472f247b97cb9264c671d932a71cf67813d529c363a8664eeca48b407a0882ad2d0d7392cffcfddea0f35f0c62881b3c11d70ce SHA512 6e22a3efa9c6db97dec27a5f6ef21efb0c0665712715338d8fb73340a9572841fcaac63b0f6b03d67bc9c459a85d1910c18a5830ff8541265509cf8a1bdc3aa1
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-6.1.9999.ebuild
copy to app-office/libreoffice/libreoffice-6.1.1.2.ebuild
index 6105cb607ab..01637fc6d61 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 6105cb607ab..01637fc6d61 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-09-16 22:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 22:34 UTC (permalink / raw
To: gentoo-commits
commit: b077048d358a02205a5dc91ef20975b5b1d67842
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 21:15:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 22:29:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b077048d
app-office/libreoffice: Pin mdds to 1.3*, liborcus to 0.13*
Package-Manager: Portage-2.3.49, Repoman-2.3.10
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 11cbcd4c3e8..6105cb607ab 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -112,7 +112,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.13.3
+ =dev-libs/liborcus-0.13*
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -219,7 +219,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
dev-util/intltool
- >=dev-util/mdds-1.2.3:1=
+ =dev-util/mdds-1.3*:1=
media-libs/glm
sys-devel/bison
sys-devel/flex
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-09-17 17:28 Mart Raudsepp
0 siblings, 0 replies; 588+ messages in thread
From: Mart Raudsepp @ 2018-09-17 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 9fd2e2c04ed2455ecf41a4bf897351bebfb0a929
Author: Roy Bamford <neddyseagoon <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 12:04:45 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 17:26:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd2e2c0
app-office/libreoffice: added ~arm64 keyword
Package-Manager: Portage-2.3.49, Repoman-2.3.10
app-office/libreoffice/libreoffice-6.1.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
index 01637fc6d61..6105cb607ab 100644
--- a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-09-18 18:17 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-09-18 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 9c75adba7ed11bfb4ec3641c755d28018bcc1702
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 18:15:50 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 18:16:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c75adba
app-office/libreoffice: Sync stable branch with 6.1.1.2 KEYWORDS
Bug: https://bugs.gentoo.org/661398
Package-Manager: Portage-2.3.49, Repoman-2.3.10
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index e6352a55b2d..285959c3464 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-09-18 18:17 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-09-18 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 14627ad48d51e49a1cb254e21ec66c78c9dbc743
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 18:12:56 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 18:16:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14627ad4
app-office/libreoffice: Add USE=accessibility
Upstream commits:
226697ae27ef451cad404256e83eef88262f16d1
84ef6d82546b044990f4efd57e51e29c6c6565c8
28e8c3e28bf4944ecad23961602b9b1f72613d39
Reported-by: Matthias Lippert <mae.lippert <AT> gmail.com>
Closes: https://bugs.gentoo.org/666492
Package-Manager: Portage-2.3.49, Repoman-2.3.10
app-office/libreoffice/libreoffice-6.1.1.2.ebuild | 6 ++++--
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 6 ++++--
app-office/libreoffice/libreoffice-9999.ebuild | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
index 6105cb607ab..285959c3464 100644
--- a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
@@ -63,8 +63,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -144,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
@@ -439,6 +440,7 @@ src_configure() {
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
$(use_enable vlc)
+ $(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 01637fc6d61..e6352a55b2d 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -63,8 +63,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -144,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
@@ -439,6 +440,7 @@ src_configure() {
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
$(use_enable vlc)
+ $(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 95989401be9..54d654db3d5 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,8 +63,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -144,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
@@ -441,6 +442,7 @@ src_configure() {
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
$(use_enable vlc)
+ $(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-09-19 18:35 Matt Turner
0 siblings, 0 replies; 588+ messages in thread
From: Matt Turner @ 2018-09-19 18:35 UTC (permalink / raw
To: gentoo-commits
commit: b55963bd9cb91061cb46cee717ae99ddd0683765
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 19 18:33:52 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 18:34:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b55963bd
app-office/libreoffice-6.1.1.2: added ~ppc64, bug 664414
app-office/libreoffice/libreoffice-6.1.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
index 285959c3464..f95a103c87c 100644
--- a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-10-01 18:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-10-01 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 80a463bf837b9c3ad136149de02349c16194ae43
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 1 17:55:15 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 18:12:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a463bf
app-office/libreoffice: Sync live KEYWORDS with 6.1.1.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 285959c3464..e889c4c70b1 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -79,7 +79,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 54d654db3d5..e78bc21416f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-10-01 18:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-10-01 18:13 UTC (permalink / raw
To: gentoo-commits
commit: df7de3edf989bd08c07711ba41b350552ba63064
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 1 17:38:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 18:12:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df7de3ed
app-office/libreoffice: Drop 6.1.1.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.1.1.2.ebuild | 568 ----------------------
2 files changed, 570 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 12c823fdb4a..eadf3888eb5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,9 +5,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
-DIST libreoffice-6.1.1.2.tar.xz 207211808 BLAKE2B 9c60f6153a82903252102056d27ae412350200fcdb8dfc8cbefeb92bd50eebfbd11bda06e20f35d19320591f9cfdfa53c9f1fda8c66d2bee66c59c37f27753be SHA512 c3429fbd247c4b17f4e140751fcb1e593705aa60911556c4dfc960ebaa6fe50a39d933d14bfc3c89cdd92619f41611eb1aa0090fe9d391d84989d206005af3ea
DIST libreoffice-6.1.2.1.tar.xz 207364016 BLAKE2B 9046cd4eaa30be40e5223718491ef5f39ad6940ae6bef1c88618eb42dfffeb9980db164367f7c6518979f57b31688abcc81068be2da4de08b6da5a7245e50283 SHA512 b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
-DIST libreoffice-help-6.1.1.2.tar.xz 15757536 BLAKE2B 5e93bb65c6e42f924bd1c782e472f247b97cb9264c671d932a71cf67813d529c363a8664eeca48b407a0882ad2d0d7392cffcfddea0f35f0c62881b3c11d70ce SHA512 6e22a3efa9c6db97dec27a5f6ef21efb0c0665712715338d8fb73340a9572841fcaac63b0f6b03d67bc9c459a85d1910c18a5830ff8541265509cf8a1bdc3aa1
DIST libreoffice-help-6.1.2.1.tar.xz 15757852 BLAKE2B 2f40eeb16956695e6a4f5d9bf6ac6ad8a72a4a38dd4b481320c1ffe7bf41b789e938291631816ee84cf4da83a0347d34383e9ed9c3f4b48374cf15cea13243a7 SHA512 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e
diff --git a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild b/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
deleted file mode 100644
index f95a103c87c..00000000000
--- a/app-office/libreoffice/libreoffice-6.1.1.2.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib:=
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- =dev-util/mdds-1.3*:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-qt5
- --disable-report-builder
- --with-alloc=system
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-10-01 18:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-10-01 18:13 UTC (permalink / raw
To: gentoo-commits
commit: a36ad9ed62b301fe337d2d81c5441e119108e76d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 1 17:38:11 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 18:12:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36ad9ed
app-office/libreoffice: 6.1.2.1 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.1.2.1.ebuild | 568 ++++++++++++++++++++++
2 files changed, 570 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6258b4e18a4..12c823fdb4a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
DIST libreoffice-6.1.1.2.tar.xz 207211808 BLAKE2B 9c60f6153a82903252102056d27ae412350200fcdb8dfc8cbefeb92bd50eebfbd11bda06e20f35d19320591f9cfdfa53c9f1fda8c66d2bee66c59c37f27753be SHA512 c3429fbd247c4b17f4e140751fcb1e593705aa60911556c4dfc960ebaa6fe50a39d933d14bfc3c89cdd92619f41611eb1aa0090fe9d391d84989d206005af3ea
+DIST libreoffice-6.1.2.1.tar.xz 207364016 BLAKE2B 9046cd4eaa30be40e5223718491ef5f39ad6940ae6bef1c88618eb42dfffeb9980db164367f7c6518979f57b31688abcc81068be2da4de08b6da5a7245e50283 SHA512 b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
DIST libreoffice-help-6.1.1.2.tar.xz 15757536 BLAKE2B 5e93bb65c6e42f924bd1c782e472f247b97cb9264c671d932a71cf67813d529c363a8664eeca48b407a0882ad2d0d7392cffcfddea0f35f0c62881b3c11d70ce SHA512 6e22a3efa9c6db97dec27a5f6ef21efb0c0665712715338d8fb73340a9572841fcaac63b0f6b03d67bc9c459a85d1910c18a5830ff8541265509cf8a1bdc3aa1
+DIST libreoffice-help-6.1.2.1.tar.xz 15757852 BLAKE2B 2f40eeb16956695e6a4f5d9bf6ac6ad8a72a4a38dd4b481320c1ffe7bf41b789e938291631816ee84cf4da83a0347d34383e9ed9c3f4b48374cf15cea13243a7 SHA512 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e
diff --git a/app-office/libreoffice/libreoffice-6.1.2.1.ebuild b/app-office/libreoffice/libreoffice-6.1.2.1.ebuild
new file mode 100644
index 00000000000..e889c4c70b1
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.2.1.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.13*
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ =dev-util/mdds-1.3*:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-qt5
+ --disable-report-builder
+ --with-alloc=system
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-11-02 8:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-11-02 8:31 UTC (permalink / raw
To: gentoo-commits
commit: ccf78800bd4bc4d0e4cc1e1dddefffb3efe00dbd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 1 23:22:52 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 2 08:28:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf78800
app-office/libreoffice: 6.1.3.2 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-office/libreoffice/Manifest | 3 +
app-office/libreoffice/libreoffice-6.1.3.2.ebuild | 568 ++++++++++++++++++++++
2 files changed, 571 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index eadf3888eb5..ba3db4af588 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
DIST libreoffice-6.1.2.1.tar.xz 207364016 BLAKE2B 9046cd4eaa30be40e5223718491ef5f39ad6940ae6bef1c88618eb42dfffeb9980db164367f7c6518979f57b31688abcc81068be2da4de08b6da5a7245e50283 SHA512 b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367
+DIST libreoffice-6.1.3.1-patchset-01.tar.xz 5068 BLAKE2B 5152903a580bbf44b40cb219c6d875753be354893470e6c5bad1b214ef3835529f3d1ba359baa362268d2b2bc72b698d4b319e0900e39c8dbfe9bfcfaaf0c171 SHA512 3cbf149f43ca89c1c22e6a67d6a66bc59e538588412b5363e662ee27ed764cd728fceffe141c7a49ea5c049640737e2fbbf673095397f422af9ae9b33af9e139
+DIST libreoffice-6.1.3.2.tar.xz 207404836 BLAKE2B d0ba57f8ca93a6bc4406ec21f1338659714af00afb861dca324a21af50abae160f3512bc1c0c5fbac23dfc24e7d8d855e377cb7e71e7ed3991456e922cb09d44 SHA512 1d3de497cbda49df6a59b550a18db5fc92f67ff522ba7432dea7052099226a260997c2efa0a59ce861c3bd921d7d569738721c5ed6efbd8a24e74c52eae5c484
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
DIST libreoffice-help-6.1.2.1.tar.xz 15757852 BLAKE2B 2f40eeb16956695e6a4f5d9bf6ac6ad8a72a4a38dd4b481320c1ffe7bf41b789e938291631816ee84cf4da83a0347d34383e9ed9c3f4b48374cf15cea13243a7 SHA512 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e
+DIST libreoffice-help-6.1.3.2.tar.xz 15757496 BLAKE2B cebfe42728c0374c355ba8d449d1858e9596b19d76b689c5eac422fa8cc749fec88e0a44fcc55e4c13cfab7a8219f565bd62944e004b7afb6f2e1fb3571c2dde SHA512 e52c9ff796696ab3dc6d32b468f3ca13f346b999a7bdbbffb7811eb8b7b347f4feb9ee02ff500f8b9e64cc246bc171a6166fcbd43e79a9ee75e2dafe37df9994
diff --git a/app-office/libreoffice/libreoffice-6.1.3.2.ebuild b/app-office/libreoffice/libreoffice-6.1.3.2.ebuild
new file mode 100644
index 00000000000..16abc13fd3e
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.3.2.ebuild
@@ -0,0 +1,568 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads,xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.1.3.1-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.13*
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ sys-libs/zlib:=
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ media-fonts/libertine
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ =dev-util/mdds-1.3*:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ )
+"
+
+PATCHES=(
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-qt5
+ --disable-report-builder
+ --with-alloc=system
+ --with-build-version="Gentoo official package"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-11-13 21:30 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-11-13 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 95324a65a11085165dc4aab923670b669b3658bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 15:46:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 21:30:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95324a65
app-office/libreoffice: Drop 6.1.2.1
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.1.2.1.ebuild | 568 ----------------------
2 files changed, 570 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ba3db4af588..7166e1ecaf7 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,10 +5,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.0.5.2-patchset-01.tar.xz 39820 BLAKE2B d8b436378b05a8a58156817b5d1e0323fd6fcfde9aa9fc4fc6a8056a06a16c84c5860ffe1ae715faddb707c5aa417b43e6c7f5c05821f86208edbb3778d830a1 SHA512 ec99a6358c0a20075abc0aa136ad6ccded4562fa0f25897efe2a8783fb33b97b92a2dd8041206b3344a79dfd10ebe98b79c8bf0b4e8539e45942978f0028dc59
DIST libreoffice-6.0.6.2.tar.xz 205022916 BLAKE2B 715d24c7bbfe4d570011f5090cf647421f68e73fb76047ec0fb973ec0bfb30be3ec1d521bdd92369e23abaa444e7afd3e070ff613486e8f85b9ca76d9496fd0e SHA512 8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517
-DIST libreoffice-6.1.2.1.tar.xz 207364016 BLAKE2B 9046cd4eaa30be40e5223718491ef5f39ad6940ae6bef1c88618eb42dfffeb9980db164367f7c6518979f57b31688abcc81068be2da4de08b6da5a7245e50283 SHA512 b7c7839da8251fd0f01794381d77a5abd4d092f21589df046402a1d332d782608aa00ab29ad60c9a34f27f11576d70c5a678e87a0f53c5b4065ae59fe77a0367
DIST libreoffice-6.1.3.1-patchset-01.tar.xz 5068 BLAKE2B 5152903a580bbf44b40cb219c6d875753be354893470e6c5bad1b214ef3835529f3d1ba359baa362268d2b2bc72b698d4b319e0900e39c8dbfe9bfcfaaf0c171 SHA512 3cbf149f43ca89c1c22e6a67d6a66bc59e538588412b5363e662ee27ed764cd728fceffe141c7a49ea5c049640737e2fbbf673095397f422af9ae9b33af9e139
DIST libreoffice-6.1.3.2.tar.xz 207404836 BLAKE2B d0ba57f8ca93a6bc4406ec21f1338659714af00afb861dca324a21af50abae160f3512bc1c0c5fbac23dfc24e7d8d855e377cb7e71e7ed3991456e922cb09d44 SHA512 1d3de497cbda49df6a59b550a18db5fc92f67ff522ba7432dea7052099226a260997c2efa0a59ce861c3bd921d7d569738721c5ed6efbd8a24e74c52eae5c484
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.0.6.2.tar.xz 2972748 BLAKE2B 38534d5fd08751af587fd5b5be03b39b086e2bc26878c50e98bafd7a2b48f517ac29b8d434748449b0a3e8a451c31f40255094d64965800aadfd94c111295be5 SHA512 89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13
-DIST libreoffice-help-6.1.2.1.tar.xz 15757852 BLAKE2B 2f40eeb16956695e6a4f5d9bf6ac6ad8a72a4a38dd4b481320c1ffe7bf41b789e938291631816ee84cf4da83a0347d34383e9ed9c3f4b48374cf15cea13243a7 SHA512 6cabaed79d0405e4e35af3e3689561e0d447bbf98b081b6a40fd52c37bda7b0886d4df4ea1c2deaa7db56c26933b5697ae4ef796f6e763a58b7ee729debcca6e
DIST libreoffice-help-6.1.3.2.tar.xz 15757496 BLAKE2B cebfe42728c0374c355ba8d449d1858e9596b19d76b689c5eac422fa8cc749fec88e0a44fcc55e4c13cfab7a8219f565bd62944e004b7afb6f2e1fb3571c2dde SHA512 e52c9ff796696ab3dc6d32b468f3ca13f346b999a7bdbbffb7811eb8b7b347f4feb9ee02ff500f8b9e64cc246bc171a6166fcbd43e79a9ee75e2dafe37df9994
diff --git a/app-office/libreoffice/libreoffice-6.1.2.1.ebuild b/app-office/libreoffice/libreoffice-6.1.2.1.ebuild
deleted file mode 100644
index e889c4c70b1..00000000000
--- a/app-office/libreoffice/libreoffice-6.1.2.1.ebuild
+++ /dev/null
@@ -1,568 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib:=
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/dejavu
- media-fonts/liberation-fonts
- media-fonts/libertine
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- =dev-util/mdds-1.3*:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- )
-"
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-qt5
- --disable-report-builder
- --with-alloc=system
- --with-build-version="Gentoo official package"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-11-15 23:12 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-11-15 23:12 UTC (permalink / raw
To: gentoo-commits
commit: ddc6b0c74e979054e0ad5c4f0329153c08009a3e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 15 01:25:04 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 15 23:12:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc6b0c7
app-office/libreoffice: Drop obsolete glibc-2.24 patch
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 3 ---
app-office/libreoffice/libreoffice-9999.ebuild | 3 ---
2 files changed, 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index e889c4c70b1..6e4ffe4f026 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -248,9 +248,6 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e78bc21416f..fd88cadb857 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -251,9 +251,6 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-11-15 23:12 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-11-15 23:12 UTC (permalink / raw
To: gentoo-commits
commit: 6adbb4a43eec0e8807686a7c16e2591f472d082e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 15 19:52:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 15 23:12:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6adbb4a4
app-office/libreoffice: Add COMMIT hash to BUILD_ID
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 13 +++++++++----
app-office/libreoffice/libreoffice-9999.ebuild | 13 +++++++++----
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 6e4ffe4f026..94aaaa087d8 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -20,9 +20,8 @@ ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -294,6 +293,7 @@ src_unpack() {
[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
@@ -365,6 +365,11 @@ src_configure() {
export MOC5="$(qt5_get_bindir)/moc"
fi
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
@@ -403,7 +408,7 @@ src_configure() {
--disable-qt5
--disable-report-builder
--with-alloc=system
- --with-build-version="Gentoo official package"
+ --with-build-version="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index fd88cadb857..4cf5eb3b938 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -20,9 +20,8 @@ ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS}
-unset SCM_ECLASS
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -297,6 +296,7 @@ src_unpack() {
[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
@@ -368,6 +368,11 @@ src_configure() {
export MOC5="$(qt5_get_bindir)/moc"
fi
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
# system headers/libs/...: enforce using system packages
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
# --enable-cairo: ensure that cairo is always required
@@ -404,7 +409,7 @@ src_configure() {
--disable-openssl
--disable-pdfium
--disable-report-builder
- --with-build-version="Gentoo official package"
+ --with-build-version="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-11-22 21:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-11-22 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 9bf0329a1d5b3a355f8ea1e4c0132ed469bdfed7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 19 00:12:37 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 21:48:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf0329a
app-office/libreoffice: Fix font test deps
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 94aaaa087d8..437ac1b2f00 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -193,9 +193,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice
- media-fonts/dejavu
media-fonts/liberation-fonts
- media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
kde? ( kde-frameworks/breeze-icons:* )
@@ -213,6 +211,7 @@ fi
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
dev-perl/Archive-Zip
@@ -238,6 +237,7 @@ DEPEND="${COMMON_DEPEND}
app-crypt/gnupg
dev-util/cppunit
media-fonts/dejavu
+ media-fonts/liberation-fonts
)
"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4cf5eb3b938..d2235c0033d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -196,9 +196,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!app-office/openoffice
- media-fonts/dejavu
media-fonts/liberation-fonts
- media-fonts/libertine
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
kde? ( kde-frameworks/breeze-icons:* )
@@ -216,6 +214,7 @@ fi
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
dev-perl/Archive-Zip
@@ -241,6 +240,7 @@ DEPEND="${COMMON_DEPEND}
app-crypt/gnupg
dev-util/cppunit
media-fonts/dejavu
+ media-fonts/liberation-fonts
)
"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-12-03 2:43 Jonathan Callen
0 siblings, 0 replies; 588+ messages in thread
From: Jonathan Callen @ 2018-12-03 2:43 UTC (permalink / raw
To: gentoo-commits
commit: f53a26a04ac5ca711243d255fc6f1d2c84899c4e
Author: Jonathan Callen <jcallen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 04:56:09 2018 +0000
Commit: Jonathan Callen <jcallen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 3 02:18:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53a26a0
app-office/libreoffice: add python3_7
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jonathan Callen <jcallen <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.3.2.ebuild | 4 ++--
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.3.2.ebuild b/app-office/libreoffice/libreoffice-6.1.3.2.ebuild
index 16abc13fd3e..aff300f1d46 100644
--- a/app-office/libreoffice/libreoffice-6.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.3.2.ebuild
@@ -3,8 +3,8 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 3c7a646b955..66a19c36880 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -3,8 +3,8 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c7399b1a5ac..dd57ab79748 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,8 +3,8 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-12-13 11:32 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-12-13 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 8495d42ac4c2e780c11714457fd49e857efd0bb6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 11:30:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 11:31:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8495d42a
app-office/libreoffice: Sync 6.1.4.2 with *9999 and vice versa
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.4.2.ebuild | 4 ++--
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index 6070b09e9e5..40fe93ee535 100644
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -3,8 +3,8 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
index 66a19c36880..29174b9eb1c 100644
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
@@ -135,7 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
- sys-libs/zlib:=
+ sys-libs/zlib
virtual/glu
virtual/jpeg:0
virtual/opengl
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index dd57ab79748..de17c67160e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -135,7 +135,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
net-nds/openldap
sci-mathematics/lpsolve
- sys-libs/zlib:=
+ sys-libs/zlib
virtual/glu
virtual/jpeg:0
virtual/opengl
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-12-19 14:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-12-19 14:23 UTC (permalink / raw
To: gentoo-commits
commit: a58bbd35c727d11086d5e72c9998199c61eed35b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 14:22:55 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 14:23:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58bbd35
app-office/libreoffice: Restore 6.1.4.2 keywords
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.4.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index 40fe93ee535..29174b9eb1c 100644
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -78,8 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-12-31 1:51 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-12-31 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 6f61ff60b548daba41c4da4b456e978711a7ae60
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 01:49:24 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 01:51:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f61ff60
app-office/libreoffice: Fix USE mysql
Upstream commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b47eabdbca1..b75bd717a25 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -187,7 +187,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
+ mysql? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -440,7 +440,7 @@ src_configure() {
$(use_enable gtk2 gtk)
$(use_enable kde kde5)
$(use_enable kde qt5)
- $(use_enable mysql ext-mariadb-connector)
+ $(use_enable mysql bundle-mariadb)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-12-31 1:51 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-12-31 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 605c9ad528db130605367e99563b097d498ef7e1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 01:51:08 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 01:51:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=605c9ad5
app-office/libreoffice: Add 6.2 stable branch
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 576 +++++++++++++++++++++
1 file changed, 576 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
new file mode 100644
index 00000000000..b75bd717a25
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -0,0 +1,576 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable mysql bundle-mariadb)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2018-12-31 1:51 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2018-12-31 1:51 UTC (permalink / raw
To: gentoo-commits
commit: 54c6be058e17121afe4ea48fbe33040e2cf99718
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 01:28:19 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 01:51:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c6be05
app-office/libreoffice: Drop obsolete build switch
--with-system-mysql-cppconn is gone.
Upstream commit 339795d6bd064f57ef33c7cbd5e90433c179e72e
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index de17c67160e..b47eabdbca1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -450,7 +450,6 @@ src_configure() {
$(use_with googledrive gdrive-client-id ${google_default_client_id})
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
$(use_with java)
- $(use_with mysql system-mysql-cppconn)
$(use_with odk doxygen)
)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-02 9:57 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2019-01-02 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 2f7bf28eabb5075ca9d76d19dcdd5fd35361d6a8
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 2 09:55:58 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan 2 09:55:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7bf28e
app-office/libreoffice: amd64 stable wrt bug #673446
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-office/libreoffice/libreoffice-6.1.4.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index 29174b9eb1c..01dfdc4ae48 100644
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-08 19:56 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2019-01-08 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 14dedf699ba3ee0f3e7e0154a8daface4025e8f7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 19:54:21 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 19:54:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14dedf69
app-office/libreoffice: x86 stable (bug #673446)
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index 01dfdc4ae48..541a32def7f 100644
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
@@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-09 10:00 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-09 10:00 UTC (permalink / raw
To: gentoo-commits
commit: 9b9b7f52a9e01373407999ca7b64918a26a36ee2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 20:13:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 09:51:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9b7f52
app-office/libreoffice: Drop 6.1 stable branch
No more release planned for packaging.
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 571 ---------------------
1 file changed, 571 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild
deleted file mode 100644
index 29174b9eb1c..00000000000
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- =dev-util/mdds-1.3*:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-qt5
- --disable-report-builder
- --with-alloc=system
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-10 19:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-10 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 1c7b5a4c1a694614bca06b710072f34b4df5f2c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 19:03:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 19:20:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7b5a4c
app-office/libreoffice: 6.2.0.2 version bump (no keywords)
Pre-release, non-keyworded dependencies.
Fixes build with poppler up to 0.72.0.
Bug: https://bugs.gentoo.org/670692
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 581 ++++++++++++++++++++++
2 files changed, 583 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1186c6f0e49..4cfcca21ae7 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,5 +4,7 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
+DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
+DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
new file mode 100644
index 00000000000..91afb2dd020
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # master branch
+ "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
+ "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable mysql bundle-mariadb)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-16 9:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 9:29 UTC (permalink / raw
To: gentoo-commits
commit: 104b4024f0ab61ac89430a63eff0b33c32dd1643
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 09:26:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 09:29:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104b4024
app-office/libreoffice: poppler patches upstreamed to 6.1/6.2 branch
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.0.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
index 9dc3659a431..e2865fbd55d 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
@@ -253,7 +253,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
- # master branch
+ # 6.2 branch
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
"${FILESDIR}"/${P}-poppler-0.73.patch
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index d1351356c1e..dbeed62a746 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -251,10 +251,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # master branch
- "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
- "${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-16 22:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-16 22:08 UTC (permalink / raw
To: gentoo-commits
commit: d2d54a39e47b855efa17619ffc5014c100715b78
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 21:19:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 22:08:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d54a39
app-office/libreoffice: 6.1.5.1 version bump (no keywords)
Bug: https://bugs.gentoo.org/670692
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.1.5.1.ebuild | 572 ++++++++++++++++++++++
2 files changed, 574 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4cfcca21ae7..b7c8d733d9f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,7 +4,9 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
+DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae
DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
+DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3
DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb
diff --git a/app-office/libreoffice/libreoffice-6.1.5.1.ebuild b/app-office/libreoffice/libreoffice-6.1.5.1.ebuild
new file mode 100644
index 00000000000..482cddcd51e
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.1.5.1.ebuild
@@ -0,0 +1,572 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ kde? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.13*
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( dev-libs/dbus-glib )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mysql? ( dev-db/mysql-connector-c++ )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ =dev-util/mdds-1.3*:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-qt5
+ --disable-report-builder
+ --with-alloc=system
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde gtk3-kde5)
+ $(use_enable mysql ext-mariadb-connector)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with mysql system-mysql-cppconn)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-20 19:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-20 19:31 UTC (permalink / raw
To: gentoo-commits
commit: 2a1efea44a772aad03ef3ce1b3c0f8de62952ead
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 19:30:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 19:31:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1efea4
app-office/libreoffice: Drop USE mysql in >=6.2
There is apparently no way to switch it off at this point.
Closes: https://bugs.gentoo.org/666684
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 5 ++---
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index dbeed62a746..c7a98fa7f09 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -102,6 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
+ dev-db/mysql-connector-c
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -187,7 +188,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -440,7 +440,6 @@ src_configure() {
$(use_enable gtk2 gtk)
$(use_enable kde kde5)
$(use_enable kde qt5)
- $(use_enable mysql bundle-mariadb)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b75bd717a25..c7a98fa7f09 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -102,6 +102,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
+ dev-db/mysql-connector-c
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -187,7 +188,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -440,7 +440,6 @@ src_configure() {
$(use_enable gtk2 gtk)
$(use_enable kde kde5)
$(use_enable kde qt5)
- $(use_enable mysql bundle-mariadb)
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-23 17:27 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2019-01-23 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 079a603ed47c4e77553c763eec879fb35b71bf71
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 21 11:00:21 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 17:27:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079a603e
app-office/libreoffice: Added "mariadb" USE flag
so users can choose between mariadb_config and mysql_config.
Package-Manager: Portage-2.3.57, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/10879
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 7 +++++--
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++++--
app-office/libreoffice/metadata.xml | 1 +
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index c7a98fa7f09..55ece7a7600 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
- dev-db/mysql-connector-c
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -188,6 +187,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -401,6 +402,7 @@ src_configure() {
--enable-randr
--enable-release-build
--disable-breakpad
+ --disable-bundle-mariadb
--disable-ccache
--disable-dependency-tracking
--disable-epm
@@ -490,6 +492,7 @@ src_configure() {
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
econf "${myeconfargs[@]}"
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c7a98fa7f09..55ece7a7600 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -102,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
- dev-db/mysql-connector-c
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -188,6 +187,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -401,6 +402,7 @@ src_configure() {
--enable-randr
--enable-release-build
--disable-breakpad
+ --disable-bundle-mariadb
--disable-ccache
--disable-dependency-tracking
--disable-epm
@@ -490,6 +492,7 @@ src_configure() {
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
econf "${myeconfargs[@]}"
}
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 103556859a0..6b514662f9a 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,6 +14,7 @@ version</longdescription>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="googledrive">Enable support for remote files on Google Drive</flag>
<flag name="gtk2">Enable legacy gtk2 frontend</flag>
+ <flag name="mariadb">Prefer mariadb connector over mysql connector</flag>
<flag name="odk">Build the Office Development Kit</flag>
<flag name="pdfimport">Enable PDF import via the Poppler library</flag>
<flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-23 22:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-23 22:53 UTC (permalink / raw
To: gentoo-commits
commit: 7394bff875c12fd058d5b1545de8e765dd56f51e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 23 20:54:59 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 22:52:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7394bff8
app-office/libreoffice: 6.2.0.3 version bump (still no keywords)
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 ++
...office-6.2.9999.ebuild => libreoffice-6.2.0.3.ebuild} | 16 +++++++---------
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b7c8d733d9f..15390722f85 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,7 +6,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae
DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278
+DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3
DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb
+DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
similarity index 97%
copy from app-office/libreoffice/libreoffice-6.2.9999.ebuild
copy to app-office/libreoffice/libreoffice-6.2.0.3.ebuild
index 55ece7a7600..1855739d749 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -77,7 +77,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -102,6 +103,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
+ dev-db/mysql-connector-c
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -187,8 +189,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -402,7 +402,6 @@ src_configure() {
--enable-randr
--enable-release-build
--disable-breakpad
- --disable-bundle-mariadb
--disable-ccache
--disable-dependency-tracking
--disable-epm
@@ -492,7 +491,6 @@ src_configure() {
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
econf "${myeconfargs[@]}"
}
@@ -552,7 +550,7 @@ src_install() {
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -561,8 +559,8 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 55ece7a7600..6536b71f535 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -552,7 +552,7 @@ src_install() {
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -561,8 +561,8 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 55ece7a7600..6536b71f535 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -552,7 +552,7 @@ src_install() {
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -561,8 +561,8 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-27 23:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-27 23:13 UTC (permalink / raw
To: gentoo-commits
commit: e2f96e17e79810c1aee9aa788cd6e46ac986df9a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 18:25:44 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 23:12:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f96e17
app-office/libreoffice: Re-apply add mariadb USE flag
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
index 2d7e26ac310..4861ff9850d 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -103,7 +103,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
- dev-db/mysql-connector-c
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -189,6 +188,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -402,6 +403,7 @@ src_configure() {
--enable-randr
--enable-release-build
--disable-breakpad
+ --disable-bundle-mariadb
--disable-ccache
--disable-dependency-tracking
--disable-epm
@@ -491,6 +493,7 @@ src_configure() {
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
econf "${myeconfargs[@]}"
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-27 23:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-27 23:13 UTC (permalink / raw
To: gentoo-commits
commit: 154af9462465338407a0ec5ad8a7c3d05263016b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 17:27:04 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 23:12:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154af946
app-office/libreoffice: Add Qt5/'KDE5' fixes patchset
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 4 ++--
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 ++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5effcd09b23..753822f5ce2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,6 +5,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae
+DIST libreoffice-6.2.0.3-patchset-01.tar.xz 12284 BLAKE2B 1585764ea7441f422f72e616fa5dff77d3997ae20410016092f35d0743f9629f17d0ecf6f0002a92a9de894d82bcf3cf22cee5124b9a5f280ea086c1ec285a6f SHA512 3a0dcee15440e74ef70aafee983951249193f0dac2b0bf48926265db01ea098486b2c3cd46178f533f3cfc20f7cadd9353c7a3d2c4bfe53812d0fe4a1fd86e22
DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
index 1855739d749..2d7e26ac310 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -246,7 +246,7 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 6536b71f535..fc17e0a1d33 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${PN}-6.2.0.3-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -246,7 +246,7 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
@@ -306,6 +306,8 @@ src_unpack() {
}
src_prepare() {
+ rm "${WORKDIR}"/${PATCHSET/.tar.xz/}/00{3,4}*.patch || die # drop backported to 6.2
+
default
# sandbox violations on many systems, we don't need it. Bug #646406
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-28 18:15 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-28 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 95bffe595339a4c3ee6459fb5c2a96b9748ec4b5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 28 18:13:13 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 18:14:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bffe59
app-office/libreoffice: Adjust patchset use, apply only non-backported
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index fc17e0a1d33..61a6eda8409 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -246,7 +246,11 @@ DEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ # master branch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/007-kde5-allow-multiple-mimetypes-clipboard.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/008-kde5-fix-selection-clipboard.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/012-kde5-no-images-to-clipboard.patch
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
@@ -306,8 +310,6 @@ src_unpack() {
}
src_prepare() {
- rm "${WORKDIR}"/${PATCHSET/.tar.xz/}/00{3,4}*.patch || die # drop backported to 6.2
-
default
# sandbox violations on many systems, we don't need it. Bug #646406
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-30 22:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-30 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 10608e49542791aaca56d28af06b1424b61d0fda
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 18:45:43 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 22:29:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10608e49
app-office/libreoffice: Drop 6.1.5.1
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.1.5.1.ebuild | 572 ----------------------
2 files changed, 574 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 771a184197b..63df811680b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,12 +4,10 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
-DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.0.3-patchset-01.tar.xz 12284 BLAKE2B 1585764ea7441f422f72e616fa5dff77d3997ae20410016092f35d0743f9629f17d0ecf6f0002a92a9de894d82bcf3cf22cee5124b9a5f280ea086c1ec285a6f SHA512 3a0dcee15440e74ef70aafee983951249193f0dac2b0bf48926265db01ea098486b2c3cd46178f533f3cfc20f7cadd9353c7a3d2c4bfe53812d0fe4a1fd86e22
DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
-DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1
diff --git a/app-office/libreoffice/libreoffice-6.1.5.1.ebuild b/app-office/libreoffice/libreoffice-6.1.5.1.ebuild
deleted file mode 100644
index 482cddcd51e..00000000000
--- a/app-office/libreoffice/libreoffice-6.1.5.1.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- =dev-util/mdds-1.3*:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-qt5
- --disable-report-builder
- --with-alloc=system
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-01-30 22:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-01-30 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 2182bf06c70cc4684da9de2391172f2ff839f9c6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 20:12:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 22:29:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2182bf06
app-office/libreoffice: Bump to libreoffice-6.2.0.3-patchset-02
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 5 ++++-
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 15 ++++++++++-----
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 63df811680b..5e2c0c964be 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,7 +5,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.0.3-patchset-01.tar.xz 12284 BLAKE2B 1585764ea7441f422f72e616fa5dff77d3997ae20410016092f35d0743f9629f17d0ecf6f0002a92a9de894d82bcf3cf22cee5124b9a5f280ea086c1ec285a6f SHA512 3a0dcee15440e74ef70aafee983951249193f0dac2b0bf48926265db01ea098486b2c3cd46178f533f3cfc20f7cadd9353c7a3d2c4bfe53812d0fe4a1fd86e22
+DIST libreoffice-6.2.0.3-patchset-02.tar.xz 22264 BLAKE2B 2ffa88eb84fd00100ad43717a9b6ca24d60f2ce03061f518f19cede0b383d7f0f3da42152ef396c976475d5b5cdb28b27c54b7680785e78fc7be2056e4fed171 SHA512 2df69e01ace90beaee993e62f0eff9bebe631f16933343156222d5b110531d17e1b9994013ba5a6cb5f8b44743743042ace9573d4d191ae43f0d54d85d4e34f0
DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
index 4861ff9850d..a09fbca2670 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-02.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -253,6 +253,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 61a6eda8409..0c48e2a46a6 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.2.0.3-patchset-01.tar.xz"
+PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -247,10 +247,15 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# master branch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/007-kde5-allow-multiple-mimetypes-clipboard.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/008-kde5-fix-selection-clipboard.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/012-kde5-no-images-to-clipboard.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/009-kde5-allow-multiple-mimetypes-clipboard.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/010-kde5-fix-selection-clipboard.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/012-qt5-initialize-glyphcache-for-psp-graphics.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/014-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/015-kde5-no-images-to-clipboard.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/020-qt5-filemanager-drag-and-drop.patch
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-05 0:30 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-05 0:30 UTC (permalink / raw
To: gentoo-commits
commit: 71c26c6de10e144bdc465d9ea878b27d3f8bc758
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 4 20:38:15 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 00:30:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c26c6d
app-office/libreoffice: Drop some backported patches
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 0c48e2a46a6..714cb3be6dc 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -247,8 +247,6 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# master branch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/009-kde5-allow-multiple-mimetypes-clipboard.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/010-kde5-fix-selection-clipboard.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/012-qt5-initialize-glyphcache-for-psp-graphics.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-05 23:27 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-05 23:27 UTC (permalink / raw
To: gentoo-commits
commit: b58527833ce20ad5583fc1dfc5e3e15ee3e0537a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 5 17:00:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 23:26:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5852783
app-office/libreoffice: Drop python3_4
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 714cb3be6dc..87a78508588 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6536b71f535..20e311f8d5c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-07 18:22 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-07 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 18ae6a7a30ad03cc0c56e28aeb639f09675a243c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 18:21:31 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 18:22:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ae6a7a
app-office/libreoffice: Restore 6.1.5.2 keywords
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.1.5.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
index 3524ee2f86e..5cf93d4642f 100644
--- a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
@@ -78,8 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-07 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-07 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 3ecb2c2470ccc13dd03aa9099e3950bb177f13da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 18:46:06 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 18:49:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ecb2c24
app-office/libreoffice: Drop some backported patches
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 87a78508588..12765a8bb8c 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -248,12 +248,8 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# master branch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/012-qt5-initialize-glyphcache-for-psp-graphics.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/014-qt5kde5-use-logicaldotsperinch-to-report-dpi.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/015-kde5-no-images-to-clipboard.patch
"${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/020-qt5-filemanager-drag-and-drop.patch
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-14 18:36 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 18:36 UTC (permalink / raw
To: gentoo-commits
commit: f89cfb0e9f3afe471ff470d075c80379f749d163
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 07:52:54 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89cfb0e
app-office/libreoffice: Switch to xdg.eclass, drop gnome2-utils.eclass
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.1.1.ebuild | 18 +++++-------------
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 18 +++++-------------
app-office/libreoffice/libreoffice-9999.ebuild | 18 +++++-------------
3 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
index a49542b0993..8116cd6766a 100644
--- a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -287,7 +287,6 @@ pkg_pretend() {
pkg_setup() {
java-pkg-opt-2_pkg_setup
python-single-r1_pkg_setup
- xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
@@ -311,7 +310,7 @@ src_unpack() {
}
src_prepare() {
- default
+ xdg_src_prepare
# sandbox violations on many systems, we don't need it. Bug #646406
sed -i \
@@ -571,14 +570,7 @@ src_install() {
pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
}
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index bc72c7c13fd..9b20bec5816 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -286,7 +286,6 @@ pkg_pretend() {
pkg_setup() {
java-pkg-opt-2_pkg_setup
python-single-r1_pkg_setup
- xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
@@ -310,7 +309,7 @@ src_unpack() {
}
src_prepare() {
- default
+ xdg_src_prepare
# sandbox violations on many systems, we don't need it. Bug #646406
sed -i \
@@ -570,14 +569,7 @@ src_install() {
pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b86252e215d..66452c403fb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -282,7 +282,6 @@ pkg_pretend() {
pkg_setup() {
java-pkg-opt-2_pkg_setup
python-single-r1_pkg_setup
- xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
@@ -306,7 +305,7 @@ src_unpack() {
}
src_prepare() {
- default
+ xdg_src_prepare
# sandbox violations on many systems, we don't need it. Bug #646406
sed -i \
@@ -566,14 +565,7 @@ src_install() {
pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-14 18:36 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 78e95b96d116e4ee8ccaf62fa570f7602a96945d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 21:57:07 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78e95b96
app-office/libreoffice: Drop 6.2.0.3
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.2.0.3.ebuild | 582 ----------------------
2 files changed, 584 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 90562e9facf..9f697bfd36f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,10 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.0.3-patchset-02.tar.xz 22264 BLAKE2B 2ffa88eb84fd00100ad43717a9b6ca24d60f2ce03061f518f19cede0b383d7f0f3da42152ef396c976475d5b5cdb28b27c54b7680785e78fc7be2056e4fed171 SHA512 2df69e01ace90beaee993e62f0eff9bebe631f16933343156222d5b110531d17e1b9994013ba5a6cb5f8b44743743042ace9573d4d191ae43f0d54d85d4e34f0
-DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1
DIST libreoffice-help-6.2.1.1.tar.xz 16186528 BLAKE2B 69b42c88a2c4ff9efe06d397bed3d782805ce85bffdc52ce02742e7f8a65e36ecdd3e08ed9639941fa4a7812fe02405865fb2aff7ef73b41f4a8df0c77019222 SHA512 0e5e753cacae453ceeb299ea6137e249078b50e6cb8797704175fc39355d2c644e4e402838d5eb32ee62c90231ea27bc65bfe8990957a61120e9caf00242d39c
diff --git a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
deleted file mode 100644
index a09fbca2670..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.0.3.ebuild
+++ /dev/null
@@ -1,582 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-02.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-
-PATCHES=(
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # master branch
- "${FILESDIR}/${PN}-6.1.5.2-gtk3_kde5-non-native-fpicker-for-non-plasma.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-14 18:36 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 18:36 UTC (permalink / raw
To: gentoo-commits
commit: ac2d17ff6ec6c6f362c4e23ea5b8155119357d1a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 21:55:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2d17ff
app-office/libreoffice: 6.2.1.1 version bump (no keywords)
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.1.1.ebuild | 582 ++++++++++++++++++++++
2 files changed, 584 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5e2c0c964be..90562e9facf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,7 +7,9 @@ DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c58836
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.0.3-patchset-02.tar.xz 22264 BLAKE2B 2ffa88eb84fd00100ad43717a9b6ca24d60f2ce03061f518f19cede0b383d7f0f3da42152ef396c976475d5b5cdb28b27c54b7680785e78fc7be2056e4fed171 SHA512 2df69e01ace90beaee993e62f0eff9bebe631f16933343156222d5b110531d17e1b9994013ba5a6cb5f8b44743743042ace9573d4d191ae43f0d54d85d4e34f0
DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1
+DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1
+DIST libreoffice-help-6.2.1.1.tar.xz 16186528 BLAKE2B 69b42c88a2c4ff9efe06d397bed3d782805ce85bffdc52ce02742e7f8a65e36ecdd3e08ed9639941fa4a7812fe02405865fb2aff7ef73b41f4a8df0c77019222 SHA512 0e5e753cacae453ceeb299ea6137e249078b50e6cb8797704175fc39355d2c644e4e402838d5eb32ee62c90231ea27bc65bfe8990957a61120e9caf00242d39c
diff --git a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
new file mode 100644
index 00000000000..12be7ce5989
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/ucpp
+ virtual/pkgconfig
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+
+PATCHES=(
+ # master branch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-14 18:36 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-02-14 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 7ce5d577799caf5c7552b08e56b6890b2b3ffeca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 15:33:49 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 18:36:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ce5d577
app-office/libreoffice: Update patchset to 6.2.1.1
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-6.2.1.1.ebuild | 6 ++----
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 ++----
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9f697bfd36f..5448428eece 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,7 +5,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.0.3-patchset-02.tar.xz 22264 BLAKE2B 2ffa88eb84fd00100ad43717a9b6ca24d60f2ce03061f518f19cede0b383d7f0f3da42152ef396c976475d5b5cdb28b27c54b7680785e78fc7be2056e4fed171 SHA512 2df69e01ace90beaee993e62f0eff9bebe631f16933343156222d5b110531d17e1b9994013ba5a6cb5f8b44743743042ace9573d4d191ae43f0d54d85d4e34f0
+DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
diff --git a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
index 8116cd6766a..410e0c32406 100644
--- a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
@@ -249,9 +249,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# master branch
"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 9b20bec5816..4b4ea02af44 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.2.0.3-patchset-02.tar.xz"
+PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
@@ -248,9 +248,7 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# master branch
"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/011-qt5-change-salgraphics-gettextlayout-def.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/013-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/019-drop-kde4-desktop-detection.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-17 15:33 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2019-02-17 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 17acdd91a9de45dde80f26b4e33b8118cc3bf1e1
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 15:32:11 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 15:32:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17acdd91
app-office/libreoffice: amd64 stable wrt bug #676956
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
app-office/libreoffice/libreoffice-6.1.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
index 5cf93d4642f..0fc6fa5c771 100644
--- a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
@@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-02-17 17:58 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2019-02-17 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 411bf64e0db2ac73f16f2f2dbf49d92590ff0219
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 17:54:57 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 17:57:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411bf64e
app-office/libreoffice: x86 stable wrt bug #676956
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"
app-office/libreoffice/libreoffice-6.1.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
index 0fc6fa5c771..4bbb1529ce9 100644
--- a/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.1.5.2.ebuild
@@ -78,7 +78,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-01 19:04 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-01 19:04 UTC (permalink / raw
To: gentoo-commits
commit: 8a1cc108a9031383d7f076fe296fa963d2d5aa44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 1 18:59:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 1 19:03:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1cc108
app-office/libreoffice: Drop 6.1.4.2
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.1.4.2.ebuild | 571 ----------------------
2 files changed, 573 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5448428eece..f8e96e5f3f8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,11 +3,9 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.1.1.tar.xz 16186528 BLAKE2B 69b42c88a2c4ff9efe06d397bed3d782805ce85bffdc52ce02742e7f8a65e36ecdd3e08ed9639941fa4a7812fe02405865fb2aff7ef73b41f4a8df0c77019222 SHA512 0e5e753cacae453ceeb299ea6137e249078b50e6cb8797704175fc39355d2c644e4e402838d5eb32ee62c90231ea27bc65bfe8990957a61120e9caf00242d39c
diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
deleted file mode 100644
index 541a32def7f..00000000000
--- a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
+++ /dev/null
@@ -1,571 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- kde? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.13*
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- net-nds/openldap
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( dev-libs/dbus-glib )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mysql? ( dev-db/mysql-connector-c++ )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- =dev-util/mdds-1.3*:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-qt5
- --disable-report-builder
- --with-alloc=system
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde gtk3-kde5)
- $(use_enable mysql ext-mariadb-connector)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with mysql system-mysql-cppconn)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-11 0:17 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-11 0:17 UTC (permalink / raw
To: gentoo-commits
commit: 767b00d3906d234b1165258eb0c9c59dc73f7bb7
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Mar 3 17:32:21 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 00:17:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767b00d3
app-office/libreoffice: EAPI-7 bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 10 +++++-----
app-office/libreoffice/libreoffice-9999.ebuild | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 4b4ea02af44..a8c322b1441 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
PYTHON_REQ_USE="threads(+),xml"
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -554,7 +554,7 @@ src_install() {
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -563,8 +563,8 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 66452c403fb..375aca4c6b2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
PYTHON_REQ_USE="threads(+),xml"
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -552,7 +552,7 @@ src_install() {
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -561,8 +561,8 @@ src_install() {
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-11 0:36 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-11 0:36 UTC (permalink / raw
To: gentoo-commits
commit: 923a081a450ef1ad317a6c04cc9b8e0d7a8a657b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 00:22:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 00:27:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=923a081a
app-office/libreoffice: Populate BDEPEND
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 51 +++++++++++-----------
app-office/libreoffice/libreoffice-9999.ebuild | 51 +++++++++++-----------
2 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index a8c322b1441..33dcacf28ec 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -79,6 +79,14 @@ SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -192,26 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
@@ -221,14 +209,9 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
- dev-util/intltool
>=dev-util/mdds-1.4.1:1=
media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
sys-devel/ucpp
- virtual/pkgconfig
x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
@@ -236,7 +219,6 @@ DEPEND="${COMMON_DEPEND}
dev-java/ant-core
>=virtual/jdk-1.6
)
- odk? ( >=app-doc/doxygen-1.8.4 )
test? (
app-crypt/gnupg
dev-util/cppunit
@@ -244,6 +226,23 @@ DEPEND="${COMMON_DEPEND}
media-fonts/liberation-fonts
)
"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
PATCHES=(
# master branch
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 375aca4c6b2..33af7c8cd64 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -79,6 +79,14 @@ SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -192,26 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
@@ -221,14 +209,9 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3
- dev-util/intltool
>=dev-util/mdds-1.4.1:1=
media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
sys-devel/ucpp
- virtual/pkgconfig
x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
@@ -236,7 +219,6 @@ DEPEND="${COMMON_DEPEND}
dev-java/ant-core
>=virtual/jdk-1.6
)
- odk? ( >=app-doc/doxygen-1.8.4 )
test? (
app-crypt/gnupg
dev-util/cppunit
@@ -244,6 +226,23 @@ DEPEND="${COMMON_DEPEND}
media-fonts/liberation-fonts
)
"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
PATCHES=(
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-12 7:10 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-12 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 4acce31b3f03b54b79e5ead5a79d3d63771e1fea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 23:29:04 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 07:07:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acce31b
app-office/libreoffice: 6.2.1.2 version bump, restore KEYWORDS
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.1.2.ebuild | 572 ++++++++++++++++++++++
2 files changed, 574 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f8e96e5f3f8..86f67f8c7e9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13
+DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212 SHA512 0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.1.1.tar.xz 16186528 BLAKE2B 69b42c88a2c4ff9efe06d397bed3d782805ce85bffdc52ce02742e7f8a65e36ecdd3e08ed9639941fa4a7812fe02405865fb2aff7ef73b41f4a8df0c77019222 SHA512 0e5e753cacae453ceeb299ea6137e249078b50e6cb8797704175fc39355d2c644e4e402838d5eb32ee62c90231ea27bc65bfe8990957a61120e9caf00242d39c
+DIST libreoffice-help-6.2.1.2.tar.xz 16187168 BLAKE2B 3b24bfa2b7f859329597305e98694d164b82f3bc6767b82df9d6b35951455d98ffaa19cb42417e1b3ece73fe35b3abebbd11fb8a0cd38f370fc7ed203b26bc55 SHA512 c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f
diff --git a/app-office/libreoffice/libreoffice-6.2.1.2.ebuild b/app-office/libreoffice/libreoffice-6.2.1.2.ebuild
new file mode 100644
index 00000000000..33dcacf28ec
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.1.2.ebuild
@@ -0,0 +1,572 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ xdg_src_prepare
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --without-help
+ --with-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=helpcontent2/source/media/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || \
+ ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-12 7:10 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-12 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 04197cb66aacafa9d9319f0332a7bd4939cb7fd1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 23:30:25 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 07:07:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04197cb6
app-office/libreoffice: Drop 6.2.1.1
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.2.1.1.ebuild | 574 ----------------------
2 files changed, 576 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 86f67f8c7e9..ce4d36de578 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,9 +5,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
-DIST libreoffice-6.2.1.1.tar.xz 213874132 BLAKE2B f8d4cc02e712f84363bca723e18127c25c76e2057985333c1045a5f656bb6482d7c381a5407dbf08ee5d1ca0f8692e43290ad90b8ed11ee5c4753072760a432f SHA512 92c79b62e99c9928eed2a0c1c14fe147f7bd0d6f891a87525b38fc3964bd298587f42f363503a93853bf57ecf898b4f0dd15d5064fcd354a8d3b4b7eba118b13
DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212 SHA512 0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.1.1.tar.xz 16186528 BLAKE2B 69b42c88a2c4ff9efe06d397bed3d782805ce85bffdc52ce02742e7f8a65e36ecdd3e08ed9639941fa4a7812fe02405865fb2aff7ef73b41f4a8df0c77019222 SHA512 0e5e753cacae453ceeb299ea6137e249078b50e6cb8797704175fc39355d2c644e4e402838d5eb32ee62c90231ea27bc65bfe8990957a61120e9caf00242d39c
DIST libreoffice-help-6.2.1.2.tar.xz 16187168 BLAKE2B 3b24bfa2b7f859329597305e98694d164b82f3bc6767b82df9d6b35951455d98ffaa19cb42417e1b3ece73fe35b3abebbd11fb8a0cd38f370fc7ed203b26bc55 SHA512 c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f
diff --git a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild b/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
deleted file mode 100644
index 410e0c32406..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.1.1.ebuild
+++ /dev/null
@@ -1,574 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- sys-devel/ucpp
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- xdg_src_prepare
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- java-utils-2_pkg_preinst
- xdg_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-16 22:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-16 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 067afe24a31efa1c23954d72d8bf7d060d26465b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 22:25:56 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 22:41:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067afe24
app-office/libreoffice: Some patches have been picked for 6.2
Closes: https://bugs.gentoo.org/680512
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 33dcacf28ec..caf354cdab3 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -247,7 +247,9 @@ fi
PATCHES=(
# master branch
"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/001-qt5-change-salgraphics-gettextlayout-def.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/002-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}/003-qt5-fpicker-honor-autoextension.patch
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-30 9:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-30 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 1409168db93211f788c6a15aca84c5beaacf899a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 16:23:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 09:58:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1409168d
app-office/libreoffice: 6.2.2.2 version bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.2.2.ebuild | 548 ++++++++++++++++++++++
2 files changed, 550 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ce4d36de578..735ca6411ec 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212 SHA512 0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef
+DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.1.2.tar.xz 16187168 BLAKE2B 3b24bfa2b7f859329597305e98694d164b82f3bc6767b82df9d6b35951455d98ffaa19cb42417e1b3ece73fe35b3abebbd11fb8a0cd38f370fc7ed203b26bc55 SHA512 c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f
+DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
diff --git a/app-office/libreoffice/libreoffice-6.2.2.2.ebuild b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
new file mode 100644
index 00000000000..6dfffd2394c
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ xdg_src_prepare
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-30 9:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-30 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 214fb6b50b013531dc3a255492726d5e0cc3bcda
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 16:05:24 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 09:58:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214fb6b5
app-office/libreoffice: Drop offlinehelp hacks, use --with-help=html
Thanks-to: V. Reher <vreher <AT> cox.net>
Bug: https://bugs.gentoo.org/671478
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 28 ++--------------------
app-office/libreoffice/libreoffice-9999.ebuild | 28 ++--------------------
2 files changed, 4 insertions(+), 52 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index caf354cdab3..79a08e6a2d5 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -428,8 +428,8 @@ src_configure() {
--with-x
--without-fonts
--without-myspell-dicts
- --without-help
- --with-helppack-integration
+ --with-help="html"
+ --without-helppack-integration
--with-system-gpgmepp
--without-system-sane
$(use_enable bluetooth sdremote-bluetooth)
@@ -506,24 +506,6 @@ src_compile() {
addpredict /dev/ati
addpredict /dev/nvidiactl
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
local target
use test && target="build" || target="build-nocheck"
@@ -558,12 +540,6 @@ src_install() {
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 33af7c8cd64..c891354e8c0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -424,8 +424,8 @@ src_configure() {
--with-x
--without-fonts
--without-myspell-dicts
- --without-help
- --with-helppack-integration
+ --with-help="html"
+ --without-helppack-integration
--with-system-gpgmepp
--without-system-sane
$(use_enable bluetooth sdremote-bluetooth)
@@ -502,24 +502,6 @@ src_compile() {
addpredict /dev/ati
addpredict /dev/nvidiactl
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
local target
use test && target="build" || target="build-nocheck"
@@ -554,12 +536,6 @@ src_install() {
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-30 9:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-30 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 553b52c6edde8b456fee47d7b5a923a0bfc4935c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 16:07:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 09:58:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553b52c6
app-office/libreoffice: Drop master qt5 patches from stable branch
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 79a08e6a2d5..6dfffd2394c 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
@@ -247,9 +247,7 @@ fi
PATCHES=(
# master branch
"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/001-qt5-change-salgraphics-gettextlayout-def.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/002-qt5-assert-missing-salgraphics-font-on-gettextlayout.patch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}/003-qt5-fpicker-honor-autoextension.patch
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-03-30 10:07 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-03-30 10:07 UTC (permalink / raw
To: gentoo-commits
commit: 3055c0c8083b1fcbca8689d865ac697b1a6b0063
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 10:06:31 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 10:07:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3055c0c8
app-office/libreoffice: Drop 6.1.2.1
Closes: https://bugs.gentoo.org/681854
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 -
app-office/libreoffice/libreoffice-6.2.1.2.ebuild | 572 ----------------------
2 files changed, 575 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b514ed85f2f..7f795f47d96 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,11 +4,8 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
-DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212 SHA512 0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef
DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.1.2.tar.xz 16187168 BLAKE2B 3b24bfa2b7f859329597305e98694d164b82f3bc6767b82df9d6b35951455d98ffaa19cb42417e1b3ece73fe35b3abebbd11fb8a0cd38f370fc7ed203b26bc55 SHA512 c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f
DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
diff --git a/app-office/libreoffice/libreoffice-6.2.1.2.ebuild b/app-office/libreoffice/libreoffice-6.2.1.2.ebuild
deleted file mode 100644
index 33dcacf28ec..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.1.2.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- xdg_src_prepare
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --without-help
- --with-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=helpcontent2/source/media/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || \
- ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- java-utils-2_pkg_preinst
- xdg_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-04-03 12:02 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-04-03 12:02 UTC (permalink / raw
To: gentoo-commits
commit: e56b7386d3500ec0ebb9a793e3523025401d451c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 3 09:13:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 12:02:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e56b7386
app-office/libreoffice: Drop pax-utils
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 5 +----
app-office/libreoffice/libreoffice-9999.ebuild | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 6dfffd2394c..0fa4dccc4d5 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -537,9 +537,6 @@ src_install() {
dodir /etc/env.d
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c891354e8c0..25021012eee 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -535,9 +535,6 @@ src_install() {
dodir /etc/env.d
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-04-11 9:03 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-04-11 9:03 UTC (permalink / raw
To: gentoo-commits
commit: 742389c3fb41bd819804fb527d923ecf128ec5ae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 13:06:52 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 09:02:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742389c3
app-office/libreoffice: 6.2.3.2 version bump (no keywords)
Pre-release.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.3.2.ebuild | 548 ++++++++++++++++++++++
2 files changed, 550 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index de991b313cf..0443321a6d0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,7 +7,9 @@ DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231
DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
DIST libreoffice-6.2.3.1.tar.xz 214212540 BLAKE2B 62898ab40a19e8517d32c427d68364289b73a8f13ea9c7b33f380f784908f5dbad2cbefe5e6e878c337b42306e29e2d7c574da36397b1bcd48651a519a8c04e0 SHA512 d835725f769af98c91ffe2e9cd6edb0361bbd7d8122ec6660fabebeec5830d14bc485ffa2b50a6bebcc72271440763e4aee427228c37ea81773bc83ef0650035
+DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550 SHA512 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.2.2.tar.xz 15267780 BLAKE2B 6e5300f8cbd202ccf411d7f5d5268075e53d004b986917a382b0bcae6e3eb2a6b69ff36bbb38b23e9661f2f0df0388032dfc2156c7e2665414137e125cc83247 SHA512 c9aebd77aa44ea54e08c9e305aa073e29a02b11fbe118f346f2bb17a6aa8c3ff13fa3ba212a29eaa4c2b3861365bf4a8683979c5e77c57fa538ef18f4aea7ae4
DIST libreoffice-help-6.2.3.1.tar.xz 13023992 BLAKE2B 5cb0f6081f60cf2ac6fe9e1e8715c5e48a4e8769a44dda1dd8a66aed18992710c6075a18ff19d3c5dba136d41396da42fd66d9ce1f1cc4d5fbc77a5c04f72e6d SHA512 1bc10999401bd7fe2a7454eb036675fd43cca9c4d0ef817f28c82cb6d3818afd44428b75fd31b2dac84a77a79f0a026679fd582ffa572b79bba38de1470f8857
+DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a SHA512 3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037
diff --git a/app-office/libreoffice/libreoffice-6.2.3.2.ebuild b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
new file mode 100644
index 00000000000..64169aefb4d
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # 6.2 stable branch
+ "${FILESDIR}/${PN}-6.2.3.1-qt5-kf5-disable-qt-hidpi-scaling.patch"
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ xdg_src_prepare
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-05-25 11:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-05-25 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 2cd2e66384137c7a04daa453646683172ff126c6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 10:48:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 25 11:08:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd2e663
app-office/libreoffice: 6.2.4.2 version bump
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 +
app-office/libreoffice/libreoffice-6.2.4.2.ebuild | 546 ++++++++++++++++++++++
2 files changed, 549 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f0cddcf56c2..e97cada4d79 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.3.2-patchset-01.tar.xz 6424 BLAKE2B 38d0be171c79345b5916e988312cac53901cadaa4d1981905822dee8ac8377954abbc36f8a82cd6bc9c9abc1bdb3863b10f425291ce1c8273e523478f42a8746 SHA512 0f54044ed14c69b37954c77607925ae7dc902429edaadb21d4a508e4628558ae3a172a51dbeddb3f4e87a5e82a9cd6be3badca17bed9ce2ff90fe433982f7903
DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550 SHA512 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
+DIST libreoffice-6.2.4.2-patchset-01.tar.xz 34176 BLAKE2B 5f246f8e1ffed70ef2c8d1618481a90159a48ad6aa0e2b0657ca594f97d7b5209467111411d797fa91c10bebc1a12f963bf3431d0724e829be0410785b777a3d SHA512 00db791292d438acfb2d4b04c31516f1170a395cb0f6aa87d44414472b1461f6e6bdce811ff09c43922b73f4df0fae4e7eed4d8d82ff265ee1e38ecafab29686
+DIST libreoffice-6.2.4.2.tar.xz 214494968 BLAKE2B bd317bc15ea5b48ae4eb3405e12eea3265d0f08c46bcc6891b550d05fff220868d035a0d9991319d6ffa80f0c770a9a79696fd11584e328300c66d5c6f672bf9 SHA512 d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a SHA512 3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037
+DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a27de13ec78e0e1935dacc23970123e4056b34f294beee941ef34b72a43208abdbba1d53614cb6d8cf0a0a2e5868431692409ef4 SHA512 d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048
diff --git a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
new file mode 100644
index 00000000000..ce0fc855d36
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
@@ -0,0 +1,546 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # 6.2 branch
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ xdg_src_prepare
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_preinst() {
+ java-utils-2_pkg_preinst
+ xdg_pkg_preinst
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-05-25 20:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-05-25 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 6cd4a1e47a2f138e40c2bd5b0269a21ad631754f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 20:07:17 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 25 20:54:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd4a1e4
app-office/libreoffice: 6.2.3.2 version bump
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 -
app-office/libreoffice/libreoffice-6.2.3.2.ebuild | 546 ----------------------
2 files changed, 549 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e97cada4d79..afcc05ad0b4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,11 +4,8 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.3.2-patchset-01.tar.xz 6424 BLAKE2B 38d0be171c79345b5916e988312cac53901cadaa4d1981905822dee8ac8377954abbc36f8a82cd6bc9c9abc1bdb3863b10f425291ce1c8273e523478f42a8746 SHA512 0f54044ed14c69b37954c77607925ae7dc902429edaadb21d4a508e4628558ae3a172a51dbeddb3f4e87a5e82a9cd6be3badca17bed9ce2ff90fe433982f7903
-DIST libreoffice-6.2.3.2.tar.xz 214234080 BLAKE2B d565a7bc80cb550179ba38a1f2233bda68acf312e8966db84a72b242a10673ac81198370ffa46a7a222ad6c0654f5691404f1a17d7b0c9a60fd378d04dc6d550 SHA512 06c7e67c521eb9d94aa1a63464a4531b61b0fa0a8f77a0ecd1584535826232557a971471bea87dbc0b794979e1cddb201dbfdf0c4a2b4261ea63730e15cd8000
DIST libreoffice-6.2.4.2-patchset-01.tar.xz 34176 BLAKE2B 5f246f8e1ffed70ef2c8d1618481a90159a48ad6aa0e2b0657ca594f97d7b5209467111411d797fa91c10bebc1a12f963bf3431d0724e829be0410785b777a3d SHA512 00db791292d438acfb2d4b04c31516f1170a395cb0f6aa87d44414472b1461f6e6bdce811ff09c43922b73f4df0fae4e7eed4d8d82ff265ee1e38ecafab29686
DIST libreoffice-6.2.4.2.tar.xz 214494968 BLAKE2B bd317bc15ea5b48ae4eb3405e12eea3265d0f08c46bcc6891b550d05fff220868d035a0d9991319d6ffa80f0c770a9a79696fd11584e328300c66d5c6f672bf9 SHA512 d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.3.2.tar.xz 13024476 BLAKE2B 1d4a993b4725dfeb2993db6ad8afa4f1cc6d68f0e3e51cf712e3983b9eb3d5e092b2fea69628b5f88237c59ec568e1a02a5898bcb0f950288ece6b4408de153a SHA512 3c2c05f22bebf59662ff2948b59055c2b8b962f8c717e8d894a6f0df1878cd13cce0e55d39c2cbbf7e83af61623149d757ec65495c4ed23a1e587832595be037
DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a27de13ec78e0e1935dacc23970123e4056b34f294beee941ef34b72a43208abdbba1d53614cb6d8cf0a0a2e5868431692409ef4 SHA512 d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048
diff --git a/app-office/libreoffice/libreoffice-6.2.3.2.ebuild b/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
deleted file mode 100644
index cacdb7a6fb5..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.3.2.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # 6.2 stable branch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- xdg_src_prepare
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_preinst() {
- java-utils-2_pkg_preinst
- xdg_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-06-09 20:16 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2019-06-09 20:16 UTC (permalink / raw
To: gentoo-commits
commit: 89ee05e6211746e9d12abbd89156498b849649ce
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 20:14:49 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 20:16:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ee05e6
app-office/libreoffice: amd64 stable wrt bug #686736
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
app-office/libreoffice/libreoffice-6.2.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
index ce0fc855d36..3dd54c5dc3b 100644
--- a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-06-18 18:24 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2019-06-18 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 3114f37cfe15c11516ea10d64427bdbfad74ab02
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 18:13:48 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 18:24:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3114f37c
app-office/libreoffice: x86 stable (bug #686736)
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
index 3dd54c5dc3b..a84bee9bab8 100644
--- a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-06-27 9:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-06-27 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 52fd68f949964514e3e6874ad23f9e93c0799c37
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 08:32:02 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 09:56:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52fd68f9
app-office/libreoffice: Switch back to xdg-utils.eclass for now
Bug: https://bugs.gentoo.org/683302
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 18 +++++++++++++-----
app-office/libreoffice/libreoffice-9999.ebuild | 18 +++++++++++++-----
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 0fa4dccc4d5..64438bc0c90 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -283,6 +283,7 @@ pkg_pretend() {
pkg_setup() {
java-pkg-opt-2_pkg_setup
python-single-r1_pkg_setup
+ xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
@@ -306,7 +307,7 @@ src_unpack() {
}
src_prepare() {
- xdg_src_prepare
+ default
# sandbox violations on many systems, we don't need it. Bug #646406
sed -i \
@@ -539,7 +540,14 @@ src_install() {
fi
}
-pkg_preinst() {
- java-utils-2_pkg_preinst
- xdg_pkg_preinst
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 25021012eee..2a035a036e8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -281,6 +281,7 @@ pkg_pretend() {
pkg_setup() {
java-pkg-opt-2_pkg_setup
python-single-r1_pkg_setup
+ xdg_environment_reset
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
}
@@ -304,7 +305,7 @@ src_unpack() {
}
src_prepare() {
- xdg_src_prepare
+ default
# sandbox violations on many systems, we don't need it. Bug #646406
sed -i \
@@ -537,7 +538,14 @@ src_install() {
fi
}
-pkg_preinst() {
- java-utils-2_pkg_preinst
- xdg_pkg_preinst
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-06-27 9:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-06-27 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 91ee1d308b5a4f24d6a9c0fa0a9648eb1d6b155a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 19:13:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 09:56:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ee1d30
app-office/libreoffice: 6.2.5.2 version bump
Pre-release, no keywords.
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.5.2.ebuild | 554 ++++++++++++++++++++++
2 files changed, 556 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index afcc05ad0b4..24217a36ecf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.4.2-patchset-01.tar.xz 34176 BLAKE2B 5f246f8e1ffed70ef2c8d1618481a90159a48ad6aa0e2b0657ca594f97d7b5209467111411d797fa91c10bebc1a12f963bf3431d0724e829be0410785b777a3d SHA512 00db791292d438acfb2d4b04c31516f1170a395cb0f6aa87d44414472b1461f6e6bdce811ff09c43922b73f4df0fae4e7eed4d8d82ff265ee1e38ecafab29686
DIST libreoffice-6.2.4.2.tar.xz 214494968 BLAKE2B bd317bc15ea5b48ae4eb3405e12eea3265d0f08c46bcc6891b550d05fff220868d035a0d9991319d6ffa80f0c770a9a79696fd11584e328300c66d5c6f672bf9 SHA512 d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5
+DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a27de13ec78e0e1935dacc23970123e4056b34f294beee941ef34b72a43208abdbba1d53614cb6d8cf0a0a2e5868431692409ef4 SHA512 d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048
+DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
new file mode 100644
index 00000000000..53d25e90bc2
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+ vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vlc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use gtk && use kde; then
+ myeconfargs+=( --enable-gtk3-kde5 )
+ fi
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-04 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-07-04 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 73daa88a6a4123d02452ab4dac553a07ad893d27
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 4 17:05:11 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 19:36:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73daa88a
app-office/libreoffice: 6.2.5.2 restore keywords
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.5.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
index 53d25e90bc2..64438bc0c90 100644
--- a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
@@ -77,8 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-17 10:19 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2019-07-17 10:19 UTC (permalink / raw
To: gentoo-commits
commit: bba5fb2900d3ca84c65351b8f7c61d463cc2f322
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 10:19:13 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 10:19:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba5fb29
app-office/libreoffice: amd64 stable wrt bug #689418
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
app-office/libreoffice/libreoffice-6.2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
index 64438bc0c90..2477a1d80a6 100644
--- a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-18 14:32 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2019-07-18 14:32 UTC (permalink / raw
To: gentoo-commits
commit: b321392b778bfe3610bc109ce3082d64ed3ee240
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 14:26:13 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 14:32:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b321392b
app-office/libreoffice: x86 stable (bug #689418)
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
index 2477a1d80a6..c66bae1fdfd 100644
--- a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-18 15:30 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-07-18 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 54258cb9e76f2c2858c6886965d87c9338b98ff1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 14:45:04 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:30:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54258cb9
app-office/libreoffice: Drop 6.2.4.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
app-office/libreoffice/Manifest | 3 -
app-office/libreoffice/libreoffice-6.2.4.2.ebuild | 546 ----------------------
2 files changed, 549 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 24217a36ecf..021c3120e7c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,10 +4,7 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
-DIST libreoffice-6.2.4.2-patchset-01.tar.xz 34176 BLAKE2B 5f246f8e1ffed70ef2c8d1618481a90159a48ad6aa0e2b0657ca594f97d7b5209467111411d797fa91c10bebc1a12f963bf3431d0724e829be0410785b777a3d SHA512 00db791292d438acfb2d4b04c31516f1170a395cb0f6aa87d44414472b1461f6e6bdce811ff09c43922b73f4df0fae4e7eed4d8d82ff265ee1e38ecafab29686
-DIST libreoffice-6.2.4.2.tar.xz 214494968 BLAKE2B bd317bc15ea5b48ae4eb3405e12eea3265d0f08c46bcc6891b550d05fff220868d035a0d9991319d6ffa80f0c770a9a79696fd11584e328300c66d5c6f672bf9 SHA512 d3c28629315fa78c1a18384b9c4144773f573c9721cb33f2c1b2beccbaa73068b1096c7009353261b1a8993f1bf5296e9dfc4279605572938b749ce9c39026e5
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
-DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a27de13ec78e0e1935dacc23970123e4056b34f294beee941ef34b72a43208abdbba1d53614cb6d8cf0a0a2e5868431692409ef4 SHA512 d93a3cac65659575fb0a17528c5d5c0cfdf6d20b8b694908b9795cac1f1b4f2122c849a31a9e5d04f579c8a27b2b1913ec7474560300ee0fbf4e0f39d3937048
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
diff --git a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild b/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
deleted file mode 100644
index a84bee9bab8..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.4.2.ebuild
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # 6.2 branch
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- xdg_src_prepare
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_preinst() {
- java-utils-2_pkg_preinst
- xdg_pkg_preinst
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-18 20:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-07-18 20:58 UTC (permalink / raw
To: gentoo-commits
commit: 122f33d3d416692e223663dca0fa3ffdc55205d0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 18:47:33 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 20:58:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122f33d3
app-office/libreoffice: Drop USE vlc
Does not work, is not maintained.
Bug: https://bugs.gentoo.org/686958
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 5 ++---
app-office/libreoffice/libreoffice-9999.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 64438bc0c90..fc96b41d6be 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -234,7 +234,6 @@ RDEPEND="${COMMON_DEPEND}
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
"
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
@@ -413,6 +412,7 @@ src_configure() {
--disable-openssl
--disable-pdfium
--disable-report-builder
+ --disable-vlc
--with-build-version="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -447,7 +447,6 @@ src_configure() {
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
$(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2a035a036e8..647dba7af7a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -234,7 +234,6 @@ RDEPEND="${COMMON_DEPEND}
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( >=virtual/jre-1.6 )
kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
"
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
@@ -411,6 +410,7 @@ src_configure() {
--disable-openssl
--disable-pdfium
--disable-report-builder
+ --disable-vlc
--with-build-version="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -445,7 +445,6 @@ src_configure() {
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
$(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-18 20:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-07-18 20:58 UTC (permalink / raw
To: gentoo-commits
commit: 9a52651d17a9be7b1e0b9c3c3cfb91a9ef2a1747
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 20:15:20 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 20:58:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a52651d
app-office/libreoffice: Disable gtk3-kde5 VCL again
kde5 backend is good enough so that we do not need to add this complexity.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 5 +----
app-office/libreoffice/libreoffice-9999.ebuild | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index fc96b41d6be..d8895f5b438 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -408,6 +408,7 @@ src_configure() {
--disable-epm
--disable-fetch-external
--disable-gstreamer-0-10
+ --disable-gtk3-kde5
--disable-online-update
--disable-openssl
--disable-pdfium
@@ -455,10 +456,6 @@ src_configure() {
$(use_with odk doxygen)
)
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 647dba7af7a..01399e679eb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -406,6 +406,7 @@ src_configure() {
--disable-epm
--disable-fetch-external
--disable-gstreamer-0-10
+ --disable-gtk3-kde5
--disable-online-update
--disable-openssl
--disable-pdfium
@@ -453,10 +454,6 @@ src_configure() {
$(use_with odk doxygen)
)
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
if use eds || use gtk; then
myeconfargs+=( --enable-dconf --enable-gio )
else
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-24 17:15 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 71b6fd5513ac82fa9c4e518886a7a5e289df9800
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 17:15:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 17:15:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b6fd55
app-office/libreoffice: Raise dev-cpp/libcmis min version to 0.5.2
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 01399e679eb..d361f06275f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -109,7 +109,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/libwps-0.4
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
+ >=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-24 19:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 1e90eacd63b9e581bf49085cd5bb4cfe3a2399e9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 19:10:20 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 19:52:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e90eacd
app-office/libreoffice: Rename kde5 -> kf5 configure switch
Upstream commit d3c6ac6d0f23df56644008ccb6aa2c8fa37ab1b5
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d361f06275f..f2a6dec770c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -440,7 +440,7 @@ src_configure() {
$(use_enable gstreamer gstreamer-1-0)
$(use_enable gtk gtk3)
$(use_enable gtk2 gtk)
- $(use_enable kde kde5)
+ $(use_enable kde kf5)
$(use_enable kde qt5)
$(use_enable ldap)
$(use_enable odk)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-07-24 19:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 19:55 UTC (permalink / raw
To: gentoo-commits
commit: d51983b7f82615c430463ca03c060fe510974e4e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 19:08:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 19:52:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d51983b7
app-office/libreoffice: Add 6.3 stable branch
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 547 +++++++++++++++++++++
1 file changed, 547 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
new file mode 100644
index 00000000000..d361f06275f
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -0,0 +1,547 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use java || \
+ ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-08 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-08 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 3a71215c136aeb7412efb62eaff69cfca04598ab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 8 13:09:12 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 16:51:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a71215c
app-office/libreoffice: Java baseline was raised to 1.8
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index dc24b6ddff2..52c32f853b5 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -217,7 +217,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.8
)
test? (
app-crypt/gnupg
@@ -232,7 +232,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/openoffice
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
+ java? ( >=virtual/jre-1.8 )
kde? ( kde-frameworks/breeze-icons:* )
"
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-08 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-08 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 54a413761897ba5ca5be71fc8ea0b20e0d0dd4da
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 8 16:34:55 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 16:51:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a41376
app-office/libreoffice: Update USE !java and add USE !firebird notice
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 7 +++++--
app-office/libreoffice/libreoffice-6.3.0.4.ebuild | 7 +++++--
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 7 +++++--
app-office/libreoffice/libreoffice-9999.ebuild | 7 +++++--
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index 95d3b41a720..8a89bd5092b 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -267,8 +267,11 @@ _check_reqs() {
}
pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
diff --git a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
index 29524e6854c..0797f73f72d 100644
--- a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
@@ -265,8 +265,11 @@ _check_reqs() {
}
pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index 29524e6854c..0797f73f72d 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -265,8 +265,11 @@ _check_reqs() {
}
pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 52c32f853b5..f0ca704cc85 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -265,8 +265,11 @@ _check_reqs() {
}
pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-08 16:52 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-08 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 57a709bcd6dc496971a4d6c9d7969b5af482ab18
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 8 12:42:18 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 8 16:51:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a709bc
app-office/libreoffice: 6.3.0.4 version bump
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 ++
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 4 ++--
.../{libreoffice-6.3.9999.ebuild => libreoffice-6.3.0.4.ebuild} | 4 ++--
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 021c3120e7c..780c4d2798f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,6 +5,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
+DIST libreoffice-6.3.0.4.tar.xz 224504440 BLAKE2B 4c006fa22dff53d3f8fd1baa5a414f9136472b13d7cd3d76a6bf055dcfe4b34aab3aa9c47b24f9b7d6aaa89691350cdf80548b7fcdb4ad8410723639d06dc576 SHA512 508beebf1e687e9ff668a82682561b639bd98ab85406178855b4301c7060147e1b5bea330e88d3bd7ef8de8f065d6a15d658eb436af0b03208c75d83a4deae40
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
+DIST libreoffice-help-6.3.0.4.tar.xz 13191436 BLAKE2B 3ad8d319ede30de5ccf7d26768388795e957d6296e794bd38d318c5a8114a41bc25bfd11d562700b4db34dd900537509175581855d8421e57595aa31d7aa3ba2 SHA512 1f197abb10d140037f10eb43b571b9e8f7b74b502f5bb91f4a3b4b388cd31aa81175df410321b9b401432c5ac02f9d08c7d681f07d68dd1733fb0536a1551ce8
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index d8895f5b438..95d3b41a720 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
+ >=dev-libs/xmlsec-1.2.28[nss]
media-gfx/fontforge
media-gfx/graphite2
media-libs/fontconfig
@@ -184,8 +184,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde? (
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtx11extras:5
dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
kde-frameworks/kconfig:5
kde-frameworks/kcoreaddons:5
kde-frameworks/ki18n:5
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-6.3.9999.ebuild
copy to app-office/libreoffice/libreoffice-6.3.0.4.ebuild
index d361f06275f..29524e6854c 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
@@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
+ >=dev-libs/xmlsec-1.2.28[nss]
media-gfx/fontforge
media-gfx/graphite2
media-libs/fontconfig
@@ -184,8 +184,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde? (
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtx11extras:5
dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
kde-frameworks/kconfig:5
kde-frameworks/kcoreaddons:5
kde-frameworks/ki18n:5
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index d361f06275f..29524e6854c 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
+ >=dev-libs/xmlsec-1.2.28[nss]
media-gfx/fontforge
media-gfx/graphite2
media-libs/fontconfig
@@ -184,8 +184,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde? (
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtx11extras:5
dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
kde-frameworks/kconfig:5
kde-frameworks/kcoreaddons:5
kde-frameworks/ki18n:5
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f2a6dec770c..dc24b6ddff2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
+ >=dev-libs/xmlsec-1.2.28[nss]
media-gfx/fontforge
media-gfx/graphite2
media-libs/fontconfig
@@ -184,8 +184,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde? (
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtx11extras:5
dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
kde-frameworks/kconfig:5
kde-frameworks/kcoreaddons:5
kde-frameworks/ki18n:5
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-09 12:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-09 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 4704b40be2f002f4f5c800ca84a540f6c422343f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 9 12:30:30 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 12:30:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4704b40b
app-office/libreoffice: Raise min dev-util/gperf version to 3.1
Reported-by: Maciej S. Szmigiero <mail <AT> maciej.szmigiero.name>
Closes: https://bugs.gentoo.org/691822
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.0.4.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
index 0797f73f72d..6d7145dfa93 100644
--- a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
@@ -208,7 +208,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
+ >=dev-util/gperf-3.1
>=dev-util/mdds-1.4.1:1=
media-libs/glm
sys-devel/ucpp
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index 0797f73f72d..6d7145dfa93 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -208,7 +208,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
+ >=dev-util/gperf-3.1
>=dev-util/mdds-1.4.1:1=
media-libs/glm
sys-devel/ucpp
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f0ca704cc85..c593c78f419 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -208,7 +208,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
+ >=dev-util/gperf-3.1
>=dev-util/mdds-1.4.1:1=
media-libs/glm
sys-devel/ucpp
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-13 15:56 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-13 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 7a4ef4669dd3924edc22ee4ba47e9ed67caaac65
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 10:23:24 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 15:56:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a4ef466
app-office/libreoffice: 6.2.6.2 version bump
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.6.2.ebuild | 552 ++++++++++++++++++++++
2 files changed, 554 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 780c4d2798f..738e0bcfb78 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,8 +5,10 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
+DIST libreoffice-6.2.6.2.tar.xz 214985796 BLAKE2B 642b92c02f4fab7075dc1c6ce79c3168401fb333fe1e2cadd2008cb2d2411769710374fa35e4928a7b51831dd7a83f0caa28a0fad2dc9478dd6b62e37888a5fa SHA512 6ea92025e32d0b73869139092ef8b6798e33d1f91a3af7b0202a2611b1a4376ce8019b7ca1e3b59692ff3a4f60c35acfefa7364b7f74d2d2236d72bac3d237cc
DIST libreoffice-6.3.0.4.tar.xz 224504440 BLAKE2B 4c006fa22dff53d3f8fd1baa5a414f9136472b13d7cd3d76a6bf055dcfe4b34aab3aa9c47b24f9b7d6aaa89691350cdf80548b7fcdb4ad8410723639d06dc576 SHA512 508beebf1e687e9ff668a82682561b639bd98ab85406178855b4301c7060147e1b5bea330e88d3bd7ef8de8f065d6a15d658eb436af0b03208c75d83a4deae40
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
+DIST libreoffice-help-6.2.6.2.tar.xz 13023940 BLAKE2B ac5cf65a391ab7d5f7030f02665d7b2e670e9b26aae068f42ce1f64e3830474958ef6d61d1721e3cd83f749e4699627b08bce97f852d607394823a95e41e7ee5 SHA512 bf3896d24201475fd45fc9da62833f0114bcbebbdd46b780ad9a71569c943bba04e3591da925f621cdc05b74c457a2d8d4b42ba9ce137cb018efea1d33a458c4
DIST libreoffice-help-6.3.0.4.tar.xz 13191436 BLAKE2B 3ad8d319ede30de5ccf7d26768388795e957d6296e794bd38d318c5a8114a41bc25bfd11d562700b4db34dd900537509175581855d8421e57595aa31d7aa3ba2 SHA512 1f197abb10d140037f10eb43b571b9e8f7b74b502f5bb91f4a3b4b388cd31aa81175df410321b9b401432c5ac02f9d08c7d681f07d68dd1733fb0536a1551ce8
diff --git a/app-office/libreoffice/libreoffice-6.2.6.2.ebuild b/app-office/libreoffice/libreoffice-6.2.6.2.ebuild
new file mode 100644
index 00000000000..8a89bd5092b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.6.2.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-13 15:56 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-13 15:56 UTC (permalink / raw
To: gentoo-commits
commit: a4b09d9c3da220c45851cdf26287ff50edc38328
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 13:54:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 13 15:56:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b09d9c
app-office/libreoffice: Drop 6.2 stable branch
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 552 ---------------------
1 file changed, 552 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
deleted file mode 100644
index 8a89bd5092b..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-14 11:54 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-14 11:54 UTC (permalink / raw
To: gentoo-commits
commit: bffeaaf173391d014f56fd2ef1db46354bc44e7a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 11:53:45 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 11:53:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bffeaaf1
app-office/libreoffice: Drop USE gtk2
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c593c78f419..b603ee3b8f4 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -63,7 +63,7 @@ unset ADDONS_SRC
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -176,11 +176,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/gtk+:3
x11-libs/pango
)
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
kde? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -409,6 +404,7 @@ src_configure() {
--disable-epm
--disable-fetch-external
--disable-gstreamer-0-10
+ --disable-gtk2
--disable-gtk3-kde5
--disable-online-update
--disable-openssl
@@ -442,7 +438,6 @@ src_configure() {
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
$(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
$(use_enable kde kf5)
$(use_enable kde qt5)
$(use_enable ldap)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-08-14 12:03 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-08-14 12:03 UTC (permalink / raw
To: gentoo-commits
commit: 39846430c29927b2406538296ca092718bbafd8f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 12:03:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 12:03:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39846430
app-office/libreoffice: Fix option
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b603ee3b8f4..7b8edda7c8f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -404,7 +404,7 @@ src_configure() {
--disable-epm
--disable-fetch-external
--disable-gstreamer-0-10
- --disable-gtk2
+ --disable-gtk
--disable-gtk3-kde5
--disable-online-update
--disable-openssl
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-09-07 11:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-09-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 944df809b45c15091ff315741b4a8f4a044c864e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 19:56:02 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 11:57:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944df809
app-office/libreoffice: 6.3.1.2 version bump
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.3.1.2.ebuild | 550 ++++++++++++++++++++++
2 files changed, 552 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 250205abdce..cc6980000e9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,7 +6,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-6.2.6.2.tar.xz 214985796 BLAKE2B 642b92c02f4fab7075dc1c6ce79c3168401fb333fe1e2cadd2008cb2d2411769710374fa35e4928a7b51831dd7a83f0caa28a0fad2dc9478dd6b62e37888a5fa SHA512 6ea92025e32d0b73869139092ef8b6798e33d1f91a3af7b0202a2611b1a4376ce8019b7ca1e3b59692ff3a4f60c35acfefa7364b7f74d2d2236d72bac3d237cc
DIST libreoffice-6.3.0.4.tar.xz 224504440 BLAKE2B 4c006fa22dff53d3f8fd1baa5a414f9136472b13d7cd3d76a6bf055dcfe4b34aab3aa9c47b24f9b7d6aaa89691350cdf80548b7fcdb4ad8410723639d06dc576 SHA512 508beebf1e687e9ff668a82682561b639bd98ab85406178855b4301c7060147e1b5bea330e88d3bd7ef8de8f065d6a15d658eb436af0b03208c75d83a4deae40
+DIST libreoffice-6.3.1.2.tar.xz 224614340 BLAKE2B b21e0133d88bf0c2377d2a1670b6730dc4c9c0cd2d6fc75e5db50cc6b4ee247322b8e5f772349c608bb5beca135e7be1ed72672fdf35ef855615f70d39da6e5a SHA512 f2fee3bb8f4470119fa77387733fb01a1fb05ecdc4b6339a27539101f0b317e5beaadba0de0b4b053f7b7d8eacbed85f0d3e21400c743b02c69cd30260bb7f2b
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.6.2.tar.xz 13023940 BLAKE2B ac5cf65a391ab7d5f7030f02665d7b2e670e9b26aae068f42ce1f64e3830474958ef6d61d1721e3cd83f749e4699627b08bce97f852d607394823a95e41e7ee5 SHA512 bf3896d24201475fd45fc9da62833f0114bcbebbdd46b780ad9a71569c943bba04e3591da925f621cdc05b74c457a2d8d4b42ba9ce137cb018efea1d33a458c4
DIST libreoffice-help-6.3.0.4.tar.xz 13191436 BLAKE2B 3ad8d319ede30de5ccf7d26768388795e957d6296e794bd38d318c5a8114a41bc25bfd11d562700b4db34dd900537509175581855d8421e57595aa31d7aa3ba2 SHA512 1f197abb10d140037f10eb43b571b9e8f7b74b502f5bb91f4a3b4b388cd31aa81175df410321b9b401432c5ac02f9d08c7d681f07d68dd1733fb0536a1551ce8
+DIST libreoffice-help-6.3.1.2.tar.xz 13191520 BLAKE2B b7f59e0ee9d4096f6a5ebb8d2decdd4b5604dac5cc00fc223ac96ae28d59f04c149361c096dd501d4fa37063f15118903006e2e8bcc30e7c0f21d545c23a71ba SHA512 05576a225f038f16a491bbd436096e51906b9f81b2cb8e856fe94fee67c1f830473b90421f6962fccf8ef6a0877610249dd18c1874b4c812582648adc5801452
diff --git a/app-office/libreoffice/libreoffice-6.3.1.2.ebuild b/app-office/libreoffice/libreoffice-6.3.1.2.ebuild
new file mode 100644
index 00000000000..6d7145dfa93
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.1.2.ebuild
@@ -0,0 +1,550 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-09-07 11:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-09-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: bb1cf46638bcaa45b699081adf663dc5527a80a6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 20:00:02 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 11:57:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1cf466
app-office/libreoffice: Drop 6.3.0.4
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.3.0.4.ebuild | 550 ----------------------
2 files changed, 552 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cc6980000e9..9de900084a9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,10 +5,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-6.2.6.2.tar.xz 214985796 BLAKE2B 642b92c02f4fab7075dc1c6ce79c3168401fb333fe1e2cadd2008cb2d2411769710374fa35e4928a7b51831dd7a83f0caa28a0fad2dc9478dd6b62e37888a5fa SHA512 6ea92025e32d0b73869139092ef8b6798e33d1f91a3af7b0202a2611b1a4376ce8019b7ca1e3b59692ff3a4f60c35acfefa7364b7f74d2d2236d72bac3d237cc
-DIST libreoffice-6.3.0.4.tar.xz 224504440 BLAKE2B 4c006fa22dff53d3f8fd1baa5a414f9136472b13d7cd3d76a6bf055dcfe4b34aab3aa9c47b24f9b7d6aaa89691350cdf80548b7fcdb4ad8410723639d06dc576 SHA512 508beebf1e687e9ff668a82682561b639bd98ab85406178855b4301c7060147e1b5bea330e88d3bd7ef8de8f065d6a15d658eb436af0b03208c75d83a4deae40
DIST libreoffice-6.3.1.2.tar.xz 224614340 BLAKE2B b21e0133d88bf0c2377d2a1670b6730dc4c9c0cd2d6fc75e5db50cc6b4ee247322b8e5f772349c608bb5beca135e7be1ed72672fdf35ef855615f70d39da6e5a SHA512 f2fee3bb8f4470119fa77387733fb01a1fb05ecdc4b6339a27539101f0b317e5beaadba0de0b4b053f7b7d8eacbed85f0d3e21400c743b02c69cd30260bb7f2b
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.6.2.tar.xz 13023940 BLAKE2B ac5cf65a391ab7d5f7030f02665d7b2e670e9b26aae068f42ce1f64e3830474958ef6d61d1721e3cd83f749e4699627b08bce97f852d607394823a95e41e7ee5 SHA512 bf3896d24201475fd45fc9da62833f0114bcbebbdd46b780ad9a71569c943bba04e3591da925f621cdc05b74c457a2d8d4b42ba9ce137cb018efea1d33a458c4
-DIST libreoffice-help-6.3.0.4.tar.xz 13191436 BLAKE2B 3ad8d319ede30de5ccf7d26768388795e957d6296e794bd38d318c5a8114a41bc25bfd11d562700b4db34dd900537509175581855d8421e57595aa31d7aa3ba2 SHA512 1f197abb10d140037f10eb43b571b9e8f7b74b502f5bb91f4a3b4b388cd31aa81175df410321b9b401432c5ac02f9d08c7d681f07d68dd1733fb0536a1551ce8
DIST libreoffice-help-6.3.1.2.tar.xz 13191520 BLAKE2B b7f59e0ee9d4096f6a5ebb8d2decdd4b5604dac5cc00fc223ac96ae28d59f04c149361c096dd501d4fa37063f15118903006e2e8bcc30e7c0f21d545c23a71ba SHA512 05576a225f038f16a491bbd436096e51906b9f81b2cb8e856fe94fee67c1f830473b90421f6962fccf8ef6a0877610249dd18c1874b4c812582648adc5801452
diff --git a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild b/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
deleted file mode 100644
index 6d7145dfa93..00000000000
--- a/app-office/libreoffice/libreoffice-6.3.0.4.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-09-07 11:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-09-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 4e318b531e24b4e750fb0ef507c673fd13fba686
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 20:16:15 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 11:57:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e318b53
app-office/libreoffice: 6.2.7.1 version bump
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.7.1.ebuild | 552 ++++++++++++++++++++++
2 files changed, 554 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9de900084a9..c9059de64ee 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,8 +5,10 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-6.2.6.2.tar.xz 214985796 BLAKE2B 642b92c02f4fab7075dc1c6ce79c3168401fb333fe1e2cadd2008cb2d2411769710374fa35e4928a7b51831dd7a83f0caa28a0fad2dc9478dd6b62e37888a5fa SHA512 6ea92025e32d0b73869139092ef8b6798e33d1f91a3af7b0202a2611b1a4376ce8019b7ca1e3b59692ff3a4f60c35acfefa7364b7f74d2d2236d72bac3d237cc
+DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b
DIST libreoffice-6.3.1.2.tar.xz 224614340 BLAKE2B b21e0133d88bf0c2377d2a1670b6730dc4c9c0cd2d6fc75e5db50cc6b4ee247322b8e5f772349c608bb5beca135e7be1ed72672fdf35ef855615f70d39da6e5a SHA512 f2fee3bb8f4470119fa77387733fb01a1fb05ecdc4b6339a27539101f0b317e5beaadba0de0b4b053f7b7d8eacbed85f0d3e21400c743b02c69cd30260bb7f2b
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.6.2.tar.xz 13023940 BLAKE2B ac5cf65a391ab7d5f7030f02665d7b2e670e9b26aae068f42ce1f64e3830474958ef6d61d1721e3cd83f749e4699627b08bce97f852d607394823a95e41e7ee5 SHA512 bf3896d24201475fd45fc9da62833f0114bcbebbdd46b780ad9a71569c943bba04e3591da925f621cdc05b74c457a2d8d4b42ba9ce137cb018efea1d33a458c4
+DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa
DIST libreoffice-help-6.3.1.2.tar.xz 13191520 BLAKE2B b7f59e0ee9d4096f6a5ebb8d2decdd4b5604dac5cc00fc223ac96ae28d59f04c149361c096dd501d4fa37063f15118903006e2e8bcc30e7c0f21d545c23a71ba SHA512 05576a225f038f16a491bbd436096e51906b9f81b2cb8e856fe94fee67c1f830473b90421f6962fccf8ef6a0877610249dd18c1874b4c812582648adc5801452
diff --git a/app-office/libreoffice/libreoffice-6.2.7.1.ebuild b/app-office/libreoffice/libreoffice-6.2.7.1.ebuild
new file mode 100644
index 00000000000..8a89bd5092b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.7.1.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-09-07 11:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-09-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 6a1330e97b899daa7073b8e3984646330c780031
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 20:23:22 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 11:57:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1330e9
app-office/libreoffice: Drop 6.2.6.2
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.2.6.2.ebuild | 552 ----------------------
2 files changed, 554 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c9059de64ee..34b72417fd0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,11 +4,9 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
-DIST libreoffice-6.2.6.2.tar.xz 214985796 BLAKE2B 642b92c02f4fab7075dc1c6ce79c3168401fb333fe1e2cadd2008cb2d2411769710374fa35e4928a7b51831dd7a83f0caa28a0fad2dc9478dd6b62e37888a5fa SHA512 6ea92025e32d0b73869139092ef8b6798e33d1f91a3af7b0202a2611b1a4376ce8019b7ca1e3b59692ff3a4f60c35acfefa7364b7f74d2d2236d72bac3d237cc
DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b
DIST libreoffice-6.3.1.2.tar.xz 224614340 BLAKE2B b21e0133d88bf0c2377d2a1670b6730dc4c9c0cd2d6fc75e5db50cc6b4ee247322b8e5f772349c608bb5beca135e7be1ed72672fdf35ef855615f70d39da6e5a SHA512 f2fee3bb8f4470119fa77387733fb01a1fb05ecdc4b6339a27539101f0b317e5beaadba0de0b4b053f7b7d8eacbed85f0d3e21400c743b02c69cd30260bb7f2b
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
-DIST libreoffice-help-6.2.6.2.tar.xz 13023940 BLAKE2B ac5cf65a391ab7d5f7030f02665d7b2e670e9b26aae068f42ce1f64e3830474958ef6d61d1721e3cd83f749e4699627b08bce97f852d607394823a95e41e7ee5 SHA512 bf3896d24201475fd45fc9da62833f0114bcbebbdd46b780ad9a71569c943bba04e3591da925f621cdc05b74c457a2d8d4b42ba9ce137cb018efea1d33a458c4
DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa
DIST libreoffice-help-6.3.1.2.tar.xz 13191520 BLAKE2B b7f59e0ee9d4096f6a5ebb8d2decdd4b5604dac5cc00fc223ac96ae28d59f04c149361c096dd501d4fa37063f15118903006e2e8bcc30e7c0f21d545c23a71ba SHA512 05576a225f038f16a491bbd436096e51906b9f81b2cb8e856fe94fee67c1f830473b90421f6962fccf8ef6a0877610249dd18c1874b4c812582648adc5801452
diff --git a/app-office/libreoffice/libreoffice-6.2.6.2.ebuild b/app-office/libreoffice/libreoffice-6.2.6.2.ebuild
deleted file mode 100644
index 8a89bd5092b..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.6.2.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-09-26 15:24 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-09-26 15:24 UTC (permalink / raw
To: gentoo-commits
commit: 54140d20b068ece603f45090c122d195e930450b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 26 15:23:36 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 26 15:24:26 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54140d20
app-office/libreoffice: 6.3.2.2 version bump
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.3.2.2.ebuild | 550 ++++++++++++++++++++++
2 files changed, 552 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 34b72417fd0..09d3bf2b8ee 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,7 +6,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b
DIST libreoffice-6.3.1.2.tar.xz 224614340 BLAKE2B b21e0133d88bf0c2377d2a1670b6730dc4c9c0cd2d6fc75e5db50cc6b4ee247322b8e5f772349c608bb5beca135e7be1ed72672fdf35ef855615f70d39da6e5a SHA512 f2fee3bb8f4470119fa77387733fb01a1fb05ecdc4b6339a27539101f0b317e5beaadba0de0b4b053f7b7d8eacbed85f0d3e21400c743b02c69cd30260bb7f2b
+DIST libreoffice-6.3.2.2.tar.xz 224752776 BLAKE2B 397d125714ae591d174ea185a488ecb652946de76d015c4ffb85e1c27ed34f87b5808ac41309b52fba117aab67097a0c378284721f0e5f3eb8e3284c799ed8dd SHA512 f0576f5a5b2c91ee6c003cbf9772580c564e05f66c3b34ddee4b723095aaa3a55070df3d70d7e6b8be68e23a7e204c1237496d7e798f9494282cadba0eacf930
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa
DIST libreoffice-help-6.3.1.2.tar.xz 13191520 BLAKE2B b7f59e0ee9d4096f6a5ebb8d2decdd4b5604dac5cc00fc223ac96ae28d59f04c149361c096dd501d4fa37063f15118903006e2e8bcc30e7c0f21d545c23a71ba SHA512 05576a225f038f16a491bbd436096e51906b9f81b2cb8e856fe94fee67c1f830473b90421f6962fccf8ef6a0877610249dd18c1874b4c812582648adc5801452
+DIST libreoffice-help-6.3.2.2.tar.xz 13192064 BLAKE2B 83c742faa698370e1561133d4c7351619639b343068691d830433ff5dfa4af20ba7f89428b67275f7f19c947dd84e4c03aa330e4ddd684dbd19acee14e842ba9 SHA512 34f34abbd21e37ea6f8ed860af27bbd641cb98331f235b84c5b5cc4e3fa01d9f43a32469f5df4f4cf4dde0e804ba12e73fdd6d357413d5d7641c32396abf09f1
diff --git a/app-office/libreoffice/libreoffice-6.3.2.2.ebuild b/app-office/libreoffice/libreoffice-6.3.2.2.ebuild
new file mode 100644
index 00000000000..6d7145dfa93
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.2.2.ebuild
@@ -0,0 +1,550 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-09-29 20:07 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-09-29 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 492d707449ba310d4fa01be3773436b12892c5e7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 18:50:05 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 20:07:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492d7074
app-office/libreoffice: Drop 6.3.1.2
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.3.1.2.ebuild | 550 ----------------------
2 files changed, 552 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 09d3bf2b8ee..a29ae0ebbb8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,10 +5,8 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b
-DIST libreoffice-6.3.1.2.tar.xz 224614340 BLAKE2B b21e0133d88bf0c2377d2a1670b6730dc4c9c0cd2d6fc75e5db50cc6b4ee247322b8e5f772349c608bb5beca135e7be1ed72672fdf35ef855615f70d39da6e5a SHA512 f2fee3bb8f4470119fa77387733fb01a1fb05ecdc4b6339a27539101f0b317e5beaadba0de0b4b053f7b7d8eacbed85f0d3e21400c743b02c69cd30260bb7f2b
DIST libreoffice-6.3.2.2.tar.xz 224752776 BLAKE2B 397d125714ae591d174ea185a488ecb652946de76d015c4ffb85e1c27ed34f87b5808ac41309b52fba117aab67097a0c378284721f0e5f3eb8e3284c799ed8dd SHA512 f0576f5a5b2c91ee6c003cbf9772580c564e05f66c3b34ddee4b723095aaa3a55070df3d70d7e6b8be68e23a7e204c1237496d7e798f9494282cadba0eacf930
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa
-DIST libreoffice-help-6.3.1.2.tar.xz 13191520 BLAKE2B b7f59e0ee9d4096f6a5ebb8d2decdd4b5604dac5cc00fc223ac96ae28d59f04c149361c096dd501d4fa37063f15118903006e2e8bcc30e7c0f21d545c23a71ba SHA512 05576a225f038f16a491bbd436096e51906b9f81b2cb8e856fe94fee67c1f830473b90421f6962fccf8ef6a0877610249dd18c1874b4c812582648adc5801452
DIST libreoffice-help-6.3.2.2.tar.xz 13192064 BLAKE2B 83c742faa698370e1561133d4c7351619639b343068691d830433ff5dfa4af20ba7f89428b67275f7f19c947dd84e4c03aa330e4ddd684dbd19acee14e842ba9 SHA512 34f34abbd21e37ea6f8ed860af27bbd641cb98331f235b84c5b5cc4e3fa01d9f43a32469f5df4f4cf4dde0e804ba12e73fdd6d357413d5d7641c32396abf09f1
diff --git a/app-office/libreoffice/libreoffice-6.3.1.2.ebuild b/app-office/libreoffice/libreoffice-6.3.1.2.ebuild
deleted file mode 100644
index 6d7145dfa93..00000000000
--- a/app-office/libreoffice/libreoffice-6.3.1.2.ebuild
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-10-17 18:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-10-17 18:40 UTC (permalink / raw
To: gentoo-commits
commit: ea1be4f3bbbafaf0916f7c2832dc5de94849042a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 17:59:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 18:39:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1be4f3
app-office/libreoffice: 6.2.8.2 version bump
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.2.8.2.ebuild | 552 ++++++++++++++++++++++
2 files changed, 554 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a29ae0ebbb8..fb1e34f891c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,8 +5,10 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-6.2.7.1.tar.xz 215022744 BLAKE2B 717acc3c310d3d973464b422176ccb4aae1481f2537c419e3afd031a2c2967a7b20b4cc5b60499befcae279441176a275f339e65534c4eb9d7395c6e050ba6e3 SHA512 9ed37c7957bb214a3de0b3dadea9debd5056d641052a669904d543a7065f1f5c721e09ddda800dfb478ff0474f71a275c7208077cb7b6566786d3b637f42860b
+DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd
DIST libreoffice-6.3.2.2.tar.xz 224752776 BLAKE2B 397d125714ae591d174ea185a488ecb652946de76d015c4ffb85e1c27ed34f87b5808ac41309b52fba117aab67097a0c378284721f0e5f3eb8e3284c799ed8dd SHA512 f0576f5a5b2c91ee6c003cbf9772580c564e05f66c3b34ddee4b723095aaa3a55070df3d70d7e6b8be68e23a7e204c1237496d7e798f9494282cadba0eacf930
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.7.1.tar.xz 13024328 BLAKE2B fcdb01a52abb90773baa96b0c25fc04bf928e13b940a5cadd7eb455a3004f83d339252346d7c615fbe511cee7e093560c99bf6ff6bd2e5e832d57d4d1053ebc6 SHA512 b4599bf6854efa800483cf16132c9809ea439d29ea63c7621a0f04ce19609a7a1966d86862342f911cde22a3bd19fe5b96ad9bdb34d5255eb716352a8ce9bbaa
+DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
DIST libreoffice-help-6.3.2.2.tar.xz 13192064 BLAKE2B 83c742faa698370e1561133d4c7351619639b343068691d830433ff5dfa4af20ba7f89428b67275f7f19c947dd84e4c03aa330e4ddd684dbd19acee14e842ba9 SHA512 34f34abbd21e37ea6f8ed860af27bbd641cb98331f235b84c5b5cc4e3fa01d9f43a32469f5df4f4cf4dde0e804ba12e73fdd6d357413d5d7641c32396abf09f1
diff --git a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
new file mode 100644
index 00000000000..8a89bd5092b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # master branch
+ "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-10-30 8:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-10-30 8:59 UTC (permalink / raw
To: gentoo-commits
commit: 5f9e901c4d6a0505791be88df94da4ea5c1b5b57
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 08:59:15 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 08:59:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f9e901c
app-office/libreoffice: Fix path to patch
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index f66047b35ff..9834ebf899b 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -252,7 +252,7 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
# master branch
- "${FILESDIR}/${PN}-6.3.2.2-mysql-connector-c-8.patch" # bug #692422
+ "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-10-31 23:50 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2019-10-31 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 385ff62906775cc3b7ae79e383e99c91e0fe481a
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 23:20:33 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 23:20:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385ff629
app-office/libreoffice: x86 stable (bug #695536)
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
index 8a89bd5092b..6831dab51cb 100644
--- a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-11-01 22:34 Piotr Karbowski
0 siblings, 0 replies; 588+ messages in thread
From: Piotr Karbowski @ 2019-11-01 22:34 UTC (permalink / raw
To: gentoo-commits
commit: de0ba787c97d21116b8ccb2dc11a544bd8fe49bc
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 22:06:38 2019 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 22:06:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0ba787
app-office/libreoffice: 6.2.8.2 amd64 stable (Bug 695536)
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
index 97acd86ab3a..35ceeee6bfb 100644
--- a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-11-02 15:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-11-02 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 597e61658604f7c3f3f74eb03d38d5a54d4e4fff
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 14:05:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 15:22:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597e6165
app-office/libreoffice: Security cleanup
Bug: https://bugs.gentoo.org/695536
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.2.5.2.ebuild | 553 ----------------------
app-office/libreoffice/metadata.xml | 1 -
3 files changed, 556 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 58a9bd64826..50f980722c3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,10 +3,8 @@ DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-6.2.5.2.tar.xz 215008848 BLAKE2B 5dd1ef185820944816e01c8ed6a7873a5a8fe6f7f4b41fad279729970d85ff868f51ed573e8b3d0a554ffd1f8e295b6ff2e493e7f7250f8cb1c7c2a40115abf4 SHA512 b46b6731c415ab354ad7d876cb8905cb9eae2ca71639abf049ea7f5930601c957cc0eb04a2cd06949073ba5e94778ecdb449692ed8bbfbd95b05f6e7980d8d10
DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd
DIST libreoffice-6.3.3.2.tar.xz 224944844 BLAKE2B 16d58d1b34f6a7da5a9cb32dade8f15ce074f516b77d6481f1befec75572f2533f3ae19964ce2688ff121789241a11823f05768b3386bc755f015a243af6c55a SHA512 4809ce26c48419e1e8408bdd71e7aeec3940bad150afeb90034013fbe8757c37417da3a996f8935aac3103806e14bd47dee7e560051d6718a75e6b869a2b1934
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
DIST libreoffice-help-6.3.3.2.tar.xz 13192080 BLAKE2B 108f33d77ec24ac5f5b669aae72dc23f0ae1800038d9028a3c92b6dfbe09003cb6d9f89a6675162c8cb058ac850a0e7c5544f8692c527cfa83bd32ba28149a50 SHA512 c4d994c4047aeee5e35207228e2b62ccc7d7303ae8fcbfb52cbf73950f232ad8d45953ee364379d3834e79c59ab79df920ec624ebe4b7214f955c2bd89af7cee
diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
deleted file mode 100644
index c66bae1fdfd..00000000000
--- a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
+++ /dev/null
@@ -1,553 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.24[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- dev-qt/qtwidgets:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
- vlc? ( media-video/vlc )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use java || \
- ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vlc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use gtk && use kde; then
- myeconfargs+=( --enable-gtk3-kde5 )
- fi
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 6b514662f9a..38a66bc313d 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -17,6 +17,5 @@ version</longdescription>
<flag name="mariadb">Prefer mariadb connector over mysql connector</flag>
<flag name="odk">Build the Office Development Kit</flag>
<flag name="pdfimport">Enable PDF import via the Poppler library</flag>
- <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-12-12 14:58 Michał Górny
0 siblings, 0 replies; 588+ messages in thread
From: Michał Górny @ 2019-12-12 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 0ffb45c67562b4b87bdac1c93b4750ff7f27cf79
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 14:55:20 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 14:58:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ffb45c6
app-office/libreoffice: Fix MissingTestRestrict
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.2.8.2.ebuild | 1 +
app-office/libreoffice/libreoffice-6.3.3.2.ebuild | 1 +
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
index 35ceeee6bfb..4ad56b304bb 100644
--- a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
diff --git a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
index c7fc98d14c9..bfcd6325898 100644
--- a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index 9834ebf899b..7a8ee9560f6 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7b8edda7c8f..52c11f8e8ca 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-12-25 21:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-12-25 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 3fdba198a85f62982a72260e83747e3560c149e8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 20:59:09 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 25 21:20:14 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdba198
app-office/libreoffice: Drop python2_7, add python3_8
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index 7a8ee9560f6..19a2070ce5c 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 52c11f8e8ca..b71dce302d5 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-12-26 8:36 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-12-26 8:36 UTC (permalink / raw
To: gentoo-commits
commit: bb758989d09d15e6800ec65bccee6affe013f66f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 25 22:44:13 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 08:36:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb758989
app-office/libreoffice: Drop 6.3.3.2
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.3.3.2.ebuild | 554 ----------------------
2 files changed, 556 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 16a3e96ee7a..ef8dbf6702a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,9 +4,7 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.2.8.2.tar.xz 215070800 BLAKE2B d6bc1e94de1df4dd20dafaeac9702435f305fe15117e8aee02233c6d2e74423bb475aeaf79ff6dcd30e22d69a5d6f0648218819b08003524a2c7b1db340281c4 SHA512 cf1dd708f10ea4b9a3134851cad45fe91c1d535e2b2068f7e65f1cb1bf4076c5c41ec253f628c5b912590e91ccfe16f5c8bcf39bc92df2ec7c8aef84210349bd
-DIST libreoffice-6.3.3.2.tar.xz 224944844 BLAKE2B 16d58d1b34f6a7da5a9cb32dade8f15ce074f516b77d6481f1befec75572f2533f3ae19964ce2688ff121789241a11823f05768b3386bc755f015a243af6c55a SHA512 4809ce26c48419e1e8408bdd71e7aeec3940bad150afeb90034013fbe8757c37417da3a996f8935aac3103806e14bd47dee7e560051d6718a75e6b869a2b1934
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
-DIST libreoffice-help-6.3.3.2.tar.xz 13192080 BLAKE2B 108f33d77ec24ac5f5b669aae72dc23f0ae1800038d9028a3c92b6dfbe09003cb6d9f89a6675162c8cb058ac850a0e7c5544f8692c527cfa83bd32ba28149a50 SHA512 c4d994c4047aeee5e35207228e2b62ccc7d7303ae8fcbfb52cbf73950f232ad8d45953ee364379d3834e79c59ab79df920ec624ebe4b7214f955c2bd89af7cee
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
diff --git a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
deleted file mode 100644
index bfcd6325898..00000000000
--- a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
+++ /dev/null
@@ -1,554 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- >=dev-util/mdds-1.4.1:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # master branch
- "${FILESDIR}/${P}-mysql-connector-c-8.patch" # bug #692422
- "${FILESDIR}/${PN}-6.2.8.2-poppler-0.82.patch"
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-dependency-tracking
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2019-12-26 10:25 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2019-12-26 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 3e0327452fb06ade6604e833f312945d6656fe97
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 10:24:14 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 10:25:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e032745
app-office/libreoffice: Add missing RESTRICT="!test? ( test )"
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.4.2.ebuild | 2 ++
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 3 ++-
app-office/libreoffice/libreoffice-9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
index 550acf13ab8..bfa4361c3b2 100644
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
@@ -74,6 +74,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
libreoffice_extensions_wiki-publisher? ( java )
"
+RESTRICT="!test? ( test )"
+
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index 19a2070ce5c..bc4dff890b8 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -66,7 +66,6 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
@@ -75,6 +74,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
libreoffice_extensions_wiki-publisher? ( java )
"
+RESTRICT="!test? ( test )"
+
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b71dce302d5..3c04bc1de8e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -66,7 +66,6 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
@@ -75,6 +74,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
libreoffice_extensions_wiki-publisher? ( java )
"
+RESTRICT="!test? ( test )"
+
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-01-16 8:12 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2020-01-16 8:12 UTC (permalink / raw
To: gentoo-commits
commit: f3ad2b9196b6bd5eedfbbf93f7d68a1b46d03ab0
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 08:11:41 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 08:12:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ad2b91
app-office/libreoffice: amd64 stable wrt bug #704840
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.4.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
index bfa4361c3b2..68bd50738fa 100644
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -79,7 +79,7 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-01-16 8:14 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2020-01-16 8:14 UTC (permalink / raw
To: gentoo-commits
commit: d21745a5bc8e5351409c2ff6e14d27eff8ca7f87
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 08:13:56 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 08:13:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21745a5
app-office/libreoffice: x86 stable wrt bug #704840
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.4.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
index 68bd50738fa..d4ce61a869a 100644
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
@@ -79,7 +79,7 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-02-09 16:11 Michał Górny
0 siblings, 0 replies; 588+ messages in thread
From: Michał Górny @ 2020-02-09 16:11 UTC (permalink / raw
To: gentoo-commits
commit: a9e7bf728e975ba7af2141239d65a7f7e2262a2e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 11:27:35 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:10:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e7bf72
app-office/libreoffice: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../{libreoffice-6.3.4.2.ebuild => libreoffice-6.3.4.2-r1.ebuild} | 6 +++++-
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 8 ++++++--
app-office/libreoffice/libreoffice-9999.ebuild | 8 ++++++--
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-6.3.4.2.ebuild
rename to app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
index d4ce61a869a..13de879df38 100644
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ accessibility? (
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index bc4dff890b8..d552a76a932 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ accessibility? (
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3c04bc1de8e..f38debf301b 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
- accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+ accessibility? (
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
bluetooth? (
dev-libs/glib:2
net-wireless/bluez
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-02-29 19:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-02-29 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 932824329fd5dcad99821a1c282b32adb2d0d2fb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 18:49:42 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 18:49:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93282432
app-office/libreoffice: 6.3.5.2 version bump
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.3.5.2.ebuild | 558 ++++++++++++++++++++++
2 files changed, 560 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1083824bebe..fd43a8ec3e5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,5 +4,7 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
+DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
+DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
diff --git a/app-office/libreoffice/libreoffice-6.3.5.2.ebuild b/app-office/libreoffice/libreoffice-6.3.5.2.ebuild
new file mode 100644
index 00000000000..d9fdd899143
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.5.2.ebuild
@@ -0,0 +1,558 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.14.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ gtk2? (
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ >=dev-util/mdds-1.4.1:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.6
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+ ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+ ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+ ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gstreamer-0-10
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable gtk2 gtk)
+ $(use_enable kde kde5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-16 21:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-16 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 17b7836a3ac3f5260f3dc2d2fd34812977408912
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 20:52:53 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:25:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b7836a
app-office/libreoffice: Pin dev-libs/liborcus, dev-util/mdds versions
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild | 4 ++--
app-office/libreoffice/libreoffice-6.3.5.2.ebuild | 4 ++--
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
index 0afc2ea5bc1..9822d3839d1 100644
--- a/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
@@ -120,7 +120,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
+ =dev-libs/liborcus-0.14*
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -215,7 +215,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- >=dev-util/mdds-1.4.1:1=
+ =dev-util/mdds-1.4*:1=
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
diff --git a/app-office/libreoffice/libreoffice-6.3.5.2.ebuild b/app-office/libreoffice/libreoffice-6.3.5.2.ebuild
index d9fdd899143..0132cdd8dd5 100644
--- a/app-office/libreoffice/libreoffice-6.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.5.2.ebuild
@@ -120,7 +120,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
+ =dev-libs/liborcus-0.14*
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -215,7 +215,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- >=dev-util/mdds-1.4.1:1=
+ =dev-util/mdds-1.4*:1=
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index d9fdd899143..0132cdd8dd5 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -120,7 +120,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
+ =dev-libs/liborcus-0.14*
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -215,7 +215,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- >=dev-util/mdds-1.4.1:1=
+ =dev-util/mdds-1.4*:1=
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-16 21:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-16 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 88a2c300080d3658839ec927a3c033868b2b633c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 18:37:10 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:25:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a2c300
app-office/libreoffice: 6.4.2.2 version bump
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-6.4.2.1.ebuild => libreoffice-6.4.2.2.ebuild} | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b22f83a402e..e46f7d0f1ee 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,8 +6,8 @@ DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
-DIST libreoffice-6.4.2.1.tar.xz 234792276 BLAKE2B 6634dfa7196ec42386f6d2cf01622eaa9c9bd33adf40702e79fd823e482e04b7b53c10f3b3d2de7d1fa2bfcfd5be1a46cab2da3545599e6f407ac4ca92f75277 SHA512 f63c7f12f8f2649dc2fdeec69ababda83d3bca7e5b86f89c282ee8d95ba33f17705a960a2d69118dd067ac320c6305f0720375cd00d1f4f2d9053c8178b63d36
+DIST libreoffice-6.4.2.2.tar.xz 234798492 BLAKE2B ed2992b1e80e5c638e4f6129988da5f3f94e74a74448ddf8b831efe1942782b62612aa7e0e2fe021696fcb4e30b2b6a2dd8dcc007f26494b8858aefd72b019fb SHA512 3439cd855bf77e07ce0efa866c878cb16d77b6532e1bfa67571e994908c9c8ecdcc8fee504d75878fb499fb84f000dd4d8261424c37a5814bc1c5792d40724d9
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
-DIST libreoffice-help-6.4.2.1.tar.xz 88381292 BLAKE2B 0853ca672967be7f2ffd08dfca71ea5044e89428cdfed1e3b7ca4983ee7022f5b14e07d316ea035cb044e64e9b169bea7397c9275656d61d13b7aa4402574142 SHA512 fab6a398951f4d96c8274473e9736bbc16da1dad11a0d4854c07a23249b9e4c976252b2e72d1c7d69b9ae18913e5f27225cd94ee1e4ee0d7036f14bf7f5999ff
+DIST libreoffice-help-6.4.2.2.tar.xz 88381732 BLAKE2B 062b2a2524642c2280a3a73a2d725ed3625254796c0dcc62a4417f7800df70f0e3a01bbd595581e040c47af58b8a048c3046d8ac85eada164b39e8e61a557c8d SHA512 503f75ac71ea1d358886d344ba722dc376a48c4a0f6b46d643640679541311215ed6f5840c7c471cce4f84e7f0aff4260f4a04c548013cc41cf2d029ee324501
diff --git a/app-office/libreoffice/libreoffice-6.4.2.1.ebuild b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-6.4.2.1.ebuild
rename to app-office/libreoffice/libreoffice-6.4.2.2.ebuild
index 94ea429f50a..ccf7d012c40 100644
--- a/app-office/libreoffice/libreoffice-6.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
@@ -10,7 +10,6 @@ MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
# experimental ; release ; old
# Usually the tarballs are moved a lot so this should make everyone happy.
-
DEV_URI="
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
@@ -27,7 +26,6 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
# Split modules following git/tarballs; Core MUST be first!
@@ -84,7 +82,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
@@ -404,7 +402,6 @@ src_configure() {
--disable-breakpad
--disable-bundle-mariadb
--disable-ccache
- --disable-dependency-tracking
--disable-epm
--disable-fetch-external
--disable-gtk3-kde5
@@ -432,7 +429,6 @@ src_configure() {
--with-system-gpgmepp
--without-system-sane
--without-system-qrcodegen
- --with-qrcodegen
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
$(use_enable cups)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-16 21:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-16 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 77167988039c5b2e2273d79f2eb81848938b8717
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Tue Mar 10 21:56:38 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:25:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77167988
app-office/libreoffice: Add 6.4 stable branch
Use the bundled QR code generator library from upstream.
Bug: https://bugs.gentoo.org/702350
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 545 +++++++++++++++++++++
1 file changed, 545 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
new file mode 100644
index 00000000000..ccf7d012c40
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -0,0 +1,545 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+ # QR code generating library for >=libreoffice-6.4
+ "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.15.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ >=dev-util/mdds-1.5.0:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.8
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-16 21:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-16 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 0eacd9e64f7048caf6e61fb3e5b498eafd200a58
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Mon Mar 2 22:24:54 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:25:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eacd9e6
app-office/libreoffice: Bump to 6.4.2.1
This release uses the bundled qrcode library. The code seems to be the same
as the separate one and the upstream's build system is in a bad shape.
Bug: https://bugs.gentoo.org/691740
Bug: https://bugs.gentoo.org/702350
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 +
app-office/libreoffice/libreoffice-6.4.2.1.ebuild | 549 ++++++++++++++++++++++
2 files changed, 552 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fd43a8ec3e5..b22f83a402e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,9 +2,12 @@ DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
+DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124 SHA512 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
+DIST libreoffice-6.4.2.1.tar.xz 234792276 BLAKE2B 6634dfa7196ec42386f6d2cf01622eaa9c9bd33adf40702e79fd823e482e04b7b53c10f3b3d2de7d1fa2bfcfd5be1a46cab2da3545599e6f407ac4ca92f75277 SHA512 f63c7f12f8f2649dc2fdeec69ababda83d3bca7e5b86f89c282ee8d95ba33f17705a960a2d69118dd067ac320c6305f0720375cd00d1f4f2d9053c8178b63d36
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
+DIST libreoffice-help-6.4.2.1.tar.xz 88381292 BLAKE2B 0853ca672967be7f2ffd08dfca71ea5044e89428cdfed1e3b7ca4983ee7022f5b14e07d316ea035cb044e64e9b169bea7397c9275656d61d13b7aa4402574142 SHA512 fab6a398951f4d96c8274473e9736bbc16da1dad11a0d4854c07a23249b9e4c976252b2e72d1c7d69b9ae18913e5f27225cd94ee1e4ee0d7036f14bf7f5999ff
diff --git a/app-office/libreoffice/libreoffice-6.4.2.1.ebuild b/app-office/libreoffice/libreoffice-6.4.2.1.ebuild
new file mode 100644
index 00000000000..94ea429f50a
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.2.1.ebuild
@@ -0,0 +1,549 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+ # QR code generating library for >=libreoffice-6.4
+ "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.15.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ >=dev-util/mdds-1.5.0:1=
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.8
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-dependency-tracking
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ --without-system-qrcodegen
+ --with-qrcodegen
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-16 21:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-16 21:29 UTC (permalink / raw
To: gentoo-commits
commit: ecb7dc36fd64bd561852d2392622236600f33628
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Mon Mar 2 22:24:57 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 21:25:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb7dc36
app-office/libreoffice: Update live ebuild
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b3fa65e1997..ccf7d012c40 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -53,6 +53,8 @@ ADDONS_SRC=(
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+ # QR code generating library for >=libreoffice-6.4
+ "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
)
SRC_URI+=" ${ADDONS_SRC[*]}"
@@ -78,6 +80,7 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
+
[[ ${MY_PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -120,7 +123,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.14.0
+ >=dev-libs/liborcus-0.15.0
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -153,9 +156,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/libXrandr
x11-libs/libXrender
accessibility? (
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_MULTI_USEDEP}]
- ')
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
)
bluetooth? (
dev-libs/glib:2
@@ -210,7 +211,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- >=dev-util/mdds-1.4.1:1=
+ >=dev-util/mdds-1.5.0:1=
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
@@ -272,12 +273,6 @@ pkg_pretend() {
use java || ewarn "Without java, several wizards are not going to be available."
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -389,6 +384,7 @@ src_configure() {
# --without-system-sane: just sane.h header that is used for scan in writer,
# not linked or anything else, worthless to depend on
# --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
local myeconfargs=(
--with-system-dicts
--with-system-epoxy
@@ -408,8 +404,6 @@ src_configure() {
--disable-ccache
--disable-epm
--disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk
--disable-gtk3-kde5
--disable-online-update
--disable-openssl
@@ -434,6 +428,7 @@ src_configure() {
--without-helppack-integration
--with-system-gpgmepp
--without-system-sane
+ --without-system-qrcodegen
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
$(use_enable cups)
@@ -516,7 +511,7 @@ src_test() {
src_install() {
# This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
# bug 593514
if use gtk; then
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-19 20:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-19 20:53 UTC (permalink / raw
To: gentoo-commits
commit: 72457259528f27a9b2b05460f25eb17a5832c3b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 18:21:33 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 20:52:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72457259
app-office/libreoffice: Add skia tarball
Closes: https://bugs.gentoo.org/710852
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 2 ++
2 files changed, 3 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e46f7d0f1ee..929e625d93d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -11,3 +11,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
DIST libreoffice-help-6.4.2.2.tar.xz 88381732 BLAKE2B 062b2a2524642c2280a3a73a2d725ed3625254796c0dcc62a4417f7800df70f0e3a01bbd595581e040c47af58b8a048c3046d8ac85eada164b39e8e61a557c8d SHA512 503f75ac71ea1d358886d344ba722dc376a48c4a0f6b46d643640679541311215ed6f5840c7c471cce4f84e7f0aff4260f4a04c548013cc41cf2d029ee324501
+DIST skia-m82-7bb74c4299b8a85de1e5718fc45da569d6dab3fc.tar.xz 8163900 BLAKE2B 4977bbc0a6f06d9e0fc4edff30602ec8b59333328ffc3e852a0ee3e32b31ad88fe0548ba98f1910fc6d21acb781157389df8eec059a483343037d38a8a171304 SHA512 19bb701633f95e2b4327bf27740ddcca3a39cef7af91b78a893dd1d50016978efe9d470b41980326b3df590c267f7695ffdb181295fcaba2a89acc6768f308f2
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a6f3687b3c4..419a43daca7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m82-7bb74c4299b8a85de1e5718fc45da569d6dab3fc.tar.xz"
# QR code generating library for >=libreoffice-6.4
"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-19 20:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-19 20:53 UTC (permalink / raw
To: gentoo-commits
commit: f6fd70b8256797e3240e0c2c7b6ad8110d86f3b2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 18:09:55 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 20:52:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6fd70b8
app-office/libreoffice: unconditional tarballs before optional ones
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.2.2.ebuild | 4 ++--
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
index cf14e8474c8..ba874835180 100644
--- a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -53,8 +55,6 @@ ADDONS_SRC=(
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
- # QR code generating library for >=libreoffice-6.4
- "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
)
SRC_URI+=" ${ADDONS_SRC[*]}"
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index ccf7d012c40..a6f3687b3c4 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -53,8 +55,6 @@ ADDONS_SRC=(
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
- # QR code generating library for >=libreoffice-6.4
- "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
)
SRC_URI+=" ${ADDONS_SRC[*]}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ccf7d012c40..a6f3687b3c4 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -53,8 +55,6 @@ ADDONS_SRC=(
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
- # QR code generating library for >=libreoffice-6.4
- "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
)
SRC_URI+=" ${ADDONS_SRC[*]}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-03-19 20:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-03-19 20:53 UTC (permalink / raw
To: gentoo-commits
commit: fb7e9c80af547bba15fc7893c8536ed1ce03bab6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 19:08:38 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 20:52:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7e9c80
app-office/libreoffice: Add dtoa tarball
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 2 ++
2 files changed, 3 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 929e625d93d..6a4868037ba 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,6 +4,7 @@ DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124 SHA512 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
+DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
DIST libreoffice-6.4.2.2.tar.xz 234798492 BLAKE2B ed2992b1e80e5c638e4f6129988da5f3f94e74a74448ddf8b831efe1942782b62612aa7e0e2fe021696fcb4e30b2b6a2dd8dcc007f26494b8858aefd72b019fb SHA512 3439cd855bf77e07ce0efa866c878cb16d77b6532e1bfa67571e994908c9c8ecdcc8fee504d75878fb499fb84f000dd4d8261424c37a5814bc1c5792d40724d9
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 419a43daca7..a3f52cbd627 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
"${ADDONS_URI}/skia-m82-7bb74c4299b8a85de1e5718fc45da569d6dab3fc.tar.xz"
# QR code generating library for >=libreoffice-6.4
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-04-09 21:37 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-04-09 21:37 UTC (permalink / raw
To: gentoo-commits
commit: f1d6aa7fbf08d602508fc94294d8a9308cb8f927
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 19:09:01 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 21:36:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d6aa7f
app-office/libreoffice: Update skia tarball
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6a4868037ba..424ed07c68f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -12,4 +12,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
DIST libreoffice-help-6.4.2.2.tar.xz 88381732 BLAKE2B 062b2a2524642c2280a3a73a2d725ed3625254796c0dcc62a4417f7800df70f0e3a01bbd595581e040c47af58b8a048c3046d8ac85eada164b39e8e61a557c8d SHA512 503f75ac71ea1d358886d344ba722dc376a48c4a0f6b46d643640679541311215ed6f5840c7c471cce4f84e7f0aff4260f4a04c548013cc41cf2d029ee324501
-DIST skia-m82-7bb74c4299b8a85de1e5718fc45da569d6dab3fc.tar.xz 8163900 BLAKE2B 4977bbc0a6f06d9e0fc4edff30602ec8b59333328ffc3e852a0ee3e32b31ad88fe0548ba98f1910fc6d21acb781157389df8eec059a483343037d38a8a171304 SHA512 19bb701633f95e2b4327bf27740ddcca3a39cef7af91b78a893dd1d50016978efe9d470b41980326b3df590c267f7695ffdb181295fcaba2a89acc6768f308f2
+DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a3f52cbd627..d9fcc7a00f9 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -47,7 +47,7 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m82-7bb74c4299b8a85de1e5718fc45da569d6dab3fc.tar.xz"
+ "${ADDONS_URI}/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz"
# QR code generating library for >=libreoffice-6.4
"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-04-10 13:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-04-10 13:48 UTC (permalink / raw
To: gentoo-commits
commit: 42d59cbe34ff9ae1a284cd9527d31c9e494553e0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 13:29:11 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 13:48:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d59cbe
app-office/libreoffice: Pin dev-util/mdds to (API-)slot
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index 0132cdd8dd5..c66886c27b0 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -215,7 +215,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- =dev-util/mdds-1.4*:1=
+ dev-util/mdds:1/1.4
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index a6f3687b3c4..185fcbf5dd5 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -211,7 +211,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- >=dev-util/mdds-1.5.0:1=
+ dev-util/mdds:1/1.5
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d9fcc7a00f9..c124c40612f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -215,7 +215,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- >=dev-util/mdds-1.5.0:1=
+ dev-util/mdds:1/1.5
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-04-16 18:52 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-04-16 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 6c16834554e59839c25b4af4167d52bc69b3c3c2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 18:51:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 18:51:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c168345
app-office/libreoffice: Drop 6.4.2.2
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.4.2.2.ebuild | 548 ----------------------
2 files changed, 550 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5333f52a64c..b621ea22158 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,11 +7,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
-DIST libreoffice-6.4.2.2.tar.xz 234798492 BLAKE2B ed2992b1e80e5c638e4f6129988da5f3f94e74a74448ddf8b831efe1942782b62612aa7e0e2fe021696fcb4e30b2b6a2dd8dcc007f26494b8858aefd72b019fb SHA512 3439cd855bf77e07ce0efa866c878cb16d77b6532e1bfa67571e994908c9c8ecdcc8fee504d75878fb499fb84f000dd4d8261424c37a5814bc1c5792d40724d9
DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
-DIST libreoffice-help-6.4.2.2.tar.xz 88381732 BLAKE2B 062b2a2524642c2280a3a73a2d725ed3625254796c0dcc62a4417f7800df70f0e3a01bbd595581e040c47af58b8a048c3046d8ac85eada164b39e8e61a557c8d SHA512 503f75ac71ea1d358886d344ba722dc376a48c4a0f6b46d643640679541311215ed6f5840c7c471cce4f84e7f0aff4260f4a04c548013cc41cf2d029ee324501
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
deleted file mode 100644
index b3b6af835f9..00000000000
--- a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # QR code generating library for >=libreoffice-6.4
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- >=dev-util/mdds-1.5.0:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.8
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # TODO: upstream (for now taken from Arch Linux)
- "${FILESDIR}/${P}-poppler-0.86.patch" # bug 711102
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-04-16 18:52 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-04-16 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 099fea0064d50b1c49e9265b133807e45e86ac89
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 18:47:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 18:51:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099fea00
app-office/libreoffice: 6.4.3.2 version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.4.3.2.ebuild | 548 ++++++++++++++++++++++
2 files changed, 550 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 424ed07c68f..5333f52a64c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,8 +8,10 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
DIST libreoffice-6.4.2.2.tar.xz 234798492 BLAKE2B ed2992b1e80e5c638e4f6129988da5f3f94e74a74448ddf8b831efe1942782b62612aa7e0e2fe021696fcb4e30b2b6a2dd8dcc007f26494b8858aefd72b019fb SHA512 3439cd855bf77e07ce0efa866c878cb16d77b6532e1bfa67571e994908c9c8ecdcc8fee504d75878fb499fb84f000dd4d8261424c37a5814bc1c5792d40724d9
+DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
DIST libreoffice-help-6.4.2.2.tar.xz 88381732 BLAKE2B 062b2a2524642c2280a3a73a2d725ed3625254796c0dcc62a4417f7800df70f0e3a01bbd595581e040c47af58b8a048c3046d8ac85eada164b39e8e61a557c8d SHA512 503f75ac71ea1d358886d344ba722dc376a48c4a0f6b46d643640679541311215ed6f5840c7c471cce4f84e7f0aff4260f4a04c548013cc41cf2d029ee324501
+DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
new file mode 100644
index 00000000000..8fd1426360f
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.15.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.8
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # TODO: upstream (for now taken from Arch Linux)
+ "${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-04-16 18:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-04-16 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 81dc76524e1a197d9ecedfa5513ecc14321288a2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 16 18:58:31 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 16 18:58:31 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dc7652
app-office/libreoffice: Raise minimum dev-libs/boost to >=1.72.0
Reported-by: Thomas Ilnseher <illth <AT> gmx.de>
Closes: https://bugs.gentoo.org/714846
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
index 8fd1426360f..604dc556242 100644
--- a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
@@ -117,7 +117,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
dev-lang/perl
- dev-libs/boost:=[nls]
+ >=dev-libs/boost-1.72.0:=[nls]
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index 185fcbf5dd5..96cb0161263 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -117,7 +117,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
dev-lang/perl
- dev-libs/boost:=[nls]
+ >=dev-libs/boost-1.72.0:=[nls]
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c124c40612f..536c445e030 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -121,7 +121,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
dev-lang/perl
- dev-libs/boost:=[nls]
+ >=dev-libs/boost-1.72.0:=[nls]
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-05-19 19:36 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2020-05-19 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 351121e94d13c5d0abedd87750f6dd2e79b98817
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 19:35:19 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May 19 19:35:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351121e9
app-office/libreoffice: amd64 stable wrt bug #716822
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
index b379ae94244..13bdfc7c519 100644
--- a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
@@ -82,7 +82,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-05-22 14:09 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-05-22 14:09 UTC (permalink / raw
To: gentoo-commits
commit: cd6e654846fa3a26a95497419343a485c3879c33
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 12:36:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 22 14:09:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6e6548
app-office/libreoffice: Set IUSE="+dbus", gtk requires sys-apps/dbus[X]
Try to fix 'minimalist WM' corner case.
Closes: https://bugs.gentoo.org/716712
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 5 +++--
app-office/libreoffice/libreoffice-9999.ebuild | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index 96cb0161263..e42e510981a 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -64,12 +64,13 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
+ gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -164,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
+ dbus? ( sys-apps/dbus[X] )
eds? (
dev-libs/glib:2
gnome-base/dconf
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 536c445e030..3e5059a2035 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -68,12 +68,13 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
+ gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -168,7 +169,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
+ dbus? ( sys-apps/dbus[X] )
eds? (
dev-libs/glib:2
gnome-base/dconf
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-05-22 14:09 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-05-22 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 55740711314c298ce5ca23bcf8f57719f9348b32
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 12:43:33 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 22 14:09:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55740711
app-office/libreoffice: Drop 6.3.5.2 and 6.3 stable branch
No more 6.3 releases.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.3.5.2.ebuild | 558 ---------------------
app-office/libreoffice/libreoffice-6.3.9999.ebuild | 558 ---------------------
3 files changed, 1118 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 90d9da37bac..8a38d5aa745 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,12 +6,10 @@ DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
-DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
-DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.3.5.2.ebuild b/app-office/libreoffice/libreoffice-6.3.5.2.ebuild
deleted file mode 100644
index 0132cdd8dd5..00000000000
--- a/app-office/libreoffice/libreoffice-6.3.5.2.ebuild
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.14*
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_MULTI_USEDEP}]
- ')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- =dev-util/mdds-1.4*:1=
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # master branch
- "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
deleted file mode 100644
index c66886c27b0..00000000000
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- =dev-libs/liborcus-0.14*
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep '
- dev-python/lxml[${PYTHON_MULTI_USEDEP}]
- ')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- gtk2? (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.24:2
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.4
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.6
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.6 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # master branch
- "${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
- ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
- ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
- ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gstreamer-0-10
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable gtk2 gtk)
- $(use_enable kde kde5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-05-22 14:09 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-05-22 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 6c166f3fa7d6cd3fa527e78a51c720d1544afcfb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 12:40:27 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 22 14:09:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c166f3f
app-office/libreoffice: 6.4.4.2 version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.4.4.2.ebuild | 552 ++++++++++++++++++++++
2 files changed, 554 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b621ea22158..90d9da37bac 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,8 +8,10 @@ DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48d
DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
DIST libreoffice-6.3.5.2.tar.xz 226222804 BLAKE2B f4b996f8eedf58f7e2ec1d1d796aecf1cc35f394cc5800b1e15db60534096a91e329f9744c8582dae85a12fb6c849be8cceff8998b45074ecc9535f7afce542c SHA512 041ee00e347f6ef229a97b56d9ceee6c0fa80a56436cc2dce909878d08d617d316731a7a21cdc4b6d5ef800f3d00d3ee67c69f770912028261f1552e79899a1a
DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
+DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
DIST libreoffice-help-6.3.5.2.tar.xz 13192732 BLAKE2B 79e869d8d2bb91243e9fe2ba279bfcd4f3b759904fdd2efbeb1add773cb732621a41841c4064ad63ad9713a53e626c50bfcc1b3d9137ddb4fe73fca39f710bb9 SHA512 aec83b210cc596131aa5bcb37012a98cc42c365274c4f80e8e87595f4f50d8f36588256616738ba3c2c9a8a61d03ed5e6c33a4b588561c5084cd008c5dbe787a
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
+DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.4.2.ebuild b/app-office/libreoffice/libreoffice-6.4.4.2.ebuild
new file mode 100644
index 00000000000..d2afc055304
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.4.2.ebuild
@@ -0,0 +1,552 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.15.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.8
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # git master
+ "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+
+ # TODO: upstream (for now taken from Arch Linux)
+ "${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if ! use java && ! use firebird; then
+ ewarn "If you plan to use Base application you must enable either firebird or java."
+ fi
+
+ use java || ewarn "Without java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-report-builder
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-05-31 15:40 Mikle Kolyada
0 siblings, 0 replies; 588+ messages in thread
From: Mikle Kolyada @ 2020-05-31 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 49f67ef4b5bc5ae8e167ba85d8fd0197413ab7f4
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 15:39:22 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May 31 15:39:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f67ef4
app-office/libreoffice: x86 stable wrt bug #716822
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
index 13bdfc7c519..f32c7fe233c 100644
--- a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
@@ -82,7 +82,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-06-17 16:05 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-06-17 16:05 UTC (permalink / raw
To: gentoo-commits
commit: b48ea5c117149d8442f943e805b14a5436f73e3f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 09:36:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 16:05:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48ea5c1
app-office/libreoffice: Add IUSE="base"
Bug: https://bugs.gentoo.org/692842
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 12 +++++++++
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 30 +++++++++++++++++-----
app-office/libreoffice/libreoffice-9999.ebuild | 30 +++++++++++++++++-----
app-office/libreoffice/metadata.xml | 1 +
4 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 973d29b2b71..eca8e76affa 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,10 +1,22 @@
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
+DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
+DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 BLAKE2B e02fced286aab6f6597b04bba37186e6f7d0793ef807c4530e15da5464e9302880278472fdc79dc27a9be15600127bebe30651a6027ef1b0a7cfc40ce56a395a SHA512 a7c3044a0a7c67881f78eddc4b3faf05e29b20755a59cdbb9a0a49bd21be5aaa95d4ea5eaabdd6f005a421981fb7c55fee590d4c9592fe363ba27ae590652bd4
+DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 BLAKE2B b9f3ef8baa6fe11b2aef25ee6ebe36d7f4c0e688022f27c6a0186a94d909c4c2166ffe5d70644207f56971888e2478e57cd1e76a252abf3825987350c4c7de45 SHA512 8eaa9eed3bff16a16483d0754756c181089eb705ea34ded7f9f6db90a591cbce3f0551f28d097bd2f44de813cb818720c430e79e516939e0398b72bf4614f4cd
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
+DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077 SHA512 12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f
+DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748 SHA512 17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6
DIST QR-Code-generator-1.4.0.tar.gz 146339 BLAKE2B b2cb329877426861e0245747ac1e8f1275ca7428b3c6768af60dec5c9bb46e93a3fee81fc77257e151604b5f6748c9f29582e9fccc2a4088747c95fe5f673124 SHA512 314a757bfdf9a38bcf07fd7a0103d28a2d1dd7311b8234761304efeef7bfdb740db78ab01e6b67e99a28d523cc2be9c1073b2de9d65e853d191c3dad19af56d0
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
+DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85 SHA512 58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e
+DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708 SHA512 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec
+DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
+DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c
+DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
+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 libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index e42e510981a..727d2c010c5 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -46,6 +46,20 @@ unset DEV_URI
ADDONS_SRC=(
# QR code generating library for >=libreoffice-6.4
"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -64,11 +78,12 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
bluetooth? ( dbus )
gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
@@ -268,11 +283,10 @@ _check_reqs() {
}
pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -409,7 +423,6 @@ src_configure() {
--disable-online-update
--disable-openssl
--disable-pdfium
- --disable-report-builder
--disable-vlc
--with-build-version="${gentoo_buildid}"
--enable-extension-integration
@@ -428,8 +441,11 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
--without-system-sane
--without-system-qrcodegen
+ $(use_enable base report-builder)
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
$(use_enable cups)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3e5059a2035..3e8136e6a80 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -50,6 +50,20 @@ ADDONS_SRC=(
"${ADDONS_URI}/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz"
# QR code generating library for >=libreoffice-6.4
"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
@@ -68,11 +82,12 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
bluetooth? ( dbus )
gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
@@ -272,11 +287,10 @@ _check_reqs() {
}
pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -413,7 +427,6 @@ src_configure() {
--disable-online-update
--disable-openssl
--disable-pdfium
- --disable-report-builder
--disable-vlc
--with-build-version="${gentoo_buildid}"
--enable-extension-integration
@@ -432,8 +445,11 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
--without-system-sane
--without-system-qrcodegen
+ $(use_enable base report-builder)
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
$(use_enable cups)
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index e13325955e7..3afed225b93 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -11,6 +11,7 @@ compilation can take up to a day depending on the speed of your
computer. It will however make a snappier LibreOffice than the binary
version</longdescription>
<use>
+ <flag name="base">Enable full support for LibreOffice Base databases (involves additional bundled libs)</flag>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="googledrive">Enable support for remote files on Google Drive</flag>
<flag name="mariadb">Prefer mariadb connector over mysql connector</flag>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-06-29 6:32 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-06-29 6:32 UTC (permalink / raw
To: gentoo-commits
commit: b8e70c301bfb772379c7b70fef5dbed4e05bd445
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 05:44:14 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 06:32:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e70c30
app-office/libreoffice: 6.4.5.2 version bump
Not released yet => no KEYWORDS.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.4.5.2.ebuild | 566 ++++++++++++++++++++++
2 files changed, 568 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index eca8e76affa..3bc5c706672 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
+DIST libreoffice-6.4.5.2.tar.xz 236255044 BLAKE2B a83ad0c50d1b7e686188c35c5f319b73e7984ad214e125102824789d1f56083a4ed8795cf7d8942fc0b3ddf3cad13f326225812458007a97a166bc5543c47eda SHA512 f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
+DIST libreoffice-help-6.4.5.2.tar.xz 88376816 BLAKE2B 8c5f8a3379dd77f41e3350314fa250ede503d998afda3cb2c8c95a4dd3b565bd6d0004b4dd7ff7b079fdb4de766fa105a8dbbd49b5ced5587e5a716aba31ba26 SHA512 fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.5.2.ebuild b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
new file mode 100644
index 00000000000..8d83fe8214b
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
@@ -0,0 +1,566 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.15.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.8
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # git master
+ "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-07-02 11:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-07-02 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 449ef8bd83323735dd5b6009681affd8379e850d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 11:48:36 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 11:49:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449ef8bd
app-office/libreoffice: Restore 6.4.5.2 KEYWORDS after release
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.5.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.5.2.ebuild b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
index 8d83fe8214b..a60413e5da4 100644
--- a/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
@@ -98,8 +98,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-07-02 21:44 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-07-02 21:44 UTC (permalink / raw
To: gentoo-commits
commit: ef4af6f4e4d161e411fadb4253a2559ead925a7a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 2 21:42:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 21:43:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4af6f4
app-office/libreoffice: Drop 6.4.4.2
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.4.4.2.ebuild | 552 ----------------------
2 files changed, 554 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3bc5c706672..5081b2e379e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,8 @@ 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 libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
-DIST libreoffice-6.4.4.2.tar.xz 231325236 BLAKE2B 25e1c765cb0ff9c195ca46a9fe857eef22ab6319da6b069e2c5c093a8f13eac2e1c5efa31fbacd4e3acbdc07e75745ff5c62c180cb61141319422720405a4638 SHA512 8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3
DIST libreoffice-6.4.5.2.tar.xz 236255044 BLAKE2B a83ad0c50d1b7e686188c35c5f319b73e7984ad214e125102824789d1f56083a4ed8795cf7d8942fc0b3ddf3cad13f326225812458007a97a166bc5543c47eda SHA512 f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
-DIST libreoffice-help-6.4.4.2.tar.xz 88296340 BLAKE2B 73ef558b830e0e2899eb72727e0eb81327807ff2d474c8d956700a09bcadc73cbff26688063f91d3a496afa55ab9a7d4847d84334b89fe4fafe17fb445fbb33d SHA512 7084428e63a458c4e35c135b16dd980fa98695be0ba974cac656a7ef6cb15b059a082891c3f74b72a62f92549afefe46c14ab30b5491fd9e3fea6d5923720b3d
DIST libreoffice-help-6.4.5.2.tar.xz 88376816 BLAKE2B 8c5f8a3379dd77f41e3350314fa250ede503d998afda3cb2c8c95a4dd3b565bd6d0004b4dd7ff7b079fdb4de766fa105a8dbbd49b5ced5587e5a716aba31ba26 SHA512 fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.4.2.ebuild b/app-office/libreoffice/libreoffice-6.4.4.2.ebuild
deleted file mode 100644
index d2afc055304..00000000000
--- a/app-office/libreoffice/libreoffice-6.4.4.2.ebuild
+++ /dev/null
@@ -1,552 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # QR code generating library for >=libreoffice-6.4
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.8
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # git master
- "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
-
- # TODO: upstream (for now taken from Arch Linux)
- "${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-08-07 23:24 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-08-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 86d014452439ad4f3144c527349447604db8ce59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 7 12:07:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 23:23:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d01445
app-office/libreoffice: python3_9
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index e10dd60165c..1a1a96143b5 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index de3b7091392..3cd82d82602 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-08-07 23:24 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-08-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: e7ad0035b7c1cb75c50435318ab9bc30e1a54f9e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 7 12:30:46 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 23:23:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ad0035
app-office/libreoffice: Fix build with boost-1.73 in 6.4 stable branch
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index 1a1a96143b5..ecae7dbf2c7 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -268,6 +268,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # git master
+ "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-08-07 23:24 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-08-07 23:24 UTC (permalink / raw
To: gentoo-commits
commit: b3a91cdc32115505e0be210111982d71dc358d99
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 16:25:35 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 7 23:23:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3a91cdc
app-office/libreoffice: Install LibreOfficeKit headers
Closes: https://bugs.gentoo.org/703474
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 4 ++++
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index 727d2c010c5..e10dd60165c 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -547,6 +547,10 @@ src_install() {
dodir /etc/env.d
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
}
pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3e8136e6a80..de3b7091392 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -551,6 +551,10 @@ src_install() {
dodir /etc/env.d
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-08-18 23:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-08-18 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 7e9dc414f75767acbd0e297979c6cfec53f6ddef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 23:04:50 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 23:07:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9dc414
app-office/libreoffice: Link python bridge in site-packages, drop patch
Essentially syncing with openSUSE changes.
- Obsolete patching of officehelper.py, uno.py not to break tests, use heredoc
- Fix finding pyuno by reshuffling imports
- Obsolete patching of soffice.sh by symlinking py files to site-packages
- Symlink byte-compiled files too
Reported-by: gerion <gerion.entrup <AT> flump.de>
Bug: https://bugs.gentoo.org/667802
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.6.2.ebuild | 34 ++++++++++++++++++-----
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
index 6f4a72b4e47..291eb07b6f0 100644
--- a/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
@@ -265,7 +265,6 @@ PATCHES=(
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
@@ -333,12 +332,6 @@ src_prepare() {
# hack in the autogen.sh
touch autogen.lastrun
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
# sed in the tests
sed -i \
-e "s#all : build unitcheck#all : build#g" \
@@ -555,6 +548,33 @@ src_install() {
# bug 703474
insinto /usr/include
doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/libreoffice/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-08-18 23:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-08-18 23:08 UTC (permalink / raw
To: gentoo-commits
commit: e8d05a2ff0ec40a915bd1cc4630aa9b65d76f540
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 23:01:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 23:07:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d05a2f
app-office/libreoffice: 6.4.6.2 version bump
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-6.4.6.2.ebuild | 570 ++++++++++++++++++++++
2 files changed, 572 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5081b2e379e..0cb8d623534 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
DIST libreoffice-6.4.5.2.tar.xz 236255044 BLAKE2B a83ad0c50d1b7e686188c35c5f319b73e7984ad214e125102824789d1f56083a4ed8795cf7d8942fc0b3ddf3cad13f326225812458007a97a166bc5543c47eda SHA512 f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
+DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
DIST libreoffice-help-6.4.5.2.tar.xz 88376816 BLAKE2B 8c5f8a3379dd77f41e3350314fa250ede503d998afda3cb2c8c95a4dd3b565bd6d0004b4dd7ff7b079fdb4de766fa105a8dbbd49b5ced5587e5a716aba31ba26 SHA512 fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
+DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
new file mode 100644
index 00000000000..6f4a72b4e47
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
@@ -0,0 +1,570 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.15.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.8
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # git master
+ "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+ "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed -i \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ pyuno/source/module/uno.py \
+ pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-09-08 18:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-09-08 18:08 UTC (permalink / raw
To: gentoo-commits
commit: e36618f3bb63fb0e4a12664a8f8c1cef864a0073
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 8 17:48:07 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 8 18:07:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36618f3
app-office/libreoffice: Drop 6.4.5.2, 6.4.6.2 (r0)
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.4.5.2.ebuild | 565 ---------------------
app-office/libreoffice/libreoffice-6.4.6.2.ebuild | 590 ----------------------
3 files changed, 1157 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 0cb8d623534..9743067cdd6 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,8 @@ 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 libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
-DIST libreoffice-6.4.5.2.tar.xz 236255044 BLAKE2B a83ad0c50d1b7e686188c35c5f319b73e7984ad214e125102824789d1f56083a4ed8795cf7d8942fc0b3ddf3cad13f326225812458007a97a166bc5543c47eda SHA512 f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752
DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
-DIST libreoffice-help-6.4.5.2.tar.xz 88376816 BLAKE2B 8c5f8a3379dd77f41e3350314fa250ede503d998afda3cb2c8c95a4dd3b565bd6d0004b4dd7ff7b079fdb4de766fa105a8dbbd49b5ced5587e5a716aba31ba26 SHA512 fffa5338baa5ebd7bdf607f83b31440c66c19c42136b41505074fe1a7a4bb1630e080e4fc2dd114f8ab0654507f4a84d4190bb134a4756d895ec350cccc10e11
DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.5.2.ebuild b/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
deleted file mode 100644
index a60413e5da4..00000000000
--- a/app-office/libreoffice/libreoffice-6.4.5.2.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # QR code generating library for >=libreoffice-6.4
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.8
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # git master
- "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
deleted file mode 100644
index 291eb07b6f0..00000000000
--- a/app-office/libreoffice/libreoffice-6.4.6.2.ebuild
+++ /dev/null
@@ -1,590 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # QR code generating library for >=libreoffice-6.4
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.8
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # git master
- "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
- "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/libreoffice/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-09-26 10:54 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-09-26 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 9592c658d2ddfc42c735d03db03f6a746478aa58
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 10:53:32 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 10:53:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9592c658
app-office/libreoffice: 6.4.6.2-r2 revbump fixing uno.py installation
Closes: https://bugs.gentoo.org/741478
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../libreoffice/libreoffice-6.4.6.2-r2.ebuild | 593 +++++++++++++++++++++
1 file changed, 593 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
new file mode 100644
index 00000000000..598c67302cc
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
@@ -0,0 +1,593 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.15.0
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-1.8
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # 6.4 branch (in 6.4.7)
+ "${FILESDIR}/${P}-qaccessiblecache-assert.patch" # bug 680186
+
+ # git master
+ "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
+ "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use kde; then
+ export QT_SELECT=5 # bug 639620 needs proper fix though
+ export QT5DIR="$(qt5_get_bindir)/../"
+ export MOC5="$(qt5_get_bindir)/moc"
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrencode: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-build-version="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-09-27 17:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-09-27 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 104963becf9028d75d186092b541761a07672bc2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 26 21:14:55 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 17:34:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104963be
app-office/libreoffice: Drop 6.4.6.2-r1
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libreoffice/libreoffice-6.4.6.2-r1.ebuild | 593 ---------------------
1 file changed, 593 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2-r1.ebuild
deleted file mode 100644
index 7f884a56cef..00000000000
--- a/app-office/libreoffice/libreoffice-6.4.6.2-r1.ebuild
+++ /dev/null
@@ -1,593 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # QR code generating library for >=libreoffice-6.4
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.8
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # 6.4 branch (in 6.4.7)
- "${FILESDIR}/${P}-qaccessiblecache-assert.patch" # bug 680186
-
- # git master
- "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
- "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/libreoffice/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-09-27 17:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-09-27 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 5b335dc89970d19a8539a7d5eaa5dcdc1a51b7cb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 6 21:39:59 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 27 17:34:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b335dc8
app-office/libreoffice: Link python bridge in site-packages, drop patch
Essentially syncing with openSUSE changes.
- Obsolete patching of officehelper.py, uno.py not to break tests, use heredoc
- Obsolete patching of soffice.sh by symlinking py files to site-packages
- Fix finding pyuno by reshuffling imports
- Fix URE_BOOTSTRAP path (bug in v1 of this patch), thanks to dilfridge
Reported-by: Jan Psota <jasiupsota <AT> gmail.com>
Closes: https://bugs.gentoo.org/667802
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 34 +++++++++++++++++-----
app-office/libreoffice/libreoffice-9999.ebuild | 34 +++++++++++++++++-----
2 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
index 6f4a72b4e47..52876b5d2f1 100644
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
@@ -265,7 +265,6 @@ PATCHES=(
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
@@ -333,12 +332,6 @@ src_prepare() {
# hack in the autogen.sh
touch autogen.lastrun
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
# sed in the tests
sed -i \
-e "s#all : build unitcheck#all : build#g" \
@@ -555,6 +548,33 @@ src_install() {
# bug 703474
insinto /usr/include
doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
}
pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3cd82d82602..a4e55bc7595 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -269,7 +269,6 @@ PATCHES=(
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
)
@@ -333,12 +332,6 @@ src_prepare() {
# hack in the autogen.sh
touch autogen.lastrun
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
# sed in the tests
sed -i \
-e "s#all : build unitcheck#all : build#g" \
@@ -555,6 +548,33 @@ src_install() {
# bug 703474
insinto /usr/include
doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-04 0:34 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2020-10-04 0:34 UTC (permalink / raw
To: gentoo-commits
commit: c4fcf4c37bfd34095ba5ba0ad51fd578cc2eda70
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 00:31:16 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 00:31:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4fcf4c3
app-office/libreoffice: Stabilize 6.4.6.2-r2 amd64, #728964
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
index 598c67302cc..68924ee9aed 100644
--- a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
@@ -98,7 +98,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-18 15:11 Thomas Deutschmann
0 siblings, 0 replies; 588+ messages in thread
From: Thomas Deutschmann @ 2020-10-18 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 39b6ace1a90085630a116fcf9723b17e9743c407
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 15:09:44 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 15:11:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b6ace1
app-office/libreoffice: x86 stable (bug #728964)
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
index 68924ee9aed..a7c3258853e 100644
--- a/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.6.2-r2.ebuild
@@ -98,7 +98,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-18 15:47 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-18 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 29dba40a563b54381db7114c75187ebcae326272
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 15:33:04 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 15:44:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dba40a
app-office/libreoffice: Cleanup vulnerable 6.4.3.2
Bug: https://bugs.gentoo.org/728964
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-6.4.3.2.ebuild | 551 ----------------------
2 files changed, 553 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9743067cdd6..75423a5c62c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,9 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
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 libreoffice-6.4.3.2.tar.xz 230409812 BLAKE2B f9cdad1540c45525bd70596dc3033e3466fcdf3d96547222b936141e49ff6d45581ca59d0e42c4bb79fcb63586d748ccafae712369e024105235e2a9b69be7ce SHA512 ee11c704fa7184ffe371aa36c835c4c7fb06ef03d08fa0a5a9e647e80610db275e091d1ac79c1fe11af0c7f14dd72c821da9e7e6ba59573fc88cec79f84c873a
DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-6.4.3.2.tar.xz 88297704 BLAKE2B bbd1af159c8b8db1909335f37095812ec3ce81d73644a30a85f3e37daeabeb9a158451b8e586f24d4b7544c8cd0948eeb20ede464384c3277d196f33322e63fb SHA512 9f8c1bcde27d153389d124af1393d0939262c85a1624f0b475a5515b5737612cb607d04742a069534771eee51ba98896926804ec7001d6bc2110dccdd6e7615a
DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
diff --git a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild b/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
deleted file mode 100644
index f32c7fe233c..00000000000
--- a/app-office/libreoffice/libreoffice-6.4.3.2.ebuild
+++ /dev/null
@@ -1,551 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # QR code generating library for >=libreoffice-6.4
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.8
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # git master
- "${FILESDIR}/${P}-boost-1.73.patch" # bug 721806
-
- # TODO: upstream (for now taken from Arch Linux)
- "${FILESDIR}/${PN}-6.4.2.2-poppler-0.86.patch" # bug 711102
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if ! use java && ! use firebird; then
- ewarn "If you plan to use Base application you must enable either firebird or java."
- fi
-
- use java || ewarn "Without java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed -i \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- pyuno/source/module/uno.py \
- pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-report-builder
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-29 10:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 0154d7b3200d1262b3d6ec5225d707357a576139
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 09:41:54 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 10:40:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0154d7b3
app-office/libreoffice: --with-build-version -> --with-extra-buildid
Upstream commit 5fdf2009d21fa220dfee70ea755bd698c16257a7
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 0c444e2be5c..8f43fa5e8eb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -428,7 +428,7 @@ src_configure() {
--disable-openssl
--disable-pdfium
--disable-vlc
- --with-build-version="${gentoo_buildid}"
+ --with-extra-buildid="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-29 10:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 10:40 UTC (permalink / raw
To: gentoo-commits
commit: bd783dbfd39642eb1bdc1f7d3629f4841a80460e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 08:37:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 10:40:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd783dbf
app-office/libreoffice: DEPEND on dev-java/openjdk{,-bin}:11
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 0b84974d047..0c444e2be5c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -239,7 +239,10 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- >=virtual/jdk-1.8
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
)
test? (
app-crypt/gnupg
@@ -254,7 +257,11 @@ RDEPEND="${COMMON_DEPEND}
!app-office/openoffice
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
+ java? (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ )
kde? ( kde-frameworks/breeze-icons:* )
"
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
@@ -487,9 +494,12 @@ src_configure() {
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
)
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
use libreoffice_extensions_scripting-beanshell && \
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-29 10:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 6fd18438a7e0fe384b4cf4ebb9ae8bdb17351334
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 22:24:11 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 10:40:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fd18438
app-office/libreoffice: Update skia tarball
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Thanks-to: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index bd974fb80fb..77502cb3e9f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,4 +22,4 @@ DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a54
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz 8218672 BLAKE2B cfeb805d82ce1f5dd70c7365983fa8107d5ccda9409b2654c032115cdf8a1c32fa0451162b0cceec3dcc0054e3d0d0e13583ea93843b0d0a6eb948cc31c15ce0 SHA512 1018fc1cc8a7edc15745cc20791f9a22e5b318018ba619d6cb5b6995d3e81ab93c910bb3a42734872d3be54893c2ce7db507b2c61088660b2ce6630ff9b36ebb
+DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a4e55bc7595..0b84974d047 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -47,8 +47,8 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz"
- # QR code generating library for >=libreoffice-6.4
+ "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz
@@ -396,7 +396,7 @@ src_configure() {
# --without-system-sane: just sane.h header that is used for scan in writer,
# not linked or anything else, worthless to depend on
# --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
+ # --without-system-qrcodegen: has no real build system and LO is the only user
local myeconfargs=(
--with-system-dicts
--with-system-epoxy
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-29 10:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 88e7c40bc2a3af8ef05d3f2f4202ddeb0050b2f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 00:06:42 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 10:40:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88e7c40b
app-office/libreoffice: Drop 6.4 stable branch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.9999.ebuild | 590 ---------------------
1 file changed, 590 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.9999.ebuild b/app-office/libreoffice/libreoffice-6.4.9999.ebuild
deleted file mode 100644
index 52876b5d2f1..00000000000
--- a/app-office/libreoffice/libreoffice-6.4.9999.ebuild
+++ /dev/null
@@ -1,590 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # QR code generating library for >=libreoffice-6.4
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- app-text/libnumbertext
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-1.8
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-1.8 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # git master
- "${FILESDIR}/${PN}-6.4.3.2-boost-1.73.patch" # bug 721806
- "${FILESDIR}/${PN}-6.4.6.2-llvm-10.patch" # bug 713574
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrencode: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-build-version="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-29 17:32 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 36a871e8cef9c6845c49ac350090f0540beb3c4a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 17:32:01 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 17:32:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a871e8
app-office/libreoffice: Add missing || ( )
Reported-by: jospezial <jospezial <AT> gmx.de>
Bug: https://bugs.gentoo.org/739134
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 772f603dd25..f19fdc74caa 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -257,11 +257,11 @@ RDEPEND="${COMMON_DEPEND}
!app-office/openoffice
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? (
+ java? ( || (
dev-java/openjdk:11
dev-java/openjdk-jre-bin:11
>=virtual/jre-1.8
- )
+ ) )
kde? ( kde-frameworks/breeze-icons:* )
"
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 8f43fa5e8eb..267f4abfb6a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -257,11 +257,11 @@ RDEPEND="${COMMON_DEPEND}
!app-office/openoffice
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? (
+ java? ( || (
dev-java/openjdk:11
dev-java/openjdk-jre-bin:11
>=virtual/jre-1.8
- )
+ ) )
kde? ( kde-frameworks/breeze-icons:* )
"
if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-29 21:44 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 01893b61f9921fb9ac213a156e115111030da36b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 21:43:44 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 21:43:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01893b61
app-office/libreoffice: Drop patch cherry-picked upstream
Reported-by: jospezial <jospezial <AT> gmx.de>
Closes: https://bugs.gentoo.org/751799
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index f19fdc74caa..267f4abfb6a 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -278,9 +278,6 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
- # git master
- "${FILESDIR}/${PN}-7.0.3.1-fix-non-pdfium-build.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-31 9:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-31 9:23 UTC (permalink / raw
To: gentoo-commits
commit: 9f9fdccb2fbc488d3edb7276d8eb4a41aa8afacb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 16:50:18 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:20:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9fdccb
app-office/libreoffice: Pin to dev-libs/liborcus:0/0.15
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index 59eabf0b026..0d74d54e9b1 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -139,7 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
+ dev-libs/liborcus:0/0.15
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 267f4abfb6a..f2d22894b1f 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
+ dev-libs/liborcus:0/0.15
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-10-31 9:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-10-31 9:23 UTC (permalink / raw
To: gentoo-commits
commit: 67b22f62e8bf8e7862b20d79ac03367f4a4fc6ae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 16:52:09 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:20:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b22f62
app-office/libreoffice: Pin 9999 to dev-libs/liborcus:0/0.16
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 267f4abfb6a..f4beb244dbf 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.15.0
+ dev-libs/liborcus:0/0.16
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-21 15:08 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-21 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 1e6582952369e1fd90f507f94853263ce07089c9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 15:05:38 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 15:07:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e658295
app-office/libreoffice: Version bump (no keywords, for testing)
Bug: https://bugs.gentoo.org/739134
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
...-7.0.9999.ebuild => libreoffice-7.0.3.1.ebuild} | 58 ++++++++++++++++++++--
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 54 +++++++++++++++++++-
app-office/libreoffice/libreoffice-9999.ebuild | 54 +++++++++++++++++++-
app-office/libreoffice/metadata.xml | 2 +
5 files changed, 162 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 77502cb3e9f..63ba9802281 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.6.2.tar.xz 232180876 BLAKE2B b2e01cc8e56b36c16fc3e39ff88617d7c31d6b0a0f4a5c05c8536313e7129862fb962e1a6efc7e86e9b56c34dff7c2d895416f33fbb23dc45e447b25813b5654 SHA512 377675494d4422c4d9363fe3857a8587e38f6ccd39aebec9c23337aa3a88cb2526608b8d0bcb27985ed8f821a98ca541dad4b48d69db441bcb27e9fb81beb9ba
DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
+DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2 SHA512 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.6.2.tar.xz 88297908 BLAKE2B 919758e81ed46138331b49668f89c6bf7f50253d7632d113aa957f524ae26e2b99f2ba490b405830314822ea91185eb2308018df77c5bd3d7197cbba940ae2ba SHA512 8ada2568a40dc4f1c843cb37dde6abe3bd61b6e5d9910b985096821e1fce5af47d4a10bff8ae91913298e593130bc1f8668b4e1c59c46591d457157e3d4b7501
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
+DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be SHA512 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
similarity index 92%
copy from app-office/libreoffice/libreoffice-7.0.9999.ebuild
copy to app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index f2d22894b1f..63c50e62f52 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -82,8 +82,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -101,8 +101,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
@@ -182,6 +182,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
net-wireless/bluez
)
+ clang? (
+ sys-devel/clang
+ sys-devel/llvm
+ sys-devel/lld
+ )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
dbus? ( sys-apps/dbus[X] )
@@ -374,6 +379,50 @@ src_configure() {
local google_default_client_id="329227923882.apps.googleusercontent.com"
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+ # Show flags set at the beginning
+ einfo "Current CFLAGS: ${CFLAGS}"
+ einfo "Current LDFLAGS: ${LDFLAGS}"
+
+ local have_switched_compiler=
+ if use clang && ! tc-is-clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ have_switched_compiler=yes
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ elif ! use clang && ! tc-is-gcc ; then
+ # Force gcc
+ have_switched_compiler=yes
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ if [[ -n "${have_switched_compiler}" ]] ; then
+ # Because we switched active compiler we have to ensure
+ # that no unsupported flags are set
+ strip-unsupported-flags
+ fi
+
+ # Show flags set at the beginning
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
@@ -465,6 +514,7 @@ src_configure() {
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
$(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index f2d22894b1f..552b65b8bbd 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -82,8 +82,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -182,6 +182,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
net-wireless/bluez
)
+ clang? (
+ sys-devel/clang
+ sys-devel/llvm
+ sys-devel/lld
+ )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
dbus? ( sys-apps/dbus[X] )
@@ -374,6 +379,50 @@ src_configure() {
local google_default_client_id="329227923882.apps.googleusercontent.com"
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+ # Show flags set at the beginning
+ einfo "Current CFLAGS: ${CFLAGS}"
+ einfo "Current LDFLAGS: ${LDFLAGS}"
+
+ local have_switched_compiler=
+ if use clang && ! tc-is-clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ have_switched_compiler=yes
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ elif ! use clang && ! tc-is-gcc ; then
+ # Force gcc
+ have_switched_compiler=yes
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ if [[ -n "${have_switched_compiler}" ]] ; then
+ # Because we switched active compiler we have to ensure
+ # that no unsupported flags are set
+ strip-unsupported-flags
+ fi
+
+ # Show flags set at the beginning
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
@@ -465,6 +514,7 @@ src_configure() {
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
$(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f4beb244dbf..d114626a09d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -82,8 +82,8 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility base bluetooth +branding coinmp +cups +dbus debug eds firebird
-googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
+IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -182,6 +182,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
net-wireless/bluez
)
+ clang? (
+ sys-devel/clang
+ sys-devel/llvm
+ sys-devel/lld
+ )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
dbus? ( sys-apps/dbus[X] )
@@ -374,6 +379,50 @@ src_configure() {
local google_default_client_id="329227923882.apps.googleusercontent.com"
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+ # Show flags set at the beginning
+ einfo "Current CFLAGS: ${CFLAGS}"
+ einfo "Current LDFLAGS: ${LDFLAGS}"
+
+ local have_switched_compiler=
+ if use clang && ! tc-is-clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ have_switched_compiler=yes
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ elif ! use clang && ! tc-is-gcc ; then
+ # Force gcc
+ have_switched_compiler=yes
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ if [[ -n "${have_switched_compiler}" ]] ; then
+ # Because we switched active compiler we have to ensure
+ # that no unsupported flags are set
+ strip-unsupported-flags
+ fi
+
+ # Show flags set at the beginning
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
@@ -465,6 +514,7 @@ src_configure() {
$(use_enable odk)
$(use_enable pdfimport)
$(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
$(use_with accessibility lxml)
$(use_with coinmp system-coinmp)
$(use_with googledrive gdrive-client-id ${google_default_client_id})
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 3afed225b93..4ac974303a8 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -12,10 +12,12 @@ computer. It will however make a snappier LibreOffice than the binary
version</longdescription>
<use>
<flag name="base">Enable full support for LibreOffice Base databases (involves additional bundled libs)</flag>
+ <flag name="clang">Use Clang compiler instead of GCC</flag>
<flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
<flag name="googledrive">Enable support for remote files on Google Drive</flag>
<flag name="mariadb">Prefer mariadb connector over mysql connector</flag>
<flag name="odk">Build the Office Development Kit</flag>
<flag name="pdfimport">Enable PDF import via the Poppler library</flag>
+ <flag name="vulkan">Enable Vulkan usage via the skia library (clang recommended)</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-21 19:02 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-21 19:02 UTC (permalink / raw
To: gentoo-commits
commit: a6e8979afea92806e9f3b469c37822a1f80e6a6f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 18:51:50 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 19:01:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e8979a
app-office/libreoffice: Use CLANG_CC in 7.0 branch
Bug: https://bugs.gentoo.org/739134
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 4 ++--
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 63c50e62f52..b7f883af378 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -403,8 +403,8 @@ src_configure() {
NM=gcc-nm
RANLIB=gcc-ranlib
fi
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
+ export CLANG_CC=${CC}
+ export CLANG_CXX=${CXX}
if [[ -n "${have_switched_compiler}" ]] ; then
# Because we switched active compiler we have to ensure
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 552b65b8bbd..735ca0fa649 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -403,8 +403,8 @@ src_configure() {
NM=gcc-nm
RANLIB=gcc-ranlib
fi
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
+ export CLANG_CC=${CC}
+ export CLANG_CXX=${CXX}
if [[ -n "${have_switched_compiler}" ]] ; then
# Because we switched active compiler we have to ensure
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-21 19:02 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-21 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 883a8fcde2ae0e61193132f7964978ec003cfb01
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 19:01:19 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 19:01:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=883a8fcd
app-office/libreoffice: Enforce consistent llvm and clang
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 14 +++++++++++---
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 14 +++++++++++---
app-office/libreoffice/libreoffice-9999.ebuild | 14 +++++++++++---
3 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index b7f883af378..75e3660ccfa 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-wireless/bluez
)
clang? (
- sys-devel/clang
- sys-devel/llvm
- sys-devel/lld
+ || (
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ )
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 735ca0fa649..5040a3e0391 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-wireless/bluez
)
clang? (
- sys-devel/clang
- sys-devel/llvm
- sys-devel/lld
+ || (
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ )
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d114626a09d..1b78e99f05f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -183,9 +183,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-wireless/bluez
)
clang? (
- sys-devel/clang
- sys-devel/llvm
- sys-devel/lld
+ || (
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ )
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-21 22:18 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-11-21 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 5030a027981dffc84b766bb93a76da25865856c5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 19:37:50 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 22:17:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5030a027
app-office/libreoffice: Fix build with ICU-68
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index b6573bba320..7d33a2c844c 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -286,14 +286,15 @@ else
fi
PATCHES=(
- # backport from 7.0 branch
- "${FILESDIR}/${PN}-7.0.3.1-fix-disable-pdfium-build.patch"
-
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+ # 7.0 branch
+ "${FILESDIR}/${P}-fix-disable-pdfium-build.patch"
+ "${FILESDIR}/${PN}-6.4.7.2-icu-68-1.patch" # bug 752021
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-21 23:27 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-21 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 150aa3a64226a0caf51f1fbdc83816136f40e014
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 23:26:41 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 23:27:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=150aa3a6
app-office/libreoffice: Fix clang alternatives order
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 12 ++++++------
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 12 ++++++------
app-office/libreoffice/libreoffice-9999.ebuild | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index e561517b8f5..3e988d5940d 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -184,15 +184,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
clang? (
|| (
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
( sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
)
)
coinmp? ( sci-libs/coinor-mp )
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 223d653facc..79ca095f21b 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -184,15 +184,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
clang? (
|| (
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
( sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
)
)
coinmp? ( sci-libs/coinor-mp )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 67ba6c45bbe..b85e0f6e397 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -184,15 +184,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
clang? (
|| (
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
( sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
)
)
coinmp? ( sci-libs/coinor-mp )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-21 23:27 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-21 23:27 UTC (permalink / raw
To: gentoo-commits
commit: f9e9a8666cd4b64a01bf3f6dcf585e8c4e1dec14
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 23:24:25 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 23:27:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e9a866
app-office/libreoffice: Brute-force compiler settings (clang/gcc)
Bug: https://bugs.gentoo.org/739134
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 26 +++++++++-------------
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 26 +++++++++-------------
app-office/libreoffice/libreoffice-9999.ebuild | 26 +++++++++-------------
3 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 695c9c5f0f6..e561517b8f5 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -393,41 +393,35 @@ src_configure() {
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
# Show flags set at the beginning
- einfo "Current CFLAGS: ${CFLAGS}"
- einfo "Current LDFLAGS: ${LDFLAGS}"
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
- local have_switched_compiler=
- if use clang && ! tc-is-clang ; then
+ if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
- have_switched_compiler=yes
AR=llvm-ar
CC=${CHOST}-clang
CXX=${CHOST}-clang++
NM=llvm-nm
RANLIB=llvm-ranlib
- elif ! use clang && ! tc-is-gcc ; then
+ LDFLAGS+=" -fuse-ld=lld"
+ strip-unsupported-flags
+ else
# Force gcc
- have_switched_compiler=yes
einfo "Enforcing the use of gcc due to USE=-clang ..."
AR=gcc-ar
CC=${CHOST}-gcc
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+ strip-unsupported-flags
fi
export CLANG_CC=${CC}
export CLANG_CXX=${CXX}
- if [[ -n "${have_switched_compiler}" ]] ; then
- # Because we switched active compiler we have to ensure
- # that no unsupported flags are set
- strip-unsupported-flags
- fi
-
- # Show flags set at the beginning
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index b10bdb491e5..223d653facc 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -389,41 +389,35 @@ src_configure() {
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
# Show flags set at the beginning
- einfo "Current CFLAGS: ${CFLAGS}"
- einfo "Current LDFLAGS: ${LDFLAGS}"
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
- local have_switched_compiler=
- if use clang && ! tc-is-clang ; then
+ if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
- have_switched_compiler=yes
AR=llvm-ar
CC=${CHOST}-clang
CXX=${CHOST}-clang++
NM=llvm-nm
RANLIB=llvm-ranlib
- elif ! use clang && ! tc-is-gcc ; then
+ LDFLAGS+=" -fuse-ld=lld"
+ strip-unsupported-flags
+ else
# Force gcc
- have_switched_compiler=yes
einfo "Enforcing the use of gcc due to USE=-clang ..."
AR=gcc-ar
CC=${CHOST}-gcc
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+ strip-unsupported-flags
fi
export CLANG_CC=${CC}
export CLANG_CXX=${CXX}
- if [[ -n "${have_switched_compiler}" ]] ; then
- # Because we switched active compiler we have to ensure
- # that no unsupported flags are set
- strip-unsupported-flags
- fi
-
- # Show flags set at the beginning
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 0bc93233961..67ba6c45bbe 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -389,41 +389,35 @@ src_configure() {
local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
# Show flags set at the beginning
- einfo "Current CFLAGS: ${CFLAGS}"
- einfo "Current LDFLAGS: ${LDFLAGS}"
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
- local have_switched_compiler=
- if use clang && ! tc-is-clang ; then
+ if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
- have_switched_compiler=yes
AR=llvm-ar
CC=${CHOST}-clang
CXX=${CHOST}-clang++
NM=llvm-nm
RANLIB=llvm-ranlib
- elif ! use clang && ! tc-is-gcc ; then
+ LDFLAGS+=" -fuse-ld=lld"
+ strip-unsupported-flags
+ else
# Force gcc
- have_switched_compiler=yes
einfo "Enforcing the use of gcc due to USE=-clang ..."
AR=gcc-ar
CC=${CHOST}-gcc
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+ strip-unsupported-flags
fi
export LO_CLANG_CC=${CC}
export LO_CLANG_CXX=${CXX}
- if [[ -n "${have_switched_compiler}" ]] ; then
- # Because we switched active compiler we have to ensure
- # that no unsupported flags are set
- strip-unsupported-flags
- fi
-
- # Show flags set at the beginning
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-22 0:16 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-22 0:16 UTC (permalink / raw
To: gentoo-commits
commit: c4e92b5385ba95aa763f1225f74a0d4ce464d292
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 00:16:17 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 00:16:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e92b53
app-office/libreoffice: Fix metainfo location, bug 709450
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 5 +++++
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 5 +++++
app-office/libreoffice/libreoffice-9999.ebuild | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 3e988d5940d..0ead7020099 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -638,6 +638,11 @@ EOF
dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
+
+ # bug 709450
+ mkdir -p "${ED}"/usr/share/metainfo || die
+ mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+ rmdir "${ED}"/usr/share/appdata || die
}
pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 79ca095f21b..c04d5929a50 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -634,6 +634,11 @@ EOF
dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
+
+ # bug 709450
+ mkdir -p "${ED}"/usr/share/metainfo || die
+ mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+ rmdir "${ED}"/usr/share/appdata || die
}
pkg_postinst() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b85e0f6e397..816e95d62a1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -634,6 +634,11 @@ EOF
dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
+
+ # bug 709450
+ mkdir -p "${ED}"/usr/share/metainfo || die
+ mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+ rmdir "${ED}"/usr/share/appdata || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-22 17:00 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-22 17:00 UTC (permalink / raw
To: gentoo-commits
commit: 811fff30b782a18f80c85e8d1edf10fcec392445
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 16:57:53 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 17:00:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=811fff30
app-office/libreoffice: Add useflag custom-cflags
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 9 ++++++++-
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 9 ++++++++-
app-office/libreoffice/libreoffice-9999.ebuild | 11 +++++++++--
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 0ead7020099..a83494ecc5e 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -405,7 +405,6 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
- strip-unsupported-flags
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
@@ -414,8 +413,16 @@ src_configure() {
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
strip-unsupported-flags
+ else
+ strip-flags
fi
+
export CLANG_CC=${CC}
export CLANG_CXX=${CXX}
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index c04d5929a50..1423e832b11 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -401,7 +401,6 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
- strip-unsupported-flags
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
@@ -410,8 +409,16 @@ src_configure() {
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
strip-unsupported-flags
+ else
+ strip-flags
fi
+
export CLANG_CC=${CC}
export CLANG_CXX=${CXX}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 816e95d62a1..cc2390bea4c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -82,7 +82,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
@@ -401,7 +401,6 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
- strip-unsupported-flags
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
@@ -410,8 +409,16 @@ src_configure() {
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
strip-unsupported-flags
+ else
+ strip-flags
fi
+
export LO_CLANG_CC=${CC}
export LO_CLANG_CXX=${CXX}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-22 17:08 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-22 17:08 UTC (permalink / raw
To: gentoo-commits
commit: 758a966d8fd830f30822335baad033f439e5a1ad
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 17:07:07 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 17:07:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758a966d
app-office/libreoffice: Re-add keywords to 7.0.3.1
Closes: https://bugs.gentoo.org/739134
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index a83494ecc5e..27f9aad7190 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -101,8 +101,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-22 18:15 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-11-22 18:15 UTC (permalink / raw
To: gentoo-commits
commit: 478ea8f1dbd69cf7e15ae93e4497e86c81925686
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 18:14:45 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 18:15:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=478ea8f1
app-office/libreoffice: add missing flag to IUSE
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 27f9aad7190..bcd7e8b8b9b 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -82,7 +82,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 1423e832b11..d7e085ccf03 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -82,7 +82,7 @@ unset ADDONS_SRC
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-IUSE="accessibility base bluetooth +branding clang coinmp +cups +dbus debug eds firebird
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-22 22:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-11-22 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 782f2fad3e4d17b00e76a6412a73f304b709c227
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 22:20:29 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 22:42:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782f2fad
app-office/libreoffice: 6.4.7.2: Fix Qt5 moc path detect, drop QT_SELECT
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index e632c848c58..15b973e2b41 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -267,6 +267,7 @@ PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
# 6.4 branch (fixed in 6.4.8)
"${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch"
@@ -377,11 +378,7 @@ src_configure() {
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
- if use kde; then
- export QT_SELECT=5 # bug 639620 needs proper fix though
- export QT5DIR="$(qt5_get_bindir)/../"
- export MOC5="$(qt5_get_bindir)/moc"
- fi
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
local gentoo_buildid="Gentoo official package"
if [[ -n ${LOCOREGIT_VERSION} ]]; then
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-23 3:58 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2020-11-23 3:58 UTC (permalink / raw
To: gentoo-commits
commit: 05646d28ac34124ecaab2b2ec6c7981163a1e4f7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 03:54:11 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 03:54:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05646d28
app-office/libreoffice: Stabilize 6.4.7.2 amd64, #755107
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index 15b973e2b41..4fed1031b8d 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -98,7 +98,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-23 4:52 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2020-11-23 4:52 UTC (permalink / raw
To: gentoo-commits
commit: f44370c2c148f4a4130c365c37e3c91ee0bf822e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 04:48:28 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 04:48:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44370c2
app-office/libreoffice: Stabilize 6.4.7.2 x86, #755107
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index 4fed1031b8d..ac7c7aa0e10 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -98,7 +98,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-24 23:03 Robin H. Johnson
0 siblings, 0 replies; 588+ messages in thread
From: Robin H. Johnson @ 2020-11-24 23:03 UTC (permalink / raw
To: gentoo-commits
commit: 17e227268f7097573411d5968117433db71b2f5e
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 17:56:17 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 23:03:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17e22726
app-office/libreoffice: fix app-text/libnumbertext dep
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index bcd7e8b8b9b..753ef4fb54d 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
- app-text/libnumbertext
+ >=app-text/libnumbertext-1.0.6
>=app-text/libodfgen-0.1.0
app-text/libqxp
app-text/libstaroffice
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index d7e085ccf03..754be8f900f 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
- app-text/libnumbertext
+ >=app-text/libnumbertext-1.0.6
>=app-text/libodfgen-0.1.0
app-text/libqxp
app-text/libstaroffice
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cc2390bea4c..67f8c3b2d86 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -125,7 +125,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
- app-text/libnumbertext
+ >=app-text/libnumbertext-1.0.6
>=app-text/libodfgen-0.1.0
app-text/libqxp
app-text/libstaroffice
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-11-28 21:56 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-11-28 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 9d909a316c62286222879497af56e16b4e138b6b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 21:30:43 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 21:56:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d909a31
app-office/libreoffice: Use eapi8-dosym
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 10 +++++-----
app-office/libreoffice/libreoffice-9999.ebuild | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 753ef4fb54d..c2fe022a62a 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -637,12 +637,12 @@ EOF
python_optimize "${D}"${lodir}/program
# link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index 754be8f900f..b9e826f9b40 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
BDEPEND="
dev-util/intltool
@@ -633,12 +633,12 @@ EOF
python_optimize "${D}"${lodir}/program
# link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 67f8c3b2d86..500abaa157c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
BDEPEND="
dev-util/intltool
@@ -633,12 +633,12 @@ EOF
python_optimize "${D}"${lodir}/program
# link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-12-10 21:58 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2020-12-10 21:58 UTC (permalink / raw
To: gentoo-commits
commit: c9ae50a3def564d0aa28719dcc244c211c1fdd8c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 21:57:57 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 21:57:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ae50a3
app-office/libreoffice: Contribute to global warming
When USE=custom-cflags is set, do not manipulate CFLAGS at all.
The build may well fail halfway through, but hey, it's just entropy.
Closes: https://bugs.gentoo.org/756697
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 1 -
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 1 -
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
3 files changed, 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index c2fe022a62a..2d3f699e1f9 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -418,7 +418,6 @@ src_configure() {
if use custom-cflags ; then
elog "USE=custom-cflags has been selected. You are on your own to make sure that"
elog "the build succeeds. Good luck!"
- strip-unsupported-flags
else
strip-flags
fi
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index b9e826f9b40..ac7501070b5 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -414,7 +414,6 @@ src_configure() {
if use custom-cflags ; then
elog "USE=custom-cflags has been selected. You are on your own to make sure that"
elog "the build succeeds. Good luck!"
- strip-unsupported-flags
else
strip-flags
fi
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 500abaa157c..f1d212b63e4 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -414,7 +414,6 @@ src_configure() {
if use custom-cflags ; then
elog "USE=custom-cflags has been selected. You are on your own to make sure that"
elog "the build succeeds. Good luck!"
- strip-unsupported-flags
else
strip-flags
fi
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-12-17 13:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-12-17 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 8b844bf9a38c66dc13b70a180333faec48f0a4a7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:14:44 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:31:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b844bf9
app-office/libreoffice: 7.0.4.2 version bump
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.0.4.2.ebuild | 660 ++++++++++++++++++++++
2 files changed, 662 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f48faeca9bd..ccd5560cf58 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
DIST libreoffice-7.0.3.1.tar.xz 240706432 BLAKE2B 4bf075fedb445a60a971adfb029fb7843afab1ee2009d32b149c91970d8eae990e4ac3ea7075d58815288f1f174846e0e9de7ce00655840ad97622a3790b43a2 SHA512 1680b5166ead7ca521130f7d23cb2bd73d3d4f801f94c9a3ab0066fb7763ced3c01d89fbe1b7a79a1826bcfd6ebcd3ce5fb3014ab6583034f08ed25969ab5f36
+DIST libreoffice-7.0.4.2.tar.xz 236477520 BLAKE2B 859b5873444163f0493f7b7c4d7bd0c65d99b8de474e45c79f9ff2d04d5db6dc9b78c43b545c536156237c9937d34874c5ffafa0476e78c025bd3fd5a04af352 SHA512 cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
DIST libreoffice-help-7.0.3.1.tar.xz 110855688 BLAKE2B 3b0e845087fe0bd25ad3c06b8a8eac548f05568cf279efc10f7190ee51e8a9922c64749ad57c21b150aaac9b3249a6e184583f389a191fc6b86128153ff363be SHA512 1acbc7575da99ce0a09a3092a8612f47c432ffd8d4b6029c885c782a857c6b0812bb2eee3873b0cdfa41ee42f84a0843c3d06109ccb651b5bba5ade1a6725a78
+DIST libreoffice-help-7.0.4.2.tar.xz 110758084 BLAKE2B 0e5478613da0745b34914847137aed240a16fb3ab753935295500f414657a2be27359f6426f089205f614afd43d4b5d0e5d0adcc6240ac3d24c0428cb9c42941 SHA512 ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
diff --git a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
new file mode 100644
index 00000000000..ac7501070b5
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
@@ -0,0 +1,660 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.15
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ clang? (
+ || (
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export CLANG_CC=${CC}
+ export CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ # bug 709450
+ mkdir -p "${ED}"/usr/share/metainfo || die
+ mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+ rmdir "${ED}"/usr/share/appdata || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2020-12-28 11:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2020-12-28 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 899fcd8a843b8f0032f92c8ebbf20cb47f90a401
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 10:23:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 11:08:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899fcd8a
app-office/libreoffice: Drop --disable-vlc
Upstream commit 747856aa3dbe9d3a438a3b01fa631124ee057ae8
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f1d212b63e4..dbeb0036825 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -481,7 +481,6 @@ src_configure() {
--disable-online-update
--disable-openssl
--disable-pdfium
- --disable-vlc
--with-extra-buildid="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-01-19 20:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-01-19 20:42 UTC (permalink / raw
To: gentoo-commits
commit: c6ab5fe5e94634fe96d98f8505811df602447f2c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 19:20:32 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 20:41:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ab5fe5
app-office/libreoffice: Restore ~ppc64 keyword
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.4.2.ebuild | 4 ++--
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
index ac7501070b5..1a4ef40f551 100644
--- a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
BDEPEND="
dev-util/intltool
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
index ac7501070b5..1a4ef40f551 100644
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
BDEPEND="
dev-util/intltool
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index dbeb0036825..2fd70e44b5a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-03-05 1:04 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-03-05 1:04 UTC (permalink / raw
To: gentoo-commits
commit: 526ceaac5648a2f0e2a36413d1e062f9ad6fef44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 5 00:17:51 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 5 01:02:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=526ceaac
app-office/libreoffice: 7.0.5.2 version bump w/o KEYWORDS
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.0.5.2.ebuild | 660 ++++++++++++++++++++++
2 files changed, 662 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 788ba8b0c10..8381f13b763 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
DIST libreoffice-7.0.4.2.tar.xz 236477520 BLAKE2B 859b5873444163f0493f7b7c4d7bd0c65d99b8de474e45c79f9ff2d04d5db6dc9b78c43b545c536156237c9937d34874c5ffafa0476e78c025bd3fd5a04af352 SHA512 cc65497b8d27f0e48ebfc5fa66b09d45948febe9454149300b447d9a6aafecd4be728403c3095c058852b9dc53570841d612bc196979f25595f6b8981f706d4b
+DIST libreoffice-7.0.5.2.tar.xz 236703992 BLAKE2B 71ae5cfbb18e012d8214d09ac1f151b8b1e6045b8453dae5dd888c8e8fe20a0675e4c58c81a179e7fd78a67f5992c124d7c1d3c9cee1a58bc2c444cbded410c4 SHA512 aff01224881d4971a44e754e0a6a15466dc2bb1e10fa4f3249453356389b3dfd6efd2d588b80359f1d06075ac7e4f7b74a711904d125e17206346808f2ddb4b8
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
DIST libreoffice-help-7.0.4.2.tar.xz 110758084 BLAKE2B 0e5478613da0745b34914847137aed240a16fb3ab753935295500f414657a2be27359f6426f089205f614afd43d4b5d0e5d0adcc6240ac3d24c0428cb9c42941 SHA512 ba346fa8ee015479d799d9d0b2a315cb901071b5fba2c4d7eba2eeba41dd4cac72210d12542704220c8cbb82d6a7b37a9285c1933fe2407e8e149510df4d58fe
+DIST libreoffice-help-7.0.5.2.tar.xz 110757908 BLAKE2B 34123bf06d52e6fe766179d74ce28943ff70bd1af4656c396d10c237d9f583034a6ba25586f29f1aad56b155d350827640381a3d3333b7e9e17995c0420e4bc9 SHA512 42935916ea31d2aea35386566754dbd2e37fa9cd2b29e6c2cca1ec7e672d10e345a92874e5875ced98d5625fd5329bd2db87ef81d3f00a1035044a9557202b31
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
diff --git a/app-office/libreoffice/libreoffice-7.0.5.2.ebuild b/app-office/libreoffice/libreoffice-7.0.5.2.ebuild
new file mode 100644
index 00000000000..9709f6c8b0d
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.0.5.2.ebuild
@@ -0,0 +1,660 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.15
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ clang? (
+ || (
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export CLANG_CC=${CC}
+ export CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ # bug 709450
+ mkdir -p "${ED}"/usr/share/metainfo || die
+ mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
+ rmdir "${ED}"/usr/share/appdata || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-03-11 17:39 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-03-11 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 67a8dd1d567c649e93a714cce295052d0c48eb74
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 17:38:25 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 17:39:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a8dd1d
app-office/libreoffice: Restore 7.0.5.2 KEYWORDS
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.5.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.5.2.ebuild b/app-office/libreoffice/libreoffice-7.0.5.2.ebuild
index 9709f6c8b0d..108fff08a3b 100644
--- a/app-office/libreoffice/libreoffice-7.0.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.5.2.ebuild
@@ -101,8 +101,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-03-13 15:51 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-03-13 15:51 UTC (permalink / raw
To: gentoo-commits
commit: 92487ce0347faa3a5a6c3a5728e6ce4e7c114e7d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 22:49:20 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 15:50:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92487ce0
app-office/libreoffice: Update dependencies
New dependency: games-engines/box2d-2.4.1
Raise dev-libs/liborcus slot dep to 0/0.16
Raise net-libs/neon minimum dep to 0.31.1 and add slot op
Drop nonexistent blocker against app-office/openoffice
Drop appdata downstream fix:
Upstream commit e98c4be2c87ba5b3f4aedc31388014b320588d4b
Update skia bundled tarball
Thanks-to: jospezial <jospezial <AT> gmx.de>
Bug: https://bugs.gentoo.org/768570
Closes: https://bugs.gentoo.org/737720
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 11 +++--------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 25c3a0d4e76..75a8e17cba5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,3 +23,4 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
DIST libreoffice-help-7.0.5.2.tar.xz 110757908 BLAKE2B 34123bf06d52e6fe766179d74ce28943ff70bd1af4656c396d10c237d9f583034a6ba25586f29f1aad56b155d350827640381a3d3333b7e9e17995c0420e4bc9 SHA512 42935916ea31d2aea35386566754dbd2e37fa9cd2b29e6c2cca1ec7e672d10e345a92874e5875ced98d5625fd5329bd2db87ef81d3f00a1035044a9557202b31
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
+DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e89f80aedfa..a38aba75536 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -47,7 +47,7 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
+ "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
# QR code generating library for >=libreoffice-6.4, bug #691740
"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
"base? (
@@ -136,6 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-cpp/clucene-2.3.3.4-r2
>=dev-cpp/libcmis-0.5.2
dev-db/unixODBC
+ >=games-engines/box2d-2.4.1:0
dev-lang/perl
>=dev-libs/boost-1.72.0:=[nls]
dev-libs/expat
@@ -164,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
media-libs/libzmf
- net-libs/neon
+ >=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve
sys-libs/zlib
@@ -267,7 +268,6 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
- !app-office/openoffice
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
java? ( || (
@@ -639,11 +639,6 @@ EOF
dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
-
- # bug 709450
- mkdir -p "${ED}"/usr/share/metainfo || die
- mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
- rmdir "${ED}"/usr/share/appdata || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-03-13 19:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-03-13 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 718a10c6cad00feb60964fd9d3347b58d7f0df9d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 16:11:02 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 19:19:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718a10c6
app-office/libreoffice: Drop 7.0 stable branch
No more packaging of this branch planned in Gentoo.
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.0.9999.ebuild | 660 ---------------------
1 file changed, 660 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.9999.ebuild b/app-office/libreoffice/libreoffice-7.0.9999.ebuild
deleted file mode 100644
index 108fff08a3b..00000000000
--- a/app-office/libreoffice/libreoffice-7.0.9999.ebuild
+++ /dev/null
@@ -1,660 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.15
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export CLANG_CC=${CC}
- export CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrcodegen: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- # bug 709450
- mkdir -p "${ED}"/usr/share/metainfo || die
- mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
- rmdir "${ED}"/usr/share/appdata || die
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-03-13 19:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-03-13 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 7f8f0905caa89acd897e0c66cd9cdada49886bc8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 22:50:57 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 19:19:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8f0905
app-office/libreoffice: Add 7.1 stable branch
Bug: https://bugs.gentoo.org/768570
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 655 +++++++++++++++++++++
1 file changed, 655 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
new file mode 100644
index 00000000000..cf695c2bff7
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ >=games-engines/box2d-2.4.1:0
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ clang? (
+ || (
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-04-01 21:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-04-01 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 30400361cacfd0ede7d256fe75c8ab0ba0098584
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 23:08:09 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 1 21:53:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30400361
app-office/libreoffice: 7.1.2.2 version bump
Bug: https://bugs.gentoo.org/768570
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.1.2.2.ebuild | 655 ++++++++++++++++++++++
2 files changed, 657 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 75a8e17cba5..c5375051c6d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,8 +19,10 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
DIST libreoffice-7.0.5.2.tar.xz 236703992 BLAKE2B 71ae5cfbb18e012d8214d09ac1f151b8b1e6045b8453dae5dd888c8e8fe20a0675e4c58c81a179e7fd78a67f5992c124d7c1d3c9cee1a58bc2c444cbded410c4 SHA512 aff01224881d4971a44e754e0a6a15466dc2bb1e10fa4f3249453356389b3dfd6efd2d588b80359f1d06075ac7e4f7b74a711904d125e17206346808f2ddb4b8
+DIST libreoffice-7.1.2.2.tar.xz 243806936 BLAKE2B 46ff8efb4e5feaa1e2a887881bdd33d8b46b0b7e5e41fff9c1cfab08cfab712d2b8c6e8e8c1b68f3549be62fdfd62622aa2819021687bde5eae6c45a789b6b8b SHA512 0e4cc2417943fcfaf84b513f6ee781a4f75d5c42804fa98c5499ec6d461be04bf68ca1f8f92952863ba3765d7e2894e77f78aa1f532b67649e31154683767297
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
DIST libreoffice-help-7.0.5.2.tar.xz 110757908 BLAKE2B 34123bf06d52e6fe766179d74ce28943ff70bd1af4656c396d10c237d9f583034a6ba25586f29f1aad56b155d350827640381a3d3333b7e9e17995c0420e4bc9 SHA512 42935916ea31d2aea35386566754dbd2e37fa9cd2b29e6c2cca1ec7e672d10e345a92874e5875ced98d5625fd5329bd2db87ef81d3f00a1035044a9557202b31
+DIST libreoffice-help-7.1.2.2.tar.xz 111784492 BLAKE2B 3b62387ed5a42bef2602c6e2fad73d4421fad25a9ce67dd11a04b11c2072214979987cbc961ba448ad1a04596adca236654aac6828b0d2cf208565a260944dd5 SHA512 571db9a2fb3410ea6e86e5000f78648acb1f581a94cb0d2021a174116c44194c68749a875624aa042985630d83b44f312a6275524e8cd57f66678c6a1f8ec22e
DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.2.2.ebuild b/app-office/libreoffice/libreoffice-7.1.2.2.ebuild
new file mode 100644
index 00000000000..620d189b1bf
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.2.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ >=games-engines/box2d-2.4.1:0
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ clang? (
+ || (
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-04-23 16:12 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-04-23 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 5f80c5329cecd3fde0035fe2f0c15395954624b2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 16:12:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 16:12:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f80c532
app-office/libreoffice: Keyword 7.1.2.2 arm64, #768570
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.2.2.ebuild b/app-office/libreoffice/libreoffice-7.1.2.2.ebuild
index 620d189b1bf..cf695c2bff7 100644
--- a/app-office/libreoffice/libreoffice-7.1.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.2.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~ppc64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-05-04 8:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 8:29 UTC (permalink / raw
To: gentoo-commits
commit: da090ff29ae31d46ae86a6470eb3d0bc1e854956
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 08:28:50 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 08:28:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da090ff2
app-office/libreoffice: Drop 7.0.5.2
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 -
app-office/libreoffice/libreoffice-7.0.5.2.ebuild | 660 ----------------------
2 files changed, 663 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c5375051c6d..f629a83afe5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,11 +18,8 @@ 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 libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
-DIST libreoffice-7.0.5.2.tar.xz 236703992 BLAKE2B 71ae5cfbb18e012d8214d09ac1f151b8b1e6045b8453dae5dd888c8e8fe20a0675e4c58c81a179e7fd78a67f5992c124d7c1d3c9cee1a58bc2c444cbded410c4 SHA512 aff01224881d4971a44e754e0a6a15466dc2bb1e10fa4f3249453356389b3dfd6efd2d588b80359f1d06075ac7e4f7b74a711904d125e17206346808f2ddb4b8
DIST libreoffice-7.1.2.2.tar.xz 243806936 BLAKE2B 46ff8efb4e5feaa1e2a887881bdd33d8b46b0b7e5e41fff9c1cfab08cfab712d2b8c6e8e8c1b68f3549be62fdfd62622aa2819021687bde5eae6c45a789b6b8b SHA512 0e4cc2417943fcfaf84b513f6ee781a4f75d5c42804fa98c5499ec6d461be04bf68ca1f8f92952863ba3765d7e2894e77f78aa1f532b67649e31154683767297
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST libreoffice-help-7.0.5.2.tar.xz 110757908 BLAKE2B 34123bf06d52e6fe766179d74ce28943ff70bd1af4656c396d10c237d9f583034a6ba25586f29f1aad56b155d350827640381a3d3333b7e9e17995c0420e4bc9 SHA512 42935916ea31d2aea35386566754dbd2e37fa9cd2b29e6c2cca1ec7e672d10e345a92874e5875ced98d5625fd5329bd2db87ef81d3f00a1035044a9557202b31
DIST libreoffice-help-7.1.2.2.tar.xz 111784492 BLAKE2B 3b62387ed5a42bef2602c6e2fad73d4421fad25a9ce67dd11a04b11c2072214979987cbc961ba448ad1a04596adca236654aac6828b0d2cf208565a260944dd5 SHA512 571db9a2fb3410ea6e86e5000f78648acb1f581a94cb0d2021a174116c44194c68749a875624aa042985630d83b44f312a6275524e8cd57f66678c6a1f8ec22e
-DIST skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz 8375536 BLAKE2B 8e3849123ce426a4dc43705537b176df82c6039a23911d75b7b3b26ca44f4a600c96c67c5f4d935a8d6a5064362f7f2167231b2aafbc44533c07299a8980aafe SHA512 4aeba56400d20e5fe234c7927b3d196233e19513a3202e074a88fad0d14d168221574a5a72b8dd9398cf3a9453c46eba4e4ed23d8d2031522b6cb11bc8bb43c1
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.0.5.2.ebuild b/app-office/libreoffice/libreoffice-7.0.5.2.ebuild
deleted file mode 100644
index 108fff08a3b..00000000000
--- a/app-office/libreoffice/libreoffice-7.0.5.2.ebuild
+++ /dev/null
@@ -1,660 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.15
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- net-libs/neon
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !app-office/openoffice
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export CLANG_CC=${CC}
- export CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrcodegen: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- # bug 709450
- mkdir -p "${ED}"/usr/share/metainfo || die
- mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die
- rmdir "${ED}"/usr/share/appdata || die
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-05-04 22:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 03d4a425cbe2cfdb8c8c78813c6f18ffbee1c88f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 22:42:45 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:56:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d4a425
app-office/libreoffice: 7.1.3.2 version bump
Bug: https://bugs.gentoo.org/788112
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 661 ++++++++++++++++++++++
2 files changed, 663 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f629a83afe5..d0ada2c53fc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
DIST libreoffice-7.1.2.2.tar.xz 243806936 BLAKE2B 46ff8efb4e5feaa1e2a887881bdd33d8b46b0b7e5e41fff9c1cfab08cfab712d2b8c6e8e8c1b68f3549be62fdfd62622aa2819021687bde5eae6c45a789b6b8b SHA512 0e4cc2417943fcfaf84b513f6ee781a4f75d5c42804fa98c5499ec6d461be04bf68ca1f8f92952863ba3765d7e2894e77f78aa1f532b67649e31154683767297
+DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
DIST libreoffice-help-7.1.2.2.tar.xz 111784492 BLAKE2B 3b62387ed5a42bef2602c6e2fad73d4421fad25a9ce67dd11a04b11c2072214979987cbc961ba448ad1a04596adca236654aac6828b0d2cf208565a260944dd5 SHA512 571db9a2fb3410ea6e86e5000f78648acb1f581a94cb0d2021a174116c44194c68749a875624aa042985630d83b44f312a6275524e8cd57f66678c6a1f8ec22e
+DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
new file mode 100644
index 00000000000..41b1282d902
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -0,0 +1,661 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ >=games-engines/box2d-2.4.1:0
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ clang? (
+ || (
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-05-04 22:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 46228c2ee31b278182016969395b3797fc19ee28
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 22:17:29 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:56:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46228c2e
app-office/libreoffice: Bad news for x86 and IUSE="base,java"
Bug: https://bugs.gentoo.org/785640
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 14 ++++++++++----
app-office/libreoffice/libreoffice-9999.ebuild | 14 ++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index cf695c2bff7..41b1282d902 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -307,10 +307,16 @@ _check_reqs() {
}
pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a38aba75536..c9f16a41c2a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -307,10 +307,16 @@ _check_reqs() {
}
pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-05-05 1:39 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-05-05 1:39 UTC (permalink / raw
To: gentoo-commits
commit: feb45d707e30cef14b8b5c3f3ef83c8d2a7c0f82
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 5 01:39:27 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 5 01:39:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb45d70
app-office/libreoffice: Add missing x11-libs/gtk+ usedep on X
Reported-by: Marcel Schilling <marcel.schilling <AT> uni-luebeck.de>
Closes: https://bugs.gentoo.org/780813
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index 41b1282d902..fb1bb207817 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -214,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/gobject-introspection
gnome-base/dconf
media-libs/mesa[egl]
- x11-libs/gtk+:3
+ x11-libs/gtk+:3[X]
x11-libs/pango
)
kde? (
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index 41b1282d902..fb1bb207817 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -214,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/gobject-introspection
gnome-base/dconf
media-libs/mesa[egl]
- x11-libs/gtk+:3
+ x11-libs/gtk+:3[X]
x11-libs/pango
)
kde? (
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c9f16a41c2a..51e4baf41b6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -214,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/gobject-introspection
gnome-base/dconf
media-libs/mesa[egl]
- x11-libs/gtk+:3
+ x11-libs/gtk+:3[X]
x11-libs/pango
)
kde? (
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-05-06 20:09 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-05-06 20:09 UTC (permalink / raw
To: gentoo-commits
commit: a1a8900ddbf5cde6d418e477f36e4ce337cc6dac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 4 23:35:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 6 20:04:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1a8900d
app-office/libreoffice: Re-add ~x86 keyword to 7.1.3.2
Closes: https://bugs.gentoo.org/785640
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index fb1bb207817..43efb5a6625 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-05-06 20:09 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-05-06 20:09 UTC (permalink / raw
To: gentoo-commits
commit: bf599bb123209777629b9d40b36f2d2a545c732b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 5 00:15:47 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 6 20:04:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf599bb1
app-office/libreoffice: Drop 7.1.2.2
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.1.2.2.ebuild | 655 ----------------------
2 files changed, 657 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d0ada2c53fc..bec12030bc3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,8 @@ 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 libreoffice-6.4.7.2.tar.xz 232364676 BLAKE2B 1df8f2a3aa00bd057dd1d6d9665a541330ceeabb2bb5d46351449cf9b916a5649f38dc0e0175cf3733123f9247157f5fd0f2c34c8dad1d676da6c31d8346927b SHA512 ba6ff5948624d7a76025406c38728d643be656091d79320a1c5ddba10000411662951a0b02de7a9e796e76d8185b6e9113882406bb0c1452b4c988ac3095afa8
-DIST libreoffice-7.1.2.2.tar.xz 243806936 BLAKE2B 46ff8efb4e5feaa1e2a887881bdd33d8b46b0b7e5e41fff9c1cfab08cfab712d2b8c6e8e8c1b68f3549be62fdfd62622aa2819021687bde5eae6c45a789b6b8b SHA512 0e4cc2417943fcfaf84b513f6ee781a4f75d5c42804fa98c5499ec6d461be04bf68ca1f8f92952863ba3765d7e2894e77f78aa1f532b67649e31154683767297
DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.4.7.2.tar.xz 88296892 BLAKE2B 9ee12ec6aa6d5539408e0206e313901540533e28686585fa0bb4edbeaa482bb0ad1cd4ae37ac18dab66bb3e2ea32d52d9960236cbf3e0f8fb5ca07c007f38794 SHA512 a5381a8cca9988998dc01d3815869e47193c1da814b714cbedb51a2099f7dc5444315c657e32defab2eb0b9a9e2a922bc4c5fbc36b7a2b60e7c551887a9cdbb3
-DIST libreoffice-help-7.1.2.2.tar.xz 111784492 BLAKE2B 3b62387ed5a42bef2602c6e2fad73d4421fad25a9ce67dd11a04b11c2072214979987cbc961ba448ad1a04596adca236654aac6828b0d2cf208565a260944dd5 SHA512 571db9a2fb3410ea6e86e5000f78648acb1f581a94cb0d2021a174116c44194c68749a875624aa042985630d83b44f312a6275524e8cd57f66678c6a1f8ec22e
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.2.2.ebuild b/app-office/libreoffice/libreoffice-7.1.2.2.ebuild
deleted file mode 100644
index cf695c2bff7..00000000000
--- a/app-office/libreoffice/libreoffice-7.1.2.2.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- >=games-engines/box2d-2.4.1:0
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrcodegen: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-06-01 9:00 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-06-01 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 8bb74ec17b88341b37e01ab964de5037d6a50817
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 1 08:58:03 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 1 08:58:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb74ec1
app-office/libreoffice: Stabilize 7.1.3.2 x86, #788112
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index 57948352e89..00ddd500bd6 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-06-01 9:00 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-06-01 9:00 UTC (permalink / raw
To: gentoo-commits
commit: bca77ee2eb19c617a2ecbf3feb09418477b83690
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 1 08:59:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 1 08:59:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca77ee2
app-office/libreoffice: Stabilize 7.1.3.2 amd64, #788112
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
index 00ddd500bd6..83fd2fd63bf 100644
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-06-14 10:51 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-06-14 10:51 UTC (permalink / raw
To: gentoo-commits
commit: 27971136e47c4ae9a91645ca47a4b02c091b89a9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 10:49:03 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 10:51:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27971136
app-office/libreoffice: 7.1.4.2 version bump
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.1.4.2.ebuild | 664 ++++++++++++++++++++++
2 files changed, 666 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 14a9b2ca921..714d568690b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +18,8 @@ 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 libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
+DIST libreoffice-7.1.4.2.tar.xz 244336900 BLAKE2B 97374216593edb0b33fda80b19686bd95f517c36e9b2a347854af915be169b4d22963f765dbfa48ded75f64e94212e6d5cc862809ac775dc25c6b6bf1c1cc2c0 SHA512 b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
+DIST libreoffice-help-7.1.4.2.tar.xz 111785284 BLAKE2B 66b7da9d986a6abbc314dbb33be8297e7241f98983c4a864c26e3b6984d10d79f36a5307e11ed549289f2ab5e15ab05e7e81c9fad3d2ccd43dff114b327d266f SHA512 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.4.2.ebuild b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
new file mode 100644
index 00000000000..e90810957e9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
@@ -0,0 +1,664 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ >=games-engines/box2d-2.4.1:0
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_MULTI_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ clang? (
+ || (
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-07-22 20:09 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-07-22 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 5a8dc9cd0dab1a668e8812e0d05787d7350f021c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 19:15:15 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 22 20:09:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8dc9cd
app-office/libreoffice: 7.1.5.2 version bump
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 664 ++++++++++++++++++++++
2 files changed, 666 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 714d568690b..2af51431845 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,9 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
DIST libreoffice-7.1.4.2.tar.xz 244336900 BLAKE2B 97374216593edb0b33fda80b19686bd95f517c36e9b2a347854af915be169b4d22963f765dbfa48ded75f64e94212e6d5cc862809ac775dc25c6b6bf1c1cc2c0 SHA512 b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8
+DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
DIST libreoffice-help-7.1.4.2.tar.xz 111785284 BLAKE2B 66b7da9d986a6abbc314dbb33be8297e7241f98983c4a864c26e3b6984d10d79f36a5307e11ed549289f2ab5e15ab05e7e81c9fad3d2ccd43dff114b327d266f SHA512 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268
+DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
new file mode 100644
index 00000000000..3d4f9adbef6
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
@@ -0,0 +1,664 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ >=games-engines/box2d-2.4.1:0
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ clang? (
+ || (
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-07-22 20:09 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-07-22 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 7e17f442fa7827d0c08784b55392bf3dd565636a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 19:17:15 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 22 20:09:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e17f442
app-office/libreoffice: python3_10
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index a2da4680272..b467f3dfb24 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1a597b43266..fef9e356afe 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
MY_PV="${PV/_alpha/.alpha}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-07-23 6:32 Matt Turner
0 siblings, 0 replies; 588+ messages in thread
From: Matt Turner @ 2021-07-23 6:32 UTC (permalink / raw
To: gentoo-commits
commit: 719fafb6fc5e749869225369c9e8601f59f6e8e8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 05:37:16 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 06:32:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719fafb6
app-office/libreoffice: Set USE-defaults for mesa[egl,gbm]
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
index 3d4f9adbef6..c44dee00e18 100644
--- a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
@@ -213,7 +213,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
- media-libs/mesa[egl]
+ media-libs/mesa[egl(+)]
x11-libs/gtk+:3[X]
x11-libs/pango
)
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index b467f3dfb24..7ce776f6f00 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -213,7 +213,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
- media-libs/mesa[egl]
+ media-libs/mesa[egl(+)]
x11-libs/gtk+:3[X]
x11-libs/pango
)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index fef9e356afe..45f856b59db 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -213,7 +213,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
- media-libs/mesa[egl]
+ media-libs/mesa[egl(+)]
x11-libs/gtk+:3[X]
x11-libs/pango
)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-07-29 18:03 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-07-29 18:03 UTC (permalink / raw
To: gentoo-commits
commit: a288b13bbc9a41412034306621c2d101561b51ca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 18:02:35 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 18:03:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a288b13b
app-office/libreoffice: Drop 7.1.4.2
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.1.4.2.ebuild | 664 ----------------------
2 files changed, 666 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2af51431845..20d2cb48790 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,8 @@ 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 libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
-DIST libreoffice-7.1.4.2.tar.xz 244336900 BLAKE2B 97374216593edb0b33fda80b19686bd95f517c36e9b2a347854af915be169b4d22963f765dbfa48ded75f64e94212e6d5cc862809ac775dc25c6b6bf1c1cc2c0 SHA512 b6c0d5ed91cd69e20e70b2fd5e6f53f05eb0fbd73c41208c317116c636b2ee8cfd848370389dd61d3c243b259ae66b9bd5de9341cd9009279ccfd299015c88c8
DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
-DIST libreoffice-help-7.1.4.2.tar.xz 111785284 BLAKE2B 66b7da9d986a6abbc314dbb33be8297e7241f98983c4a864c26e3b6984d10d79f36a5307e11ed549289f2ab5e15ab05e7e81c9fad3d2ccd43dff114b327d266f SHA512 7730a17cd171d126b3b094abde1797524ff7250a5895d6d80b10b30944225d318001cbc66bdff06019be69434278dfd864aec71b0b9572c6385639620b416268
DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.4.2.ebuild b/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
deleted file mode 100644
index 23d791513de..00000000000
--- a/app-office/libreoffice/libreoffice-7.1.4.2.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- >=games-engines/box2d-2.4.1:0
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-
- # master branch
- "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrcodegen: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-09-07 18:28 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-09-07 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 32a6a0e837f901c0cdeab1b9765030aaea916ba5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 18:08:31 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 18:28:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a6a0e8
app-office/libreoffice: Switch to bundled libcmis-0.5.2
Fixes >=7.1.6.2 build error due to incompatible patches:
https://github.com/tdf/libcmis/pull/43
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 4 ++++
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++
3 files changed, 9 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 639c9655e71..bbb1df88721 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,6 +17,7 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
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 libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index 7ce776f6f00..229e39b60b6 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -44,6 +44,9 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
@@ -507,6 +510,7 @@ src_configure() {
--with-system-gpgmepp
--without-system-jfreereport
--without-system_apache_commons
+ --without-system-libcmis
--without-system-sane
--without-system-qrcodegen
$(use_enable base report-builder)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6ca28c7797e..48469b754b1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,6 +44,9 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
@@ -504,6 +507,7 @@ src_configure() {
--with-system-gpgmepp
--without-system-jfreereport
--without-system_apache_commons
+ --without-system-libcmis
--without-system-sane
$(use_enable base report-builder)
$(use_enable bluetooth sdremote-bluetooth)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-09-13 5:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-09-13 5:19 UTC (permalink / raw
To: gentoo-commits
commit: f2eb45cc8e88c5e1ef25b8cf293d7ab447d154f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 12 21:16:02 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 05:19:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2eb45cc
app-office/libreoffice: Restore ~x86 in live ebuild templates
Follow-up to commit 46228c2ee31b278182016969395b3797fc19ee28
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index 229e39b60b6..752bacd6f31 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 48469b754b1..188cea2395f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-09-14 6:01 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-09-14 6:01 UTC (permalink / raw
To: gentoo-commits
commit: ba5edbdf41149115273f3e69d37ba5200ff62d60
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 06:00:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 06:00:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5edbdf
app-office/libreoffice: add Bison 3.8.1 upper bound
Seems to cause build failures.
Bug: https://bugs.gentoo.org/812923
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.6.2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
index f18f1e2704a..ec8c361bf6c 100644
--- a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
@@ -107,9 +107,10 @@ SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+# Bison upper bound due to bug #812923
BDEPEND="
dev-util/intltool
- sys-devel/bison
+ <sys-devel/bison-3.8.1
sys-devel/flex
sys-devel/gettext
virtual/pkgconfig
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-09-18 18:36 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-09-18 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 5419a885b48e6335ff9056dafd33d6db14645e2d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 18:34:18 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 18:34:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5419a885
app-office/libreoffice: Stabilize 7.1.5.2 amd64, #809131
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
index 08d09ea8bd9..1710acb0a13 100644
--- a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-09-18 18:36 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-09-18 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 78aa78f7a9b73466fdd11c9a73254dcdfae0eba4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 18:34:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 18:34:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78aa78f7
app-office/libreoffice: Stabilize 7.1.5.2 x86, #809131
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
index 1710acb0a13..3e5f21d722b 100644
--- a/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.5.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-09-18 19:16 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-09-18 19:16 UTC (permalink / raw
To: gentoo-commits
commit: 4160d2a11bd4fb891a89fad5c2bd2253fd123ff5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 19:06:52 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 19:16:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4160d2a1
app-office/libreoffice: Drop 7.1.3.2
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.1.3.2.ebuild | 664 ----------------------
2 files changed, 666 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 51645c123ad..9a257640902 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,11 +18,9 @@ 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 libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
-DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
DIST libreoffice-7.1.6.2.tar.xz 244535588 BLAKE2B 79d4980b5842b37e7fdc328e832e3b672225e1903676d5c63ab68d7a993caf000bdb763837f98b4dd8156a95224ce22f501ec66dc315ca801a9c748e203e9170 SHA512 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
DIST libreoffice-help-7.1.6.2.tar.xz 111785436 BLAKE2B 810de348ca8fc297a75608bf4def1b4fe68dae976c727ceb157937de8029e9d30b52929c4a4fa6521b3391be27943bfe30b76466b9c415b4f78f0b68a28377ca SHA512 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild b/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
deleted file mode 100644
index 8a1c3cfb7d6..00000000000
--- a/app-office/libreoffice/libreoffice-7.1.3.2.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- >=games-engines/box2d-2.4.1:0
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-
- # master branch
- "${FILESDIR}/${P}-bashism.patch" # bug 780432
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrcodegen: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-01 10:03 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-11-01 10:03 UTC (permalink / raw
To: gentoo-commits
commit: be35efa3defa75a1593364a0804a839bb47417f6
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 31 10:46:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 1 10:02:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be35efa3
app-office/libreoffice: add 7.2.2.2
Bug: https://bugs.gentoo.org/811741
Closes: https://bugs.gentoo.org/793773
Closes: https://bugs.gentoo.org/793776
Closes: https://bugs.gentoo.org/816075
Closes: https://bugs.gentoo.org/820308
Closes: https://github.com/gentoo/gentoo/pull/22235
Closes: https://github.com/gentoo/gentoo/pull/22683
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 +
app-office/libreoffice/libreoffice-7.2.2.2.ebuild | 662 ++++++++++++++++++++++
2 files changed, 666 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9a257640902..b4e52bd7a5d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,10 +18,14 @@ 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 libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
+DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
DIST libreoffice-7.1.6.2.tar.xz 244535588 BLAKE2B 79d4980b5842b37e7fdc328e832e3b672225e1903676d5c63ab68d7a993caf000bdb763837f98b4dd8156a95224ce22f501ec66dc315ca801a9c748e203e9170 SHA512 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257
+DIST libreoffice-7.2.2.2.tar.xz 252478892 BLAKE2B e2e4ce76fc91ef0725f105ee87e480ede51610de7cabbc2bee1e32a9822f457ff9c21b0b13636447751727f42917dbdc9e24e20457ee9e5f1e4054d742337b5f SHA512 9adc14aa2aa24e1e91b32f0663d3fed8421baf78c3d310e8cc52ae70ea338b9d58406344d22d2c2fa6f91f10ae91945ef2d5713036f9144705bdb4c19ad69ca7
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
DIST libreoffice-help-7.1.6.2.tar.xz 111785436 BLAKE2B 810de348ca8fc297a75608bf4def1b4fe68dae976c727ceb157937de8029e9d30b52929c4a4fa6521b3391be27943bfe30b76466b9c415b4f78f0b68a28377ca SHA512 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad
+DIST libreoffice-help-7.2.2.2.tar.xz 111988404 BLAKE2B a0caafa4685c7356c8f1e592c104cd6e403283eb5b86580665637c3319eac4b651805ca6d7c45c5a0522e882ca1a28b6ae08f73c71b0417612c6fc084e194c1d SHA512 1e3a250b68f591c0dc0cd5d57843baa370ed009faabc9446826e8207043af5d193a263b85b9443a2baf1cb64366d90d08b763adf9ec9865d256f760f847ea638
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
+DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8
diff --git a/app-office/libreoffice/libreoffice-7.2.2.2.ebuild b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
new file mode 100644
index 00000000000..d8ad94e8fca
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
@@ -0,0 +1,662 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~amd64-linux ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ media-libs/zxing-cpp
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-webdav
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-01 10:03 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-11-01 10:03 UTC (permalink / raw
To: gentoo-commits
commit: 12dc5854892f73be328b8297bcc523d93552d11f
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 31 23:10:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 1 10:02:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12dc5854
app-office/libreoffice: unkeyword 7.2.2.2 for testing
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.2.2.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.2.2.ebuild b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
index 8e25775da85..808d0d4018b 100644
--- a/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
@@ -102,8 +102,7 @@ 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"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-01 10:03 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-11-01 10:03 UTC (permalink / raw
To: gentoo-commits
commit: be73d46e6d3bb71ab1a535d379c4f8f8dceea00e
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 31 10:46:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 1 10:02:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be73d46e
app-office/libreoffice: add 7.2.9999
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 662 +++++++++++++++++++++
1 file changed, 662 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
new file mode 100644
index 00000000000..d8ad94e8fca
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -0,0 +1,662 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~amd64-linux ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ media-libs/zxing-cpp
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-webdav
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-01 10:03 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-11-01 10:03 UTC (permalink / raw
To: gentoo-commits
commit: c89c50467244be3f24d015c832c6d8a3efa8dfc4
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 31 10:46:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 1 10:02:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89c5046
app-office/libreoffice: sync live
Closes: https://bugs.gentoo.org/813246
Signed-off-by: James Beddek <telans <AT> posteo.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.2.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 38 ++++++++++++----------
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.2.2.ebuild b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
index d8ad94e8fca..8e25775da85 100644
--- a/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.2.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~amd64-linux ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
index d8ad94e8fca..8e25775da85 100644
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~amd64-linux ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 188cea2395f..dfd813483da 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,6 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
+ # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
+ "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
# broken against latest upstream release, too many patches on top:
# https://github.com/tdf/libcmis/pull/43
"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
@@ -111,6 +113,22 @@ BDEPEND="
sys-devel/flex
sys-devel/gettext
virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ )
+ )
odk? ( >=app-doc/doxygen-1.8.4 )
"
COMMON_DEPEND="${PYTHON_DEPS}
@@ -156,7 +174,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/fontforge
media-gfx/graphite2
media-libs/fontconfig
- media-libs/freetype:2
+ >=media-libs/freetype-2.11.0-r1:2
>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
@@ -171,7 +189,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
sci-mathematics/lpsolve
sys-libs/zlib
- virtual/glu
virtual/jpeg:0
virtual/opengl
x11-libs/cairo[X]
@@ -185,19 +202,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
net-wireless/bluez
)
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
dbus? ( sys-apps/dbus[X] )
@@ -475,7 +479,6 @@ src_configure() {
--enable-cairo-canvas
--enable-largefile
--enable-mergelibs
- --enable-neon
--enable-python=system
--enable-randr
--enable-release-build
@@ -499,14 +502,15 @@ src_configure() {
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
+ --with-webdav
--with-x
--without-fonts
--without-myspell-dicts
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
+ --without-system-cuckoo
--without-system-jfreereport
- --without-system_apache_commons
--without-system-libcmis
--without-system-sane
$(use_enable base report-builder)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-05 17:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-11-05 17:57 UTC (permalink / raw
To: gentoo-commits
commit: 88845498a9df83e47142b798f4ded77f1e057bc9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 17:23:28 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 17:57:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88845498
app-office/libreoffice: 7.1.7.2 version bump
Bug: https://bugs.gentoo.org/816075
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.1.7.2.ebuild | 669 ++++++++++++++++++++++
2 files changed, 671 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b4e52bd7a5d..c98b7a92e01 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,10 +21,12 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
DIST libreoffice-7.1.6.2.tar.xz 244535588 BLAKE2B 79d4980b5842b37e7fdc328e832e3b672225e1903676d5c63ab68d7a993caf000bdb763837f98b4dd8156a95224ce22f501ec66dc315ca801a9c748e203e9170 SHA512 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257
+DIST libreoffice-7.1.7.2.tar.xz 244585600 BLAKE2B 65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430 SHA512 fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
DIST libreoffice-7.2.2.2.tar.xz 252478892 BLAKE2B e2e4ce76fc91ef0725f105ee87e480ede51610de7cabbc2bee1e32a9822f457ff9c21b0b13636447751727f42917dbdc9e24e20457ee9e5f1e4054d742337b5f SHA512 9adc14aa2aa24e1e91b32f0663d3fed8421baf78c3d310e8cc52ae70ea338b9d58406344d22d2c2fa6f91f10ae91945ef2d5713036f9144705bdb4c19ad69ca7
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
DIST libreoffice-help-7.1.6.2.tar.xz 111785436 BLAKE2B 810de348ca8fc297a75608bf4def1b4fe68dae976c727ceb157937de8029e9d30b52929c4a4fa6521b3391be27943bfe30b76466b9c415b4f78f0b68a28377ca SHA512 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad
+DIST libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 947860ebbcdf8bd0ee96ebad688057d776d049ccad066951bf0361bcc1f9a1f8187eed266061ad161f479a3691263dc4f179f4b81aa666fdc1a4a380d28425a4 SHA512 20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268
DIST libreoffice-help-7.2.2.2.tar.xz 111988404 BLAKE2B a0caafa4685c7356c8f1e592c104cd6e403283eb5b86580665637c3319eac4b651805ca6d7c45c5a0522e882ca1a28b6ae08f73c71b0417612c6fc084e194c1d SHA512 1e3a250b68f591c0dc0cd5d57843baa370ed009faabc9446826e8207043af5d193a263b85b9443a2baf1cb64366d90d08b763adf9ec9865d256f760f847ea638
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
diff --git a/app-office/libreoffice/libreoffice-7.1.7.2.ebuild b/app-office/libreoffice/libreoffice-7.1.7.2.ebuild
new file mode 100644
index 00000000000..1aabf934a4c
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.1.7.2.ebuild
@@ -0,0 +1,669 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+ # QR code generating library for >=libreoffice-6.4, bug #691740
+ "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? ( || (
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ ) )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ >=games-engines/box2d-2.4.1:0
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ # --without-system-qrcodegen: has no real build system and LO is the only user
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-neon
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --disable-vlc
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system_apache_commons
+ --without-system-libcmis
+ --without-system-sane
+ --without-system-qrcodegen
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-05 17:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-11-05 17:57 UTC (permalink / raw
To: gentoo-commits
commit: 95247259e84b5e18dfed7a325fb6f6d792bfac89
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 16:50:36 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 17:57:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95247259
app-office/libreoffice: Move clang to BDEPEND, allow sys-devel/llvm:13
Bug: https://bugs.gentoo.org/816075
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 27 +++++++++++-----------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index 74914f80b47..1aabf934a4c 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -113,6 +113,20 @@ BDEPEND="
sys-devel/flex
sys-devel/gettext
virtual/pkgconfig
+ clang? ( || (
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ ( sys-devel/clang:10
+ sys-devel/llvm:10
+ =sys-devel/lld-10* )
+ ) )
odk? ( >=app-doc/doxygen-1.8.4 )
"
COMMON_DEPEND="${PYTHON_DEPS}
@@ -186,19 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/glib:2
net-wireless/bluez
)
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
dbus? ( sys-apps/dbus[X] )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-07 17:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-11-07 17:23 UTC (permalink / raw
To: gentoo-commits
commit: a6a0e3e4bdcd363350f15650e9cf60074fdeb900
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 7 16:14:40 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 17:23:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a0e3e4
app-office/libreoffice: Drop 7.1.6.2
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.1.6.2.ebuild | 672 ----------------------
2 files changed, 674 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c98b7a92e01..c5a8ee649c8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,12 +20,10 @@ 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.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
-DIST libreoffice-7.1.6.2.tar.xz 244535588 BLAKE2B 79d4980b5842b37e7fdc328e832e3b672225e1903676d5c63ab68d7a993caf000bdb763837f98b4dd8156a95224ce22f501ec66dc315ca801a9c748e203e9170 SHA512 13f8e0a45614c75861b6262bcf845c1dc63baef044dc434319f739b6180f61a740f945e99663d76b1c51ce5226b9765431aa34b49d8a7f017c966bf5d4694257
DIST libreoffice-7.1.7.2.tar.xz 244585600 BLAKE2B 65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430 SHA512 fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
DIST libreoffice-7.2.2.2.tar.xz 252478892 BLAKE2B e2e4ce76fc91ef0725f105ee87e480ede51610de7cabbc2bee1e32a9822f457ff9c21b0b13636447751727f42917dbdc9e24e20457ee9e5f1e4054d742337b5f SHA512 9adc14aa2aa24e1e91b32f0663d3fed8421baf78c3d310e8cc52ae70ea338b9d58406344d22d2c2fa6f91f10ae91945ef2d5713036f9144705bdb4c19ad69ca7
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
-DIST libreoffice-help-7.1.6.2.tar.xz 111785436 BLAKE2B 810de348ca8fc297a75608bf4def1b4fe68dae976c727ceb157937de8029e9d30b52929c4a4fa6521b3391be27943bfe30b76466b9c415b4f78f0b68a28377ca SHA512 1b0f7fe4bc9bf2e16e3b3ddf49d4a70ef1d7369d9fd4d4835618007a230fb6e36e81fa1bde42d38dba1068147b285148dbff6c336aff52872e8794b594d309ad
DIST libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 947860ebbcdf8bd0ee96ebad688057d776d049ccad066951bf0361bcc1f9a1f8187eed266061ad161f479a3691263dc4f179f4b81aa666fdc1a4a380d28425a4 SHA512 20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268
DIST libreoffice-help-7.2.2.2.tar.xz 111988404 BLAKE2B a0caafa4685c7356c8f1e592c104cd6e403283eb5b86580665637c3319eac4b651805ca6d7c45c5a0522e882ca1a28b6ae08f73c71b0417612c6fc084e194c1d SHA512 1e3a250b68f591c0dc0cd5d57843baa370ed009faabc9446826e8207043af5d193a263b85b9443a2baf1cb64366d90d08b763adf9ec9865d256f760f847ea638
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
diff --git a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild b/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
deleted file mode 100644
index f2d42758311..00000000000
--- a/app-office/libreoffice/libreoffice-7.1.6.2.ebuild
+++ /dev/null
@@ -1,672 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- >=games-engines/box2d-2.4.1:0
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- clang? (
- || (
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- )
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-
- # 7.1 branch
- "${FILESDIR}/${P}-KF5-fix-double-buffer-graphics.patch"
-
- # master branch
- "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
- "${FILESDIR}/${PN}-7.1.5.2-bison-3.8.patch" # bug 812923
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrcodegen: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-libcmis
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-07 17:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-11-07 17:23 UTC (permalink / raw
To: gentoo-commits
commit: acfaefb70f0778bbeecb9590d61878c1b3be8ffb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 7 16:15:21 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 7 17:23:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acfaefb7
app-office/libreoffice: Drop 7.1.9999 stable branch ebuild
No more development.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.9999.ebuild | 669 ---------------------
1 file changed, 669 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
deleted file mode 100644
index 1aabf934a4c..00000000000
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ /dev/null
@@ -1,669 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
- # QR code generating library for >=libreoffice-6.4, bug #691740
- "${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? ( || (
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- ( sys-devel/clang:10
- sys-devel/llvm:10
- =sys-devel/lld-10* )
- ) )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- >=games-engines/box2d-2.4.1:0
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- media-libs/freetype:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/glu
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
-
- # master branch
- "${FILESDIR}/${PN}-7.1.3.2-bashism.patch" # bug 780432
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- # --without-system-qrcodegen: has no real build system and LO is the only user
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-neon
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --disable-vlc
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system_apache_commons
- --without-system-libcmis
- --without-system-sane
- --without-system-qrcodegen
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-11-14 5:25 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-11-14 5:25 UTC (permalink / raw
To: gentoo-commits
commit: be87fd465f6937d9dd7721c25855e282b53dd42f
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Nov 13 10:47:57 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 05:24:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be87fd46
app-office/libreoffice: update mdds/liborcus slots
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22770
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index dfd813483da6..6e95a9c0abd7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -162,7 +162,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
+ dev-libs/liborcus:0/0.17
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -251,7 +251,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
+ dev-util/mdds:1/2.0
media-libs/glm
sys-devel/ucpp
x11-base/xorg-proto
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-12-02 8:39 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-12-02 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 85400976bc840534c9b49b0a7c3ada3453b69e0c
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Thu Dec 2 04:15:32 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 08:38:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85400976
app-office/libreoffice: update 9999
Closes: https://bugs.gentoo.org/827675
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/23142
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 457efe533ae0..7b592716c7af 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -28,4 +28,4 @@ DIST libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 947860ebbcdf8bd0ee96ebad6
DIST libreoffice-help-7.2.3.2.tar.xz 111989408 BLAKE2B 862af98e7fddcf8ed30c16e111aba1e13c7e143398c55cb07c0612648e0fd8b73cdd1a1303efce6050fda49737eca6c645aae9e75fd4f3add6928326624c5db1 SHA512 64ab9d676cc86116ec8aac1157aee33551932f2047f1c47cde865e50e39438f497b7b08073c3f058fae4870325950bad1a5063a55b8897ecb09c046c98bf7264
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
-DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8
+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-9999.ebuild
index 355a710f5757..41971fab4eeb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -52,7 +52,7 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz"
+ "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-12-02 19:52 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2021-12-02 19:52 UTC (permalink / raw
To: gentoo-commits
commit: c3940437b134265c479c2e77d48e03184ad300f1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 19:51:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 19:52:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3940437
app-office/libreoffice: Stabilize 7.1.7.2 x86, #821970
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.1.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.1.7.2.ebuild b/app-office/libreoffice/libreoffice-7.1.7.2.ebuild
index 066412f4d24c..fe9daf532de9 100644
--- a/app-office/libreoffice/libreoffice-7.1.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.7.2.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
BDEPEND="
dev-util/intltool
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: cc416d838a3deed2cebc6a0bc646d37150cdc1f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 13:55:50 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc416d83
app-office/libreoffice: Forward patch to 7.2 stable branch
Fix comment of origin.
Bug: https://bugs.gentoo.org/821265
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.3.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild b/app-office/libreoffice/libreoffice-7.2.3.2.ebuild
index 3b60b78183c0..4a18f0401b53 100644
--- a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.3.2.ebuild
@@ -293,7 +293,7 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
- # Upstream
+ # 7.3 branch
"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
)
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
index 42698197f1cd..b819e767c27d 100644
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -293,6 +293,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.3 branch
+ "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: a190d43b723ed4f5b71f6fb7e63e6bb868b4e53e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 14:29:09 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a190d43b
app-office/libreoffice: 7.2.4.1 version bump
No material difference to Gentoo, but first keyworded 7.2 release
anyway.
See also:
https://blog.documentfoundation.org/blog/2021/12/06/libreoffice-7-2-4-and-7-1-8-community/
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-7.2.3.2.ebuild => libreoffice-7.2.4.1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 48c19050357c..bfa3145416eb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,10 +20,10 @@ 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.1.7.2.tar.xz 244585600 BLAKE2B 65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430 SHA512 fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
-DIST libreoffice-7.2.3.2.tar.xz 252752188 BLAKE2B aa3118e1b719078e1a0963edf9829bcbc8b6e8ea6752ca69b407a95307c8cd2f8b068eb707fbc176bd5bb4c5c9382a990863a44fd676a60b09204782993fe544 SHA512 b59e679025115cf176faf8a153833ed5ebac374372ba46bef46da22657dda399b88b3d503bfaf9964184d2dde4b19d3852d53c27cf6ceb0dd4967077b45eb5f6
+DIST libreoffice-7.2.4.1.tar.xz 252734952 BLAKE2B 27dfffd291095553dfb4ca60944a4782f8fc7fc675a08a8b3bdcc55d38d744824c4651f6d10c376424528de2ea591bb7596856c46232b24a578fb6500be93885 SHA512 3193edbd9d162fc0b2f69e072719e4c9fb8242f6851caf101fe973e33db8440e80722bc11da410eb155de4550ed42552645f7c1a3361584a0c1cc816e4a04aaa
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 947860ebbcdf8bd0ee96ebad688057d776d049ccad066951bf0361bcc1f9a1f8187eed266061ad161f479a3691263dc4f179f4b81aa666fdc1a4a380d28425a4 SHA512 20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268
-DIST libreoffice-help-7.2.3.2.tar.xz 111989408 BLAKE2B 862af98e7fddcf8ed30c16e111aba1e13c7e143398c55cb07c0612648e0fd8b73cdd1a1303efce6050fda49737eca6c645aae9e75fd4f3add6928326624c5db1 SHA512 64ab9d676cc86116ec8aac1157aee33551932f2047f1c47cde865e50e39438f497b7b08073c3f058fae4870325950bad1a5063a55b8897ecb09c046c98bf7264
+DIST libreoffice-help-7.2.4.1.tar.xz 111989824 BLAKE2B 11efe907c4df6e3f5b840d2bb52db88959d0f01d479f9578ad44ec17f5225c54ac19dc63d8c1145a518cd379487d6d82489c37f3b868660af03f89f8a978f315 SHA512 132554fc3ec6c5699ed47355e993630006c48b093fe5affe505ae8292edca8764a28e5d9806658d3227d6f13226a27d8dfb38b6aa5041f92f078ba6de04b199d
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
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-7.2.3.2.ebuild b/app-office/libreoffice/libreoffice-7.2.4.1.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-7.2.3.2.ebuild
rename to app-office/libreoffice/libreoffice-7.2.4.1.ebuild
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 2ac15c37ae9b90562b334870fe577d7bdd4cb018
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Thu Dec 2 04:28:35 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac15c37
app-office/libreoffice: keyword 7.2.3.2
Closes: https://bugs.gentoo.org/813399
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/23145
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.3.2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild b/app-office/libreoffice/libreoffice-7.2.3.2.ebuild
index 4a18f0401b53..b819e767c27d 100644
--- a/app-office/libreoffice/libreoffice-7.2.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.3.2.ebuild
@@ -102,7 +102,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
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-01-07 14:49 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-01-07 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 8df7d1ae22729c8598ba1e3241d0ea2a1e945059
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 7 14:48:29 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 7 14:49:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df7d1ae
app-office/libreoffice: Drop 7.2.4.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.2.4.1.ebuild | 662 ----------------------
2 files changed, 664 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 0676dc172659..17f0e970c4b2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,11 +20,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.1.7.2.tar.xz 244585600 BLAKE2B 65cb8f5ddbae5aa8fb37a54cc0fab8d541a030f6f94141f4e4355f1dfb24a927ffb713e5213e382152fe444e115f27b41f297ca37e320193c5e0289a01ee5430 SHA512 fa55bea912b4efa73cd1ad8bcc611a71146ab42534a348a7c695916d74f1912ad13a2d9ccb4f3f4ee4d604a0747619b75bbcc5e2b14bc306d53b3a1f27525093
-DIST libreoffice-7.2.4.1.tar.xz 252734952 BLAKE2B 27dfffd291095553dfb4ca60944a4782f8fc7fc675a08a8b3bdcc55d38d744824c4651f6d10c376424528de2ea591bb7596856c46232b24a578fb6500be93885 SHA512 3193edbd9d162fc0b2f69e072719e4c9fb8242f6851caf101fe973e33db8440e80722bc11da410eb155de4550ed42552645f7c1a3361584a0c1cc816e4a04aaa
DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463 SHA512 a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.1.7.2.tar.xz 111785664 BLAKE2B 947860ebbcdf8bd0ee96ebad688057d776d049ccad066951bf0361bcc1f9a1f8187eed266061ad161f479a3691263dc4f179f4b81aa666fdc1a4a380d28425a4 SHA512 20c464ff9cea68b37f6988faea84e9d72ba174706e75d91bbcac514011c65ab55d4f3a9f21fbb8f04f02908237b16d7a6983624c5ab8f27ee4f83aa7eb621268
-DIST libreoffice-help-7.2.4.1.tar.xz 111989824 BLAKE2B 11efe907c4df6e3f5b840d2bb52db88959d0f01d479f9578ad44ec17f5225c54ac19dc63d8c1145a518cd379487d6d82489c37f3b868660af03f89f8a978f315 SHA512 132554fc3ec6c5699ed47355e993630006c48b093fe5affe505ae8292edca8764a28e5d9806658d3227d6f13226a27d8dfb38b6aa5041f92f078ba6de04b199d
DIST libreoffice-help-7.2.5.2.tar.xz 112080572 BLAKE2B 9c07cec6cd6c639335c38af65f3dccf331200422f670fa225e355117062f5ad2a8173c5f59ee63137aa480e8db307b0671e4a7a0ff503ea3a034e126e0464120 SHA512 70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00
DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
diff --git a/app-office/libreoffice/libreoffice-7.2.4.1.ebuild b/app-office/libreoffice/libreoffice-7.2.4.1.ebuild
deleted file mode 100644
index b819e767c27d..000000000000
--- a/app-office/libreoffice/libreoffice-7.2.4.1.ebuild
+++ /dev/null
@@ -1,662 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- media-libs/zxing-cpp
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # 7.3 branch
- "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-webdav
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-03 3:42 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-02-03 3:42 UTC (permalink / raw
To: gentoo-commits
commit: 1d8ebcce79faf92b40a60394e45236869150bf77
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 3 03:41:55 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 03:41:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8ebcce
app-office/libreoffice: Stabilize 7.2.5.2 x86, #830739
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.5.2.ebuild b/app-office/libreoffice/libreoffice-7.2.5.2.ebuild
index 4c0dd666744c..abe83166c928 100644
--- a/app-office/libreoffice/libreoffice-7.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.5.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-03 3:42 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-02-03 3:42 UTC (permalink / raw
To: gentoo-commits
commit: 13d15a1c368ae229a215a2eb3be6ec46925fbccc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 3 03:42:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 03:42:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13d15a1c
app-office/libreoffice: Stabilize 7.2.5.2 amd64, #830739
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.5.2.ebuild b/app-office/libreoffice/libreoffice-7.2.5.2.ebuild
index abe83166c928..1f23e8ac0e86 100644
--- a/app-office/libreoffice/libreoffice-7.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.5.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-08 23:23 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2022-02-08 23:23 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-12 0:34 Andreas K. Hüttel
0 siblings, 0 replies; 588+ messages in thread
From: Andreas K. Hüttel @ 2022-02-12 0:34 UTC (permalink / raw
To: gentoo-commits
commit: 786426e9a5bf51c1664ae1367ad2a99c87c245ed
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 00:33:50 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 00:33:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=786426e9
app-office/libreoffice: Fix build target
Closes: https://bugs.gentoo.org/828485
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.0.3.ebuild | 6 +-----
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 10 +++-------
app-office/libreoffice/libreoffice-9999.ebuild | 10 +++-------
3 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.0.3.ebuild b/app-office/libreoffice/libreoffice-7.3.0.3.ebuild
index 378ef7d794de..286d80a181b0 100644
--- a/app-office/libreoffice/libreoffice-7.3.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.0.3.ebuild
@@ -588,11 +588,7 @@ src_compile() {
addpredict /dev/ati
addpredict /dev/nvidiactl
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
+ default
}
src_test() {
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 0a6cb0608a09..286d80a181b0 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -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
@@ -588,11 +588,7 @@ src_compile() {
addpredict /dev/ati
addpredict /dev/nvidiactl
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
+ default
}
src_test() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 0a6cb0608a09..286d80a181b0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -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
@@ -588,11 +588,7 @@ src_compile() {
addpredict /dev/ati
addpredict /dev/nvidiactl
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
+ default
}
src_test() {
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-16 15:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-02-16 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 36fd6dd3e52ecbc25c760a71d3a5eb9647d0737f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 15:05:27 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 15:57:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36fd6dd3
app-office/libreoffice: EAPI-8 bump
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 10 +++++-----
app-office/libreoffice/libreoffice-7.3.1.1.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-9999.ebuild | 8 ++++----
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
index b819e767c27d..9953baa89170 100644
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -641,10 +641,10 @@ EOF
# link python bridge in site-packages, bug 667802
local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
}
diff --git a/app-office/libreoffice/libreoffice-7.3.1.1.ebuild b/app-office/libreoffice/libreoffice-7.3.1.1.ebuild
index 286d80a181b0..74a8caa49137 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -642,10 +642,10 @@ EOF
# link python bridge in site-packages, bug 667802
local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
}
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 286d80a181b0..74a8caa49137 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -642,10 +642,10 @@ EOF
# link python bridge in site-packages, bug 667802
local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 286d80a181b0..74a8caa49137 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE="threads(+),xml"
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
@@ -642,10 +642,10 @@ EOF
# link python bridge in site-packages, bug 667802
local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
done
}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-17 18:43 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-02-17 18:43 UTC (permalink / raw
To: gentoo-commits
commit: f5a48becda7d7f37a128af84a9523ad3482f5a36
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 18:32:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 18:43:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a48bec
app-office/libreoffice: add subslot dependency on gpgme
gpgme broke ABI
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{libreoffice-7.2.5.2.ebuild => libreoffice-7.2.5.2-r1.ebuild} | 2 +-
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 2 +-
.../{libreoffice-7.3.0.3.ebuild => libreoffice-7.3.0.3-r1.ebuild} | 2 +-
.../{libreoffice-7.3.1.1.ebuild => libreoffice-7.3.1.1-r1.ebuild} | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.5.2.ebuild b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.2.5.2.ebuild
rename to app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
index a2fc6ed686a7..bdf13f03b39c 100644
--- a/app-office/libreoffice/libreoffice-7.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
@@ -108,7 +108,7 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-crypt/gpgme[cxx]
+ app-crypt/gpgme:=[cxx]
app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
index 9953baa89170..e2b8f99a1ca1 100644
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -108,7 +108,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-crypt/gpgme[cxx]
+ app-crypt/gpgme:=[cxx]
app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
diff --git a/app-office/libreoffice/libreoffice-7.3.0.3.ebuild b/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.0.3.ebuild
rename to app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
index 286d80a181b0..702733b0f4d2 100644
--- a/app-office/libreoffice/libreoffice-7.3.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
@@ -110,7 +110,7 @@ SLOT="0"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-crypt/gpgme[cxx]
+ app-crypt/gpgme:=[cxx]
app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
diff --git a/app-office/libreoffice/libreoffice-7.3.1.1.ebuild b/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.1.1.ebuild
rename to app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
index 74a8caa49137..e4211ec16391 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
@@ -110,7 +110,7 @@ SLOT="0"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-crypt/gpgme[cxx]
+ app-crypt/gpgme:=[cxx]
app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 74a8caa49137..e4211ec16391 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -110,7 +110,7 @@ SLOT="0"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
- app-crypt/gpgme[cxx]
+ app-crypt/gpgme:=[cxx]
app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-19 16:27 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-02-19 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 081738cfa8a2e8b91dbd73f247951b9badca6bce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 21:21:22 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:26:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=081738cf
app-office/libreoffice: 7.2.6.1 version bump w/o KEYWORDS
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.2.6.1.ebuild | 662 ++++++++++++++++++++++
2 files changed, 664 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9f3a86421a7d..e1ffdbeabcbb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,10 +19,12 @@ 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.2.6.1.tar.xz 252987652 BLAKE2B 5ad4288182722d875a21492fd1ab6911fa97451552121929e54521cf29c42b832d0bfc57a140c773f415ffcd2749400822cadbc830f36f3a63044f54a09fcdfc SHA512 97e15eb8fdaa0e24ec50539c9818592499f50f628de1de066e080e30b37830164f3f9fab04ae8607bf9a1111db277094c1d554074c559b7b719d72936468fbdc
DIST libreoffice-7.3.0.3.tar.xz 254873208 BLAKE2B 08eff5890ca882e3aad688575f3114d461922c497c3397a5ff24c331d74564d0fe2d39e0bf195cd4bc2beadb63ca19914433cf5119990c54ae895cdd89059120 SHA512 408b98184afc0721f922768f60e877fd756b656b4fd30cf6ad629bd32ba323fb1f4b052c8427b11395253b4ed67f9a1fd20ef3f7fd5945abc0f8cfb1f40c5d47
DIST libreoffice-7.3.1.1.tar.xz 255263512 BLAKE2B abc2893a05a83dae41fcbdb1d22c665e0ffa61c89971a02c910bf98d96e71e88fe53b8049bc0de79c848c5b1c03a84959aa459cc9cf13de7b98f125bd4a55ae5 SHA512 186c4037b3b8e9bc225baf6dffa3604f17fa2340b32286e4557346b119a64bd93d4c62ee1451b3c0bfd88fcebcd5ba7b161680592e8723f686b98d36cba12993
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.2.6.1.tar.xz 112080000 BLAKE2B daead434fa06fb59df298ba698824e0645fcb2ec3be571ffa032bb0fbf391f7cceb595fc872ea6a5174c046f14f391d46de59bdbcd3efb0d3a712299d3c29fc6 SHA512 fe4061458a913f511d17b42016ddb0002705c4bd3c13379fcdaf6d6052c8a7319ebe545e5775c23a563d1760e28c2b7ae8498242a83e2eef3b9dd8d6a23adaa8
DIST libreoffice-help-7.3.0.3.tar.xz 112208912 BLAKE2B 445c0923296010fbbe9a6409596e8bf453ced7989d0a82989f5eb70fcc167039a72783aa85d6c7587e9cba07def80ca5a9e1af450039f7ddaae6233021530c7e SHA512 6d6fb4968ce7b40291c9426183d2d031761e5d3421d66adda0b0e1cf57c1aeb68252cec561119935c68b6239add8ba7ee686ce6365ce84cc2ce4f85346fe2aec
DIST libreoffice-help-7.3.1.1.tar.xz 112208076 BLAKE2B 0eb13e4143bdc3417baa0c22ffc54db42ee27ec9d476097e681f15f3ceec7a3b657657031ed5d93e59de4867b499095e8bbab1dfafad5cf3ddb1128dde0bc894 SHA512 c9517d94ad18554fb1e35b755fce7863fcc85c54ec8f3719cf55aafddfba8dca10e4ee6a328501da828dd5647960e41ac153f0152d9630c90779f84eb756cff9
DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
diff --git a/app-office/libreoffice/libreoffice-7.2.6.1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.1.ebuild
new file mode 100644
index 000000000000..b87110e81eac
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.2.6.1.ebuild
@@ -0,0 +1,662 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+# [[ ${MY_PV} == *9999* ]] || \
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.16
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ media-libs/zxing-cpp
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/1.5
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.3 branch
+ "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-ucpp
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-webdav
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-19 16:27 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-02-19 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 6052c9bf90757240033446edcd89e28e0415ff1e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 22:18:36 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:26:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6052c9bf
app-office/libreoffice: Drop 7.3.0.3-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../libreoffice/libreoffice-7.3.0.3-r1.ebuild | 666 ---------------------
2 files changed, 668 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e1ffdbeabcbb..8a2a7a9ed754 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,12 +20,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
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.2.6.1.tar.xz 252987652 BLAKE2B 5ad4288182722d875a21492fd1ab6911fa97451552121929e54521cf29c42b832d0bfc57a140c773f415ffcd2749400822cadbc830f36f3a63044f54a09fcdfc SHA512 97e15eb8fdaa0e24ec50539c9818592499f50f628de1de066e080e30b37830164f3f9fab04ae8607bf9a1111db277094c1d554074c559b7b719d72936468fbdc
-DIST libreoffice-7.3.0.3.tar.xz 254873208 BLAKE2B 08eff5890ca882e3aad688575f3114d461922c497c3397a5ff24c331d74564d0fe2d39e0bf195cd4bc2beadb63ca19914433cf5119990c54ae895cdd89059120 SHA512 408b98184afc0721f922768f60e877fd756b656b4fd30cf6ad629bd32ba323fb1f4b052c8427b11395253b4ed67f9a1fd20ef3f7fd5945abc0f8cfb1f40c5d47
DIST libreoffice-7.3.1.1.tar.xz 255263512 BLAKE2B abc2893a05a83dae41fcbdb1d22c665e0ffa61c89971a02c910bf98d96e71e88fe53b8049bc0de79c848c5b1c03a84959aa459cc9cf13de7b98f125bd4a55ae5 SHA512 186c4037b3b8e9bc225baf6dffa3604f17fa2340b32286e4557346b119a64bd93d4c62ee1451b3c0bfd88fcebcd5ba7b161680592e8723f686b98d36cba12993
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.2.6.1.tar.xz 112080000 BLAKE2B daead434fa06fb59df298ba698824e0645fcb2ec3be571ffa032bb0fbf391f7cceb595fc872ea6a5174c046f14f391d46de59bdbcd3efb0d3a712299d3c29fc6 SHA512 fe4061458a913f511d17b42016ddb0002705c4bd3c13379fcdaf6d6052c8a7319ebe545e5775c23a563d1760e28c2b7ae8498242a83e2eef3b9dd8d6a23adaa8
-DIST libreoffice-help-7.3.0.3.tar.xz 112208912 BLAKE2B 445c0923296010fbbe9a6409596e8bf453ced7989d0a82989f5eb70fcc167039a72783aa85d6c7587e9cba07def80ca5a9e1af450039f7ddaae6233021530c7e SHA512 6d6fb4968ce7b40291c9426183d2d031761e5d3421d66adda0b0e1cf57c1aeb68252cec561119935c68b6239add8ba7ee686ce6365ce84cc2ce4f85346fe2aec
DIST libreoffice-help-7.3.1.1.tar.xz 112208076 BLAKE2B 0eb13e4143bdc3417baa0c22ffc54db42ee27ec9d476097e681f15f3ceec7a3b657657031ed5d93e59de4867b499095e8bbab1dfafad5cf3ddb1128dde0bc894 SHA512 c9517d94ad18554fb1e35b755fce7863fcc85c54ec8f3719cf55aafddfba8dca10e4ee6a328501da828dd5647960e41ac153f0152d9630c90779f84eb756cff9
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-7.3.0.3-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
deleted file mode 100644
index a192705bcdf3..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
+++ /dev/null
@@ -1,666 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=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
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # master branch
- "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-cuckoo
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-02-27 21:41 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-02-27 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 18b9bc4a7957e31a53b99f95c41a9ba60dfb0d95
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 17:26:17 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 21:41:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b9bc4a
app-office/libreoffice: Drop upstream backported patch from 7.3.9999
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index c8ad5df807a3..74a8caa49137 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -297,9 +297,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # master branch
- "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-09 10:01 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-03-09 10:01 UTC (permalink / raw
To: gentoo-commits
commit: 76aa01b7c9dfe94b1bd55c1356d62e9562f385eb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 9 09:50:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 9 10:01:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76aa01b7
app-office/libreoffice: 7.2.6.2, 7.3.1.2 version bumps
Dropping 7.2.6.1, 7.3.1.1.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 8 ++++----
.../{libreoffice-7.2.6.1.ebuild => libreoffice-7.2.6.2.ebuild} | 0
.../{libreoffice-7.3.1.1-r1.ebuild => libreoffice-7.3.1.2.ebuild} | 3 ---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8a2a7a9ed754..cd7d3a4bfa78 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,11 +19,11 @@ 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.2.6.1.tar.xz 252987652 BLAKE2B 5ad4288182722d875a21492fd1ab6911fa97451552121929e54521cf29c42b832d0bfc57a140c773f415ffcd2749400822cadbc830f36f3a63044f54a09fcdfc SHA512 97e15eb8fdaa0e24ec50539c9818592499f50f628de1de066e080e30b37830164f3f9fab04ae8607bf9a1111db277094c1d554074c559b7b719d72936468fbdc
-DIST libreoffice-7.3.1.1.tar.xz 255263512 BLAKE2B abc2893a05a83dae41fcbdb1d22c665e0ffa61c89971a02c910bf98d96e71e88fe53b8049bc0de79c848c5b1c03a84959aa459cc9cf13de7b98f125bd4a55ae5 SHA512 186c4037b3b8e9bc225baf6dffa3604f17fa2340b32286e4557346b119a64bd93d4c62ee1451b3c0bfd88fcebcd5ba7b161680592e8723f686b98d36cba12993
+DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
+DIST libreoffice-7.3.1.2.tar.xz 255320720 BLAKE2B 0acf9ef8679bf11349823f81e3da6d1bbb282e54bc3c16a6939ec602631fcc8c87d06bb1c2ab07cc1275897c9000cdcde614dd6bd73914911f81656f210a8728 SHA512 a8455ce010814275a22bafdc6f643935f7797b8bfdf898b9c7dbf48c129516585628e9c04c4af9f7b4654358f5fa94f89414fbbec744d1b5f084157bf66aad4a
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.2.6.1.tar.xz 112080000 BLAKE2B daead434fa06fb59df298ba698824e0645fcb2ec3be571ffa032bb0fbf391f7cceb595fc872ea6a5174c046f14f391d46de59bdbcd3efb0d3a712299d3c29fc6 SHA512 fe4061458a913f511d17b42016ddb0002705c4bd3c13379fcdaf6d6052c8a7319ebe545e5775c23a563d1760e28c2b7ae8498242a83e2eef3b9dd8d6a23adaa8
-DIST libreoffice-help-7.3.1.1.tar.xz 112208076 BLAKE2B 0eb13e4143bdc3417baa0c22ffc54db42ee27ec9d476097e681f15f3ceec7a3b657657031ed5d93e59de4867b499095e8bbab1dfafad5cf3ddb1128dde0bc894 SHA512 c9517d94ad18554fb1e35b755fce7863fcc85c54ec8f3719cf55aafddfba8dca10e4ee6a328501da828dd5647960e41ac153f0152d9630c90779f84eb756cff9
+DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
+DIST libreoffice-help-7.3.1.2.tar.xz 112208144 BLAKE2B 29b295d6ba4d078f4b4861755aa06368bed3d57104c51d294ecd6f78eefcae5b58d46626c2ac0d11ded676f13d0cd26d2ecca3be545284b649e1b02b976dc692 SHA512 92c48c354835729aae8361e75c3f92bf8da471f1a4f479c8474269c5fe2546b1a2aeb08c38f28b98d1855fc9777f3fce47669b8d290c05553ae1d873a3bad822
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-7.2.6.1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-7.2.6.1.ebuild
rename to app-office/libreoffice/libreoffice-7.2.6.2.ebuild
diff --git a/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.1.2.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
rename to app-office/libreoffice/libreoffice-7.3.1.2.ebuild
index 96318dc2ec53..e4211ec16391 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.2.ebuild
@@ -297,9 +297,6 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # master branch
- "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-10 18:14 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-03-10 18:14 UTC (permalink / raw
To: gentoo-commits
commit: d9949118c4e51deb6b8bff2c884779df7447aaf3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 18:13:14 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 18:14:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9949118
app-office/libreoffice: Restore 7.2.6.2 keywords
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.6.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
index b87110e81eac..e2b8f99a1ca1 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
@@ -102,8 +102,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
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-10 20:07 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-03-10 20:07 UTC (permalink / raw
To: gentoo-commits
commit: e49a3419528a4d21b71d9816faf6e49c1594c1d3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 18:38:00 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 20:07:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49a3419
app-office/libreoffice: 7.3.1.3 version bump w/o KEYWORDS
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-7.3.1.2.ebuild => libreoffice-7.3.1.3.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index cd7d3a4bfa78..7afe40508935 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,10 +20,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
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.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
-DIST libreoffice-7.3.1.2.tar.xz 255320720 BLAKE2B 0acf9ef8679bf11349823f81e3da6d1bbb282e54bc3c16a6939ec602631fcc8c87d06bb1c2ab07cc1275897c9000cdcde614dd6bd73914911f81656f210a8728 SHA512 a8455ce010814275a22bafdc6f643935f7797b8bfdf898b9c7dbf48c129516585628e9c04c4af9f7b4654358f5fa94f89414fbbec744d1b5f084157bf66aad4a
+DIST libreoffice-7.3.1.3.tar.xz 255329180 BLAKE2B 37e16f2946e17bb8707d529197836c8401c97c80a746e274367b5666ae5634af2ba5737f8024ad226432095df181bd824a70b179e0e8066ab5e2cf82a21231a7 SHA512 d0daaee058e2cd7f1af02101b68d33c3df50b3eaae951b40c557c4e74c6f0929162fec0759fa4688cd7da41a5fa7ab4dbf867f31cad428487da2393dcb40a3d8
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.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
-DIST libreoffice-help-7.3.1.2.tar.xz 112208144 BLAKE2B 29b295d6ba4d078f4b4861755aa06368bed3d57104c51d294ecd6f78eefcae5b58d46626c2ac0d11ded676f13d0cd26d2ecca3be545284b649e1b02b976dc692 SHA512 92c48c354835729aae8361e75c3f92bf8da471f1a4f479c8474269c5fe2546b1a2aeb08c38f28b98d1855fc9777f3fce47669b8d290c05553ae1d873a3bad822
+DIST libreoffice-help-7.3.1.3.tar.xz 112208156 BLAKE2B 1e13d9b57f8806cb5aeb34b816b7003a843d7bf6efd4f86eb391456deac85cae9f69046f13427835e131541e05c84fa754ebf039f4bb4c9ce07b2f1a08a5f0f9 SHA512 cb41afc6b4c35a97a62d4263395210b3309c8a68822cecfc245217d9f93697a0bd9043801622923ed81a14d346161d56f6443ccb6e082d3ba8ddcf737653da0f
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-7.3.1.2.ebuild b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-7.3.1.2.ebuild
rename to app-office/libreoffice/libreoffice-7.3.1.3.ebuild
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-16 16:15 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-03-16 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 0d68f44bca2e601fa5ecafc274bb5889d5344081
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 16:14:56 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 16:15:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d68f44b
app-office/libreoffice: Drop 7.2 stable branch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 665 ---------------------
1 file changed, 665 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
deleted file mode 100644
index 32c95181ca6e..000000000000
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ /dev/null
@@ -1,665 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
- dev-db/unixODBC
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- dev-libs/liborcus:0/0.16
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libzmf
- media-libs/zxing-cpp
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/1.5
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # 7.3 branch
- "${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
-
- # master branch
- "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-ucpp
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-webdav
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-19 20:59 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-03-19 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 4aa0c28b44c64bebb5b2d3477829f857d82a9fb5
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Mar 19 11:47:54 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 20:42:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa0c28b
app-office/libreoffice: Push rhino dep to >=1.7.14
Closes: https://bugs.gentoo.org/835518
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24661
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.6.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
index e51b271e87c1..8250a1278b19 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
@@ -210,7 +210,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
ldap? ( net-nds/openldap )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
mariadb? ( dev-db/mariadb-connector-c )
!mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
@@ -570,7 +570,7 @@ src_configure() {
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-20 0:53 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-03-20 0:53 UTC (permalink / raw
To: gentoo-commits
commit: 8555403004d8047987dcce007a4590f704d706f5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 00:51:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 00:51:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85554030
app-office/libreoffice: sync live ebuilds for Java build fix
Bug: https://bugs.gentoo.org/835518
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.1.3.ebuild | 4 ++--
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
index 9b774db180ef..f47286769364 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
@@ -214,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
ldap? ( net-nds/openldap )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
mariadb? ( dev-db/mariadb-connector-c )
!mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
@@ -575,7 +575,7 @@ src_configure() {
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 74a8caa49137..fc4fd4820cf0 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -214,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
ldap? ( net-nds/openldap )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
mariadb? ( dev-db/mariadb-connector-c )
!mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
@@ -572,7 +572,7 @@ src_configure() {
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index e4211ec16391..f53fee56e61b 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -214,7 +214,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
ldap? ( net-nds/openldap )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
mariadb? ( dev-db/mariadb-connector-c )
!mariadb? ( dev-db/mysql-connector-c )
pdfimport? ( app-text/poppler:=[cxx] )
@@ -572,7 +572,7 @@ src_configure() {
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-23 1:02 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-03-23 1:02 UTC (permalink / raw
To: gentoo-commits
commit: 90ff78ecc15ab9e57668b1f5cad8d149aacf72c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 00:50:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 00:50:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90ff78ec
app-office/libreoffice: add subslot dep on OpenLDAP
New OpenLDAP breaks ABI (changes SONAME)
(Only revbumping 7.3.1.3 because it'll be keyworded soon
and the OpenLDAP version which breaks ABI won't be stabled
for a while -- definitely after 7.3.1.3 (or something after it)
is stabled. Let's avoid inflicting pain on users.)
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild | 6 +++---
app-office/libreoffice/libreoffice-7.2.6.2.ebuild | 6 +++---
.../{libreoffice-7.3.1.3.ebuild => libreoffice-7.3.1.3-r1.ebuild} | 6 +++---
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
index f9cc748f0b85..58d6d820c38c 100644
--- a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
@@ -208,11 +208,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kio:5
kde-frameworks/kwindowsystem:5
)
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
index 8250a1278b19..e62667b537b0 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
@@ -208,11 +208,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kio:5
kde-frameworks/kwindowsystem:5
)
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
diff --git a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild b/app-office/libreoffice/libreoffice-7.3.1.3-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.1.3.ebuild
rename to app-office/libreoffice/libreoffice-7.3.1.3-r1.ebuild
index f47286769364..b5d0ca50a424 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.3-r1.ebuild
@@ -212,11 +212,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kio:5
kde-frameworks/kwindowsystem:5
)
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index fc4fd4820cf0..41fa7859c3a7 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -212,11 +212,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kio:5
kde-frameworks/kwindowsystem:5
)
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f53fee56e61b..db53409b551c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -212,11 +212,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kio:5
kde-frameworks/kwindowsystem:5
)
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-26 16:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-03-26 16:40 UTC (permalink / raw
To: gentoo-commits
commit: d6a0cf874e10aefc668b421517abed47ef3e9aa5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 16:32:36 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 16:39:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a0cf87
app-office/libreoffice: 7.3.2.2 version bump w/o KEYWORDS
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.3.2.2.ebuild | 666 ++++++++++++++++++++++
2 files changed, 668 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 7afe40508935..4a31a3b03a9f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,9 +21,11 @@ DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 8
DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463 SHA512 a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8
DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
DIST libreoffice-7.3.1.3.tar.xz 255329180 BLAKE2B 37e16f2946e17bb8707d529197836c8401c97c80a746e274367b5666ae5634af2ba5737f8024ad226432095df181bd824a70b179e0e8066ab5e2cf82a21231a7 SHA512 d0daaee058e2cd7f1af02101b68d33c3df50b3eaae951b40c557c4e74c6f0929162fec0759fa4688cd7da41a5fa7ab4dbf867f31cad428487da2393dcb40a3d8
+DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f SHA512 c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
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.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
DIST libreoffice-help-7.3.1.3.tar.xz 112208156 BLAKE2B 1e13d9b57f8806cb5aeb34b816b7003a843d7bf6efd4f86eb391456deac85cae9f69046f13427835e131541e05c84fa754ebf039f4bb4c9ce07b2f1a08a5f0f9 SHA512 cb41afc6b4c35a97a62d4263395210b3309c8a68822cecfc245217d9f93697a0bd9043801622923ed81a14d346161d56f6443ccb6e082d3ba8ddcf737653da0f
+DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
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-7.3.2.2.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
new file mode 100644
index 000000000000..9b774db180ef
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
@@ -0,0 +1,666 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
+ "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=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
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c )
+ !mariadb? ( dev-db/mysql-connector-c )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ ( sys-devel/clang:11
+ sys-devel/llvm:11
+ =sys-devel/lld-11* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # TODO upstream
+ "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-webdav
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-cuckoo
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-03-30 5:57 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-03-30 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 1ea4e8ce621bfd5eb6a2cd0812ead66f3ac77d44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 05:56:20 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 05:56:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea4e8ce
app-office/libreoffice: Drop 7.3.1.3-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../libreoffice/libreoffice-7.3.1.3-r1.ebuild | 666 ---------------------
2 files changed, 668 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4a31a3b03a9f..5f0f654063a8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,12 +20,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
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.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
-DIST libreoffice-7.3.1.3.tar.xz 255329180 BLAKE2B 37e16f2946e17bb8707d529197836c8401c97c80a746e274367b5666ae5634af2ba5737f8024ad226432095df181bd824a70b179e0e8066ab5e2cf82a21231a7 SHA512 d0daaee058e2cd7f1af02101b68d33c3df50b3eaae951b40c557c4e74c6f0929162fec0759fa4688cd7da41a5fa7ab4dbf867f31cad428487da2393dcb40a3d8
DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f SHA512 c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
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.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
-DIST libreoffice-help-7.3.1.3.tar.xz 112208156 BLAKE2B 1e13d9b57f8806cb5aeb34b816b7003a843d7bf6efd4f86eb391456deac85cae9f69046f13427835e131541e05c84fa754ebf039f4bb4c9ce07b2f1a08a5f0f9 SHA512 cb41afc6b4c35a97a62d4263395210b3309c8a68822cecfc245217d9f93697a0bd9043801622923ed81a14d346161d56f6443ccb6e082d3ba8ddcf737653da0f
DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
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-7.3.1.3-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.1.3-r1.ebuild
deleted file mode 100644
index b5d0ca50a424..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.1.3-r1.ebuild
+++ /dev/null
@@ -1,666 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=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
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # TODO upstream
- "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-cuckoo
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-04-10 10:46 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-04-10 10:46 UTC (permalink / raw
To: gentoo-commits
commit: 93e16659766a6a8a91c647f23de503e9e999fca0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 10:22:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 10:46:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e16659
app-office/libreoffice: keyword 7.3.2.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.2.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
index 9b774db180ef..31759b24aa48 100644
--- a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
@@ -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 ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-04-10 10:46 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-04-10 10:46 UTC (permalink / raw
To: gentoo-commits
commit: 5d61563ae4f3fa5e7190df7b95861de22ccba1f6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 10:39:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 10:46:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d61563a
app-office/libreoffice: add LLVM 14 to 7.3+; sync live
Closes: https://bugs.gentoo.org/837353
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.2.2.ebuild | 14 +++++++++-----
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 10 +++++++---
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++
3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
index 31759b24aa48..9f5a7ab0de81 100644
--- a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
@@ -212,11 +212,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
kde-frameworks/kio:5
kde-frameworks/kwindowsystem:5
)
- ldap? ( net-nds/openldap )
+ ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- mariadb? ( dev-db/mariadb-connector-c )
- !mariadb? ( dev-db/mysql-connector-c )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
pdfimport? ( app-text/poppler:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
@@ -269,6 +269,10 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ (
+ sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
( sys-devel/clang:13
sys-devel/llvm:13
=sys-devel/lld-13* )
@@ -575,7 +579,7 @@ src_configure() {
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 41fa7859c3a7..0f7170a5e44e 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -104,13 +104,13 @@ 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
app-arch/zip
- app-crypt/gpgme[cxx]
+ app-crypt/gpgme:=[cxx]
app-text/hunspell:=
>=app-text/libabw-0.1.0
>=app-text/libebook-0.1
@@ -269,6 +269,10 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ (
+ sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
( sys-devel/clang:13
sys-devel/llvm:13
=sys-devel/lld-13* )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index db53409b551c..a30d4d21bfbd 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -269,6 +269,10 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ (
+ sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
( sys-devel/clang:13
sys-devel/llvm:13
=sys-devel/lld-13* )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-04-10 10:46 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-04-10 10:46 UTC (permalink / raw
To: gentoo-commits
commit: a7aafd030a86bbbad39e1ccb7c86976cbe54a7e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 10:45:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 10:46:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7aafd03
app-office/libreoffice: fix jdk-home typo
Closes: https://bugs.gentoo.org/837587
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.2.2.ebuild | 4 ++--
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
index 9f5a7ab0de81..a516928958fc 100644
--- a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
@@ -570,9 +570,9 @@ src_configure() {
--with-ant-home="${ANT_HOME}"
)
if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
fi
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 0f7170a5e44e..6b265eb5bf1e 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -567,9 +567,9 @@ src_configure() {
--with-ant-home="${ANT_HOME}"
)
if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
fi
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a30d4d21bfbd..73154bc2f905 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -567,9 +567,9 @@ src_configure() {
--with-ant-home="${ANT_HOME}"
)
if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
fi
use libreoffice_extensions_scripting-beanshell && \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-04-12 23:49 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-04-12 23:49 UTC (permalink / raw
To: gentoo-commits
commit: f1cd1c6fcdf419953be361fbff12391dbe695d0d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 23:48:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 23:48:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1cd1c6f
app-office/libreoffice: fix --with-webdav option (runtime problems)
Not clear how this actually deviates from the default but multiple
people report this fixing the issue for them.
Closes: https://bugs.gentoo.org/834438
Acked-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{libreoffice-7.2.6.2.ebuild => libreoffice-7.2.6.2-r1.ebuild} | 2 +-
.../{libreoffice-7.3.2.2.ebuild => libreoffice-7.3.2.2-r1.ebuild} | 2 +-
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.2.6.2.ebuild
rename to app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
index e62667b537b0..82b0fcb88f40 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
@@ -503,7 +503,7 @@ src_configure() {
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav
+ --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
diff --git a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.2.2.ebuild
rename to app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild
index a516928958fc..52d4e539465a 100644
--- a/app-office/libreoffice/libreoffice-7.3.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild
@@ -511,7 +511,7 @@ src_configure() {
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav
+ --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 6b265eb5bf1e..d21640a76c4a 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -508,7 +508,7 @@ src_configure() {
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav
+ --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 73154bc2f905..60baac70da26 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -508,7 +508,7 @@ src_configure() {
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav
+ --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-04-17 22:23 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-04-17 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 10307a569f5b08fee433b8121e4dc9fe979670ea
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 22:23:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 22:23:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10307a56
app-office/libreoffice: Stabilize 7.2.6.2-r1 amd64, #835426
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
index 82b0fcb88f40..0740e633f32a 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-04-29 5:38 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-04-29 5:38 UTC (permalink / raw
To: gentoo-commits
commit: c923511f7fb37a2d3ff3d84e312e8234c3b0d365
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 05:36:20 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 05:36:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c923511f
app-office/libreoffice: Stabilize 7.2.6.2-r1 arm64, #835426
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
index 0740e633f32a..d40ccb686da2 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-05-01 23:36 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-05-01 23:36 UTC (permalink / raw
To: gentoo-commits
commit: bb19ec273692bd98f4de911bd2f0c58fcc9b5e4d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 1 23:36:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 1 23:36:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb19ec27
app-office/libreoffice: Stabilize 7.2.6.2-r1 x86, #835426
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
index d40ccb686da2..62e42b1e8c03 100644
--- a/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.6.2-r1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-05-08 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-05-08 13:23 UTC (permalink / raw
To: gentoo-commits
commit: f689ea53bb1357f53dc582df58927058d982246b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 12:37:47 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 8 13:23:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f689ea53
app-office/libreoffice: Switch to media-libs/libjpeg-turbo:=
Away from deprecated virtual/jpeg.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index d21640a76c4a..89a2b91e0543 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -157,6 +157,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libcdr-0.1.0
>=media-libs/libepoxy-1.3.1[X]
>=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
@@ -167,7 +168,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
sci-mathematics/lpsolve
sys-libs/zlib
- virtual/jpeg:0
virtual/opengl
x11-libs/cairo[X]
x11-libs/libXinerama
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 60baac70da26..ce2de45f3ddb 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -157,6 +157,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libcdr-0.1.0
>=media-libs/libepoxy-1.3.1[X]
>=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
@@ -167,7 +168,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
sci-mathematics/lpsolve
sys-libs/zlib
- virtual/jpeg:0
virtual/opengl
x11-libs/cairo[X]
x11-libs/libXinerama
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-05-08 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-05-08 13:23 UTC (permalink / raw
To: gentoo-commits
commit: aaa199dfa25ef403163154bfb6e8003043a4f2fa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 12:39:39 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 8 13:23:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaa199df
app-office/libreoffice: Drop obsolete sys-devel/{clang,llvm}:11
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 3 ---
app-office/libreoffice/libreoffice-9999.ebuild | 3 ---
2 files changed, 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 89a2b91e0543..68cf55317be3 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -279,9 +279,6 @@ BDEPEND="
( sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ce2de45f3ddb..b155f2f2f525 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -279,9 +279,6 @@ BDEPEND="
( sys-devel/clang:12
sys-devel/llvm:12
=sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-05-09 20:18 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-05-09 20:18 UTC (permalink / raw
To: gentoo-commits
commit: fd4432e14c37a4f5a828d5a0aa4c5193326ed535
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 20:17:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 9 20:17:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd4432e1
app-office/libreoffice: ... uncomment patch
Thanks asturm. And I'll keyword this shortly.
Bug: https://bugs.gentoo.org/843311
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{libreoffice-7.3.3.2-r1.ebuild => libreoffice-7.3.3.2-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild
rename to app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
index 129fac1b9644..f229dff9382b 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
@@ -302,7 +302,7 @@ PATCHES=(
# TODO: upstream
"${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
"${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
- #"${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
+ "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-05-09 21:48 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-05-09 21:48 UTC (permalink / raw
To: gentoo-commits
commit: cd260cfc2e85e51814decb0c7d80a7118b008d3b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 21:47:33 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 9 21:47:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd260cfc
app-office/libreoffice: keyword 7.3.3.2-r2
Closes: https://bugs.gentoo.org/843311
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
index f229dff9382b..22d36d585f5f 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r2.ebuild
@@ -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 ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-06-01 7:30 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-06-01 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 57b587199d65b3265df6e206ab66a5af7a708596
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 07:30:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 07:30:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b58719
app-office/libreoffice: Keyword 7.3.3.2-r3 arm, #833183
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
index e03a37669e72..767e106f3f02 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-06-05 23:50 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-06-05 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 4beef19f6f4be4c9115cbf3b263e3a6c0661afa9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 23:46:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 23:50:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4beef19f
app-office/libreoffice: update SRC_URI
Closes: https://bugs.gentoo.org/847445
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ca926b8807fb..17e790c04fa1 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -27,5 +27,6 @@ DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656
DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
+DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
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-9999.ebuild
index 7fe70e573e21..6c87f05ed3dd 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -52,7 +52,7 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-06-05 23:50 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-06-05 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 1c845d92871ab947c94536e56c49689fa47068d6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 5 23:45:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 5 23:50:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c845d92
app-office/libreoffice: add 7.3.4.2 (unkeyworded)
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.3.4.2.ebuild | 674 ++++++++++++++++++++++
2 files changed, 676 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 29b86b003ae9..ca926b8807fb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,9 +21,11 @@ DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 8
DIST libreoffice-7.2.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f SHA512 c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
+DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
+DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
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-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
new file mode 100644
index 000000000000..7624d9dff8fc
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
@@ -0,0 +1,674 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
+ "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=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
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( app-text/poppler:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( || (
+ dev-java/openjdk:11
+ dev-java/openjdk-jre-bin:11
+ >=virtual/jre-1.8
+ ) )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ (
+ sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ ( sys-devel/clang:12
+ sys-devel/llvm:12
+ =sys-devel/lld-12* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
+ "${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
+ "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ if use x86; then
+ elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+ elog "most notably Report Builder in LibreOffice Base, will not be available."
+ elog "See also: https://bugs.gentoo.org/785640"
+ else
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+ fi
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-cuckoo
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ )
+ if has_version "dev-java/openjdk:11"; then
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+ elif has_version "dev-java/openjdk-bin:11"; then
+ myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
+ fi
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-06-10 3:18 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-06-10 3:18 UTC (permalink / raw
To: gentoo-commits
commit: 8cab2181a9dc5a975328b41c7763bbba231ff713
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 03:17:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 03:17:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cab2181
app-office/libreoffice: keyword 7.3.4.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
index 7624d9dff8fc..767e106f3f02 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
@@ -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
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-06-11 7:14 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-06-11 7:14 UTC (permalink / raw
To: gentoo-commits
commit: 927204470935f67016aeea6f3c285794def9f0a9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 07:13:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 07:14:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92720447
app-office/libreoffice: fix gcc LTO
Closes: https://bugs.gentoo.org/838115
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2.ebuild | 4 ++++
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 4 ++++
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++
3 files changed, 12 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
index 767e106f3f02..ba2c51a3aab7 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
@@ -428,6 +428,10 @@ src_configure() {
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
fi
if use custom-cflags ; then
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 67730f9d7995..05a70aea66a3 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -423,6 +423,10 @@ src_configure() {
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
fi
if use custom-cflags ; then
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6c87f05ed3dd..20d275f63d6f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -423,6 +423,10 @@ src_configure() {
CXX=${CHOST}-g++
NM=gcc-nm
RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
fi
if use custom-cflags ; then
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-06-11 14:25 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-06-11 14:25 UTC (permalink / raw
To: gentoo-commits
commit: cea8ecbe2e7d7563e7908dc109030a9df74257ce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 11 14:07:42 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 14:10:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea8ecbe
app-office/libreoffice: Drop 7.3.2.2-r1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../libreoffice/libreoffice-7.3.2.2-r1.ebuild | 670 ---------------------
2 files changed, 672 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 17e790c04fa1..abc191ea3e4b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,12 +19,10 @@ 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.6.2.tar.xz 252995284 BLAKE2B b807e666d39b4302b0a33f84f7e8797bc41ec9e1814bfe57f0e06c8bbbf3b8bf89a70a25caa65401f402a593acce04cb1118bd13bbd961d7feeac295511e36e4 SHA512 2b1a92d98595d4a40bf699ebf5ee3cbf4daeb765a8d37ae035f459f2a74c2ce27e53747307d9875aaec7d1d5a2693266ea81b7fe1281c33653c9fa4bbd727242
-DIST libreoffice-7.3.2.2.tar.xz 255657596 BLAKE2B ef362c6e53ab8668309f1f9b10a8cbb87e8027aaf56a3d1185494757376b89bdf126fe08ef3e416d0330bb96df4ac046b8c60d535eeef8430c60485313e80b5f SHA512 c9f0deaf812425cfc08649f5a9f88c56a9f9221a6b117f9fece56ed17984fec25446ccad52ff2f22ebdfa1db495289edb22a8b7b1fec7a0e42d4b3cd2e81363b
DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.2.6.2.tar.xz 112079748 BLAKE2B f9d96d6d72e70f28f12dcf656cf8fd22bc8e563ec53c840cf7cd668e3de677ee73a3f3099e7c62c6034cd4d23915b9e7a94012340c6a7db7f8822e4c8c6d0887 SHA512 05f02eb1afaa90547ca388008e02c4a48c191984e77d4022adf02089f69a3b4792cdc065e160f59fbf2f5554b062ff0d6853b12aa9abb9b180dd7c4c855e4d8b
-DIST libreoffice-help-7.3.2.2.tar.xz 112209056 BLAKE2B 320aa76bdce62b94707cd3b6fafd72ce0322e22f28fbb6059b8e1b5b4ef5e99796aee01592a84bf19527bffc0553b937f2d13451e75f105338beb6c1ac1ca077 SHA512 a1f5b1763841b159c623008075ad48ed916c78a856b557553c498590a7c9cd52e23487652c4ab4e4201fc829e7bf4a489ab467e4f412b5538252d893bd74341d
DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
diff --git a/app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild
deleted file mode 100644
index 52d4e539465a..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.2.2-r1.ebuild
+++ /dev/null
@@ -1,670 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=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
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- (
- sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- ( sys-devel/clang:11
- sys-devel/llvm:11
- =sys-devel/lld-11* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # TODO upstream
- "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav="neon"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-cuckoo
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-07-04 16:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-07-04 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 1f6eaf50b2d30a9fbc4cdb3a2f1a31bc1879fd12
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 15:30:10 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 16:28:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6eaf50
app-office/libreoffice: py3_11; depend on >=app-text/poppler-22.06
Upstream commits:
56c7e666ebf47d6cdf29adf85fc5de56246be86d (in 7.3.5 branch)
0d0469b4302dfe95b016a6f04b145834b79d5ed3 (in master branch)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.3.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 6 +++---
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
index 9c8dd7f4efdc..4c7509c6d65a 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
index ba2c51a3aab7..99329d166bc3 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 05a70aea66a3..86e77b20eb76 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
@@ -217,7 +217,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
mariadb? ( dev-db/mariadb-connector-c:= )
!mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( app-text/poppler:=[cxx] )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
# FIXME: cppunit should be moved to test conditional
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 20d275f63d6f..cb77e652cea2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
MY_PV="${MY_PV/_beta/.beta}"
@@ -217,7 +217,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
mariadb? ( dev-db/mariadb-connector-c:= )
!mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( app-text/poppler:=[cxx] )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
"
# FIXME: cppunit should be moved to test conditional
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-07-14 11:45 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-07-14 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 3e858c5780d492f39972b047bffcccba2f35b88b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 11:07:55 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 11:45:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e858c57
app-office/libreoffice: Drop 7.3.4.2 (r0)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2.ebuild | 678 ----------------------
1 file changed, 678 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
deleted file mode 100644
index 99329d166bc3..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.4.2.ebuild
+++ /dev/null
@@ -1,678 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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
- dev-lang/perl
- >=dev-libs/boost-1.72.0:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=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
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- (
- sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
- "${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
- "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav="neon"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-cuckoo
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-07-14 11:45 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-07-14 11:45 UTC (permalink / raw
To: gentoo-commits
commit: 293cc7291594848a49365fe6d1a74d9911f90e0c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 10:57:51 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 11:45:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293cc729
app-office/libreoffice: media-libs/zxing-cpp slot op, update JDK handling
Drop x86 pkg_setup message about non-existing features, virtual/jdk:11 was
keyworded at last. Also raise minimum JRE to 11.
Bug: https://bugs.gentoo.org/785640
Closes: https://bugs.gentoo.org/857204
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...3.9999.ebuild => libreoffice-7.3.4.2-r1.ebuild} | 33 ++++++----------------
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 33 ++++++----------------
app-office/libreoffice/libreoffice-9999.ebuild | 33 ++++++----------------
3 files changed, 24 insertions(+), 75 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
similarity index 95%
copy from app-office/libreoffice/libreoffice-7.3.9999.ebuild
copy to app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 86e77b20eb76..9a3813a2b48b 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libvisio-0.1.0
media-libs/libzmf
media-libs/openjpeg:=
- media-libs/zxing-cpp
+ media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
+ >=virtual/jdk-11
)
test? (
app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
+ java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
}
pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -568,12 +555,8 @@ src_configure() {
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
)
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
use libreoffice_extensions_scripting-beanshell && \
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 86e77b20eb76..9a3813a2b48b 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libvisio-0.1.0
media-libs/libzmf
media-libs/openjpeg:=
- media-libs/zxing-cpp
+ media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
+ >=virtual/jdk-11
)
test? (
app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
+ java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
}
pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -568,12 +555,8 @@ src_configure() {
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
)
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
use libreoffice_extensions_scripting-beanshell && \
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cb77e652cea2..b334b35d33ee 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -163,7 +163,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=media-libs/libvisio-0.1.0
media-libs/libzmf
media-libs/openjpeg:=
- media-libs/zxing-cpp
+ media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve
@@ -237,10 +237,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
+ >=virtual/jdk-11
)
test? (
app-crypt/gnupg
@@ -256,11 +253,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin-debug
media-fonts/liberation-fonts
|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
+ java? ( >=virtual/jre-11 )
kde? ( kde-frameworks/breeze-icons:* )
"
BDEPEND="
@@ -315,16 +308,10 @@ _check_reqs() {
}
pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
}
@@ -568,12 +555,8 @@ src_configure() {
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
)
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
use libreoffice_extensions_scripting-beanshell && \
myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-07-14 17:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-07-14 17:29 UTC (permalink / raw
To: gentoo-commits
commit: f8aa778f4cc4fb73066b3094b50d1aa6562d5b9f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 17:27:04 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 17:27:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8aa778f
app-office/libreoffice: Re-add mistakenly dropped patches
Closes: https://bugs.gentoo.org/857981
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 9a3813a2b48b..779d228b8167 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -293,6 +293,11 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
+ "${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
+ "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-07-21 13:18 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-07-21 13:18 UTC (permalink / raw
To: gentoo-commits
commit: 5ab2d3fd1e7d38aedc2f2c40073ebe511eac204b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 12:57:47 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 21 13:18:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab2d3fd
app-office/libreoffice: add 7.3.5.2, update clang/llvm/lld deps
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-7.3.9999.ebuild => libreoffice-7.3.5.2.ebuild} | 9 ++++-----
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 9 ++++-----
app-office/libreoffice/libreoffice-9999.ebuild | 9 ++++-----
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ddf63b465c03..6652e01c6507 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,8 +20,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
+DIST libreoffice-7.3.5.2.tar.xz 256607688 BLAKE2B 82d9b1407e42e844214ab323a202beaa964857cf77279e199e2730adb6d86ff79acec197bc0ae9969b429894bf0ed7a50dbda8fe8c29472b16d88e1eab6d7a57 SHA512 00d381e97c0bc6f97d4e770b7037f08fc659e58e792d47b539ecd0b3fb4e3e9b570769e9b3eb26522d951fa14926f71bef8567756b8b8b8c4777a00e48ee030c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
+DIST libreoffice-help-7.3.5.2.tar.xz 112208852 BLAKE2B 700887d829f420d1f7a023e83727862182a0cc8c0066c0897a41b73af2565e2bfd2fcb43ed8d7f3cf964329f5304a64c1b80fc950eab7a3450877025748d6167 SHA512 9e8c782fa20bef6806d96965c469be2423d5be6e6b3e78f690c553294cfe83877cd96fc2234caa247cf063264c1bea4909047771298946e33ae83e04597104c6
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-7.3.9999.ebuild
copy to app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 9a3813a2b48b..c5e49cdb159d 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -264,16 +264,15 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
- (
- sys-devel/clang:14
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
sys-devel/llvm:14
=sys-devel/lld-14* )
( sys-devel/clang:13
sys-devel/llvm:13
=sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 9a3813a2b48b..c5e49cdb159d 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -264,16 +264,15 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
- (
- sys-devel/clang:14
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
sys-devel/llvm:14
=sys-devel/lld-14* )
( sys-devel/clang:13
sys-devel/llvm:13
=sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b334b35d33ee..ce4f8df2f92a 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -264,16 +264,15 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
- (
- sys-devel/clang:14
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
sys-devel/llvm:14
=sys-devel/lld-14* )
( sys-devel/clang:13
sys-devel/llvm:13
=sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-07-26 4:46 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-07-26 4:46 UTC (permalink / raw
To: gentoo-commits
commit: fb58fcce5b7796db52944e9fad4efa973ff3fd22
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 04:42:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 04:42:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb58fcce
app-office/libreoffice: Stabilize 7.3.4.2-r1 amd64, #856673
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 779d228b8167..69c1eeb3133d 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-07-27 7:56 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2022-07-27 7:56 UTC (permalink / raw
To: gentoo-commits
commit: ed4c317acb8d0d4b094003772f2119538a7b8332
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 07:56:23 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 07:56:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed4c317a
app-office/libreoffice: x86 stable wrt bug #856673
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 69c1eeb3133d..1037e8f13e5e 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-08-15 21:15 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-08-15 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 69fc15afc8b81272abfe7a4035c8a6c2d37b8d13
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 21:14:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 21:14:59 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69fc15af
app-office/libreoffice: fix build w/ gpgme 1.18.0, add which BDEPEND
- Fix build w/ gpgme 1.18.0 by spoofing existence of progress_callback
(see bug for details; reported upstream but waiting for email to appear
in archive/pending moderation)
- Add which BDEPEND (bunch of configure checks use it for now)
Closes: https://bugs.gentoo.org/865321
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild | 4 ++++
app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 4 ++++
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 4 ++++
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 4 ++++
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++++
5 files changed, 20 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
index 4c7509c6d65a..3561c754cf20 100644
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
@@ -265,6 +265,7 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
dev-util/intltool
+ sys-apps/which
sys-devel/bison
sys-devel/flex
sys-devel/gettext
@@ -583,6 +584,9 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321
+ export ac_cv_lib_gpgmepp_progress_callback=yes
+
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 1037e8f13e5e..d04598d4c791 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
dev-util/intltool
+ sys-apps/which
sys-devel/bison
sys-devel/flex
sys-devel/gettext
@@ -570,6 +571,9 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321
+ export ac_cv_lib_gpgmepp_progress_callback=yes
+
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index c5e49cdb159d..dd4c5cd297b3 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
dev-util/intltool
+ sys-apps/which
sys-devel/bison
sys-devel/flex
sys-devel/gettext
@@ -564,6 +565,9 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321
+ export ac_cv_lib_gpgmepp_progress_callback=yes
+
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index c5e49cdb159d..dd4c5cd297b3 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
dev-util/intltool
+ sys-apps/which
sys-devel/bison
sys-devel/flex
sys-devel/gettext
@@ -564,6 +565,9 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321
+ export ac_cv_lib_gpgmepp_progress_callback=yes
+
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ce4f8df2f92a..6c215e444452 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -258,6 +258,7 @@ RDEPEND="${COMMON_DEPEND}
"
BDEPEND="
dev-util/intltool
+ sys-apps/which
sys-devel/bison
sys-devel/flex
sys-devel/gettext
@@ -564,6 +565,9 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
+ # Workaround to fix build w/ gpgme 1.18.0, bug #865321
+ export ac_cv_lib_gpgmepp_progress_callback=yes
+
is-flagq "-flto*" && myeconfargs+=( --enable-lto )
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-08-23 7:41 WANG Xuerui
0 siblings, 0 replies; 588+ messages in thread
From: WANG Xuerui @ 2022-08-23 7:41 UTC (permalink / raw
To: gentoo-commits
commit: b846f885d5da6ae91f37c2a31ed18b7ef02a64f1
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 12:23:35 2022 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 07:40:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b846f885
app-office/libreoffice: keyword 7.3.5.2 for ~loong
Tests passed on real hardware.
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 3c73f44e73c2..26b88244df96 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-08-23 7:41 WANG Xuerui
0 siblings, 0 replies; 588+ messages in thread
From: WANG Xuerui @ 2022-08-23 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 70a6fc55a44c4fab59d087c0a8d199d4258f0a4f
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 15:36:53 2022 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 07:40:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a6fc55
app-office/libreoffice: 7.3.5.2: add support for loong
By incorporating the upstreamed patch by Loongson.
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6652e01c6507..ea2bc7075bee 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,6 +20,7 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
+DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.5.2.tar.xz 256607688 BLAKE2B 82d9b1407e42e844214ab323a202beaa964857cf77279e199e2730adb6d86ff79acec197bc0ae9969b429894bf0ed7a50dbda8fe8c29472b16d88e1eab6d7a57 SHA512 00d381e97c0bc6f97d4e770b7037f08fc659e58e792d47b539ecd0b3fb4e3e9b570769e9b3eb26522d951fa14926f71bef8567756b8b8b8c4777a00e48ee030c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index dd4c5cd297b3..3c73f44e73c2 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
@@ -26,7 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
# Split modules following git/tarballs; Core MUST be first!
# Help is used for the image generator
@@ -287,7 +287,7 @@ else
fi
PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-08-31 21:47 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-08-31 21:47 UTC (permalink / raw
To: gentoo-commits
commit: ac656fb80987a2a35def9ef131371ccddb5d1fb0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 21:46:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 21:47:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac656fb8
app-office/libreoffice: use emake, not make
If the rationale (and that's a big if) for using make
and not emake was parallelism, we should be using -j1,
not 'make' which won't respect ${MAKE} or other ${MAKEOPTS}.
While at it, clean up a stale/misplaced comment in
src_install too (makes no sense where it is,
presumably 'make' was previously used in src_install
or -j1 was forced in the past).
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 5 ++---
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 5 ++---
app-office/libreoffice/libreoffice-9999.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index d45c3048f25c..07c41dd1473e 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -585,12 +585,11 @@ src_compile() {
}
src_test() {
- make unitcheck || die
- make slowcheck || die
+ emake unitcheck
+ emake slowcheck
}
src_install() {
- # This is not Makefile so no buildserver
emake DESTDIR="${D}" distro-pack-install -o build -o check
# bug 593514
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 4969bd6b6a3e..69651435d7d7 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -585,12 +585,11 @@ src_compile() {
}
src_test() {
- make unitcheck || die
- make slowcheck || die
+ emake unitcheck
+ emake slowcheck
}
src_install() {
- # This is not Makefile so no buildserver
emake DESTDIR="${D}" distro-pack-install -o build -o check
# bug 593514
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f791cbf01383..f7ff3494a447 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -582,12 +582,11 @@ src_compile() {
}
src_test() {
- make unitcheck || die
- make slowcheck || die
+ emake unitcheck
+ emake slowcheck
}
src_install() {
- # This is not Makefile so no buildserver
emake DESTDIR="${D}" distro-pack-install -o build -o check
# bug 593514
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-02 18:26 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-09-02 18:26 UTC (permalink / raw
To: gentoo-commits
commit: b4c74c43f12595719f80069f30131e8007fe43fa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 18:24:50 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 18:25:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c74c43
app-office/libreoffice: Foward-port missing ~loong changes to live
- Add poppler-22.09.0.patch to 7.3 stable branch ebuild too
- Also return to our usual notation of patch origin (branch, status).
See also: https://github.com/gentoo/gentoo/pull/26832
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 4 +++-
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 11 +++++++----
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 92051c1009c6..83d67af61341 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -294,8 +294,10 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
- # Upstream
+ # 7.4 branch
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+
+ # pending upstream
"${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 69651435d7d7..a6c93546a6ed 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -26,7 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
# Split modules following git/tarballs; Core MUST be first!
# Help is used for the image generator
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -287,15 +287,18 @@ else
fi
PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
- # Upstream
+ # 7.4 branch
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+
+ # pending upstream
+ "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index f7ff3494a447..decb622507ab 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-02 19:18 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-09-02 19:18 UTC (permalink / raw
To: gentoo-commits
commit: 5a2b00af8d8eda5d51b0159113753117225c6d7a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 19:16:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 19:17:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2b00af
app-office/libreoffice: fix PATCHSET SRC_URI
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index a6c93546a6ed..607738de58fc 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-03 23:22 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-09-03 23:22 UTC (permalink / raw
To: gentoo-commits
commit: 910c0251c1c78449e9078856c718516f01b5d04f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 23:20:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 23:20:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910c0251
app-office/libreoffice: Stabilize 7.3.4.2-r1 arm64, #856673
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index d04598d4c791..88346389d1f4 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-08 16:05 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-09-08 16:05 UTC (permalink / raw
To: gentoo-commits
commit: b5f53fe76f9098d9581fcf84a7c27b526f6f2364
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 16:01:51 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 16:03:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f53fe7
app-office/libreoffice: add 7.3.6.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.3.6.2.ebuild | 661 ++++++++++++++++++++++
2 files changed, 663 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ea2bc7075bee..f36e52e49bb2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,9 +22,11 @@ DIST libreoffice-7.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d3619
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.5.2.tar.xz 256607688 BLAKE2B 82d9b1407e42e844214ab323a202beaa964857cf77279e199e2730adb6d86ff79acec197bc0ae9969b429894bf0ed7a50dbda8fe8c29472b16d88e1eab6d7a57 SHA512 00d381e97c0bc6f97d4e770b7037f08fc659e58e792d47b539ecd0b3fb4e3e9b570769e9b3eb26522d951fa14926f71bef8567756b8b8b8c4777a00e48ee030c
+DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0 SHA512 8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
DIST libreoffice-help-7.3.5.2.tar.xz 112208852 BLAKE2B 700887d829f420d1f7a023e83727862182a0cc8c0066c0897a41b73af2565e2bfd2fcb43ed8d7f3cf964329f5304a64c1b80fc950eab7a3450877025748d6167 SHA512 9e8c782fa20bef6806d96965c469be2423d5be6e6b3e78f690c553294cfe83877cd96fc2234caa247cf063264c1bea4909047771298946e33ae83e04597104c6
+DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305 SHA512 7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
new file mode 100644
index 000000000000..275b7ba290b6
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
@@ -0,0 +1,661 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
+ "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=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
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.4 branch
+ "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+
+ # pending upstream
+ "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-cuckoo
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-14 7:32 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-09-14 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 030b5c329ab361f426117740b5a30be2a7910956
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 19:34:06 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 07:31:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=030b5c32
app-office/libreoffice: drop 7.3.3.2-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../libreoffice/libreoffice-7.3.3.2-r3.ebuild | 678 ---------------------
2 files changed, 680 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f36e52e49bb2..38be84c39e5b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,13 +18,11 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
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.3.3.2.tar.xz 256036064 BLAKE2B 8a96121448e3cc1f81990c837d36191a6127e3ff78773440a4ecdfb5f178f7ab522298fec1d0dd872afe38b67ec102d4f5ea4b0cde64caf5d6420a7f02f25e1b SHA512 242d5694b6d09c669992ea68223b62fb8e418e886f68c7e5d843272d55ad2de34e5207180b7a541fd97cbe678c2d12d5290ebd8b82d47c88f1607e6736413c96
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.5.2.tar.xz 256607688 BLAKE2B 82d9b1407e42e844214ab323a202beaa964857cf77279e199e2730adb6d86ff79acec197bc0ae9969b429894bf0ed7a50dbda8fe8c29472b16d88e1eab6d7a57 SHA512 00d381e97c0bc6f97d4e770b7037f08fc659e58e792d47b539ecd0b3fb4e3e9b570769e9b3eb26522d951fa14926f71bef8567756b8b8b8c4777a00e48ee030c
DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0 SHA512 8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.3.3.2.tar.xz 112209704 BLAKE2B b0e92b88aeb866d3f611fe89d723287cf037bca1772a861cb8b76ee046ae0d039d67648e121aa253eccbfa132c8d252b947bdcbbc3ee6178b6defd3c876749d0 SHA512 f70e747c5b78be20bbe4dd0c20840923d14b4278c00a12a60f5e58e3226abc0c218ac3cce4885cf5a440ace92141bf0428df40a4d1469edb91103167c5e3d46f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
DIST libreoffice-help-7.3.5.2.tar.xz 112208852 BLAKE2B 700887d829f420d1f7a023e83727862182a0cc8c0066c0897a41b73af2565e2bfd2fcb43ed8d7f3cf964329f5304a64c1b80fc950eab7a3450877025748d6167 SHA512 9e8c782fa20bef6806d96965c469be2423d5be6e6b3e78f690c553294cfe83877cd96fc2234caa247cf063264c1bea4909047771298946e33ae83e04597104c6
DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305 SHA512 7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189
diff --git a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild b/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
deleted file mode 100644
index 6fb12da13b2c..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.3.2-r3.ebuild
+++ /dev/null
@@ -1,678 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=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
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( app-text/poppler:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- || (
- dev-java/openjdk:11
- dev-java/openjdk-bin:11
- )
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( || (
- dev-java/openjdk:11
- dev-java/openjdk-jre-bin:11
- >=virtual/jre-1.8
- ) )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- (
- sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- ( sys-devel/clang:12
- sys-devel/llvm:12
- =sys-devel/lld-12* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-7.2.6.2-poppler-22.03.0.patch" # by Archlinux
- "${FILESDIR}/${PN}-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch" # from FreeBSD
- "${FILESDIR}/${PN}-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch" # fixup for FreeBSD patch
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- if use x86; then
- elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
- elog "most notably Report Builder in LibreOffice Base, will not be available."
- elog "See also: https://bugs.gentoo.org/785640"
- else
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
- fi
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav="neon"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-cuckoo
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- )
- if has_version "dev-java/openjdk:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
- elif has_version "dev-java/openjdk-bin:11"; then
- myeconfargs+=( --with-jdk-home="${EPREFIX}/opt/openjdk-bin-11" )
- fi
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- # Workaround to fix build w/ gpgme 1.18.0, bug #865321
- export ac_cv_lib_gpgmepp_progress_callback=yes
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-15 15:11 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2022-09-15 15:11 UTC (permalink / raw
To: gentoo-commits
commit: b613fe1f6262bf8bb8cb88490cd122bbadbb620c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 15:11:24 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 15:11:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b613fe1f
app-office/libreoffice: Stabilize 7.3.5.2 amd64, #867094
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index bbd10983c691..b266ff614f53 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-29 13:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-09-29 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 3614d5d642f0841f8b310966f8c06c2d8ac5e93d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 13:40:07 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 13:40:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3614d5d6
app-office/libreoffice: Drop --without-system-cuckoo, obsolete tarball
Closes: https://bugs.gentoo.org/813246
Closes: https://bugs.gentoo.org/869338
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.6.2.ebuild | 3 ---
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 3 ---
app-office/libreoffice/libreoffice-9999.ebuild | 2 --
3 files changed, 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
index 275b7ba290b6..956e03914be1 100644
--- a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
@@ -44,8 +44,6 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
# broken against latest upstream release, too many patches on top:
# https://github.com/tdf/libcmis/pull/43
"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
@@ -511,7 +509,6 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
- --without-system-cuckoo
--without-system-jfreereport
--without-system-libcmis
--without-system-sane
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 275b7ba290b6..956e03914be1 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -44,8 +44,6 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
# broken against latest upstream release, too many patches on top:
# https://github.com/tdf/libcmis/pull/43
"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
@@ -511,7 +509,6 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
- --without-system-cuckoo
--without-system-jfreereport
--without-system-libcmis
--without-system-sane
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c9b09c861b09..3871468488ce 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,8 +44,6 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
# broken against latest upstream release, too many patches on top:
# https://github.com/tdf/libcmis/pull/43
"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-09-30 9:26 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-09-30 9:26 UTC (permalink / raw
To: gentoo-commits
commit: d3e82b5a704224b979a736516f4cfd8059d7ba21
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 07:07:23 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 09:16:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e82b5a
app-office/libreoffice: Drop remaining --without-system-cuckoo
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3871468488ce..ad176ec03f49 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -503,7 +503,6 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
- --without-system-cuckoo
--without-system-jfreereport
--without-system-libcmis
--without-system-sane
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-10-09 8:48 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2022-10-09 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 05f12b0e68ba3d60fc60cd53d54d128475c19ff6
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 08:47:09 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 08:47:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f12b0e
app-office/libreoffice: Stabilize 7.3.6.2 amd64, #873469
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
index 956e03914be1..1445c9969805 100644
--- a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-10-09 8:55 Agostino Sarubbo
0 siblings, 0 replies; 588+ messages in thread
From: Agostino Sarubbo @ 2022-10-09 8:55 UTC (permalink / raw
To: gentoo-commits
commit: db31a0b458ddae5a4ef805b577d10554be2b40a2
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 08:54:13 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Oct 9 08:54:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db31a0b4
app-office/libreoffice: Stabilize 7.3.6.2 x86, #873469
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
index 1445c9969805..72370923fad5 100644
--- a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-10-10 8:15 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-10-10 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 75414458b8d11aad2a9e9d109a21eea4e80e6d9d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 9 12:55:30 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 08:14:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75414458
app-office/libreoffice: drop 7.3.5.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.3.5.2.ebuild | 661 ----------------------
2 files changed, 663 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 38be84c39e5b..a6c65e1b179b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,11 +20,9 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
-DIST libreoffice-7.3.5.2.tar.xz 256607688 BLAKE2B 82d9b1407e42e844214ab323a202beaa964857cf77279e199e2730adb6d86ff79acec197bc0ae9969b429894bf0ed7a50dbda8fe8c29472b16d88e1eab6d7a57 SHA512 00d381e97c0bc6f97d4e770b7037f08fc659e58e792d47b539ecd0b3fb4e3e9b570769e9b3eb26522d951fa14926f71bef8567756b8b8b8c4777a00e48ee030c
DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0 SHA512 8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
-DIST libreoffice-help-7.3.5.2.tar.xz 112208852 BLAKE2B 700887d829f420d1f7a023e83727862182a0cc8c0066c0897a41b73af2565e2bfd2fcb43ed8d7f3cf964329f5304a64c1b80fc950eab7a3450877025748d6167 SHA512 9e8c782fa20bef6806d96965c469be2423d5be6e6b3e78f690c553294cfe83877cd96fc2234caa247cf063264c1bea4909047771298946e33ae83e04597104c6
DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305 SHA512 7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
deleted file mode 100644
index bdfa488fd98b..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo, https://github.com/efficient/libcuckoo/
- "${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=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
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # 7.4 branch
- "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
-
- # pending upstream
- "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav="neon"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-cuckoo
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-10-12 18:22 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-10-12 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 4a4787e7f0c1006fe08cbd67d5a3d484b2b25f78
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 17:57:22 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 18:22:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4787e7
app-office/libreoffice: unkeyword 7.3.4.2-r1
Bug: https://bugs.gentoo.org/876869
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
index 25c918467f07..e540a164ed9c 100644
--- a/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.4.2-r1.ebuild
@@ -105,7 +105,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="arm64"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-10-28 17:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-10-28 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 16767bd3b1822eaf32fc71abe8273c199f53fe37
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 17:45:15 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 17:45:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16767bd3
app-office/libreoffice: Drop upstreamed poppler-22.09.0.patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 956e03914be1..7890edc7daa9 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -294,9 +294,6 @@ PATCHES=(
# 7.4 branch
"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
-
- # pending upstream
- "${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-10-28 17:46 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-10-28 17:46 UTC (permalink / raw
To: gentoo-commits
commit: c863032916e04780b0941a963d0783c243c08b6d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 17:13:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 17:45:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8630329
app-office/libreoffice: add 7.3.7.2 w/o KEYWORDS
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 655 ++++++++++++++++++++++
2 files changed, 657 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a6c65e1b179b..7790922bd5eb 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,8 +21,10 @@ DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 8
DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0 SHA512 8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86
+DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305 SHA512 7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189
+DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
new file mode 100644
index 000000000000..e2c4656f8321
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # broken against latest upstream release, too many patches on top:
+ # https://github.com/tdf/libcmis/pull/43
+ "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+# [[ ${MY_PV} == *9999* ]] || \
+# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=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
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.4 branch
+ "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-jfreereport
+ --without-system-libcmis
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-11-02 9:07 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-11-02 9:07 UTC (permalink / raw
To: gentoo-commits
commit: be577a55090b75ae804fb12c9a1274cc0515c9bd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 2 09:06:26 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 2 09:06:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be577a55
app-office/libreoffice: drop 7.3.9999, no more development
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 655 ---------------------
1 file changed, 655 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
deleted file mode 100644
index 7890edc7daa9..000000000000
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=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
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # 7.4 branch
- "${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav="neon"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-jfreereport
- --without-system-libcmis
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-11-03 7:29 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-11-03 7:29 UTC (permalink / raw
To: gentoo-commits
commit: b4c484ff23d73c81e2aff6e5e980451d1184f0d5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 07:25:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 07:25:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c484ff
app-office/libreoffice: Stabilize 7.3.6.2 arm64, #873469
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
index 72370923fad5..a84c77d04f19 100644
--- a/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.6.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-11-03 22:25 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-11-03 22:25 UTC (permalink / raw
To: gentoo-commits
commit: 5411652b6b0f3bfa82b30b3f018fa22d8aba2e72
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 22:17:23 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 22:25:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5411652b
app-office/libreoffice: keyword 7.3.7.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index e2c4656f8321..7890edc7daa9 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -102,8 +102,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-# [[ ${MY_PV} == *9999* ]] || \
-# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-11-21 17:52 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2022-11-21 17:52 UTC (permalink / raw
To: gentoo-commits
commit: b783757b43c0a68f96d21f19a73d0db103c2c312
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 17:51:56 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 17:51:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b783757b
app-office/libreoffice: Stabilize 7.3.7.2 arm64, #879495
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index 7890edc7daa9..fecaa72caf58 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-11-23 2:26 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2022-11-23 2:26 UTC (permalink / raw
To: gentoo-commits
commit: 3abe52431eefd6dd3c12a2f0adafe77bc2242126
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 02:26:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 02:26:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3abe5243
app-office/libreoffice: Stabilize 7.3.7.2 amd64, #879495
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index fecaa72caf58..5d536f2a6968 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-12-02 18:47 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2022-12-02 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 5d5a95e801a44512d942aab5b5004474aa0bc118
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 18:47:15 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 18:47:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d5a95e8
app-office/libreoffice: Stabilize 7.3.7.2 x86, #879495
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index 5d536f2a6968..dddc49045f08 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-12-26 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-12-26 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 7e4dec60f803aeb9fd055fe4c8020e4961af9614
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 14:39:56 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 23:19:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4dec60
app-office/libreoffice: add 7.4.3.2
Dropping ~loong for lack of patchset.
Closes: https://bugs.gentoo.org/866221
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 +
app-office/libreoffice/libreoffice-7.4.3.2.ebuild | 658 ++++++++++++++++++++++
2 files changed, 661 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2a619f248696..298adce4653c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,6 +13,7 @@ DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb
DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c
DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6
+DIST dragonbox-1.1.0.tar.gz 2837666 BLAKE2B e8f8c6668b047c3d4afa682216ddef19d0cf2b2f0e57a8ce76330daac410ba112cf4b58247942390c5b7cbf231e48a4f99e1c709424c9fed61fbfcfc9dbd3be4 SHA512 4d7cb2e0314ffda8e51600f6cbb953bf1dff9ea46d5c45a08cb0ca45ac386e8bb8b73588cd35b1a1261439a31f46447e59e2980ac6f710dec007c0c575e368e7
DIST dragonbox-1.1.3.tar.gz 4337233 BLAKE2B 0793954e6f922261af7edd590a0deb8d9e9d803111321c17abdb338bcd7b5bb42a691ec3809f9df9b0c0a773828750679c4c00037e45d62ff494ae0056080ef9 SHA512 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
@@ -20,7 +21,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
+DIST libreoffice-7.4.3.2.tar.xz 263885136 BLAKE2B 4e709fc6034d1e04ec80194062bc7de76b0da9fb99fb7203ddecb9c89838db7c808c51457572315e895be46cb4ddbe085338ef63e31701965db91f73e7260862 SHA512 979d893b89048ff8600b4a89b55a77ee071b5ff472ff73728a70efe282c00a43d9b1432c7364a2f019efa082fdf0ab49ab540596e4957c76439e1860c2706039
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
+DIST libreoffice-help-7.4.3.2.tar.xz 112594804 BLAKE2B 79611390f90e5fa242df366269f827c3e74e0e9abc6eb30cfe9dcfc2ac158ae7c3ab881d30653535d2619a7abad9304d8befa73fc45efc755016463543fbae6d SHA512 d1b3021d3c1a6014e5c8c8f2de35da53e11a018f9a3fa9e91e7eb6052379a7970626f90a07a347744a904b26c70aadea6ada099cd9729e746f66710be87770ec
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.4.3.2.ebuild b/app-office/libreoffice/libreoffice-7.4.3.2.ebuild
new file mode 100644
index 000000000000..8850d76c0403
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.4.3.2.ebuild
@@ -0,0 +1,658 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.0.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.5 branch
+ "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-12-26 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-12-26 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 3af58ce3264a8d65f906296a856662add25b662e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 14:33:26 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 23:19:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af58ce3
app-office/libreoffice: add 7.4.9999
Bug: https://bugs.gentoo.org/866221
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 658 +++++++++++++++++++++
1 file changed, 658 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
new file mode 100644
index 000000000000..9a4e143d2efb
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -0,0 +1,658 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.5 branch
+ "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-12-26 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-12-26 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 5c6ce0db9735094b458da8efd6237c73e52e99c2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 13:16:16 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 23:19:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c6ce0db
app-office/libreoffice: update dependencies (more bundled SRC_URIs)
Fix libreoffice-l10n blocker
Thanks-to: jospezial <jospezial <AT> gmx.de>
Closes: https://bugs.gentoo.org/833594
Closes: https://bugs.gentoo.org/835704
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8ad5063506b0..2a619f248696 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,6 +13,7 @@ DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb
DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c
DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6
+DIST dragonbox-1.1.3.tar.gz 4337233 BLAKE2B 0793954e6f922261af7edd590a0deb8d9e9d803111321c17abdb338bcd7b5bb42a691ec3809f9df9b0c0a773828750679c4c00037e45d62ff494ae0056080ef9 SHA512 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ad176ec03f49..567aaa08c52d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,9 +44,8 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- # broken against latest upstream release, too many patches on top:
- # https://github.com/tdf/libcmis/pull/43
- "${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
# not packaged in Gentoo, https://skia.org/
@@ -103,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -117,7 +116,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/libexttextcat
app-text/liblangtag
>=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.1
+ >=app-text/libmwaw-0.3.21
>=app-text/libnumbertext-1.0.6
>=app-text/libodfgen-0.1.0
app-text/libqxp
@@ -128,7 +127,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-text/mythes
dev-cpp/abseil-cpp:=
>=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2
+ >=dev-cpp/libcmis-0.5.2-r2
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -159,8 +158,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/libpagemaker
>=media-libs/libpng-1.4:0=
>=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
media-libs/libzmf
media-libs/openjpeg:=
+ media-libs/tiff:=
media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
@@ -192,6 +193,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/gst-plugins-base:1.0
)
gtk? (
+ app-accessibility/at-spi2-core:2
dev-libs/glib:2
dev-libs/gobject-introspection
gnome-base/dconf
@@ -281,7 +283,7 @@ if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
else
# Translations are not reliable on live ebuilds
# rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
+ RDEPEND+=" !app-office/libreoffice-l10n"
fi
PATCHES=(
@@ -503,8 +505,9 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
+ --without-system-dragonbox
--without-system-jfreereport
- --without-system-libcmis
+ --without-system-libfixmath
--without-system-sane
$(use_enable base report-builder)
$(use_enable bluetooth sdremote-bluetooth)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2022-12-30 16:20 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2022-12-30 16:20 UTC (permalink / raw
To: gentoo-commits
commit: e13dbe2e79cfda007dee22650d9804f6f8e48587
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 15:45:17 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 16:19:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13dbe2e
app-office/libreoffice: add 7.4.4.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 658 ++++++++++++++++++++++
2 files changed, 660 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 298adce4653c..fcc3b2c497cd 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,8 +22,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.3.2.tar.xz 263885136 BLAKE2B 4e709fc6034d1e04ec80194062bc7de76b0da9fb99fb7203ddecb9c89838db7c808c51457572315e895be46cb4ddbe085338ef63e31701965db91f73e7260862 SHA512 979d893b89048ff8600b4a89b55a77ee071b5ff472ff73728a70efe282c00a43d9b1432c7364a2f019efa082fdf0ab49ab540596e4957c76439e1860c2706039
+DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.3.2.tar.xz 112594804 BLAKE2B 79611390f90e5fa242df366269f827c3e74e0e9abc6eb30cfe9dcfc2ac158ae7c3ab881d30653535d2619a7abad9304d8befa73fc45efc755016463543fbae6d SHA512 d1b3021d3c1a6014e5c8c8f2de35da53e11a018f9a3fa9e91e7eb6052379a7970626f90a07a347744a904b26c70aadea6ada099cd9729e746f66710be87770ec
+DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
new file mode 100644
index 000000000000..9a4e143d2efb
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -0,0 +1,658 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ ( sys-devel/clang:13
+ sys-devel/llvm:13
+ =sys-devel/lld-13* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.5 branch
+ "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-01-12 14:51 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-01-12 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 71c4799b8274ad234fb51589634badae45a68b92
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 13:48:55 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 14:51:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71c4799b
app-office/libreoffice: keyword 7.4.4.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index 45f0f59276d6..1c1165c55a5f 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -82,8 +82,8 @@ unset ADDONS_SRC
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"
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-01-14 23:34 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-01-14 23:34 UTC (permalink / raw
To: gentoo-commits
commit: f6007103a4427b5eff7a701f503d1aa518f77b7d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 22:29:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 23:32:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6007103
app-office/libreoffice: drop 7.4.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 -
app-office/libreoffice/libreoffice-7.4.3.2.ebuild | 659 ----------------------
2 files changed, 662 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fcc3b2c497cd..31c4bb7f5a67 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,7 +13,6 @@ DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb
DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 BLAKE2B 0b7bb7b801a553950644ea1cdd522b43744ed6e2f5c71df0360e6e93f3f04eb33d9585c977783b0572a63f47017ba12becc5255a8aba9255c3e64ff7ae7eaef7 SHA512 71164f5e052db4fc16d1eb6ceb66d2b483d4912d874e371399047761e1d82e95d14288be5a7952c40f0ce39366f0706e726720e6e7171a00ce7bb55632cbf10c
DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d5c740b74b589f435d59934397111b9e645e965b2c6fd5c12bdc20fd6a9dc93410b40e61fd1dfd058747803bc113cfd6c73fc9e777e5f074cb6b750f93c0 SHA512 4476024e7f307617719714fbf0999409aa11d730bc316f833bb6627d1b83abb42460417be588c193ecb49d6b926dd1f411934d8a8abebe00a3e85c0047dad0a6
-DIST dragonbox-1.1.0.tar.gz 2837666 BLAKE2B e8f8c6668b047c3d4afa682216ddef19d0cf2b2f0e57a8ce76330daac410ba112cf4b58247942390c5b7cbf231e48a4f99e1c709424c9fed61fbfcfc9dbd3be4 SHA512 4d7cb2e0314ffda8e51600f6cbb953bf1dff9ea46d5c45a08cb0ca45ac386e8bb8b73588cd35b1a1261439a31f46447e59e2980ac6f710dec007c0c575e368e7
DIST dragonbox-1.1.3.tar.gz 4337233 BLAKE2B 0793954e6f922261af7edd590a0deb8d9e9d803111321c17abdb338bcd7b5bb42a691ec3809f9df9b0c0a773828750679c4c00037e45d62ff494ae0056080ef9 SHA512 41ac356ebced3312c0f9ea0f07ff372337ab78af69071f63f63dc12bd2b0088d5d89aae3792276599dd0393bfdfd2b979946c43d36042e43105080bcdcbe089d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
@@ -21,11 +20,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
-DIST libreoffice-7.4.3.2.tar.xz 263885136 BLAKE2B 4e709fc6034d1e04ec80194062bc7de76b0da9fb99fb7203ddecb9c89838db7c808c51457572315e895be46cb4ddbe085338ef63e31701965db91f73e7260862 SHA512 979d893b89048ff8600b4a89b55a77ee071b5ff472ff73728a70efe282c00a43d9b1432c7364a2f019efa082fdf0ab49ab540596e4957c76439e1860c2706039
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
-DIST libreoffice-help-7.4.3.2.tar.xz 112594804 BLAKE2B 79611390f90e5fa242df366269f827c3e74e0e9abc6eb30cfe9dcfc2ac158ae7c3ab881d30653535d2619a7abad9304d8befa73fc45efc755016463543fbae6d SHA512 d1b3021d3c1a6014e5c8c8f2de35da53e11a018f9a3fa9e91e7eb6052379a7970626f90a07a347744a904b26c70aadea6ada099cd9729e746f66710be87770ec
DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.4.3.2.ebuild b/app-office/libreoffice/libreoffice-7.4.3.2.ebuild
deleted file mode 100644
index ab70d775c3e0..000000000000
--- a/app-office/libreoffice/libreoffice-7.4.3.2.ebuild
+++ /dev/null
@@ -1,659 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.0.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # 7.5 branch
- "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
- "${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav="neon"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-04 17:26 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-02-04 17:26 UTC (permalink / raw
To: gentoo-commits
commit: afbf63cff600c28f5d064b8495e7ea5e45d123c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 17:22:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 17:22:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afbf63cf
app-office/libreoffice: add lpsolve subslot dep
Not revbumping myself as LO is one of those packages which needs
some special care around doing so given huge build time and there's
possibly a version bump soon anyway.
Bug: https://bugs.gentoo.org/614866
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.4.5.1.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index 2e450be4a573..78127517fe70 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -164,7 +164,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
- sci-mathematics/lpsolve
+ sci-mathematics/lpsolve:=
sys-libs/zlib
virtual/opengl
x11-libs/cairo[X]
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index 9e8e362925ae..fd9c9b8ed1b6 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -165,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
- sci-mathematics/lpsolve
+ sci-mathematics/lpsolve:=
sys-libs/zlib
virtual/opengl
x11-libs/cairo[X]
diff --git a/app-office/libreoffice/libreoffice-7.4.5.1.ebuild b/app-office/libreoffice/libreoffice-7.4.5.1.ebuild
index bb49b1aebb23..99cf0687ff79 100644
--- a/app-office/libreoffice/libreoffice-7.4.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.5.1.ebuild
@@ -165,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
- sci-mathematics/lpsolve
+ sci-mathematics/lpsolve:=
sys-libs/zlib
virtual/opengl
x11-libs/cairo[X]
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index ed03025adecb..6400a6ada991 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -165,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
- sci-mathematics/lpsolve
+ sci-mathematics/lpsolve:=
sys-libs/zlib
virtual/opengl
x11-libs/cairo[X]
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 726d2cdb097d..bcd7d50224e9 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -165,7 +165,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/zxing-cpp:=
>=net-libs/neon-0.31.1:=
net-misc/curl
- sci-mathematics/lpsolve
+ sci-mathematics/lpsolve:=
sys-libs/zlib
virtual/opengl
x11-libs/cairo[X]
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-12 11:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-02-12 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 72dce62644ba328f3b6040997e7df055080d83b5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 10:53:03 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 11:50:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72dce626
app-office/libreoffice: Update dependencies, allow {clang,llvm}:16
Drop {clang,llvm}:13
Drop unused sys-devel/ucpp BDEPEND
Raise minimum media-libs/harfbuzz to 2.6.8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 3 ---
app-office/libreoffice/libreoffice-9999.ebuild | 10 ++++------
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 6400a6ada991..0e91df871e67 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -271,9 +271,6 @@ BDEPEND="
( sys-devel/clang:14
sys-devel/llvm:14
=sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index bcd7d50224e9..59ae26b54637 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -149,7 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
>=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ >=media-libs/harfbuzz-2.6.8:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
>=media-libs/libepoxy-1.3.1[X]
@@ -231,7 +231,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/gperf-3.1
dev-util/mdds:1/2.0
media-libs/glm
- sys-devel/ucpp
x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
@@ -265,15 +264,15 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
( sys-devel/clang:15
sys-devel/llvm:15
=sys-devel/lld-15* )
( sys-devel/clang:14
sys-devel/llvm:14
=sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
@@ -495,7 +494,6 @@ src_configure() {
--with-parallelism=$(makeopts_jobs)
--with-system-abseil
--with-system-openjpeg
- --with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
--with-webdav="neon"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-12 11:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-02-12 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 49331480cbb3edfc5c1c13822c040513b13a18ae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 10:59:38 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 11:50:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49331480
app-office/libreoffice: Raise minimum media-libs/harfbuzz to 2.1.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 0e91df871e67..10f50893b27b 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -149,7 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
>=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ >=media-libs/harfbuzz-2.6.0:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
>=media-libs/libepoxy-1.3.1[X]
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-12 11:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-02-12 11:50 UTC (permalink / raw
To: gentoo-commits
commit: e958215b52f04a50324625e80e98d0b01a38db6c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 10:57:16 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 11:50:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e958215b
app-office/libreoffice: add 7.5.1.1 w/o KEYWORDS
Bug: https://bugs.gentoo.org/881389
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.5.1.1.ebuild | 653 ++++++++++++++++++++++
2 files changed, 655 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 0215a413a5db..b645999c9f9a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,9 +22,11 @@ DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb3228
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-7.4.5.1.tar.xz 264347796 BLAKE2B 89403e25137e74f1c50b720c140a799284bd2277d132b24bfd5bac5e3eb1d8d2adfc7a3417886c4c4d0777c563bbd43346de58bc6a9f2162f5b5a5f57b22dff7 SHA512 1a3deebeeb0789c00997b0d88a197fd5708e8518938670271e5a90d754f11cee4e25ad46a3171fb7184de828a6ee9ceb37993832f001b10f8435416a2286e266
+DIST libreoffice-7.5.1.1.tar.xz 266285328 BLAKE2B 3b4386602702ccac25736b997381aeada81fe1d0c4ba0d92b41ce7b5e5fda73cb71e9c12f20ffea4775cc4c12e2114090e887fcdce6bbcefbd5b9b3523bd4b14 SHA512 b0b9800d6e764c4eb04fb556f2acf8ce66f21bb3e2ffde6042abe8060af6045b61f01101321ba6467dff279b8e00059328a42303c7506e81c0c7487bcaa72c48
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST libreoffice-help-7.4.5.1.tar.xz 112594972 BLAKE2B c38b1f36a764c775f7a6b5f357ef94d925e1d9d0c6c5dbddcd08688b9bbd6c9bb296e96366f4e14c73003e0434a6632dbdc8abd6580f410701e2bd0627226a2a SHA512 a725557ea4890ce0f424c2d985398e67056dde2a369be2d8282f042bd7ec2715f32e1134be020480717b4d469192c61ef0748fcfed067bcda04cd0e9317d87f7
+DIST libreoffice-help-7.5.1.1.tar.xz 166236924 BLAKE2B 87521ca292bc11ecada6a2c8a681e3391409960b85415ad194a9958032a6e16efab98bd7d60d13dc52e731af89eeff3866e4970f819b3a99e564bb751662b9a8 SHA512 db13a0fe01229f171cca63ba2473fe4d3c3c7f6bcee5d0f6ff16d3d9d7e82681e0a650e64f9c689585048207000c116b21f2eb5e57cd3a00e9376796c1fc83a0
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.5.1.1.ebuild b/app-office/libreoffice/libreoffice-7.5.1.1.ebuild
new file mode 100644
index 000000000000..7fdc6efe49a9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.1.1.ebuild
@@ -0,0 +1,653 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS=""
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-2.6.8:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-12 11:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-02-12 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 77a438d00834dd115fa5d38fee59253ef9436de8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 10:55:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 11:50:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a438d0
app-office/libreoffice: add 7.5 stable branch
Bug: https://bugs.gentoo.org/881389
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 653 +++++++++++++++++++++
1 file changed, 653 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
new file mode 100644
index 000000000000..59ae26b54637
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -0,0 +1,653 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-2.6.8:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ >=net-libs/neon-0.31.1:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-webdav="neon"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-14 19:07 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-02-14 19:07 UTC (permalink / raw
To: gentoo-commits
commit: dd6dc68f8ad19ab272beb018bb8a68abbbef8bc6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 18:50:59 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 19:07:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6dc68f
app-office/libreoffice: Raise minimum media-libs/harfbuzz to 5.1.0
Upstream commit 6a006674c2cf62742ae0653f397aea1166fb43d8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 59ae26b54637..2037cb5ffcc6 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -149,7 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
>=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-2.6.8:=[graphite,icu]
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
>=media-libs/libepoxy-1.3.1[X]
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 59ae26b54637..2037cb5ffcc6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -149,7 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-gfx/graphite2
media-libs/fontconfig
>=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-2.6.8:=[graphite,icu]
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
media-libs/lcms:2
>=media-libs/libcdr-0.1.0
>=media-libs/libepoxy-1.3.1[X]
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-22 21:42 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-02-22 21:42 UTC (permalink / raw
To: gentoo-commits
commit: a9204120361f20d3bec22e658457489d9377c086
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 21:06:21 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 21:06:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9204120
app-office/libreoffice: add 7.5.1.2, drop 7.5.1.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-7.5.1.1.ebuild => libreoffice-7.5.1.2.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b645999c9f9a..63c1bfaeb8bc 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,11 +22,11 @@ DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb3228
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-7.4.5.1.tar.xz 264347796 BLAKE2B 89403e25137e74f1c50b720c140a799284bd2277d132b24bfd5bac5e3eb1d8d2adfc7a3417886c4c4d0777c563bbd43346de58bc6a9f2162f5b5a5f57b22dff7 SHA512 1a3deebeeb0789c00997b0d88a197fd5708e8518938670271e5a90d754f11cee4e25ad46a3171fb7184de828a6ee9ceb37993832f001b10f8435416a2286e266
-DIST libreoffice-7.5.1.1.tar.xz 266285328 BLAKE2B 3b4386602702ccac25736b997381aeada81fe1d0c4ba0d92b41ce7b5e5fda73cb71e9c12f20ffea4775cc4c12e2114090e887fcdce6bbcefbd5b9b3523bd4b14 SHA512 b0b9800d6e764c4eb04fb556f2acf8ce66f21bb3e2ffde6042abe8060af6045b61f01101321ba6467dff279b8e00059328a42303c7506e81c0c7487bcaa72c48
+DIST libreoffice-7.5.1.2.tar.xz 266318492 BLAKE2B 3a7131340af458575e2dbfc933cfdf58689c61d87271a6ca424d57713b4a1c2589406f42f8feda36df606923ca4fb912ddbdc69a47f287ac40ad82c7693ab552 SHA512 7fadf392186c8eb5801395d89c78fdac4fb47756e1a71cd758d232686a457353b2e5e7a96e0854b7cdcfbb3da8cb78155c6d3c1e50ea701341dae1e811e7806f
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST libreoffice-help-7.4.5.1.tar.xz 112594972 BLAKE2B c38b1f36a764c775f7a6b5f357ef94d925e1d9d0c6c5dbddcd08688b9bbd6c9bb296e96366f4e14c73003e0434a6632dbdc8abd6580f410701e2bd0627226a2a SHA512 a725557ea4890ce0f424c2d985398e67056dde2a369be2d8282f042bd7ec2715f32e1134be020480717b4d469192c61ef0748fcfed067bcda04cd0e9317d87f7
-DIST libreoffice-help-7.5.1.1.tar.xz 166236924 BLAKE2B 87521ca292bc11ecada6a2c8a681e3391409960b85415ad194a9958032a6e16efab98bd7d60d13dc52e731af89eeff3866e4970f819b3a99e564bb751662b9a8 SHA512 db13a0fe01229f171cca63ba2473fe4d3c3c7f6bcee5d0f6ff16d3d9d7e82681e0a650e64f9c689585048207000c116b21f2eb5e57cd3a00e9376796c1fc83a0
+DIST libreoffice-help-7.5.1.2.tar.xz 166236184 BLAKE2B 716f70dca7c15c5a09970b0954d77800331213ad87416d70f6aecd6a15f938d6656fd7c24d6237d80721591f4bef5612907cc1727b536ae6f40b891b9fdc1798 SHA512 b866f4814e1fed0c976f3f5c577563939ec2127d1846403bb0e8a30734ac174f3b427ec393f2e49273b497b7c827dfcbae611c08d151bc45bb3547f3f2327499
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.5.1.1.ebuild b/app-office/libreoffice/libreoffice-7.5.1.2.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-7.5.1.1.ebuild
rename to app-office/libreoffice/libreoffice-7.5.1.2.ebuild
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-02-25 10:27 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-02-25 10:27 UTC (permalink / raw
To: gentoo-commits
commit: b4856b4864f62c811eca358750731708d610b6ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 10:11:24 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 10:27:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4856b48
app-office/libreoffice: bump dev-util/mdds app-text/libetonyek slot deps
Closes: https://bugs.gentoo.org/831828
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2037cb5ffcc6..c16cb719cdf1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -136,7 +136,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/icu:=
dev-libs/libassuan
dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
+ >=dev-libs/liborcus-0.18.0:0/0.18
dev-libs/librevenge
dev-libs/libxml2
dev-libs/libxslt
@@ -229,7 +229,7 @@ DEPEND="${COMMON_DEPEND}
dev-perl/Archive-Zip
>=dev-util/cppunit-1.14.0
>=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
+ dev-util/mdds:1/2.1
media-libs/glm
x11-base/xorg-proto
x11-libs/libXt
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-03-02 19:27 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-03-02 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 2d337da8cae2c579cc96068de531d0f7c3613f79
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 19:21:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 19:27:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d337da8
app-office/libreoffice: Drop obsolete dependency and configure flag
Upstream commits:
023ebf17898db4bca63129f079fd90b5cf76c1a9 (ucb: remove --with-webdav=neon)
df9cbdd22658131b881e6527467c8e2a2dd36c70 (Drop remnants of --with-webdav=neon)
2177f48b16b8cd68c0ef4ec817ca391f28324418 (Simplify --with-webdav)
Bug: https://bugs.gentoo.org/891903
Bug: https://bugs.gentoo.org/834438
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 2 --
app-office/libreoffice/libreoffice-7.5.1.2.ebuild | 2 --
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 --
app-office/libreoffice/libreoffice-9999.ebuild | 2 --
4 files changed, 8 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 10f50893b27b..9a7c645b7420 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -163,7 +163,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/openjpeg:=
media-libs/tiff:=
media-libs/zxing-cpp:=
- >=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve:=
sys-libs/zlib
@@ -499,7 +498,6 @@ src_configure() {
--with-system-ucpp
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
diff --git a/app-office/libreoffice/libreoffice-7.5.1.2.ebuild b/app-office/libreoffice/libreoffice-7.5.1.2.ebuild
index 7fdc6efe49a9..ace8f982e074 100644
--- a/app-office/libreoffice/libreoffice-7.5.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.1.2.ebuild
@@ -163,7 +163,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/openjpeg:=
media-libs/tiff:=
media-libs/zxing-cpp:=
- >=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve:=
sys-libs/zlib
@@ -496,7 +495,6 @@ src_configure() {
--with-system-openjpeg
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 2037cb5ffcc6..2607ab8f2f33 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -163,7 +163,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/openjpeg:=
media-libs/tiff:=
media-libs/zxing-cpp:=
- >=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve:=
sys-libs/zlib
@@ -496,7 +495,6 @@ src_configure() {
--with-system-openjpeg
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index c16cb719cdf1..b00a53940ad6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -163,7 +163,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/openjpeg:=
media-libs/tiff:=
media-libs/zxing-cpp:=
- >=net-libs/neon-0.31.1:=
net-misc/curl
sci-mathematics/lpsolve:=
sys-libs/zlib
@@ -496,7 +495,6 @@ src_configure() {
--with-system-openjpeg
--with-tls=nss
--with-vendor="Gentoo Foundation"
- --with-webdav="neon"
--with-x
--without-fonts
--without-myspell-dicts
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-03-03 19:37 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-03-03 19:37 UTC (permalink / raw
To: gentoo-commits
commit: b7e318162aa2d375d081135a2a71a86cb6aa4f2b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 3 19:03:16 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 3 19:32:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e31816
app-office/libreoffice: add 7.4.6.2, no KEYWORDS yet
Bug: https://bugs.gentoo.org/891903
Bug: https://bugs.gentoo.org/894400
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.4.6.2.ebuild | 655 ++++++++++++++++++++++
2 files changed, 657 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 63c1bfaeb8bc..fb150691e353 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,11 +22,13 @@ DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb3228
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-7.4.5.1.tar.xz 264347796 BLAKE2B 89403e25137e74f1c50b720c140a799284bd2277d132b24bfd5bac5e3eb1d8d2adfc7a3417886c4c4d0777c563bbd43346de58bc6a9f2162f5b5a5f57b22dff7 SHA512 1a3deebeeb0789c00997b0d88a197fd5708e8518938670271e5a90d754f11cee4e25ad46a3171fb7184de828a6ee9ceb37993832f001b10f8435416a2286e266
+DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.1.2.tar.xz 266318492 BLAKE2B 3a7131340af458575e2dbfc933cfdf58689c61d87271a6ca424d57713b4a1c2589406f42f8feda36df606923ca4fb912ddbdc69a47f287ac40ad82c7693ab552 SHA512 7fadf392186c8eb5801395d89c78fdac4fb47756e1a71cd758d232686a457353b2e5e7a96e0854b7cdcfbb3da8cb78155c6d3c1e50ea701341dae1e811e7806f
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST libreoffice-help-7.4.5.1.tar.xz 112594972 BLAKE2B c38b1f36a764c775f7a6b5f357ef94d925e1d9d0c6c5dbddcd08688b9bbd6c9bb296e96366f4e14c73003e0434a6632dbdc8abd6580f410701e2bd0627226a2a SHA512 a725557ea4890ce0f424c2d985398e67056dde2a369be2d8282f042bd7ec2715f32e1134be020480717b4d469192c61ef0748fcfed067bcda04cd0e9317d87f7
+DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
DIST libreoffice-help-7.5.1.2.tar.xz 166236184 BLAKE2B 716f70dca7c15c5a09970b0954d77800331213ad87416d70f6aecd6a15f938d6656fd7c24d6237d80721591f4bef5612907cc1727b536ae6f40b891b9fdc1798 SHA512 b866f4814e1fed0c976f3f5c577563939ec2127d1846403bb0e8a30734ac174f3b427ec393f2e49273b497b7c827dfcbae611c08d151bc45bb3547f3f2327499
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
new file mode 100644
index 000000000000..39f77fa5d894
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-2.6.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ sys-devel/ucpp
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 7.5 branch
+ "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
+ "${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
+ "${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --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"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-03-07 0:18 Yixun Lan
0 siblings, 0 replies; 588+ messages in thread
From: Yixun Lan @ 2023-03-07 0:18 UTC (permalink / raw
To: gentoo-commits
commit: cbabbe89c1440c08655bc23b8b1fba98051e97b0
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 11:38:45 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 00:15:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbabbe89
app-office/libreoffice: Keyword 7.5.1.2 riscv, #881389
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.1.2.ebuild b/app-office/libreoffice/libreoffice-7.5.1.2.ebuild
index ace8f982e074..a1612ba9dc50 100644
--- a/app-office/libreoffice/libreoffice-7.5.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.1.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
+KEYWORDS="~riscv"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-03-07 0:22 Yixun Lan
0 siblings, 0 replies; 588+ messages in thread
From: Yixun Lan @ 2023-03-07 0:22 UTC (permalink / raw
To: gentoo-commits
commit: 28d5a993618ee5f34dce7b3ef8a4dccddab4f742
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 7 00:19:57 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Mar 7 00:21:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d5a993
app-office/libreoffice: forward ~riscv keyword to live ebuild
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 2607ab8f2f33..49bd275ef785 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b00a53940ad6..93f656a18661 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-03-10 10:15 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-03-10 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 6c5fcfb226997fd59c79c25f7a03054587269b1e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 10:13:06 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 10:14:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5fcfb2
app-office/libreoffice: Restore 7.4.6.2 keywords
Bug: https://bugs.gentoo.org/894400
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.6.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
index 39f77fa5d894..5a5213d51cf9 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
@@ -82,8 +82,8 @@ unset ADDONS_SRC
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"
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-03-24 19:17 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-03-24 19:17 UTC (permalink / raw
To: gentoo-commits
commit: db068c2346389c767a036e5bbb102211046d31ab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 18:39:22 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 19:17:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db068c23
app-office/libreoffice: drop 7.5.2.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.5.2.1.ebuild | 651 ----------------------
2 files changed, 653 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 003040fafd7e..253a6ae08333 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,13 +22,11 @@ DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb3228
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
-DIST libreoffice-7.5.2.1.tar.xz 269321772 BLAKE2B 94fbb9fc995556940c4cd682a66df61542c2f66f519a052a520ce103f1c99b821536347b5c48b61090a4d72732d832f5fbdfae1228972eea8a94a191d5025d58 SHA512 4fe502d0af82be82db444655dc4b4f51df83150c26c245d4f7fe206f185bb9574772008446c1201eadb048b680b511cff17974f063edbc82b30e1685feb0f200
DIST libreoffice-7.5.2.2.tar.xz 269326892 BLAKE2B 5aac890235facb8074dc6ed02468aca791895cda8f045befb44a363b747f0c812c6dfaad635f36e60901f7afe8aff22ff36710afcc4d4e69bd4c3f5ef97440bd SHA512 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
-DIST libreoffice-help-7.5.2.1.tar.xz 166235820 BLAKE2B 8f2fa8ef912e884a2ac7defa6f7a3ea140f1bdd3eaf55a468e7a10e4445adcbe2e423e16760444e47c4db1ee3f1d6bdefbd368a86931cb5d187b0eefb6b714c7 SHA512 1e9476a1d76daf77d93bdd72181b4732f2ef8a8fd2a8e86b1229766d3647211fefeeac050ae7ee4d1c14d2baea2a421803b3e7e8053fb246829cd09a22f0f8c9
DIST libreoffice-help-7.5.2.2.tar.xz 166236800 BLAKE2B cb7b79d3e7f7d8190bce107689617fd1b848f8fd1741a34375f3697394df006827b5cf071202d26e1777722cb53ee3e5e0718c6e40fca74651ed1fe199aecd0f SHA512 8c3e5a03ccfc8b7ed33c34287bd145a70e8c7254aaf00a9bceb036b3164031133816b4e9807293ca84ee67de545cab6ee77a2c8ec22ccef71b42c336767d18b0
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.5.2.1.ebuild b/app-office/libreoffice/libreoffice-7.5.2.1.ebuild
deleted file mode 100644
index a1612ba9dc50..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.2.1.ebuild
+++ /dev/null
@@ -1,651 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- gtk? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~riscv"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-2.6.8:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-abseil
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-03-24 19:17 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-03-24 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 896676469f0990284977f4701471e960fc0568a4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 18:39:04 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 19:17:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89667646
app-office/libreoffice: add 7.5.2.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.5.2.2.ebuild | 651 ++++++++++++++++++++++
2 files changed, 653 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ba3dfcf9bc9c..003040fafd7e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,10 +23,12 @@ DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.2.1.tar.xz 269321772 BLAKE2B 94fbb9fc995556940c4cd682a66df61542c2f66f519a052a520ce103f1c99b821536347b5c48b61090a4d72732d832f5fbdfae1228972eea8a94a191d5025d58 SHA512 4fe502d0af82be82db444655dc4b4f51df83150c26c245d4f7fe206f185bb9574772008446c1201eadb048b680b511cff17974f063edbc82b30e1685feb0f200
+DIST libreoffice-7.5.2.2.tar.xz 269326892 BLAKE2B 5aac890235facb8074dc6ed02468aca791895cda8f045befb44a363b747f0c812c6dfaad635f36e60901f7afe8aff22ff36710afcc4d4e69bd4c3f5ef97440bd SHA512 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
DIST libreoffice-help-7.5.2.1.tar.xz 166235820 BLAKE2B 8f2fa8ef912e884a2ac7defa6f7a3ea140f1bdd3eaf55a468e7a10e4445adcbe2e423e16760444e47c4db1ee3f1d6bdefbd368a86931cb5d187b0eefb6b714c7 SHA512 1e9476a1d76daf77d93bdd72181b4732f2ef8a8fd2a8e86b1229766d3647211fefeeac050ae7ee4d1c14d2baea2a421803b3e7e8053fb246829cd09a22f0f8c9
+DIST libreoffice-help-7.5.2.2.tar.xz 166236800 BLAKE2B cb7b79d3e7f7d8190bce107689617fd1b848f8fd1741a34375f3697394df006827b5cf071202d26e1777722cb53ee3e5e0718c6e40fca74651ed1fe199aecd0f SHA512 8c3e5a03ccfc8b7ed33c34287bd145a70e8c7254aaf00a9bceb036b3164031133816b4e9807293ca84ee67de545cab6ee77a2c8ec22ccef71b42c336767d18b0
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
new file mode 100644
index 000000000000..68d5556ba49f
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
@@ -0,0 +1,651 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ gtk? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~riscv"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus[X] )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-06 1:03 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-04-06 1:03 UTC (permalink / raw
To: gentoo-commits
commit: efa5d29f7b4c6686f19a181e0a05cd6f790f237b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 6 01:02:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 6 01:02:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa5d29f
app-office/libreoffice: filter out -Wlto-type-mismatch for USE=clang
Clang doesn't implement this yet.
Closes: https://bugs.gentoo.org/903889
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.4.6.2.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.5.2.2.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 3 +++
app-office/libreoffice/libreoffice-9999.ebuild | 3 +++
7 files changed, 21 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index 78127517fe70..8478937fdb36 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -407,6 +407,9 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index fd9c9b8ed1b6..b3baf553f005 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -407,6 +407,9 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
index 5a5213d51cf9..5c71a167ea27 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
@@ -403,6 +403,9 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 9a7c645b7420..684e4c0d635f 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -402,6 +402,9 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
index 68d5556ba49f..3d98400899a5 100644
--- a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
@@ -400,6 +400,9 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 49bd275ef785..7214f182ae9e 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -400,6 +400,9 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 93f656a18661..2070a4f324ae 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -400,6 +400,9 @@ src_configure() {
NM=llvm-nm
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
# Force gcc
einfo "Enforcing the use of gcc due to USE=-clang ..."
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-08 22:56 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-04-08 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 81d6e7ccdb312d17556cf969befc642a932a0dad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 8 21:40:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 8 22:55:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d6e7cc
app-office/libreoffice: Backport loong fix from git master
Upstream commit 477374d8f5e3acfc2727b009a95427ef05297ffc
Bug: https://bugs.gentoo.org/881389
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-7.5.2.2.ebuild | 4 ++++
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 8 ++++++--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 253a6ae08333..d5884a52348b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,6 +22,7 @@ DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb3228
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
+DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.2.2.tar.xz 269326892 BLAKE2B 5aac890235facb8074dc6ed02468aca791895cda8f045befb44a363b747f0c812c6dfaad635f36e60901f7afe8aff22ff36710afcc4d4e69bd4c3f5ef97440bd SHA512 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
index 3d98400899a5..cccdba5049dd 100644
--- a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
@@ -26,6 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-loong-buildsys-fix.patch.xz"
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
# Split modules following git/tarballs; Core MUST be first!
@@ -291,6 +292,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # git master
+ "${WORKDIR}"/${P}-loong-buildsys-fix.patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 7214f182ae9e..78e088c23087 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -26,6 +26,7 @@ inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 mult
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
# Split modules following git/tarballs; Core MUST be first!
@@ -101,8 +102,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -291,6 +292,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # git master
+ "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-11 19:17 WANG Xuerui
0 siblings, 0 replies; 588+ messages in thread
From: WANG Xuerui @ 2023-04-11 19:17 UTC (permalink / raw
To: gentoo-commits
commit: ef1ccb5ac01cd850ec5593a44335e4a84642c119
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 19:16:20 2023 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 19:16:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1ccb5a
app-office/libreoffice: keyword 7.5.2.2 for ~loong
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.2.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
index cccdba5049dd..bd2b5713a57a 100644
--- a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~riscv"
+KEYWORDS="~loong ~riscv"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-13 18:35 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-04-13 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 6a202baff8a20afe02999d13361c4e4fe5ba6823
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 18:11:52 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 18:15:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a202baf
app-office/libreoffice: Restore 7.5.2.2 KEYWORDS
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-7.5.2.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 684e4c0d635f..5cf9be4a22a4 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -82,8 +82,8 @@ unset ADDONS_SRC
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"
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
index bd2b5713a57a..13fe8c346d53 100644
--- a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~loong ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 78e088c23087..fadbf5470dee 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2070a4f324ae..d1dc3e5be99c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -101,8 +101,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-14 0:51 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-04-14 0:51 UTC (permalink / raw
To: gentoo-commits
commit: a1da65ccf1379f646dacf91f100d4c71a66f8843
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Mar 28 14:54:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 00:50:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1da65cc
app-office/libreoffice: Remove erroneous dbus dependency
It is not required to build libreoffice with dbus support when gtk
support is enabled.
The original reporter confirms this.
Closes: https://bugs.gentoo.org/726446
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30393
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 1 -
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 1 -
app-office/libreoffice/libreoffice-7.4.6.2.ebuild | 1 -
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 1 -
app-office/libreoffice/libreoffice-7.5.2.2.ebuild | 1 -
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 1 -
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
7 files changed, 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index 8478937fdb36..fdda06e198e6 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -90,7 +90,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( firebird java )
bluetooth? ( dbus )
- gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index b3baf553f005..53daf4b05467 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -95,7 +95,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( firebird java )
bluetooth? ( dbus )
- gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
index 5c71a167ea27..ff4d94ded68d 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
@@ -95,7 +95,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( firebird java )
bluetooth? ( dbus )
- gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 5cf9be4a22a4..c70611e46ab7 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -95,7 +95,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( firebird java )
bluetooth? ( dbus )
- gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
index 13fe8c346d53..7a51ff18ae63 100644
--- a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
@@ -90,7 +90,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( firebird java )
bluetooth? ( dbus )
- gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index fadbf5470dee..75ddae1047ac 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -90,7 +90,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( firebird java )
bluetooth? ( dbus )
- gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index d1dc3e5be99c..25d7297b769c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -89,7 +89,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( firebird java )
bluetooth? ( dbus )
- gtk? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-15 5:40 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-04-15 5:40 UTC (permalink / raw
To: gentoo-commits
commit: 8e254673e41ea38f9ea0843798f6a9d53d22b9ca
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 05:34:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 05:40:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e254673
app-office/libreoffice: depend on xmlsec subslot dep
xmlsec changed ABI.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 2 +-
.../{libreoffice-7.4.6.2.ebuild => libreoffice-7.4.6.2-r1.ebuild} | 2 +-
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 2 +-
.../{libreoffice-7.5.2.2.ebuild => libreoffice-7.5.2.2-r1.ebuild} | 2 +-
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index fdda06e198e6..4aa0d1b60c29 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
+ >=dev-libs/xmlsec-1.2.28:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index 53daf4b05467..50134c88661e 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
+ >=dev-libs/xmlsec-1.2.28:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.4.6.2.ebuild
rename to app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
index ff4d94ded68d..e31b755d0767 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
+ >=dev-libs/xmlsec-1.2.28:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index c70611e46ab7..4ae4724a6fa7 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
+ >=dev-libs/xmlsec-1.2.28:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-7.5.2.2.ebuild
rename to app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
index 7a51ff18ae63..28b4b94fdc28 100644
--- a/app-office/libreoffice/libreoffice-7.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
+ >=dev-libs/xmlsec-1.2.28:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 75ddae1047ac..e7f2a80baa11 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
+ >=dev-libs/xmlsec-1.2.28:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 25d7297b769c..cf6147578487 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28[nss]
+ >=dev-libs/xmlsec-1.2.28:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-16 4:53 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-04-16 4:53 UTC (permalink / raw
To: gentoo-commits
commit: 903cdd1bdee4adfba34f63d23aac65c7f910884d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 04:52:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 04:52:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903cdd1b
app-office/libreoffice: <libreoffice-7.5 needs <xmlsec-1.3
Needs deprecated xmlSecBase64Encode. Patch is a bit too big for me to
quickly backport and xmlsec-1.3 won't be stabled any time soon anyway.
Closes: https://bugs.gentoo.org/904387
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.3.7.2.ebuild | 2 ++
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 2 ++
app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild | 2 ++
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 2 ++
4 files changed, 8 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
index 4aa0d1b60c29..8ca5f59348da 100644
--- a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -104,6 +104,7 @@ SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86 ~amd64-linux"
+# xmlsec version cap for bug #904387
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -144,6 +145,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nss
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.28:=[nss]
+ <dev-libs/xmlsec-1.3.0
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
index 50134c88661e..a80d34ef3030 100644
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
@@ -103,6 +103,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
+# xmlsec version cap for bug #904387
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -143,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nss
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.28:=[nss]
+ <dev-libs/xmlsec-1.3.0
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
index e31b755d0767..7219d6b8a49d 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
@@ -103,6 +103,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
+# xmlsec version cap for bug #904387
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -143,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nss
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.28:=[nss]
+ <dev-libs/xmlsec-1.3.0
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 4ae4724a6fa7..738a0daa6f5e 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -103,6 +103,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="!test? ( test )"
+# xmlsec version cap for bug #904387
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
@@ -143,6 +144,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nss
>=dev-libs/redland-1.0.16
>=dev-libs/xmlsec-1.2.28:=[nss]
+ <dev-libs/xmlsec-1.3.0
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-16 5:15 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-04-16 5:15 UTC (permalink / raw
To: gentoo-commits
commit: 4a7f233f3662e59b01ebf754dbeb26e129eeb8e5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 05:14:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 05:15:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7f233f
app-office/libreoffice: update minimum dev-libs/xmlsec version
See https://github.com/LibreOffice/core/commit/75e16fdc9d111aad9663b7de1b229fbd2a61b51e.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
index 28b4b94fdc28..3015e1f4bef7 100644
--- a/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28:=[nss]
+ >=dev-libs/xmlsec-1.2.35:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index e7f2a80baa11..b00d6175767d 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28:=[nss]
+ >=dev-libs/xmlsec-1.2.35:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index cf6147578487..2d2b44bdb227 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/nspr
dev-libs/nss
>=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28:=[nss]
+ >=dev-libs/xmlsec-1.2.35:=[nss]
>=games-engines/box2d-2.4.1:0
media-gfx/fontforge
media-gfx/graphite2
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-26 3:51 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-04-26 3:51 UTC (permalink / raw
To: gentoo-commits
commit: d6c3df04b26e98cbd9ebb5baacd9c7bd668c4fcc
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Apr 16 17:02:45 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 03:47:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c3df04
app-office/libreoffice: Don't require X for dbus
It doesn't seem to be required anymore with LibreOffice.
Bug: https://bugs.gentoo.org/726446
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30620
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
index 738a0daa6f5e..36ed04a552ca 100644
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
@@ -181,7 +181,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
+ dbus? ( sys-apps/dbus )
eds? (
dev-libs/glib:2
gnome-base/dconf
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index b00d6175767d..941b2c21607a 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -180,7 +180,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
+ dbus? ( sys-apps/dbus )
eds? (
dev-libs/glib:2
gnome-base/dconf
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2d2b44bdb227..3f227c0a320f 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -179,7 +179,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
coinmp? ( sci-libs/coinor-mp )
cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
+ dbus? ( sys-apps/dbus )
eds? (
dev-libs/glib:2
gnome-base/dconf
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-26 13:34 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-04-26 13:34 UTC (permalink / raw
To: gentoo-commits
commit: 212fea420c9eb7796d0d1a8f1a7748183a9f1f1f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 13:34:31 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 13:34:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=212fea42
app-office/libreoffice: Stabilize 7.4.6.2-r1 arm64, #894400
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
index 7219d6b8a49d..559a87364845 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
@@ -83,7 +83,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-04-29 17:16 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-04-29 17:16 UTC (permalink / raw
To: gentoo-commits
commit: a52d1f5213bd20af917cdaea7fa1222477d9ad32
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 17:15:49 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 17:15:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52d1f52
app-office/libreoffice: Stabilize 7.4.6.2-r1 x86, #894400
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
index 559a87364845..7bed3321ecea 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
@@ -83,7 +83,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-05-01 1:43 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-05-01 1:43 UTC (permalink / raw
To: gentoo-commits
commit: 7ba625cc23e1b299f83808ddff6c7b76d7817101
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 01:40:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 01:40:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba625cc
app-office/libreoffice: Stabilize 7.4.6.2-r1 amd64, #894400
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
index 7bed3321ecea..1ac2bcce093d 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
@@ -83,7 +83,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
# Extensions that need extra work:
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-05-03 11:31 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-05-03 11:31 UTC (permalink / raw
To: gentoo-commits
commit: a30e5078fef8e68d3775cf908491623928e86165
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 3 10:25:19 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 3 11:30:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30e5078
app-office/libreoffice: drop 7.4.4.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.4.4.2.ebuild | 664 ----------------------
2 files changed, 666 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d5884a52348b..a5be4b586f43 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,13 +20,11 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
-DIST libreoffice-7.4.4.2.tar.xz 264346748 BLAKE2B 4498a615df78816e579173be585b61dfd16958f16fc29d3171f09f17e4caa370fc6cbe427c7a79c28f8a23a7ecd036b21488188fb4ef035a8ccb2ef877bb1363 SHA512 8205d1980cc282a3f18214cdfa036788a4b288c72e153716b807d5ad0cf8e5ec42c3223b783d75bfe92ea7f6caa7eadcd5ebf88ff899742a3b1733c1e36807de
DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.2.2.tar.xz 269326892 BLAKE2B 5aac890235facb8074dc6ed02468aca791895cda8f045befb44a363b747f0c812c6dfaad635f36e60901f7afe8aff22ff36710afcc4d4e69bd4c3f5ef97440bd SHA512 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
-DIST libreoffice-help-7.4.4.2.tar.xz 112594808 BLAKE2B 5cb59edeacca40eec1955828b76ae94f000fb386a6ebe7dae71b62f95c7207f47af376923395abcb78e619aed410481343bac12a7390578e6fdc4e8ae0b1daa4 SHA512 24132f52a3452c5d90825c1c1ec6f9ac3faa8b7cdd3bbfa36d97221327a6ca2677d2c03c115f2d8990ecc43f7a492c26a8c1a2dd45fe40eab8deab99593ccf50
DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
DIST libreoffice-help-7.5.2.2.tar.xz 166236800 BLAKE2B cb7b79d3e7f7d8190bce107689617fd1b848f8fd1741a34375f3697394df006827b5cf071202d26e1777722cb53ee3e5e0718c6e40fca74651ed1fe199aecd0f SHA512 8c3e5a03ccfc8b7ed33c34287bd145a70e8c7254aaf00a9bceb036b3164031133816b4e9807293ca84ee67de545cab6ee77a2c8ec22ccef71b42c336767d18b0
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
diff --git a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild b/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
deleted file mode 100644
index a80d34ef3030..000000000000
--- a/app-office/libreoffice/libreoffice-7.4.4.2.ebuild
+++ /dev/null
@@ -1,664 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux"
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-# xmlsec version cap for bug #904387
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28:=[nss]
- <dev-libs/xmlsec-1.3.0
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- >=net-libs/neon-0.31.1:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- ( sys-devel/clang:13
- sys-devel/llvm:13
- =sys-devel/lld-13* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # 7.5 branch
- "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
- "${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
- "${FILESDIR}/${PN}-7.4.4.2-zxing-cpp-1.4.0-c++17.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-webdav="neon"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-05-04 13:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-05-04 13:13 UTC (permalink / raw
To: gentoo-commits
commit: a49824c3d11a86a033ee6ef09d7b11ab02332d41
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 4 13:08:29 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 4 13:13:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49824c3
app-office/libreoffice: drop 7.5.2.2-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../libreoffice/libreoffice-7.5.2.2-r1.ebuild | 657 ---------------------
2 files changed, 659 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3f48bb0460bf..cc0a09e2dd73 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,12 +22,10 @@ DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb3228
DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
-DIST libreoffice-7.5.2.2.tar.xz 269326892 BLAKE2B 5aac890235facb8074dc6ed02468aca791895cda8f045befb44a363b747f0c812c6dfaad635f36e60901f7afe8aff22ff36710afcc4d4e69bd4c3f5ef97440bd SHA512 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6
DIST libreoffice-7.5.3.2.tar.xz 269840284 BLAKE2B 4decdaf2410b3e1bd1d349b00766fbd7c458d895ecfda8e1565a905d1dbc515c7ead5d5416a74c7ce5854a86c3ad39b0e1f658317bfeb99d079da12d847bb6c6 SHA512 ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
-DIST libreoffice-help-7.5.2.2.tar.xz 166236800 BLAKE2B cb7b79d3e7f7d8190bce107689617fd1b848f8fd1741a34375f3697394df006827b5cf071202d26e1777722cb53ee3e5e0718c6e40fca74651ed1fe199aecd0f SHA512 8c3e5a03ccfc8b7ed33c34287bd145a70e8c7254aaf00a9bceb036b3164031133816b4e9807293ca84ee67de545cab6ee77a2c8ec22ccef71b42c336767d18b0
DIST libreoffice-help-7.5.3.2.tar.xz 166237184 BLAKE2B 50f8482fe8a91117de2ddd4eacae8373e900066c783b95ff8a7c725009210e72e5eb891499f358f90ec18ecab8fd9ada5c1be246667e7c2c871b61573c837e82 SHA512 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
deleted file mode 100644
index 3015e1f4bef7..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.2.2-r1.ebuild
+++ /dev/null
@@ -1,657 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-loong-buildsys-fix.patch.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus[X] )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # git master
- "${WORKDIR}"/${P}-loong-buildsys-fix.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-abseil
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-05-04 13:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-05-04 13:13 UTC (permalink / raw
To: gentoo-commits
commit: a0d4796e82f6dd617866588e01d26e4ca2b1fac5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 4 13:08:16 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 4 13:12:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d4796e
app-office/libreoffice: add 7.5.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.5.3.2.ebuild | 657 ++++++++++++++++++++++
2 files changed, 659 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a5be4b586f43..3f48bb0460bf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -23,9 +23,11 @@ DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d
DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.2.2.tar.xz 269326892 BLAKE2B 5aac890235facb8074dc6ed02468aca791895cda8f045befb44a363b747f0c812c6dfaad635f36e60901f7afe8aff22ff36710afcc4d4e69bd4c3f5ef97440bd SHA512 1507c6b60eb680ed36a5c16b802a07218ab3bd26ea65acb8a43576003b120246849e1a4f2c6e3cfca181979a46d541dcf37841b95f5b43d40946f12b92c686b6
+DIST libreoffice-7.5.3.2.tar.xz 269840284 BLAKE2B 4decdaf2410b3e1bd1d349b00766fbd7c458d895ecfda8e1565a905d1dbc515c7ead5d5416a74c7ce5854a86c3ad39b0e1f658317bfeb99d079da12d847bb6c6 SHA512 ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
DIST libreoffice-help-7.5.2.2.tar.xz 166236800 BLAKE2B cb7b79d3e7f7d8190bce107689617fd1b848f8fd1741a34375f3697394df006827b5cf071202d26e1777722cb53ee3e5e0718c6e40fca74651ed1fe199aecd0f SHA512 8c3e5a03ccfc8b7ed33c34287bd145a70e8c7254aaf00a9bceb036b3164031133816b4e9807293ca84ee67de545cab6ee77a2c8ec22ccef71b42c336767d18b0
+DIST libreoffice-help-7.5.3.2.tar.xz 166237184 BLAKE2B 50f8482fe8a91117de2ddd4eacae8373e900066c783b95ff8a7c725009210e72e5eb891499f358f90ec18ecab8fd9ada5c1be246667e7c2c871b61573c837e82 SHA512 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
diff --git a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
new file mode 100644
index 000000000000..941b2c21607a
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
@@ -0,0 +1,657 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # git master
+ "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ if use vulkan && ! use clang ; then
+ ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+ fi
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-05-13 21:25 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-05-13 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 12b7a9b603c2f9130610003b7e9cd6fcf31af19f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 21:20:24 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 13 21:24:43 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b7a9b6
app-office/libreoffice: drop 7.4.9999
No more development or packaging for 7.4 branch.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.9999.ebuild | 658 ---------------------
1 file changed, 658 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.9999.ebuild b/app-office/libreoffice/libreoffice-7.4.9999.ebuild
deleted file mode 100644
index 36ed04a552ca..000000000000
--- a/app-office/libreoffice/libreoffice-7.4.9999.ebuild
+++ /dev/null
@@ -1,658 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
-
-# Extensions that need extra work:
-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 test vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-# xmlsec version cap for bug #904387
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.28:=[nss]
- <dev-libs/xmlsec-1.3.0
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-2.6.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- sys-devel/ucpp
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # 7.5 branch
- "${FILESDIR}/${PN}-7.3.7.2-boost-1.81-locale.patch"
- "${FILESDIR}/${PN}-7.3.7.2-zxing-cpp-1.4.0.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --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"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-05-16 1:52 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-05-16 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 20daeb992dfaa00e2793b5f9d5e670e382b1db1a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 16 00:44:42 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 16 01:52:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20daeb99
app-office/libreoffice: add Valgrind annotation support
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.3.2.ebuild | 4 +++-
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 4 +++-
app-office/libreoffice/libreoffice-9999.ebuild | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
index 941b2c21607a..772e63c73d8e 100644
--- a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
@@ -84,7 +84,7 @@ 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 test vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -243,6 +243,7 @@ DEPEND="${COMMON_DEPEND}
media-fonts/dejavu
media-fonts/liberation-fonts
)
+ valgrind? ( dev-util/valgrind )
"
RDEPEND="${COMMON_DEPEND}
acct-group/libreoffice
@@ -534,6 +535,7 @@ src_configure() {
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
$(use_with java)
$(use_with odk doxygen)
+ $(use_with valgrind)
)
if use eds || use gtk; then
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 941b2c21607a..772e63c73d8e 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -84,7 +84,7 @@ 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 test vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -243,6 +243,7 @@ DEPEND="${COMMON_DEPEND}
media-fonts/dejavu
media-fonts/liberation-fonts
)
+ valgrind? ( dev-util/valgrind )
"
RDEPEND="${COMMON_DEPEND}
acct-group/libreoffice
@@ -534,6 +535,7 @@ src_configure() {
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
$(use_with java)
$(use_with odk doxygen)
+ $(use_with valgrind)
)
if use eds || use gtk; then
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3f227c0a320f..3e79b6523909 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -83,7 +83,7 @@ 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 test vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -242,6 +242,7 @@ DEPEND="${COMMON_DEPEND}
media-fonts/dejavu
media-fonts/liberation-fonts
)
+ valgrind? ( dev-util/valgrind )
"
RDEPEND="${COMMON_DEPEND}
acct-group/libreoffice
@@ -530,6 +531,7 @@ src_configure() {
$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
$(use_with java)
$(use_with odk doxygen)
+ $(use_with valgrind)
)
if use eds || use gtk; then
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-05-23 9:33 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-05-23 9:33 UTC (permalink / raw
To: gentoo-commits
commit: 326d52937573cf713dd070d23573b8deb5c9ede8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 09:30:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 23 09:32:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326d5293
app-office/libreoffice: drop obsolete GCC Skia warning
Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92645
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild | 4 ----
app-office/libreoffice/libreoffice-7.5.3.2.ebuild | 4 ----
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 4 ----
app-office/libreoffice/libreoffice-9999.ebuild | 4 ----
4 files changed, 16 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
index 1ac2bcce093d..de5dc3cb189f 100644
--- a/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.4.6.2-r1.ebuild
@@ -438,10 +438,6 @@ src_configure() {
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
diff --git a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
index 772e63c73d8e..5b07c58a5af5 100644
--- a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
@@ -438,10 +438,6 @@ src_configure() {
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 772e63c73d8e..5b07c58a5af5 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -438,10 +438,6 @@ src_configure() {
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3e79b6523909..03c8eb7fdfb7 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -434,10 +434,6 @@ src_configure() {
# Ensure we use correct toolchain
tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
- if use vulkan && ! use clang ; then
- ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
- fi
-
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-06-01 19:15 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-06-01 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 548ee9c22c54dd4b4e182c5338e23c63a8c70031
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 1 19:14:36 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 19:14:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=548ee9c2
app-office/libreoffice: Stabilize 7.5.3.2 arm64, #905701
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
index 5b07c58a5af5..ce190a785e37 100644
--- a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-06-02 16:13 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-06-02 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 05ee8055c607edc6399f0b3d1c3bf4281a493e3b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 16:12:35 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 16:12:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ee8055
app-office/libreoffice: Stabilize 7.5.3.2 amd64, #905701
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
index ce190a785e37..0cbb41e464af 100644
--- a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-06-08 14:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-06-08 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 9d1354fcc935e54450c32f3ea0c652de268c4325
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 8 14:26:01 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 8 14:26:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1354fc
app-office/libreoffice: add 7.5.4.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.5.4.2.ebuild | 655 ++++++++++++++++++++++
2 files changed, 657 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index abad1c805b39..5f3e930714da 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,7 +20,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST libreoffice-7.4.6.2.tar.xz 264594056 BLAKE2B e18084aa45d021d5a14bc4259aac61de86571a526fa335cf64b04fbbf77eb02c154d5b2be5735063089453f0a6710ee526c7c9f5b76a3c30b733e6c4fcb81a7e SHA512 c0b18d6c5bec1140d87fc24b539640280fea782ff1239e44368afeac63058ba38aae1b81e30d1ab17e84089918d7e698f0afd342e98208171faeff303ccd7fab
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.3.2.tar.xz 269840284 BLAKE2B 4decdaf2410b3e1bd1d349b00766fbd7c458d895ecfda8e1565a905d1dbc515c7ead5d5416a74c7ce5854a86c3ad39b0e1f658317bfeb99d079da12d847bb6c6 SHA512 ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
+DIST libreoffice-7.5.4.2.tar.xz 270237076 BLAKE2B d9903c46c899c129749b32b720788f2c56583524117624b161a84be356b08e3ed80cd1e34d5825ccbc2f627e7e37fc50407edbbd994d20071b9c3a10684b98c4 SHA512 582aa92a5cac3970a1fef96d6fbc4bd398c9f5705b5d9a05c83f374932a8050e7c3a20abe45d13db87eadc93334d9f3e6fb11075a86d7ad49c2f7768baedb6b3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.4.6.2.tar.xz 112594112 BLAKE2B e74a0dea796eab29bc6e5359748ec11ec1deb2d81237b919b5873c13c34b673c11b3be66ed895995b233e4d79b68bf5ab6cefaaabacc49aad8c90d89f4bfdb47 SHA512 c158c0126aef3d0c6602ace5e57efdf2b9c35511424eb960ac52b7f8371eca02a604919f95dc3449f3cafc86db514c24e4deb5dbfde1ffb57170c5e82bc9d25b
DIST libreoffice-help-7.5.3.2.tar.xz 166237184 BLAKE2B 50f8482fe8a91117de2ddd4eacae8373e900066c783b95ff8a7c725009210e72e5eb891499f358f90ec18ecab8fd9ada5c1be246667e7c2c871b61573c837e82 SHA512 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
+DIST libreoffice-help-7.5.4.2.tar.xz 166236736 BLAKE2B 2e1a2e6c77ae9aa7198f889623b5022176e424c95d57d1d45a5206c0c56526ed8aed0bcafa92ac57b7a852aba8bed5a12c0524c227d66626883ae05239243fd6 SHA512 cea4222d05c2d5ce661758f080e26bf4bab3d158936b85482ec885241a5cb2abb38be108b1c5ed909b2d1ea762c550211330400377b89c483f4e9e3c8af16f3a
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
diff --git a/app-office/libreoffice/libreoffice-7.5.4.2.ebuild b/app-office/libreoffice/libreoffice-7.5.4.2.ebuild
new file mode 100644
index 000000000000..c43905a51812
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.4.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # git master
+ "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-06-09 6:53 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-06-09 6:53 UTC (permalink / raw
To: gentoo-commits
commit: aa072d8215e9734c593181015e8f88c06d2fb333
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 9 06:53:30 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 9 06:53:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa072d82
app-office/libreoffice: Stabilize 7.5.3.2 x86, #905701
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.3.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
index 0cbb41e464af..e04f67f90716 100644
--- a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-07-12 20:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-07-12 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 1a85e7a4c2ca4793eadbfbff282bd29947f704b9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 18:18:25 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 20:29:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a85e7a4
app-office/libreoffice: add 7.5.5.2 w/o KEYWORDS
Pre-release.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-7.5.9999.ebuild => libreoffice-7.5.5.2.ebuild} | 8 ++++----
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 4 ++--
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d717eb30a241..5151b22e2e1f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,7 +20,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.3.2.tar.xz 269840284 BLAKE2B 4decdaf2410b3e1bd1d349b00766fbd7c458d895ecfda8e1565a905d1dbc515c7ead5d5416a74c7ce5854a86c3ad39b0e1f658317bfeb99d079da12d847bb6c6 SHA512 ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
DIST libreoffice-7.5.4.2.tar.xz 270237076 BLAKE2B d9903c46c899c129749b32b720788f2c56583524117624b161a84be356b08e3ed80cd1e34d5825ccbc2f627e7e37fc50407edbbd994d20071b9c3a10684b98c4 SHA512 582aa92a5cac3970a1fef96d6fbc4bd398c9f5705b5d9a05c83f374932a8050e7c3a20abe45d13db87eadc93334d9f3e6fb11075a86d7ad49c2f7768baedb6b3
+DIST libreoffice-7.5.5.2.tar.xz 270545744 BLAKE2B 5e957447905dec28ae5165b438f7df8bebc55f2ea9402068459a376109cc43bb12087a22854bd90cd6a0b9fcf3f72f49d906369dc937a06c9a51fdcb41a9dc52 SHA512 22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.5.3.2.tar.xz 166237184 BLAKE2B 50f8482fe8a91117de2ddd4eacae8373e900066c783b95ff8a7c725009210e72e5eb891499f358f90ec18ecab8fd9ada5c1be246667e7c2c871b61573c837e82 SHA512 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
DIST libreoffice-help-7.5.4.2.tar.xz 166236736 BLAKE2B 2e1a2e6c77ae9aa7198f889623b5022176e424c95d57d1d45a5206c0c56526ed8aed0bcafa92ac57b7a852aba8bed5a12c0524c227d66626883ae05239243fd6 SHA512 cea4222d05c2d5ce661758f080e26bf4bab3d158936b85482ec885241a5cb2abb38be108b1c5ed909b2d1ea762c550211330400377b89c483f4e9e3c8af16f3a
+DIST libreoffice-help-7.5.5.2.tar.xz 166236984 BLAKE2B 2880fb61532c31a52e99f8dd150967b1206f2861085b0ca433e96dea4b95c18896e8837aca6d72e278c57d73e4ae51f6da273ad586ab50835964192f1f5780e4 SHA512 1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-7.5.9999.ebuild
copy to app-office/libreoffice/libreoffice-7.5.5.2.ebuild
index 5b07c58a5af5..15cb549075e0 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
@@ -101,8 +101,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
@@ -294,7 +294,7 @@ PATCHES=(
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
# git master
- "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch
+ "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 5b07c58a5af5..df73586c96e8 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
@@ -294,7 +294,7 @@ PATCHES=(
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
# git master
- "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch
+ "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 03c8eb7fdfb7..1b0074df9454 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-08-19 12:19 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-08-19 12:19 UTC (permalink / raw
To: gentoo-commits
commit: e8cc7ac7b0069ee1d1e2f64f20ad68e25693ed8f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 12:19:15 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 12:19:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cc7ac7
app-office/libreoffice: Stabilize 7.5.5.2 amd64, #911192
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
index df73586c96e8..bfd886786972 100644
--- a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-08-19 12:19 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-08-19 12:19 UTC (permalink / raw
To: gentoo-commits
commit: 615ee59605467dea260d66c5d66987d4797a2da0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 12:19:30 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 12:19:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615ee596
app-office/libreoffice: Stabilize 7.5.5.2 arm64, #911192
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
index bfd886786972..bda7fca73ab5 100644
--- a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-08-19 12:39 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-08-19 12:39 UTC (permalink / raw
To: gentoo-commits
commit: ed760c9a022faca54e9b4f86756350c8f7153363
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 12:39:13 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 12:39:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed760c9a
app-office/libreoffice: Stabilize 7.5.5.2 x86, #911192
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
index bda7fca73ab5..ec4510741e85 100644
--- a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-08-20 12:00 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-08-20 12:00 UTC (permalink / raw
To: gentoo-commits
commit: 2d4df808ae5c6f438cd68be67797132586f4e0a7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 11:53:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 11:53:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d4df808
app-office/libreoffice: drop 7.5.3.2, 7.5.4.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 -
app-office/libreoffice/libreoffice-7.5.3.2.ebuild | 655 ----------------------
app-office/libreoffice/libreoffice-7.5.4.2.ebuild | 655 ----------------------
3 files changed, 1314 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5151b22e2e1f..4b2b28b64e66 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,11 +18,7 @@ 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 libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
-DIST libreoffice-7.5.3.2.tar.xz 269840284 BLAKE2B 4decdaf2410b3e1bd1d349b00766fbd7c458d895ecfda8e1565a905d1dbc515c7ead5d5416a74c7ce5854a86c3ad39b0e1f658317bfeb99d079da12d847bb6c6 SHA512 ea3b05fe7ac42a23766759712fbab9ab0bcf0cbf3177cd7f0f680140d52661ae626caf89c7c4cce0e557c309ac1980875abfb520ad09d885c32bd1c6e9eec61e
-DIST libreoffice-7.5.4.2.tar.xz 270237076 BLAKE2B d9903c46c899c129749b32b720788f2c56583524117624b161a84be356b08e3ed80cd1e34d5825ccbc2f627e7e37fc50407edbbd994d20071b9c3a10684b98c4 SHA512 582aa92a5cac3970a1fef96d6fbc4bd398c9f5705b5d9a05c83f374932a8050e7c3a20abe45d13db87eadc93334d9f3e6fb11075a86d7ad49c2f7768baedb6b3
DIST libreoffice-7.5.5.2.tar.xz 270545744 BLAKE2B 5e957447905dec28ae5165b438f7df8bebc55f2ea9402068459a376109cc43bb12087a22854bd90cd6a0b9fcf3f72f49d906369dc937a06c9a51fdcb41a9dc52 SHA512 22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.5.3.2.tar.xz 166237184 BLAKE2B 50f8482fe8a91117de2ddd4eacae8373e900066c783b95ff8a7c725009210e72e5eb891499f358f90ec18ecab8fd9ada5c1be246667e7c2c871b61573c837e82 SHA512 8a8f7915de4eafbfafc81c66de70410b1ca827ec8dc40db55ad2275dc1544da471b2de5aacb42ad31b03a676f5133df78a70332810588895d950083f3b8724f4
-DIST libreoffice-help-7.5.4.2.tar.xz 166236736 BLAKE2B 2e1a2e6c77ae9aa7198f889623b5022176e424c95d57d1d45a5206c0c56526ed8aed0bcafa92ac57b7a852aba8bed5a12c0524c227d66626883ae05239243fd6 SHA512 cea4222d05c2d5ce661758f080e26bf4bab3d158936b85482ec885241a5cb2abb38be108b1c5ed909b2d1ea762c550211330400377b89c483f4e9e3c8af16f3a
DIST libreoffice-help-7.5.5.2.tar.xz 166236984 BLAKE2B 2880fb61532c31a52e99f8dd150967b1206f2861085b0ca433e96dea4b95c18896e8837aca6d72e278c57d73e4ae51f6da273ad586ab50835964192f1f5780e4 SHA512 1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
diff --git a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild b/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
deleted file mode 100644
index e04f67f90716..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.3.2.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # git master
- "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-abseil
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-7.5.4.2.ebuild b/app-office/libreoffice/libreoffice-7.5.4.2.ebuild
deleted file mode 100644
index c43905a51812..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.4.2.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # git master
- "${WORKDIR}"/${PN}-7.5.2.2-loong-buildsys-fix.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-abseil
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-08-21 15:51 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-08-21 15:51 UTC (permalink / raw
To: gentoo-commits
commit: bdb5c1f500f7407fee070cf6dc74653dd675d80a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 15:50:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 15:51:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb5c1f5
app-office/libreoffice: firebird is no longer needed for base
See https://gerrit.libreoffice.org/c/core/+/78240/. It's now considered
experimental upstream and is not required for the LO 'Base' functionality.
Bug: https://bugs.documentfoundation.org/show_bug.cgi?id=127180
Closes: https://bugs.gentoo.org/912703
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index e79d7470ac97..90048ef61fed 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -88,7 +88,7 @@ googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrin
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
+ base? ( java )
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9790fa5595b1..b18f51bf94d8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -89,7 +89,7 @@ googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrin
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
+ base? ( java )
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-08-21 15:51 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-08-21 15:51 UTC (permalink / raw
To: gentoo-commits
commit: ca082bdd4768c1eada06c19fbd76cffb8352a067
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 15:25:12 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 15:51:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca082bdd
app-office/libreoffice: bundle abseil-cpp
abseil isn't *really* intended to be a system library and having a year-old
pinned dep like this causes havoc for other packages and leads to uninstallable
combinations (e.g. libreoffice-bin + anything needing grpc).
Please see also the extensive discussion in the linked PRs wrt abseil now
depending on re2 and the ABI implications of the used C++ std. versions with
abseil. It's not worth it and there's more downsides to unbundling than not.
Bug: https://github.com/gentoo/gentoo/pull/31388
Bug: https://github.com/gentoo/gentoo/pull/31609
Bug: https://github.com/gentoo/gentoo/pull/31893
Bug: https://github.com/gentoo/gentoo/pull/32281
Bug: https://bugs.gentoo.org/908373
Closes: https://bugs.gentoo.org/912686
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 3 +--
app-office/libreoffice/libreoffice-9999.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index df73586c96e8..e79d7470ac97 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -125,7 +125,6 @@ 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-r2
dev-db/unixODBC
@@ -494,7 +493,6 @@ src_configure() {
--with-external-tar="${DISTDIR}"
--with-lang=""
--with-parallelism=$(makeopts_jobs)
- --with-system-abseil
--with-system-openjpeg
--with-tls=nss
--with-vendor="Gentoo Foundation"
@@ -504,6 +502,7 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
+ --without-system-abseil
--without-system-dragonbox
--without-system-jfreereport
--without-system-libfixmath
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1b0074df9454..834e9e736aa9 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -124,7 +124,6 @@ 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-r2
dev-db/unixODBC
@@ -490,7 +489,6 @@ src_configure() {
--with-external-tar="${DISTDIR}"
--with-lang=""
--with-parallelism=$(makeopts_jobs)
- --with-system-abseil
--with-system-openjpeg
--with-tls=nss
--with-vendor="Gentoo Foundation"
@@ -500,6 +498,7 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
+ --without-system-abseil
--without-system-dragonbox
--without-system-jfreereport
--without-system-libfixmath
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-08-21 15:51 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-08-21 15:51 UTC (permalink / raw
To: gentoo-commits
commit: dadb42f041a2a25d6e4532fcf14f0d71f7216106
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 15:48:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 15:51:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dadb42f0
app-office/libreoffice: update skia for 9999, add new frozen (bundled) dep
Closes: https://bugs.gentoo.org/898030
Closes: https://bugs.gentoo.org/908833
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 ++
app-office/libreoffice/libreoffice-9999.ebuild | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4b2b28b64e66..97e073860091 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,8 +17,10 @@ DIST dragonbox-1.1.3.tar.gz 4337233 BLAKE2B 0793954e6f922261af7edd590a0deb8d9e9d
DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
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-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.5.2.tar.xz 270545744 BLAKE2B 5e957447905dec28ae5165b438f7df8bebc55f2ea9402068459a376109cc43bb12087a22854bd90cd6a0b9fcf3f72f49d906369dc937a06c9a51fdcb41a9dc52 SHA512 22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.5.5.2.tar.xz 166236984 BLAKE2B 2880fb61532c31a52e99f8dd150967b1206f2861085b0ca433e96dea4b95c18896e8837aca6d72e278c57d73e4ae51f6da273ad586ab50835964192f1f5780e4 SHA512 1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
+DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 834e9e736aa9..9790fa5595b1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -48,8 +48,10 @@ ADDONS_SRC=(
"${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
"${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -500,6 +502,7 @@ src_configure() {
--with-system-gpgmepp
--without-system-abseil
--without-system-dragonbox
+ --without-system-frozen
--without-system-jfreereport
--without-system-libfixmath
--without-system-sane
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-09-07 18:02 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-09-07 18:02 UTC (permalink / raw
To: gentoo-commits
commit: c405ced9a3406e801a96289d7ae00fb404780ed6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 17:42:18 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 18:01:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c405ced9
app-office/libreoffice: add 7.5.6.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 655 ++++++++++++++++++++++
2 files changed, 657 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 97e073860091..37194e4e3414 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,7 +20,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.5.2.tar.xz 270545744 BLAKE2B 5e957447905dec28ae5165b438f7df8bebc55f2ea9402068459a376109cc43bb12087a22854bd90cd6a0b9fcf3f72f49d906369dc937a06c9a51fdcb41a9dc52 SHA512 22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
+DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.5.5.2.tar.xz 166236984 BLAKE2B 2880fb61532c31a52e99f8dd150967b1206f2861085b0ca433e96dea4b95c18896e8837aca6d72e278c57d73e4ae51f6da273ad586ab50835964192f1f5780e4 SHA512 1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
+DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
new file mode 100644
index 000000000000..df73586c96e8
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( firebird java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ 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-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # git master
+ "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-abseil
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-09-09 12:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-09-09 12:53 UTC (permalink / raw
To: gentoo-commits
commit: fe66755db1a54af033c382bf0169381adeea5e58
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 12:53:13 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 12:53:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe66755d
app-office/libreoffice: Sync missed changes from 7.5.9999
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index df73586c96e8..90048ef61fed 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -88,7 +88,7 @@ googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrin
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
+ base? ( java )
bluetooth? ( dbus )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
@@ -125,7 +125,6 @@ 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-r2
dev-db/unixODBC
@@ -494,7 +493,6 @@ src_configure() {
--with-external-tar="${DISTDIR}"
--with-lang=""
--with-parallelism=$(makeopts_jobs)
- --with-system-abseil
--with-system-openjpeg
--with-tls=nss
--with-vendor="Gentoo Foundation"
@@ -504,6 +502,7 @@ src_configure() {
--with-help="html"
--without-helppack-integration
--with-system-gpgmepp
+ --without-system-abseil
--without-system-dragonbox
--without-system-jfreereport
--without-system-libfixmath
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-10-08 14:37 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-10-08 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 0063809803dadee26ee9115de9cd8e23e29292d7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 7 23:19:18 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 14:37:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00638098
app-office/libreoffice: 7.5.7.1 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.5.7.1.ebuild | 654 ++++++++++++++++++++++
2 files changed, 656 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 37194e4e3414..8623753da656 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,8 +21,10 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.5.2.tar.xz 270545744 BLAKE2B 5e957447905dec28ae5165b438f7df8bebc55f2ea9402068459a376109cc43bb12087a22854bd90cd6a0b9fcf3f72f49d906369dc937a06c9a51fdcb41a9dc52 SHA512 22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
+DIST libreoffice-7.5.7.1.tar.xz 270595536 BLAKE2B 89c45784953c29ffcfc2e82c64e71d9fb5ddc47cfd486c3482e3e3786df6c2e04e1368bae8a2e3332653ae746d5ec89b870b67c0921061bcb44329af3c86b32e SHA512 8777508d8067ad68db1afd10587b9db9e69192df63f0fb072bc6f109b4778e11f3bce9fbcb842cc1a1eecf011a89e13a4d24dea569250040febc9178aa68b61e
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.5.5.2.tar.xz 166236984 BLAKE2B 2880fb61532c31a52e99f8dd150967b1206f2861085b0ca433e96dea4b95c18896e8837aca6d72e278c57d73e4ae51f6da273ad586ab50835964192f1f5780e4 SHA512 1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
+DIST libreoffice-help-7.5.7.1.tar.xz 166237072 BLAKE2B bf5f13b70a078823f9dae2c45110614fcc52b73dc4fccc9c41a06cba9b8a5fba8ae2cd17d8e4478855c5529b58e91e6121fb6231f8fac9e8cd6e1dcc2ec84713 SHA512 f56a107d4151df85f1f4be2ffa9ddd2903e8dd6759240ef29c94c52c1972aa69d4becf62bfaae3a785d2a1e31b456e7084f380fd55168e92c4719a655e11f19d
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
new file mode 100644
index 000000000000..90048ef61fed
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
@@ -0,0 +1,654 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2-r2
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # git master
+ "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-10-11 8:30 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-10-11 8:30 UTC (permalink / raw
To: gentoo-commits
commit: 1c9e8df3cb2bccfcd1699bbae7c30ee7ca616435
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 08:29:22 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 08:29:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9e8df3
app-office/libreoffice: workaround failure w/ lld 17
Closes: https://bugs.gentoo.org/915067
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.7.1.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 3 +++
app-office/libreoffice/libreoffice-9999.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
index 90048ef61fed..5d22adeb817d 100644
--- a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
@@ -404,6 +404,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #915067
+ append-ldflags -Wl,--undefined-version
+
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 90048ef61fed..5d22adeb817d 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -404,6 +404,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #915067
+ append-ldflags -Wl,--undefined-version
+
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b18f51bf94d8..4e7d3a6cd6c6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -402,6 +402,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #915067
+ append-ldflags -Wl,--undefined-version
+
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-10-24 19:36 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:36 UTC (permalink / raw
To: gentoo-commits
commit: f22aa9c8f3fc1cf8596ac460bd68c1ced10e8c21
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:35:42 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:35:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22aa9c8
app-office/libreoffice: Stabilize 7.5.6.2 amd64, #913891
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index 90048ef61fed..91e7ac462033 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-10-24 19:36 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-10-24 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 49d05f79c3b1edd8dbf65ca498e930f9e639aa93
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:35:48 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:35:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d05f79
app-office/libreoffice: Stabilize 7.5.6.2 arm64, #913891
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index 91e7ac462033..440670313bc3 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-10-28 4:53 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2023-10-28 4:53 UTC (permalink / raw
To: gentoo-commits
commit: 275a3af1b2d6af3da05f7a0ba6a1f11bb5dee198
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 04:45:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 04:52:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275a3af1
app-office/libreoffice: backport lld 17 workaround
Closes: https://bugs.gentoo.org/916333
Bug: https://bugs.gentoo.org/915067
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index 440670313bc3..c8c2708fb0b1 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -404,6 +404,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #915067
+ append-ldflags -Wl,--undefined-version
+
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-03 11:16 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-03 11:16 UTC (permalink / raw
To: gentoo-commits
commit: decbbfcd0c715315a7b177809d25e239a8d8bd80
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 3 09:37:17 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 3 11:16:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=decbbfcd
app-office/libreoffice: 7.5.8.2 version bump, python3_12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 ++
.../{libreoffice-7.5.9999.ebuild => libreoffice-7.5.8.2.ebuild} | 2 +-
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8623753da656..74257783ebae 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,9 +22,11 @@ DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f
DIST libreoffice-7.5.5.2.tar.xz 270545744 BLAKE2B 5e957447905dec28ae5165b438f7df8bebc55f2ea9402068459a376109cc43bb12087a22854bd90cd6a0b9fcf3f72f49d906369dc937a06c9a51fdcb41a9dc52 SHA512 22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
DIST libreoffice-7.5.7.1.tar.xz 270595536 BLAKE2B 89c45784953c29ffcfc2e82c64e71d9fb5ddc47cfd486c3482e3e3786df6c2e04e1368bae8a2e3332653ae746d5ec89b870b67c0921061bcb44329af3c86b32e SHA512 8777508d8067ad68db1afd10587b9db9e69192df63f0fb072bc6f109b4778e11f3bce9fbcb842cc1a1eecf011a89e13a4d24dea569250040febc9178aa68b61e
+DIST libreoffice-7.5.8.2.tar.xz 270645960 BLAKE2B 6948d9bcf53aa8be45702a416acb9cf2220e7a2a37f1b3a635ebdd7eaff515f290883fc963cc7474b75195417e635db9690f5f3f6ba919db3877ab02c2231162 SHA512 e36677cab0ea3f5ed68dbdcd3e90d7611390447be838c7ce9e681991a31c10866f3743836e85fc65f638e41f5153522f1569db77189a348aef73f741ba2a3721
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.5.5.2.tar.xz 166236984 BLAKE2B 2880fb61532c31a52e99f8dd150967b1206f2861085b0ca433e96dea4b95c18896e8837aca6d72e278c57d73e4ae51f6da273ad586ab50835964192f1f5780e4 SHA512 1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
DIST libreoffice-help-7.5.7.1.tar.xz 166237072 BLAKE2B bf5f13b70a078823f9dae2c45110614fcc52b73dc4fccc9c41a06cba9b8a5fba8ae2cd17d8e4478855c5529b58e91e6121fb6231f8fac9e8cd6e1dcc2ec84713 SHA512 f56a107d4151df85f1f4be2ffa9ddd2903e8dd6759240ef29c94c52c1972aa69d4becf62bfaae3a785d2a1e31b456e7084f380fd55168e92c4719a655e11f19d
+DIST libreoffice-help-7.5.8.2.tar.xz 166237912 BLAKE2B b98875bb372ccebd5b92cf9a0effa38ed4dbd189e6ec72c31a3458133c67d4e8b91ce742a0e37478413d0c56799bb030380415617f14a72ac8e74f1a93091cd9 SHA512 aaac46ffeb6fa06fa535d097cf76ca02e52d15864e9fb3c1a80ada80710284cfaf79119273334f1ae38290abc7b4849609737ee4a15f97a41d747481d9b3314a
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
similarity index 99%
copy from app-office/libreoffice/libreoffice-7.5.9999.ebuild
copy to app-office/libreoffice/libreoffice-7.5.8.2.ebuild
index 5d22adeb817d..d17697cc93d8 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 5d22adeb817d..d17697cc93d8 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 4e7d3a6cd6c6..8f10333a4643 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="threads(+),xml(+)"
MY_PV="${PV/_alpha/.alpha}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-05 19:14 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2023-11-05 19:14 UTC (permalink / raw
To: gentoo-commits
commit: ab947b0c40d2a3f71ae74d9134b95860b54f5cdd
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:14:20 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 19:14:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab947b0c
app-office/libreoffice: Stabilize 7.5.6.2 x86, #913891
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index 218687cea076..9d3043493da2 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-05 22:59 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-05 22:59 UTC (permalink / raw
To: gentoo-commits
commit: a9cd29c6f5374ae22f5744969c42915d9b2e682d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 22:58:03 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 22:59:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cd29c6
app-office/libreoffice: Allow {clang,llvm}:17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.8.2.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 3 +++
app-office/libreoffice/libreoffice-9999.ebuild | 3 +++
3 files changed, 9 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
index 996c240bfb6e..6bc10de8a41e 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
@@ -263,6 +263,9 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
( sys-devel/clang:16
sys-devel/llvm:16
=sys-devel/lld-16* )
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
index 996c240bfb6e..6bc10de8a41e 100644
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
@@ -263,6 +263,9 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
( sys-devel/clang:16
sys-devel/llvm:16
=sys-devel/lld-16* )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 8f10333a4643..a24e522bc074 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -264,6 +264,9 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
( sys-devel/clang:16
sys-devel/llvm:16
=sys-devel/lld-16* )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-05 23:45 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-05 23:45 UTC (permalink / raw
To: gentoo-commits
commit: e34bcbd8ef847171975a810fe443e3ad44d04af4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 23:00:30 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 23:45:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34bcbd8
app-office/libreoffice: drop 7.5.9999, no more development
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9999.ebuild | 661 ---------------------
1 file changed, 661 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9999.ebuild b/app-office/libreoffice/libreoffice-7.5.9999.ebuild
deleted file mode 100644
index 6bc10de8a41e..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.9999.ebuild
+++ /dev/null
@@ -1,661 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # git master
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
- "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Workaround for bug #915067
- append-ldflags -Wl,--undefined-version
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-abseil
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-06 18:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-06 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 7d3a34b73047f963b79c729e2f29b477dd7c9230
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 23:51:57 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 18:13:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3a34b7
app-office/libreoffice: drop 7.5.5.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.5.5.2.ebuild | 655 ----------------------
2 files changed, 657 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 74257783ebae..f000686226f8 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,12 +19,10 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
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-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
-DIST libreoffice-7.5.5.2.tar.xz 270545744 BLAKE2B 5e957447905dec28ae5165b438f7df8bebc55f2ea9402068459a376109cc43bb12087a22854bd90cd6a0b9fcf3f72f49d906369dc937a06c9a51fdcb41a9dc52 SHA512 22b905507c3c5e97eb41673fdd21254f254992bfd5f6abf95b49603372027bbb2e329ec43a52ac56d42116fb1821b5c87e53e96105fe194df0ccbfabc7104358
DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
DIST libreoffice-7.5.7.1.tar.xz 270595536 BLAKE2B 89c45784953c29ffcfc2e82c64e71d9fb5ddc47cfd486c3482e3e3786df6c2e04e1368bae8a2e3332653ae746d5ec89b870b67c0921061bcb44329af3c86b32e SHA512 8777508d8067ad68db1afd10587b9db9e69192df63f0fb072bc6f109b4778e11f3bce9fbcb842cc1a1eecf011a89e13a4d24dea569250040febc9178aa68b61e
DIST libreoffice-7.5.8.2.tar.xz 270645960 BLAKE2B 6948d9bcf53aa8be45702a416acb9cf2220e7a2a37f1b3a635ebdd7eaff515f290883fc963cc7474b75195417e635db9690f5f3f6ba919db3877ab02c2231162 SHA512 e36677cab0ea3f5ed68dbdcd3e90d7611390447be838c7ce9e681991a31c10866f3743836e85fc65f638e41f5153522f1569db77189a348aef73f741ba2a3721
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-7.5.5.2.tar.xz 166236984 BLAKE2B 2880fb61532c31a52e99f8dd150967b1206f2861085b0ca433e96dea4b95c18896e8837aca6d72e278c57d73e4ae51f6da273ad586ab50835964192f1f5780e4 SHA512 1747bd1c4df7341074d4e805b8fa4165d1f311d7113b7f73b94449496a8c37c0cd02c4bf1faa5187a14ea43fc531028347cca2dd0a3db9e8a9b9abe72fe7f07f
DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
DIST libreoffice-help-7.5.7.1.tar.xz 166237072 BLAKE2B bf5f13b70a078823f9dae2c45110614fcc52b73dc4fccc9c41a06cba9b8a5fba8ae2cd17d8e4478855c5529b58e91e6121fb6231f8fac9e8cd6e1dcc2ec84713 SHA512 f56a107d4151df85f1f4be2ffa9ddd2903e8dd6759240ef29c94c52c1972aa69d4becf62bfaae3a785d2a1e31b456e7084f380fd55168e92c4719a655e11f19d
DIST libreoffice-help-7.5.8.2.tar.xz 166237912 BLAKE2B b98875bb372ccebd5b92cf9a0effa38ed4dbd189e6ec72c31a3458133c67d4e8b91ce742a0e37478413d0c56799bb030380415617f14a72ac8e74f1a93091cd9 SHA512 aaac46ffeb6fa06fa535d097cf76ca02e52d15864e9fb3c1a80ada80710284cfaf79119273334f1ae38290abc7b4849609737ee4a15f97a41d747481d9b3314a
diff --git a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild b/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
deleted file mode 100644
index ec4510741e85..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.5.2.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( firebird java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- 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-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # git master
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-abseil
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-22 8:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-22 8:13 UTC (permalink / raw
To: gentoo-commits
commit: b49e1ca7fe1586cb0d3c73c3ffe6869367a180dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 08:10:40 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 08:10:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b49e1ca7
app-office/libreoffice: Pin dev-cpp/libcmis to SLOT=0.5
... in advance of being stabilised.
Bug: https://bugs.gentoo.org/917695
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.8.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
index 6bc10de8a41e..b46394a7d063 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
@@ -126,7 +126,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/libwps-0.4
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2-r2
+ >=dev-cpp/libcmis-0.5.2-r2:0.5
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-22 8:13 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-22 8:13 UTC (permalink / raw
To: gentoo-commits
commit: f4debf4a81f731873aacd00f3c4944a9d62d629b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 08:12:35 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 08:12:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4debf4a
app-office/libreoffice: drop 7.5.7.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.5.7.1.ebuild | 658 ----------------------
2 files changed, 660 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f000686226f8..d98a2e0fba21 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,11 +20,9 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
-DIST libreoffice-7.5.7.1.tar.xz 270595536 BLAKE2B 89c45784953c29ffcfc2e82c64e71d9fb5ddc47cfd486c3482e3e3786df6c2e04e1368bae8a2e3332653ae746d5ec89b870b67c0921061bcb44329af3c86b32e SHA512 8777508d8067ad68db1afd10587b9db9e69192df63f0fb072bc6f109b4778e11f3bce9fbcb842cc1a1eecf011a89e13a4d24dea569250040febc9178aa68b61e
DIST libreoffice-7.5.8.2.tar.xz 270645960 BLAKE2B 6948d9bcf53aa8be45702a416acb9cf2220e7a2a37f1b3a635ebdd7eaff515f290883fc963cc7474b75195417e635db9690f5f3f6ba919db3877ab02c2231162 SHA512 e36677cab0ea3f5ed68dbdcd3e90d7611390447be838c7ce9e681991a31c10866f3743836e85fc65f638e41f5153522f1569db77189a348aef73f741ba2a3721
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
-DIST libreoffice-help-7.5.7.1.tar.xz 166237072 BLAKE2B bf5f13b70a078823f9dae2c45110614fcc52b73dc4fccc9c41a06cba9b8a5fba8ae2cd17d8e4478855c5529b58e91e6121fb6231f8fac9e8cd6e1dcc2ec84713 SHA512 f56a107d4151df85f1f4be2ffa9ddd2903e8dd6759240ef29c94c52c1972aa69d4becf62bfaae3a785d2a1e31b456e7084f380fd55168e92c4719a655e11f19d
DIST libreoffice-help-7.5.8.2.tar.xz 166237912 BLAKE2B b98875bb372ccebd5b92cf9a0effa38ed4dbd189e6ec72c31a3458133c67d4e8b91ce742a0e37478413d0c56799bb030380415617f14a72ac8e74f1a93091cd9 SHA512 aaac46ffeb6fa06fa535d097cf76ca02e52d15864e9fb3c1a80ada80710284cfaf79119273334f1ae38290abc7b4849609737ee4a15f97a41d747481d9b3314a
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild b/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
deleted file mode 100644
index b59666e8479d..000000000000
--- a/app-office/libreoffice/libreoffice-7.5.7.1.ebuild
+++ /dev/null
@@ -1,658 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2-r2
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.17.2:0/0.17
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- gnome-base/dconf
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.0
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-util/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
- )
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # git master
- "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
- "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Workaround for bug #915067
- append-ldflags -Wl,--undefined-version
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-abseil
- --without-system-dragonbox
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-22 23:10 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-22 23:10 UTC (permalink / raw
To: gentoo-commits
commit: de0a360faab26e96b35e811aba21f4d6c41cb010
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 23:08:28 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 23:10:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0a360f
app-office/libreoffice: Raise minimum dev-cpp/libcmis version to 0.6.2
Made necessary by follow-up patch backported from 7.5.9.1.
Closes: https://bugs.gentoo.org/917752
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
index e2f24692185b..58778eaca03c 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
@@ -126,7 +126,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=app-text/libwps-0.4
app-text/mythes
>=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.5.2-r2:=
+ >=dev-cpp/libcmis-0.6.2:0=
dev-db/unixODBC
dev-lang/perl
dev-libs/boost:=[nls]
@@ -299,6 +299,7 @@ PATCHES=(
"${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch"
# 7.5.9.1
+ "${FILESDIR}/${P}-libcmis-0.6.patch" # prerequisite for below
"${FILESDIR}/${P}-curl-8.3.0-mitigation.patch" # bug 891903(?)
# git master
@@ -354,10 +355,6 @@ src_unpack() {
}
src_prepare() {
- if has_version '>=dev-cpp/libcmis-0.6.1'; then
- PATCHES+=( "${FILESDIR}/${P}-libcmis-0.6.patch" ) # from 7.5.9.1
- fi
-
default
# sandbox violations on many systems, we don't need it. Bug #646406
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-29 21:21 Matt Turner
0 siblings, 0 replies; 588+ messages in thread
From: Matt Turner @ 2023-11-29 21:21 UTC (permalink / raw
To: gentoo-commits
commit: b45e1bd93fc1000237d1d1594e31a4bc77c8883a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 21:19:58 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 21:21:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b45e1bd9
app-office/libreoffice: filter-lto with USE=clang
Bug: https://bugs.gentoo.org/907905
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild | 3 +++
app-office/libreoffice/libreoffice-7.5.8.2.ebuild | 3 +++
app-office/libreoffice/libreoffice-9999.ebuild | 3 +++
4 files changed, 12 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index 9d3043493da2..9d2b564c853d 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -405,6 +405,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #907905
+ filter-lto
+
# Workaround for bug #915067
append-ldflags -Wl,--undefined-version
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
index 58778eaca03c..2d1d90c37611 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
@@ -415,6 +415,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #907905
+ filter-lto
+
# Workaround for bug #915067
append-ldflags -Wl,--undefined-version
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
index b46394a7d063..b346307b840c 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
@@ -408,6 +408,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #907905
+ filter-lto
+
# Workaround for bug #915067
append-ldflags -Wl,--undefined-version
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index a706f71b5698..7eec09df7595 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -405,6 +405,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #907905
+ filter-lto
+
# Workaround for bug #915067
append-ldflags -Wl,--undefined-version
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-11-29 21:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-11-29 21:29 UTC (permalink / raw
To: gentoo-commits
commit: 221b1b5c7ea3adb452df7fd46e4feae6a19d6355
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 21:25:36 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 21:28:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221b1b5c
app-office/libreoffice: add 7.5.9.2 w/o KEYWORDS
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 667 ++++++++++++++++++++++
2 files changed, 669 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d98a2e0fba21..71aef1151dbe 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,8 +21,10 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b
DIST libreoffice-7.5.2.2-loong-buildsys-fix.patch.xz 5172 BLAKE2B bd9b84b770b23f9ad8f09bfeb1948fd3679f0dfd32424e1c997e25340d29e55b403dde995510da76c824a169e594ae37310d2c51ad4c3c9df76ec5707676588b SHA512 13eb46209755b7098183c60cdd2fedff75c50af4496a2d8dedd34de379dbeccbdac435531aa930e212638a685f2054e143dc4015a5ba3be9a3736d9073188d43
DIST libreoffice-7.5.6.2.tar.xz 270583764 BLAKE2B f30ec810cfa2c465efa5dfe6488d3c9c9f428d3f3b103c5bbf7290f0704c2c01c1a1936973f4ada386da9cf6bf162ce816f4d48ed9e0e4f6da581532adc4e7a3 SHA512 12847528621cf34cce858a5a067ef296094d4371544fd3b70327c52968289d22457064fd413f88afd6161822526bf17f43c7e6c8816a1d7ea64642438cf5c6d7
DIST libreoffice-7.5.8.2.tar.xz 270645960 BLAKE2B 6948d9bcf53aa8be45702a416acb9cf2220e7a2a37f1b3a635ebdd7eaff515f290883fc963cc7474b75195417e635db9690f5f3f6ba919db3877ab02c2231162 SHA512 e36677cab0ea3f5ed68dbdcd3e90d7611390447be838c7ce9e681991a31c10866f3743836e85fc65f638e41f5153522f1569db77189a348aef73f741ba2a3721
+DIST libreoffice-7.5.9.2.tar.xz 270609308 BLAKE2B 8fbbe665b31aa6b85d17fa279da44da87817b8521abf40d80a40383b726e6cfb4026f9db50ac0a9bea92e88dc8be96a922a6937992d35b3766fda54f9fa7377a SHA512 36a012c044d755b2a9c1b0cea42290239647bdf81af198245075d89e19fb25b0e404a71db6beff743f738f059a85818bc89adb051c24b09234a763f42008b6e1
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-7.5.6.2.tar.xz 166236964 BLAKE2B fb9110ab5555f915a1106493e0689606a969e2bc296df644815ef24b7344ec3c7562271f6c7eb4c1be14d52b9e78aa49291b70392c6595ffed26f8163914c5e4 SHA512 0c4441058d57abb967c4c403bec432141663de07416eeb101ac180472bd45e8cc428e8357ee1443e340ad1ea60516a989ce3044530d64b07fface6cad3993434
DIST libreoffice-help-7.5.8.2.tar.xz 166237912 BLAKE2B b98875bb372ccebd5b92cf9a0effa38ed4dbd189e6ec72c31a3458133c67d4e8b91ce742a0e37478413d0c56799bb030380415617f14a72ac8e74f1a93091cd9 SHA512 aaac46ffeb6fa06fa535d097cf76ca02e52d15864e9fb3c1a80ada80710284cfaf79119273334f1ae38290abc7b4849609737ee4a15f97a41d747481d9b3314a
+DIST libreoffice-help-7.5.9.2.tar.xz 166236976 BLAKE2B c4c6c1e0ace4ebf43f1110edc21d9debb42b3a3756320ebec7d6e9f42b258c6d959a45778a4fc60aba85b4e7e852dbd9089a5694e32d37f5aa39f84ce826a18f SHA512 a3ad0005d0b09f0cc221a92f822c666a2d954cbf74d5f7c16e083cfaa4cfbc7a442d12dbcb51a3eaf3a7b3bd774f17614d79b6ec7553cec46edcb341c97ecf5b
DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
new file mode 100644
index 000000000000..b0ffc896108d
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -0,0 +1,667 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-7.5.2.2-loong-buildsys-fix.patch.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+# [[ ${MY_PV} == *9999* ]] || \
+# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.17.2:0/0.17
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.0
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ ( sys-devel/clang:14
+ sys-devel/llvm:14
+ =sys-devel/lld-14* )
+ )
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # maybe upstreamable
+ "${FILESDIR}/libreoffice-7.5.8.2-icu-74-compatibility.patch"
+
+ # git master
+ "${WORKDIR}/${PN}-7.5.2.2-loong-buildsys-fix.patch"
+ "${FILESDIR}/${PN}-7.5.6.2-gcc-14.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #915067
+ append-ldflags -Wl,--undefined-version
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ # Workaround for bug #907905
+ filter-lto
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-12-07 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-12-07 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 01489758c826fe03e868291e46fe3b130f368d64
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 17:37:22 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 18:50:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01489758
app-office/libreoffice: Restore 7.5.9.2 keywords
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index 5e1706712f41..64d3859995c9 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -101,8 +101,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-# [[ ${MY_PV} == *9999* ]] || \
-# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2023-12-07 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2023-12-07 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 44c0777f52a10640685e67f27c01d2a714e38318
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 17:42:27 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 18:50:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44c0777f
app-office/libreoffice: filter-lto only if USE=clang, same as 7.5.8.x
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index 786eff58ca6c..5e1706712f41 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -414,6 +414,9 @@ src_configure() {
RANLIB=llvm-ranlib
LDFLAGS+=" -fuse-ld=lld"
+ # Workaround for bug #907905
+ filter-lto
+
# Workaround for bug #915067
append-ldflags -Wl,--undefined-version
@@ -440,9 +443,6 @@ src_configure() {
strip-flags
fi
- # Workaround for bug #907905
- filter-lto
-
export LO_CLANG_CC=${CC}
export LO_CLANG_CXX=${CXX}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-03 10:40 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2024-01-03 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 52c53b39cde723e70083e979f2b006322f302ecb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 10:31:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:39:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c53b39
app-office/libreoffice: pass -Wl,--undefined-version for other linkers if supported
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.6.2.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-7.5.8.2.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 8 ++++----
app-office/libreoffice/libreoffice-9999.ebuild | 8 ++++----
5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
index 9d2b564c853d..7ec34f336fdf 100644
--- a/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -395,6 +395,9 @@ src_configure() {
einfo "Preset CFLAGS: ${CFLAGS}"
einfo "Preset LDFLAGS: ${LDFLAGS}"
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
@@ -408,9 +411,6 @@ src_configure() {
# Workaround for bug #907905
filter-lto
- # Workaround for bug #915067
- append-ldflags -Wl,--undefined-version
-
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
index 2d1d90c37611..984ca1c390bb 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -405,6 +405,9 @@ src_configure() {
einfo "Preset CFLAGS: ${CFLAGS}"
einfo "Preset LDFLAGS: ${LDFLAGS}"
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
@@ -418,9 +421,6 @@ src_configure() {
# Workaround for bug #907905
filter-lto
- # Workaround for bug #915067
- append-ldflags -Wl,--undefined-version
-
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
diff --git a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
index b346307b840c..c0a3d703ff40 100644
--- a/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -398,6 +398,9 @@ src_configure() {
einfo "Preset CFLAGS: ${CFLAGS}"
einfo "Preset LDFLAGS: ${LDFLAGS}"
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
@@ -411,9 +414,6 @@ src_configure() {
# Workaround for bug #907905
filter-lto
- # Workaround for bug #915067
- append-ldflags -Wl,--undefined-version
-
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index 64d3859995c9..c072a93b00e1 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -404,6 +404,9 @@ src_configure() {
einfo "Preset CFLAGS: ${CFLAGS}"
einfo "Preset LDFLAGS: ${LDFLAGS}"
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
@@ -417,9 +420,6 @@ src_configure() {
# Workaround for bug #907905
filter-lto
- # Workaround for bug #915067
- append-ldflags -Wl,--undefined-version
-
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7eec09df7595..3341480b61da 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -395,6 +395,9 @@ src_configure() {
einfo "Preset CFLAGS: ${CFLAGS}"
einfo "Preset LDFLAGS: ${LDFLAGS}"
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
if use clang ; then
# Force clang
einfo "Enforcing the use of clang due to USE=clang ..."
@@ -408,9 +411,6 @@ src_configure() {
# Workaround for bug #907905
filter-lto
- # Workaround for bug #915067
- append-ldflags -Wl,--undefined-version
-
# Not implemented by Clang, bug #903889
filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
else
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-05 5:26 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-01-05 5:26 UTC (permalink / raw
To: gentoo-commits
commit: 35cd38732821d1ddbb8ff1af164a822ec10b4188
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 05:24:38 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 05:26:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cd3873
app-office/libreoffice: Stabilize 7.5.9.2 x86, #919762
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index c072a93b00e1..e229abd43fe3 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-05 5:26 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-01-05 5:26 UTC (permalink / raw
To: gentoo-commits
commit: edf196dec0ee35937c067618333a791cd934cd3e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 05:24:48 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 05:26:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf196de
app-office/libreoffice: Stabilize 7.5.9.2 arm64, #919762
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index e229abd43fe3..6f17f427cbbd 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-05 5:26 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-01-05 5:26 UTC (permalink / raw
To: gentoo-commits
commit: 80ae7df2f8805a225e49a5f5ae7ff50611ba2147
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 05:24:54 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 05:26:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ae7df2
app-office/libreoffice: Stabilize 7.5.9.2 amd64, #919762
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index 6f17f427cbbd..adc74fa5257f 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-07 9:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-01-07 9:29 UTC (permalink / raw
To: gentoo-commits
commit: 38f7162080d4cb872f41ea718ce983b27d14aa75
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 09:26:42 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 09:29:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f71620
app-office/libreoffice: Add LLVM 18, drop 14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3341480b61da..15e07e5ccb7c 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -264,6 +264,9 @@ BDEPEND="
virtual/pkgconfig
clang? (
|| (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
( sys-devel/clang:17
sys-devel/llvm:17
=sys-devel/lld-17* )
@@ -273,9 +276,6 @@ BDEPEND="
( sys-devel/clang:15
sys-devel/llvm:15
=sys-devel/lld-15* )
- ( sys-devel/clang:14
- sys-devel/llvm:14
- =sys-devel/lld-14* )
)
)
odk? ( >=app-doc/doxygen-1.8.4 )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-24 6:55 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2024-01-24 6:55 UTC (permalink / raw
To: gentoo-commits
commit: 198d1cae195f4d8807f3092933bc9a45a939207b
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 18 22:03:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 06:54:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198d1cae
app-office/libreoffice: migrate checking for enabled lto, to tc-is-lto
This toolchain func was recently added, and is a lot more reliable than
get-flagq, for example if the active flags contain `-flto -fno-lto` then
tc-is-lto gets it correct. We would rather use this wherever possible.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index e8a4b6d5ca4e..c5269a7e3134 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -580,7 +580,7 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+ tc-is-lto && myeconfargs+=( --enable-lto )
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
econf "${myeconfargs[@]}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3d488003abe7..46798bb521b1 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -572,7 +572,7 @@ src_configure() {
myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
fi
- is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+ tc-is-lto && myeconfargs+=( --enable-lto )
MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
econf "${myeconfargs[@]}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-27 0:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-01-27 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 1dd37ce3184608f3053c9e3a29d1d25610aaa1d6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 23:27:27 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 00:47:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd37ce3
app-office/libreoffice: add 24.2 stable branch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libreoffice/libreoffice-24.2.9999.ebuild | 666 +++++++++++++++++++++
1 file changed, 666 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
new file mode 100644
index 000000000000..5e42fa31a46e
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -0,0 +1,666 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/argon2:=
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-17
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ --without-system-zxcvbn
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-27 0:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-01-27 0:48 UTC (permalink / raw
To: gentoo-commits
commit: d4949fc045c7805aeb1c1f87fa81a6ac26022013
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 23:23:57 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 00:47:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4949fc0
app-office/libreoffice: update 9999 dependencies
Closes: https://bugs.gentoo.org/921094
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 287e13fe8e5a..070b0c78c6b9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -27,3 +27,4 @@ DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef
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
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3211338cb330..5e42fa31a46e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -52,6 +52,8 @@ ADDONS_SRC=(
"${ADDONS_URI}/frozen-1.1.1.tar.gz"
# not packaged in Gentoo, https://skia.org/
"${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -108,6 +110,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
app-arch/zip
+ app-crypt/argon2:=
app-crypt/gpgme:=[cxx]
app-text/hunspell:=
>=app-text/libabw-0.1.0
@@ -235,7 +238,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXtst
java? (
dev-java/ant-core
- >=virtual/jdk-11
+ >=virtual/jdk-17
)
test? (
app-crypt/gnupg
@@ -515,6 +518,7 @@ src_configure() {
--without-system-jfreereport
--without-system-libfixmath
--without-system-sane
+ --without-system-zxcvbn
$(use_enable base report-builder)
$(use_enable bluetooth sdremote-bluetooth)
$(use_enable coinmp)
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-27 0:48 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-01-27 0:48 UTC (permalink / raw
To: gentoo-commits
commit: 8ff806b132349b4550e1e2d4bf1ec1edaf8c0c02
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 26 22:26:31 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 00:47:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ff806b1
app-office/libreoffice: 7.6.4.1 version bump, add 7.6 stable branch
Closes: https://bugs.gentoo.org/922141
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 3 +++
.../{libreoffice-9999.ebuild => libreoffice-7.6.4.1.ebuild} | 10 ++++++++--
.../{libreoffice-9999.ebuild => libreoffice-7.6.9999.ebuild} | 10 ++++++++--
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index f7ee42c9476b..287e13fe8e5a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,7 +20,10 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
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-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
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
similarity index 98%
copy from app-office/libreoffice/libreoffice-9999.ebuild
copy to app-office/libreoffice/libreoffice-7.6.4.1.ebuild
index 46798bb521b1..aa14ea35f69e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
@@ -51,7 +51,7 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
"${ADDONS_URI}/frozen-1.1.1.tar.gz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -183,7 +183,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( sys-apps/dbus )
eds? (
dev-libs/glib:2
- gnome-base/dconf
+ >=gnome-base/dconf-0.40.0
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
@@ -295,6 +295,12 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # maybe upstreamable
+ "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+
+ # 24.2 branch
+ "${FILESDIR}/${PN}-7.5.9.2-libxml2-2.12.patch" # bug 917691
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
similarity index 98%
copy from app-office/libreoffice/libreoffice-9999.ebuild
copy to app-office/libreoffice/libreoffice-7.6.9999.ebuild
index 46798bb521b1..aa14ea35f69e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
@@ -51,7 +51,7 @@ ADDONS_SRC=(
# not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
"${ADDONS_URI}/frozen-1.1.1.tar.gz"
# not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
"base? (
${ADDONS_URI}/commons-logging-1.2-src.tar.gz
${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -183,7 +183,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( sys-apps/dbus )
eds? (
dev-libs/glib:2
- gnome-base/dconf
+ >=gnome-base/dconf-0.40.0
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
@@ -295,6 +295,12 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # maybe upstreamable
+ "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+
+ # 24.2 branch
+ "${FILESDIR}/${PN}-7.5.9.2-libxml2-2.12.patch" # bug 917691
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 46798bb521b1..3211338cb330 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -183,7 +183,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( sys-apps/dbus )
eds? (
dev-libs/glib:2
- gnome-base/dconf
+ >=gnome-base/dconf-0.40.0
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-28 16:28 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-01-28 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 3a31490ad8ef5109c119158da380b57904e937ce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 16:22:51 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 16:28:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a31490a
app-office/libreoffice: add missing bundled tarball
Closes: https://bugs.gentoo.org/913844
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 1 +
app-office/libreoffice/libreoffice-24.2.9999.ebuild | 6 +++++-
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 070b0c78c6b9..c38c267ec9aa 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,6 +7,7 @@ DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 BLAKE2B b9f3ef8
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077 SHA512 12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f
DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748 SHA512 17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6
+DIST Java-WebSocket-1.5.4.tar.gz 189725 BLAKE2B f90700d58d7230e1a3ab32d07bdfc11a1ec6ceffbc094b4b0dc8bfd83cf1d060400c758de8bf47fb593dd07927f95a9e7ab70617b4a1afb64b09e225771b2c5e SHA512 e195ccaa97a7f167a7b27a28226a0bccde7a5cc3cde9b3e718860bd7ceb86da2c272ec2512cb1d0d893dbd6ac47633978a44a8620a2ffbb0652aaeeb2c4ecb08
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85 SHA512 58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e
DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708 SHA512 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index eb5c23c90864..6e84f6de9008 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -68,7 +68,11 @@ ADDONS_SRC=(
${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
)"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
# Does not build with 1.6 rhino at all
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index eb5c23c90864..6e84f6de9008 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -68,7 +68,11 @@ ADDONS_SRC=(
${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
)"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
# Does not build with 1.6 rhino at all
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-01-28 16:28 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-01-28 16:28 UTC (permalink / raw
To: gentoo-commits
commit: d61dea27af58d2a6b8198a3a2b3874be80f94256
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 09:52:14 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 16:28:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61dea27
app-office/libreoffice: add 24.2.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-24.2.0.3.ebuild | 697 +++++++++++++++++++++
2 files changed, 699 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c38c267ec9aa..43d16b2a9258 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,10 +19,12 @@ 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-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-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
diff --git a/app-office/libreoffice/libreoffice-24.2.0.3.ebuild b/app-office/libreoffice/libreoffice-24.2.0.3.ebuild
new file mode 100644
index 000000000000..27202c7f0efc
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.0.3.ebuild
@@ -0,0 +1,697 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/argon2:=
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ qt6? (
+ kde-frameworks/kconfig:6
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/ki18n:6
+ kde-frameworks/kio:6
+ kde-frameworks/kwindowsystem:6
+ )
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ qt6? ( dev-qt/qtbase:6[gui,widgets] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-17
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ 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"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ --without-system-zxcvbn
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(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
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-02 12:44 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-02-02 12:44 UTC (permalink / raw
To: gentoo-commits
commit: a7731fa374c5831a24541a6ecf1c62338c33dba6
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 2 12:41:21 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 12:41:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7731fa3
app-office/libreoffice: Stabilize 7.5.9.2 ppc64, #921319
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.5.9.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
index c5269a7e3134..d6651b34391d 100644
--- a/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.5.9.2.ebuild
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-12 10:31 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2024-02-12 10:31 UTC (permalink / raw
To: gentoo-commits
commit: e7174f2b8fba8fdb4f8f7f383a2588a1fe2fd100
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 10:30:29 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 12 10:30:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7174f2b
app-office/libreoffice: Stabilize 7.6.4.1 amd64, #923155
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
index aa14ea35f69e..184c62e5df60 100644
--- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-14 19:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-02-14 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 8372ef09246821d7ceafeead6ab0890ba38d170d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 19:05:15 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:55:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8372ef09
app-office/libreoffice: add 24.2.1.1, drop 24.2.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-24.2.0.3.ebuild => libreoffice-24.2.1.1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 43d16b2a9258..4225b9d9c9e1 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,12 +19,12 @@ 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
diff --git a/app-office/libreoffice/libreoffice-24.2.0.3.ebuild b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-24.2.0.3.ebuild
rename to app-office/libreoffice/libreoffice-24.2.1.1.ebuild
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-14 19:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-02-14 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 59a0f9c8a17777fe13cbb5716cd4437d7fdda94d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 12 19:27:12 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:55:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a0f9c8
app-office/libreoffice: Use --enable-mergelibs=more
We can't split this package anyway, so might as well try it out.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.1.1.ebuild | 2 +-
app-office/libreoffice/libreoffice-24.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
index 4c68aafe99c5..588451cdcb06 100644
--- a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
@@ -508,7 +508,7 @@ src_configure() {
--enable-build-opensymbol
--enable-cairo-canvas
--enable-largefile
- --enable-mergelibs
+ --enable-mergelibs=more
--enable-python=system
--enable-randr
--enable-release-build
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 6e84f6de9008..8ba5fc4e88b8 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -501,7 +501,7 @@ src_configure() {
--enable-build-opensymbol
--enable-cairo-canvas
--enable-largefile
- --enable-mergelibs
+ --enable-mergelibs=more
--enable-python=system
--enable-randr
--enable-release-build
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6e84f6de9008..8ba5fc4e88b8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -501,7 +501,7 @@ src_configure() {
--enable-build-opensymbol
--enable-cairo-canvas
--enable-largefile
- --enable-mergelibs
+ --enable-mergelibs=more
--enable-python=system
--enable-randr
--enable-release-build
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-14 19:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-02-14 19:55 UTC (permalink / raw
To: gentoo-commits
commit: c7740af5ecacc45f567488b7156f528e9dfdaa41
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 19:53:21 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:55:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7740af5
app-office/libreoffice: Add IUSE qt5 and allow parallel build w/ qt6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.1.1.ebuild | 39 +++++++++-------------
.../libreoffice/libreoffice-24.2.9999.ebuild | 39 +++++++++-------------
app-office/libreoffice/libreoffice-9999.ebuild | 39 +++++++++-------------
3 files changed, 48 insertions(+), 69 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
index c9eed10d3c29..a01d614a45dd 100644
--- a/app-office/libreoffice/libreoffice-24.2.1.1.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
@@ -475,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"
@@ -560,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)
@@ -570,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 8ba5fc4e88b8..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"
@@ -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 8ba5fc4e88b8..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"
@@ -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 )
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-17 9:55 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-02-17 9:55 UTC (permalink / raw
To: gentoo-commits
commit: efee09d7178e795c1b5bee8c711d761b6de40b68
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 09:55:15 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 09:55:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efee09d7
app-office/libreoffice: Stabilize 7.6.4.1 ppc64, #923155
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
index 184c62e5df60..6d5a0f51d658 100644
--- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-20 5:56 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2024-02-20 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 73433436078933c70e99449464d5d3df52ddc4b4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 05:55:12 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 05:55:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73433436
app-office/libreoffice: Stabilize 7.6.4.1 x86, #923155
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
index 36f86feafc39..e69a806f2b3b 100644
--- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-24 20:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-02-24 20:40 UTC (permalink / raw
To: gentoo-commits
commit: b53fa616034a524af7d9845715bc7ccf5e247e0a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 20:39:33 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 20:39:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53fa616
app-office/libreoffice: Drop upstreamed patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.9999.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.9999.ebuild b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
index aa14ea35f69e..938dfe9ad75d 100644
--- a/app-office/libreoffice/libreoffice-7.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
@@ -298,9 +298,6 @@ PATCHES=(
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
-
- # 24.2 branch
- "${FILESDIR}/${PN}-7.5.9.2-libxml2-2.12.patch" # bug 917691
)
S="${WORKDIR}/${PN}-${MY_PV}"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-25 7:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-02-25 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 73a82e5ec54413f2d00109dc843adb4b0330f50e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 17:11:02 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 07:52:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a82e5e
app-office/libreoffice: add 7.6.5.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.6.5.2.ebuild | 665 ++++++++++++++++++++++
2 files changed, 667 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 5a20d6cc6b05..a0df772d848f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,9 +21,11 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
DIST libreoffice-24.2.1.1.tar.xz 280318924 BLAKE2B 62530c44ede834699054d07e9694264b7c2c74309e6aa4bd3b6e1c7b9d6ce8ecbd74c55e2748eaf38fe43740f4d3bcbfbbf0507752ce0c3b1269275f20eeb6a1 SHA512 33ff4852274bf6f6c37a2bfdddc925afdaf893352b830154e679b7ed919f697713a0beaf45315c61084b0f2b5c8e16635f9065de610d425581f640425de3fe67
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
+DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.1.1.tar.xz 167069068 BLAKE2B de7795c3e57da85a4329562cdeed1017e34ef2743b2441392183a54557b40ba7f36b87ad534a61610e9bf37671f56e4d9fdffda794f0a61163bee3206f1515ea SHA512 e9f09a2d6adbdd01bae9bf05d9a0f573878cf37e10468eaf0c1cbcd05e109d6bec3c496bdcb58030bd5f8d1472342334f983c63ecc3756ff2c9a0e231b86fdb9
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
+DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3
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
diff --git a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
new file mode 100644
index 000000000000..938dfe9ad75d
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
@@ -0,0 +1,665 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # maybe upstreamable
+ "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-02-26 18:29 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-02-26 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 266ff4a4fb5ac153f7ae81a3d4a3e92e9e3c2094
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 15:36:09 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 18:29:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266ff4a4
app-office/libreoffice: add 24.2.1.2, drop 24.2.1.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-24.2.1.1.ebuild => libreoffice-24.2.1.2.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a0df772d848f..6a34160d54f9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,11 +19,11 @@ 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.1.1.tar.xz 280318924 BLAKE2B 62530c44ede834699054d07e9694264b7c2c74309e6aa4bd3b6e1c7b9d6ce8ecbd74c55e2748eaf38fe43740f4d3bcbfbbf0507752ce0c3b1269275f20eeb6a1 SHA512 33ff4852274bf6f6c37a2bfdddc925afdaf893352b830154e679b7ed919f697713a0beaf45315c61084b0f2b5c8e16635f9065de610d425581f640425de3fe67
+DIST libreoffice-24.2.1.2.tar.xz 280349652 BLAKE2B 4035f85c8c155e2131e972c94355d360a538a9460c62e6ea416b123b9564bfecc100c8c7ce07f22ecd8f14ba140077da9d8aeaed9ad3be5171d1ffdbede53ce2 SHA512 650a61a56759109a17e65bcd31b9876b19ac7c71996854566ea8f6e8039276bd29173c80b3a2d4466cd2c6fcb63d4b95f3d4c78bd7ad22bdd190b801b5665a56
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-24.2.1.1.tar.xz 167069068 BLAKE2B de7795c3e57da85a4329562cdeed1017e34ef2743b2441392183a54557b40ba7f36b87ad534a61610e9bf37671f56e4d9fdffda794f0a61163bee3206f1515ea SHA512 e9f09a2d6adbdd01bae9bf05d9a0f573878cf37e10468eaf0c1cbcd05e109d6bec3c496bdcb58030bd5f8d1472342334f983c63ecc3756ff2c9a0e231b86fdb9
+DIST libreoffice-help-24.2.1.2.tar.xz 167070728 BLAKE2B fd265ddc95b7a7638d0edd61682bc48332bb5ea04a171bfb30a16f2705d28697b7860a5ecaa12491ce57ee74f90cfb4f19de62d83d954e9d7c58ba46b2831113 SHA512 bac54ac89f4c97434c354f3f281602fd8720546f549a687940bd028bedbd2841241429ee11983f805322136a8376453bcbbc6c87b8d032c025a50da95b1ce851
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
diff --git a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild b/app-office/libreoffice/libreoffice-24.2.1.2.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-24.2.1.1.ebuild
rename to app-office/libreoffice/libreoffice-24.2.1.2.ebuild
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-03-10 16:30 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-03-10 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 88db997ef4d1978407becb1f16fd2e8a8538f2f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 15:53:07 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 16:30:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88db997e
app-office/libreoffice: add 24.2.2.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-24.2.2.1.ebuild | 693 +++++++++++++++++++++
2 files changed, 695 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6a34160d54f9..e6c133476b6b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,10 +20,12 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
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.1.2.tar.xz 280349652 BLAKE2B 4035f85c8c155e2131e972c94355d360a538a9460c62e6ea416b123b9564bfecc100c8c7ce07f22ecd8f14ba140077da9d8aeaed9ad3be5171d1ffdbede53ce2 SHA512 650a61a56759109a17e65bcd31b9876b19ac7c71996854566ea8f6e8039276bd29173c80b3a2d4466cd2c6fcb63d4b95f3d4c78bd7ad22bdd190b801b5665a56
+DIST libreoffice-24.2.2.1.tar.xz 280628072 BLAKE2B f9b22b25bdd58278de020fa67ec6ab3d7a3986c75d7931ea82b69dc5d330876be1aaf4cd3ef7cde6e9eb2554ee7d156c04bb8729e13a5e622e8e68b4e28cba08 SHA512 62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.1.2.tar.xz 167070728 BLAKE2B fd265ddc95b7a7638d0edd61682bc48332bb5ea04a171bfb30a16f2705d28697b7860a5ecaa12491ce57ee74f90cfb4f19de62d83d954e9d7c58ba46b2831113 SHA512 bac54ac89f4c97434c354f3f281602fd8720546f549a687940bd028bedbd2841241429ee11983f805322136a8376453bcbbc6c87b8d032c025a50da95b1ce851
+DIST libreoffice-help-24.2.2.1.tar.xz 167069480 BLAKE2B ca1c551a38b2c4250e2c39216e476fab67d72df4adcf5f3ced2e83b0b2ec6f3ae0596a9c7eeb8bfca27e360bfb2b2d32c90e6c1216f0204bc971fe9ba2277446 SHA512 51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
diff --git a/app-office/libreoffice/libreoffice-24.2.2.1.ebuild b/app-office/libreoffice/libreoffice-24.2.2.1.ebuild
new file mode 100644
index 000000000000..6790640974f2
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.2.1.ebuild
@@ -0,0 +1,693 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 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 )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/argon2:=
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ qt5? (
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ qt6? (
+ kde-frameworks/kconfig:6
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/ki18n:6
+ kde-frameworks/kio:6
+ kde-frameworks/kwindowsystem:6
+ )
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !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
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant-core
+ >=virtual/jdk-17
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
+
+ # maybe upstreamable
+ "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ 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)/.."
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs=more
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ --without-system-zxcvbn
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable ldap)
+ $(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)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ 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 )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-03-11 10:55 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-03-11 10:55 UTC (permalink / raw
To: gentoo-commits
commit: ef9ca7b4023d7181a7f27bad1a892375cbaf0214
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 11 10:38:39 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 10:55:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9ca7b4
app-office/libreoffice: live ebuilds switch to dev-java/ant:0
no longer depend on deprecated ant-core
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35709
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.6.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index dd6d14b2c12d..7e6c19c6cac2 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -254,7 +254,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXt
x11-libs/libXtst
java? (
- dev-java/ant-core
+ dev-java/ant:0
>=virtual/jdk-17
)
test? (
diff --git a/app-office/libreoffice/libreoffice-7.6.9999.ebuild b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
index 938dfe9ad75d..37c26c171771 100644
--- a/app-office/libreoffice/libreoffice-7.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
@@ -234,7 +234,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXt
x11-libs/libXtst
java? (
- dev-java/ant-core
+ dev-java/ant:0
>=virtual/jdk-11
)
test? (
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index dd6d14b2c12d..7e6c19c6cac2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -254,7 +254,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXt
x11-libs/libXtst
java? (
- dev-java/ant-core
+ dev-java/ant:0
>=virtual/jdk-17
)
test? (
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-03-25 12:05 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-03-25 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 22f5e5664e2ad33e6a2ba4c8e6d804d60c40d87a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 21:42:57 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 12:05:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f5e566
app-office/libreoffice: add 24.2.2.2, drop 24.2.2.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-24.2.2.1.ebuild => libreoffice-24.2.2.2.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6bb546e82c94..73d79b952f62 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,12 +19,12 @@ 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.2.1.tar.xz 280628072 BLAKE2B f9b22b25bdd58278de020fa67ec6ab3d7a3986c75d7931ea82b69dc5d330876be1aaf4cd3ef7cde6e9eb2554ee7d156c04bb8729e13a5e622e8e68b4e28cba08 SHA512 62840468733eabb4a4b9784802e1710e2a697ebe6fa3d6246bcc9d08b97a8af189b259fe8af6f2add4d1cf706df40431fc26d92be318dd9b547f05de992368d5
+DIST libreoffice-24.2.2.2.tar.xz 280611816 BLAKE2B db0f141f93ae5d43b0c4ae363560770a98930ebe2fbbe8ab44909bc57d9d88bcb0d4476e374e1af1e4d6e38b4167d6d50a28719fecee69f61483f34522be57d2 SHA512 a05b8ea123b687dc27b9e9919814581efc155a075d797d1ddf2e2565dd029f82e09efe52b0c4082dde6156704023b6262c91ef356e6f4794250dfd133759cb29
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-24.2.2.1.tar.xz 167069480 BLAKE2B ca1c551a38b2c4250e2c39216e476fab67d72df4adcf5f3ced2e83b0b2ec6f3ae0596a9c7eeb8bfca27e360bfb2b2d32c90e6c1216f0204bc971fe9ba2277446 SHA512 51daafb453d5bfb296a4985a51cb69c1bc0e8559546061440713c3cb6a8021ff54989c02f9d34bd00734e4d4b32d9533d9cffb80f4bcd3fffbed1b6c48a19cb3
+DIST libreoffice-help-24.2.2.2.tar.xz 167069856 BLAKE2B 1d3524ea1db78420b0f5df54d58517bd7f1419dd125086bc1e36851250062f3ed5dd14793f1bee0017220c007b5e624b5e0baf8aa6c83ff0a18381c5ed6d547e SHA512 c05f87a24b511ad34ce7c8bb02e90034848a6297033e3d1f2ea14f2d8686ba5e01547031960f214c215e41e9aa105dd6c52ace29e4807dcca92fd4297230598c
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3
DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f
diff --git a/app-office/libreoffice/libreoffice-24.2.2.1.ebuild b/app-office/libreoffice/libreoffice-24.2.2.2.ebuild
similarity index 99%
rename from app-office/libreoffice/libreoffice-24.2.2.1.ebuild
rename to app-office/libreoffice/libreoffice-24.2.2.2.ebuild
index 6790640974f2..db935414187a 100644
--- a/app-office/libreoffice/libreoffice-24.2.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.2.2.ebuild
@@ -254,7 +254,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXt
x11-libs/libXtst
java? (
- dev-java/ant-core
+ dev-java/ant:0
>=virtual/jdk-17
)
test? (
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-04-09 20:02 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-04-09 20:02 UTC (permalink / raw
To: gentoo-commits
commit: c14946a549091199104c42df022ee990b19c3e99
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 19:50:38 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 20:01:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14946a5
app-office/libreoffice: drop 7.6.5.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-7.6.5.2.ebuild | 668 ----------------------
2 files changed, 670 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 73d79b952f62..d88204750c21 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,12 +21,10 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
DIST libreoffice-24.2.2.2.tar.xz 280611816 BLAKE2B db0f141f93ae5d43b0c4ae363560770a98930ebe2fbbe8ab44909bc57d9d88bcb0d4476e374e1af1e4d6e38b4167d6d50a28719fecee69f61483f34522be57d2 SHA512 a05b8ea123b687dc27b9e9919814581efc155a075d797d1ddf2e2565dd029f82e09efe52b0c4082dde6156704023b6262c91ef356e6f4794250dfd133759cb29
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
-DIST libreoffice-7.6.5.2.tar.xz 281916516 BLAKE2B b0e21dbc9a1c76027065862ca7ea24eba21ffe5dc1862ff50941644f291122396fbf94141cdbed84c54b0251f3c4452db1e4714ec30c35e416a6450a6caf7f2f SHA512 b6289b1c9b7d363a04f8f63b16994a1820468cb4b270a639279046965b8b773cd9aec40eca57528b17990679a6e8a29a17c5e643b50fe5a5c971928904472602
DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.2.2.tar.xz 167069856 BLAKE2B 1d3524ea1db78420b0f5df54d58517bd7f1419dd125086bc1e36851250062f3ed5dd14793f1bee0017220c007b5e624b5e0baf8aa6c83ff0a18381c5ed6d547e SHA512 c05f87a24b511ad34ce7c8bb02e90034848a6297033e3d1f2ea14f2d8686ba5e01547031960f214c215e41e9aa105dd6c52ace29e4807dcca92fd4297230598c
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
-DIST libreoffice-help-7.6.5.2.tar.xz 166958152 BLAKE2B 440a268b8a5ea13abc553a0154f56c39eaec88024e268b1a40f016fb53f368df7610b0e53cbf3a6b9ca87ca7c753d086ad1944b48bab11d1861862c1b345e61c SHA512 f7b2a068f0bfcb35f3ad521c3c41ce26dd0f1abcc2c002e654ea951131b60451b81af964bf8c870615d14c8330bcd1c6d0b941caba390aa86ec6fb53dfe200c3
DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild b/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
deleted file mode 100644
index f13092052517..000000000000
--- a/app-office/libreoffice/libreoffice-7.6.5.2.ebuild
+++ /dev/null
@@ -1,668 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
- "${ADDONS_URI}/frozen-1.1.1.tar.gz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.6.2:0=
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.18.0:0/0.18
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- >=gnome-base/dconf-0.40.0
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.1
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant-core
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- app-alternatives/yacc
- app-alternatives/lex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:18
- sys-devel/llvm:18
- =sys-devel/lld-18* )
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- )
- )
- odk? ( >=app-text/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # upstream
- "${FILESDIR}/${PN}-7.6.5.2-gcc14.patch"
-
- # maybe upstreamable
- "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- # Workaround for bug #915067
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Workaround for bug #907905
- filter-lto
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-abseil
- --without-system-dragonbox
- --without-system-frozen
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- tc-is-lto && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-04-11 20:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-04-11 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 15d26568ac2a4d86224b3990c2f50fe666848ac8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 20:09:56 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 20:14:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d26568
app-office/libreoffice: add 24.2.3.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-24.2.3.1.ebuild | 697 +++++++++++++++++++++
2 files changed, 699 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d88204750c21..e83fbe3df28f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,10 +20,12 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
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.2.2.tar.xz 280611816 BLAKE2B db0f141f93ae5d43b0c4ae363560770a98930ebe2fbbe8ab44909bc57d9d88bcb0d4476e374e1af1e4d6e38b4167d6d50a28719fecee69f61483f34522be57d2 SHA512 a05b8ea123b687dc27b9e9919814581efc155a075d797d1ddf2e2565dd029f82e09efe52b0c4082dde6156704023b6262c91ef356e6f4794250dfd133759cb29
+DIST libreoffice-24.2.3.1.tar.xz 280290188 BLAKE2B 92ca634b3000a6c63d9cfe53e84e3139bbf083246437d070bb7ef2e294c7b2c548526763e1bdffc2af7c222dc0a9cfdef4c1db291a6aa182c2cbca1be957a24b SHA512 76c7fd3d36a350224f834016889a7e93307ae0bb1b05e4c2dee0c2e90ff35604b5cf99363d3a49c9a2d35828045820b5fcac6d50392cc127c968d7febd3aa905
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.2.2.tar.xz 167069856 BLAKE2B 1d3524ea1db78420b0f5df54d58517bd7f1419dd125086bc1e36851250062f3ed5dd14793f1bee0017220c007b5e624b5e0baf8aa6c83ff0a18381c5ed6d547e SHA512 c05f87a24b511ad34ce7c8bb02e90034848a6297033e3d1f2ea14f2d8686ba5e01547031960f214c215e41e9aa105dd6c52ace29e4807dcca92fd4297230598c
+DIST libreoffice-help-24.2.3.1.tar.xz 167013500 BLAKE2B 5d0a8ff77fa164626dc10eb99dad89f62df0077b397b88c8bfe720b2d68e650ed77597fc666d243c85079a27b882b9bc06f837a82776f0868ed1b877ed7cb590 SHA512 3c2e7402fc6e0f764d1105ea971a7f01593d1c21efe6452055ff7f7144ef637bdf7f145ca08739bac8ad59b1d3ba5b7877c52b2760d7b4463812326e11ab9a99
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
diff --git a/app-office/libreoffice/libreoffice-24.2.3.1.ebuild b/app-office/libreoffice/libreoffice-24.2.3.1.ebuild
new file mode 100644
index 000000000000..b2b4c6c66ef4
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.3.1.ebuild
@@ -0,0 +1,697 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 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 )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/argon2:=
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ qt5? (
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ qt6? (
+ kde-frameworks/kconfig:6
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/ki18n:6
+ kde-frameworks/kio:6
+ kde-frameworks/kwindowsystem:6
+ )
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !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
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant:0
+ >=virtual/jdk-17
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
+
+ # maybe upstreamable
+ "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+ "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ 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)/.."
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs=more
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ --without-system-zxcvbn
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable ldap)
+ $(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)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ 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 )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-04-11 20:40 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-04-11 20:40 UTC (permalink / raw
To: gentoo-commits
commit: dea21130a8d2d8895dbec0cd78109bc27d541547
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 20:10:09 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 20:14:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea21130
app-office/libreoffice: drop 24.2.2.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-24.2.2.2.ebuild | 697 ---------------------
2 files changed, 699 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e83fbe3df28f..77fd055a4717 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,12 +19,10 @@ 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.2.2.tar.xz 280611816 BLAKE2B db0f141f93ae5d43b0c4ae363560770a98930ebe2fbbe8ab44909bc57d9d88bcb0d4476e374e1af1e4d6e38b4167d6d50a28719fecee69f61483f34522be57d2 SHA512 a05b8ea123b687dc27b9e9919814581efc155a075d797d1ddf2e2565dd029f82e09efe52b0c4082dde6156704023b6262c91ef356e6f4794250dfd133759cb29
DIST libreoffice-24.2.3.1.tar.xz 280290188 BLAKE2B 92ca634b3000a6c63d9cfe53e84e3139bbf083246437d070bb7ef2e294c7b2c548526763e1bdffc2af7c222dc0a9cfdef4c1db291a6aa182c2cbca1be957a24b SHA512 76c7fd3d36a350224f834016889a7e93307ae0bb1b05e4c2dee0c2e90ff35604b5cf99363d3a49c9a2d35828045820b5fcac6d50392cc127c968d7febd3aa905
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-24.2.2.2.tar.xz 167069856 BLAKE2B 1d3524ea1db78420b0f5df54d58517bd7f1419dd125086bc1e36851250062f3ed5dd14793f1bee0017220c007b5e624b5e0baf8aa6c83ff0a18381c5ed6d547e SHA512 c05f87a24b511ad34ce7c8bb02e90034848a6297033e3d1f2ea14f2d8686ba5e01547031960f214c215e41e9aa105dd6c52ace29e4807dcca92fd4297230598c
DIST libreoffice-help-24.2.3.1.tar.xz 167013500 BLAKE2B 5d0a8ff77fa164626dc10eb99dad89f62df0077b397b88c8bfe720b2d68e650ed77597fc666d243c85079a27b882b9bc06f837a82776f0868ed1b877ed7cb590 SHA512 3c2e7402fc6e0f764d1105ea971a7f01593d1c21efe6452055ff7f7144ef637bdf7f145ca08739bac8ad59b1d3ba5b7877c52b2760d7b4463812326e11ab9a99
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f
diff --git a/app-office/libreoffice/libreoffice-24.2.2.2.ebuild b/app-office/libreoffice/libreoffice-24.2.2.2.ebuild
deleted file mode 100644
index b2b4c6c66ef4..000000000000
--- a/app-office/libreoffice/libreoffice-24.2.2.2.ebuild
+++ /dev/null
@@ -1,697 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
- "${ADDONS_URI}/frozen-1.1.1.tar.gz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
- # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
- "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
- "java? (
- ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
- ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 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 )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/argon2:=
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.6.2:0=
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.18.0:0/0.18
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- >=gnome-base/dconf-0.40.0
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- qt5? (
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- qt6? (
- kde-frameworks/kconfig:6
- kde-frameworks/kcoreaddons:6
- kde-frameworks/ki18n:6
- kde-frameworks/kio:6
- kde-frameworks/kwindowsystem:6
- )
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !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
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.1
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant:0
- >=virtual/jdk-17
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- app-alternatives/yacc
- app-alternatives/lex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:18
- sys-devel/llvm:18
- =sys-devel/lld-18* )
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- )
- )
- odk? ( >=app-text/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-24.2-qtdetect.patch"
-
- # maybe upstreamable
- "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
- "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- # Workaround for bug #915067
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Workaround for bug #907905
- filter-lto
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- 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)/.."
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs=more
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-abseil
- --without-system-dragonbox
- --without-system-frozen
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- --without-system-zxcvbn
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable ldap)
- $(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)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- 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 )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- tc-is-lto && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-04-20 11:56 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-04-20 11:56 UTC (permalink / raw
To: gentoo-commits
commit: 148e367c0bc6ea1a5be90b55147bd9e5f4adca68
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 11:04:14 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 11:56:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148e367c
app-office/libreoffice: drop 7.6.9999, no more packaging this branch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.9999.ebuild | 668 ---------------------
1 file changed, 668 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.9999.ebuild b/app-office/libreoffice/libreoffice-7.6.9999.ebuild
deleted file mode 100644
index 968f3b9be2f7..000000000000
--- a/app-office/libreoffice/libreoffice-7.6.9999.ebuild
+++ /dev/null
@@ -1,668 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
- "${ADDONS_URI}/frozen-1.1.1.tar.gz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.6.2:0=
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.18.0:0/0.18
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- >=gnome-base/dconf-0.40.0
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.1
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant:0
- >=virtual/jdk-11
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- app-alternatives/yacc
- app-alternatives/lex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:18
- sys-devel/llvm:18
- =sys-devel/lld-18* )
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- )
- )
- odk? ( >=app-text/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
-
- # maybe upstreamable
- "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- # Workaround for bug #915067
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Workaround for bug #907905
- filter-lto
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-abseil
- --without-system-dragonbox
- --without-system-frozen
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- tc-is-lto && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-05-07 21:35 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-05-07 21:35 UTC (permalink / raw
To: gentoo-commits
commit: d82b1d914501045d4ace11567bc9bb8841d70d70
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 21:19:54 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 7 21:34:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d82b1d91
app-office/libreoffice: add 7.6.7.2 w/o KEYWORDS
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-7.6.7.2.ebuild | 672 ++++++++++++++++++++++
2 files changed, 674 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fe616ef49a69..ab5a2f50b2aa 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,10 +22,12 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b
DIST libreoffice-24.2.3.2.tar.xz 280246948 BLAKE2B f0694abc23a612e303d694800f6f83a7d307c3fcce40e459a59cce76435cfdd9de57be95910152bbc5a9e124871477e4638f1deef489a19c22fbfbdf1237a91b SHA512 c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3
+DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.3.2.tar.xz 167014344 BLAKE2B 93c87d5b0e7d35d3335dcb80868a0ea516378e3c46c56e34a1123661db29ab6215f62074feef1078daad04977726bf226de2a7ad281e8b9900ddd7fb1bc23961 SHA512 5ccf579da3791f4a78b17eedc6b641351f69e4e8b4079180dede2f3a4180d1ccc617dff0f49b89fdc93f9e86d8d0630ecbf87437079caf7f0d1b51765ac3e877
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f
+DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
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
diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
new file mode 100644
index 000000000000..2a8dc96610a6
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
@@ -0,0 +1,672 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant:0
+ >=virtual/jdk-11
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # 24.2 branch
+ "${FILESDIR}/${P}-autoconf-2.72.patch" # bug 925162
+ "${FILESDIR}/${PN}-7.6.5.2-gcc14.patch" # bug 928152
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+
+ # maybe upstreamable
+ "${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-05-07 21:35 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-05-07 21:35 UTC (permalink / raw
To: gentoo-commits
commit: b5206d3d51b4b7cc4ca0cf8fcd9831fea43633a0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 21:04:18 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 7 21:34:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5206d3d
app-office/libreoffice: add 24.2.3.2, drop 24.2.3.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-24.2.3.1.ebuild => libreoffice-24.2.3.2.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 77fd055a4717..fe616ef49a69 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,11 +19,11 @@ 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.3.1.tar.xz 280290188 BLAKE2B 92ca634b3000a6c63d9cfe53e84e3139bbf083246437d070bb7ef2e294c7b2c548526763e1bdffc2af7c222dc0a9cfdef4c1db291a6aa182c2cbca1be957a24b SHA512 76c7fd3d36a350224f834016889a7e93307ae0bb1b05e4c2dee0c2e90ff35604b5cf99363d3a49c9a2d35828045820b5fcac6d50392cc127c968d7febd3aa905
+DIST libreoffice-24.2.3.2.tar.xz 280246948 BLAKE2B f0694abc23a612e303d694800f6f83a7d307c3fcce40e459a59cce76435cfdd9de57be95910152bbc5a9e124871477e4638f1deef489a19c22fbfbdf1237a91b SHA512 c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.6.3.tar.xz 282144120 BLAKE2B 8d6f39046c9793c8dc5e2667e684c32f61b475b83787c75eeacf441a636c7244b032ae2cd7dac75c3077de63c68382e63bb834f69986ef788d78542df087b19b SHA512 822584e1a191aac08f3141ba2dc2b91b0cbd50635a8506e9f3d00e224c997e1ec83957dd8a7dbede28a0ba28e1a8658d7e0b526bf796db286210393a326e6ca3
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-24.2.3.1.tar.xz 167013500 BLAKE2B 5d0a8ff77fa164626dc10eb99dad89f62df0077b397b88c8bfe720b2d68e650ed77597fc666d243c85079a27b882b9bc06f837a82776f0868ed1b877ed7cb590 SHA512 3c2e7402fc6e0f764d1105ea971a7f01593d1c21efe6452055ff7f7144ef637bdf7f145ca08739bac8ad59b1d3ba5b7877c52b2760d7b4463812326e11ab9a99
+DIST libreoffice-help-24.2.3.2.tar.xz 167014344 BLAKE2B 93c87d5b0e7d35d3335dcb80868a0ea516378e3c46c56e34a1123661db29ab6215f62074feef1078daad04977726bf226de2a7ad281e8b9900ddd7fb1bc23961 SHA512 5ccf579da3791f4a78b17eedc6b641351f69e4e8b4079180dede2f3a4180d1ccc617dff0f49b89fdc93f9e86d8d0630ecbf87437079caf7f0d1b51765ac3e877
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.6.3.tar.xz 166956596 BLAKE2B 217b32cf9d1882b2a60e436bb6319be5c60807bd7bb8ce373a6a2ecbd8d6f2537bd2a13d58ea14f47532a5a780df1815457adc473e2b0107e5e510db144d90a4 SHA512 07ed22d2161770a39e618075aadc5b42f8f5c436938a0aa29351628e61572e6e1d03642d45541dcfebf57dfdd1e558b23a8d596025fb45a1771652ad2860583f
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
diff --git a/app-office/libreoffice/libreoffice-24.2.3.1.ebuild b/app-office/libreoffice/libreoffice-24.2.3.2.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-24.2.3.1.ebuild
rename to app-office/libreoffice/libreoffice-24.2.3.2.ebuild
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-05-07 21:53 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-05-07 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 8a49576a988685f055e3846a862cf4a96fca1898
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 7 21:52:37 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 7 21:52:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a49576a
app-office/libreoffice: Fix patch name
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
index 2a8dc96610a6..fd40095adc35 100644
--- a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
@@ -297,7 +297,7 @@ PATCHES=(
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
# 24.2 branch
- "${FILESDIR}/${P}-autoconf-2.72.patch" # bug 925162
+ "${FILESDIR}/${PN}-7.6.6.3-autoconf-2.72.patch" # bug 925162
"${FILESDIR}/${PN}-7.6.5.2-gcc14.patch" # bug 928152
# TODO: upstream
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-05-31 8:31 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-05-31 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 6fe11450457313b784ea87e1eb08327d9f86bb4f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 08:31:08 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 08:31:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe11450
app-office/libreoffice: Stabilize 7.6.7.2 arm64, #927996
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
index 63d7b45f975b..dfa1550977bd 100644
--- a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-05-31 8:31 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-05-31 8:31 UTC (permalink / raw
To: gentoo-commits
commit: ba62a1262fbc165c6526673ca8ea149b9d8f01e0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 08:31:16 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 08:31:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba62a126
app-office/libreoffice: Stabilize 7.6.7.2 ppc64, #927996
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
index dfa1550977bd..5868c131dd07 100644
--- a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-05-31 8:31 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-05-31 8:31 UTC (permalink / raw
To: gentoo-commits
commit: 02d794619cdf05170e67fd7251d8b312153c7ff4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 08:31:03 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri May 31 08:31:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d79461
app-office/libreoffice: Stabilize 7.6.7.2 amd64, #927996
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
index a31c6b56b657..63d7b45f975b 100644
--- a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-05 18:17 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-06-05 18:17 UTC (permalink / raw
To: gentoo-commits
commit: a518ed3a570b987ab069ef28afbbba3dceab41a6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 17:09:55 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 18:16:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a518ed3a
app-office/libreoffice: add 24.2.4.2, drop 24.2.4.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 4 ++--
.../{libreoffice-24.2.4.1.ebuild => libreoffice-24.2.4.2.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d352d7d9c1fa..135b67a59901 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,12 +21,12 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
DIST libreoffice-24.2.3.2.tar.xz 280246948 BLAKE2B f0694abc23a612e303d694800f6f83a7d307c3fcce40e459a59cce76435cfdd9de57be95910152bbc5a9e124871477e4638f1deef489a19c22fbfbdf1237a91b SHA512 c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b
-DIST libreoffice-24.2.4.1.tar.xz 279904088 BLAKE2B 082f3a65a6ab7bfa2a871c18300eba62b963ca83c4eda42cea2048fe1f1f8b87fdcecc63a5d0d7d90ca91bfc014ecbadf840e71e7b3919ddbb92d24c940e4133 SHA512 7ea86529b615363e973fbfabf25ea44010691e32e244fa76e554f6f4a0e61480ebc027cf8d578a6d2d01f1a23926a6c606bf9e4d9005250bf19a00444854204d
+DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.3.2.tar.xz 167014344 BLAKE2B 93c87d5b0e7d35d3335dcb80868a0ea516378e3c46c56e34a1123661db29ab6215f62074feef1078daad04977726bf226de2a7ad281e8b9900ddd7fb1bc23961 SHA512 5ccf579da3791f4a78b17eedc6b641351f69e4e8b4079180dede2f3a4180d1ccc617dff0f49b89fdc93f9e86d8d0630ecbf87437079caf7f0d1b51765ac3e877
-DIST libreoffice-help-24.2.4.1.tar.xz 167013380 BLAKE2B cf6b9524a10cebd5b6c39d07cd03a5dc4f4f64b47b9422a9757209c632a7750112d41287de40ffa00b4856686b214484f49a29397ce505ca00e9e8cb82329073 SHA512 1db7810e518eee4c39355e594e3c7ec03c71e49d42de70573f93fcfaaf7c2594ebc676b4d6f1fe7cf3e984f81cd1c4f6679e67c103a3178e94ac9f2239205138
+DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
diff --git a/app-office/libreoffice/libreoffice-24.2.4.1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2.ebuild
similarity index 100%
rename from app-office/libreoffice/libreoffice-24.2.4.1.ebuild
rename to app-office/libreoffice/libreoffice-24.2.4.2.ebuild
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-07 16:18 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-06-07 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 7b7641e11d65fe52b7763779392d849a976012a2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 13:07:49 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 16:16:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7641e1
app-office/libreoffice: 24.2.4.2-r1 version bump without IUSE=qt6,qt5
Bug: https://bugs.gentoo.org/933693
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libreoffice/libreoffice-24.2.4.2-r1.ebuild | 682 +++++++++++++++++++++
1 file changed, 682 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
new file mode 100644
index 000000000000..ca46a65753f7
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
@@ -0,0 +1,682 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 test valgrind vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ base? ( java )
+ bluetooth? ( dbus )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/argon2:=
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant:0
+ >=virtual/jdk-17
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+ "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
+
+ # git master
+ "${FILESDIR}/${PN}-24.2.3.2-fix-bashism.patch" # bug #928733
+ # bug #917618, thx to Debian:
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch"
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch"
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs=more
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --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"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ --without-system-zxcvbn
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable kde kf5)
+ $(use_enable kde qt5)
+ $(use_enable ldap)
+ $(use_enable odk)
+ $(use_enable pdfimport)
+ $(use_enable postgres postgresql-sdbc)
+ $(use_enable vulkan skia)
+ $(use_with accessibility lxml)
+ $(use_with coinmp system-coinmp)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ if use eds || use gtk; then
+ myeconfargs+=( --enable-dconf --enable-gio )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-07 16:18 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-06-07 16:18 UTC (permalink / raw
To: gentoo-commits
commit: b35b02374e88b16bb31d506840b2ded9ac227bc4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 16:14:46 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 16:16:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35b0237
app-office/libreoffice: drop 24.2.3.2-r1
Bug: https://bugs.gentoo.org/933693
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
.../libreoffice/libreoffice-24.2.3.2-r1.ebuild | 682 ---------------------
2 files changed, 684 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 135b67a59901..a091f36e87d2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,12 +20,10 @@ DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a3
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.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
-DIST libreoffice-24.2.3.2.tar.xz 280246948 BLAKE2B f0694abc23a612e303d694800f6f83a7d307c3fcce40e459a59cce76435cfdd9de57be95910152bbc5a9e124871477e4638f1deef489a19c22fbfbdf1237a91b SHA512 c0313a5f1ea0a860b40debf6bc75bc792ffb152d76fa1372e8e4574eca5c4a8a33748e74636a09e01dab1ae21e08261856c7c11b82080e6e8d6c2dd1a166782b
DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
DIST libreoffice-7.6.4.1.tar.xz 281547116 BLAKE2B 55712cf41e38373476dbc3d6a6f244dc0ba9222caf587c5d8a56c5f952e064e815d752a786d6770891775dc2a43739ae05fb94935006c005b41b3aeca229a866 SHA512 dbfc0cc8aa68e26c89da12156046ccf18201759c0e67757ce259a1150934ad7e2d914837701731fbe00aeab9a2f8c996619eb0892b7907de8012fdd7421da0f6
DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-24.2.3.2.tar.xz 167014344 BLAKE2B 93c87d5b0e7d35d3335dcb80868a0ea516378e3c46c56e34a1123661db29ab6215f62074feef1078daad04977726bf226de2a7ad281e8b9900ddd7fb1bc23961 SHA512 5ccf579da3791f4a78b17eedc6b641351f69e4e8b4079180dede2f3a4180d1ccc617dff0f49b89fdc93f9e86d8d0630ecbf87437079caf7f0d1b51765ac3e877
DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
DIST libreoffice-help-7.6.4.1.tar.xz 166959028 BLAKE2B fadcd32c50af1d4607ecd20ef7640cfbd1912361a792c324540dee1b5ee78c5f622b8363a5b96a1afb8256618573a0bb6f919a144de98fe88a1331d9241612f0 SHA512 0f72cd933ab7b897ec36f7b29bc5e568be289ea50ae0844e6083ff4957eab3cd313b39ffbda2e58f59de7962a05b371d8d61043d80323bb474e5436d23d3a859
DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
diff --git a/app-office/libreoffice/libreoffice-24.2.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.3.2-r1.ebuild
deleted file mode 100644
index d49c614f096b..000000000000
--- a/app-office/libreoffice/libreoffice-24.2.3.2-r1.ebuild
+++ /dev/null
@@ -1,682 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-icu-74.tar.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
- "${ADDONS_URI}/frozen-1.1.1.tar.gz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
- # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
- "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
- "java? (
- ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
- ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 test valgrind vulkan
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- base? ( java )
- bluetooth? ( dbus )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/argon2:=
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.6.2:0=
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.18.0:0/0.18
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- >=gnome-base/dconf-0.40.0
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !mariadb? ( dev-db/mysql-connector-c:= )
- pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
- postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.1
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant:0
- >=virtual/jdk-17
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- app-alternatives/yacc
- app-alternatives/lex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:18
- sys-devel/llvm:18
- =sys-devel/lld-18* )
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- )
- )
- odk? ( >=app-text/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-24.2-qtdetect.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
- "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
-
- # git master
- "${FILESDIR}/${P}-fix-bashism.patch" # bug #928733
- # bug #917618, thx to Debian:
- "${WORKDIR}/${P}-icu-74/${P}-icu-74.2-reviewed-breakIterator-customizations.patch"
- "${WORKDIR}/${P}-icu-74/${P}-icu-74.2-breakiterator-updates.patch"
- "${WORKDIR}/${P}-icu-74/${P}-icu-74-unicode.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- # Workaround for bug #915067
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Workaround for bug #907905
- filter-lto
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- use kde && export QT5DIR="$(qt5_get_bindir)/.."
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs=more
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --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"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-abseil
- --without-system-dragonbox
- --without-system-frozen
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- --without-system-zxcvbn
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable kde kf5)
- $(use_enable kde qt5)
- $(use_enable ldap)
- $(use_enable odk)
- $(use_enable pdfimport)
- $(use_enable postgres postgresql-sdbc)
- $(use_enable vulkan skia)
- $(use_with accessibility lxml)
- $(use_with coinmp system-coinmp)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- if use eds || use gtk; then
- myeconfargs+=( --enable-dconf --enable-gio )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- tc-is-lto && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-13 19:32 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-06-13 19:32 UTC (permalink / raw
To: gentoo-commits
commit: e4e853e6e632215fee00340d8fb03bfc067b55d4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 13 19:32:11 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 19:32:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e853e6
app-office/libreoffice: Stabilize 7.6.7.2 x86, #927996
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-7.6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
index 5868c131dd07..c0762bb1096f 100644
--- a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
@@ -103,7 +103,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-23 1:49 Sam James
0 siblings, 0 replies; 588+ messages in thread
From: Sam James @ 2024-06-23 1:49 UTC (permalink / raw
To: gentoo-commits
commit: 113c6d746c8bad1335465054d086b1aaf22a2eb7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 01:44:11 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 01:49:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113c6d74
app-office/libreoffice: subscribe to libassuan subslot
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild | 2 +-
app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild | 2 +-
app-office/libreoffice/libreoffice-24.2.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.6.4.1.ebuild | 2 +-
app-office/libreoffice/libreoffice-7.6.7.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
index ca46a65753f7..9ebd66de842f 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- dev-libs/libassuan
+ dev-libs/libassuan:=
dev-libs/libgpg-error
>=dev-libs/liborcus-0.18.0:0/0.18
dev-libs/librevenge
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild
index 0c07c5ec3c55..a09f78e4d1c4 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild
@@ -143,7 +143,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- dev-libs/libassuan
+ dev-libs/libassuan:=
dev-libs/libgpg-error
>=dev-libs/liborcus-0.18.0:0/0.18
dev-libs/librevenge
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 1d2cd2085e48..7ba726491591 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- dev-libs/libassuan
+ dev-libs/libassuan:=
dev-libs/libgpg-error
>=dev-libs/liborcus-0.18.0:0/0.18
dev-libs/librevenge
diff --git a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
index e69a806f2b3b..f670c0d85276 100644
--- a/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.4.1.ebuild
@@ -134,7 +134,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- dev-libs/libassuan
+ dev-libs/libassuan:=
dev-libs/libgpg-error
>=dev-libs/liborcus-0.18.0:0/0.18
dev-libs/librevenge
diff --git a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
index c0762bb1096f..30536129efd3 100644
--- a/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.6.7.2.ebuild
@@ -134,7 +134,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- dev-libs/libassuan
+ dev-libs/libassuan:=
dev-libs/libgpg-error
>=dev-libs/liborcus-0.18.0:0/0.18
dev-libs/librevenge
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1d2cd2085e48..7ba726491591 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -142,7 +142,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/hyphen
dev-libs/icu:=
- dev-libs/libassuan
+ dev-libs/libassuan:=
dev-libs/libgpg-error
>=dev-libs/liborcus-0.18.0:0/0.18
dev-libs/librevenge
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-23 12:15 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-06-23 12:15 UTC (permalink / raw
To: gentoo-commits
commit: 2930abe3b9632c68085e373515e30ab26b8de433
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 12:12:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 12:12:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2930abe3
app-office/libreoffice: Disable tests causing sandbox error
Bug: https://bugs.gentoo.org/933257
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild | 1 +
app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild | 1 +
app-office/libreoffice/libreoffice-24.2.9999.ebuild | 1 +
app-office/libreoffice/libreoffice-9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
index 9ebd66de842f..e2d59019f820 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
@@ -501,6 +501,7 @@ src_configure() {
--enable-python=system
--enable-randr
--enable-release-build
+ --disable-atspi-tests # bug 933257
--disable-breakpad
--disable-bundle-mariadb
--disable-ccache
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild
index a09f78e4d1c4..d3fd84524e48 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r10.ebuild
@@ -519,6 +519,7 @@ src_configure() {
--enable-python=system
--enable-randr
--enable-release-build
+ --disable-atspi-tests # bug 933257
--disable-breakpad
--disable-bundle-mariadb
--disable-ccache
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 7ba726491591..20bf4268cdef 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -511,6 +511,7 @@ src_configure() {
--enable-python=system
--enable-randr
--enable-release-build
+ --disable-atspi-tests # bug 933257
--disable-breakpad
--disable-bundle-mariadb
--disable-ccache
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7ba726491591..20bf4268cdef 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -511,6 +511,7 @@ src_configure() {
--enable-python=system
--enable-randr
--enable-release-build
+ --disable-atspi-tests # bug 933257
--disable-breakpad
--disable-bundle-mariadb
--disable-ccache
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-29 20:05 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-06-29 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 5e4daaa9c0afe7a5b9ac08f23cdc7a68ab089255
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 20:04:07 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 20:04:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e4daaa9
app-office/libreoffice: Stabilize 24.2.4.2-r1 amd64, #933693
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
index e2d59019f820..53d33213e3ef 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
@@ -110,7 +110,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-29 20:05 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-06-29 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 821ad95d781b682121d0f3f12df8a9da98442a7f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 20:04:12 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 20:04:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821ad95d
app-office/libreoffice: Stabilize 24.2.4.2-r1 arm64, #933693
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
index 53d33213e3ef..ca610c8403c0 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
@@ -110,7 +110,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-06-29 20:05 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-06-29 20:05 UTC (permalink / raw
To: gentoo-commits
commit: ec27a8274d4c82c9e84ae5c420cb8322e3ede7af
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 20:04:18 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 20:04:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec27a827
app-office/libreoffice: Stabilize 24.2.4.2-r1 ppc64, #933693
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
index ca610c8403c0..a81ab47c1896 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
@@ -110,7 +110,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-07-26 4:57 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-07-26 4:57 UTC (permalink / raw
To: gentoo-commits
commit: 0cc0f735ca902488bba2b1ea55a1034d6fa893e9
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 04:56:47 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 04:56:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc0f735
app-office/libreoffice: Stabilize 24.2.4.2-r1 x86, #933693
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
index a81ab47c1896..4ee54961e0ee 100644
--- a/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.4.2-r1.ebuild
@@ -110,7 +110,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-08-10 13:14 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-08-10 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 8274503b748e2c870051081773c911c913a1adb0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 12:19:08 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 13:08:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8274503b
app-office/libreoffice: drop 24.2.5.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 -
app-office/libreoffice/libreoffice-24.2.5.1.ebuild | 702 ---------------------
2 files changed, 704 deletions(-)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4cb050cb79ae..63d0e5b237ef 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -21,12 +21,10 @@ DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c7
DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b2227d56133c48b9f9f0542361f3e007687089145939c12fc6a1af8baf1c76ba76176bdddec3d726e45d705d1 SHA512 e22561a4e634e388e11f95b3005bc711e543013d314f6aaeda34befb2c673aea2d71a717d8822bc8fa85bdc8409945ba2ad91a1bac4f8cb5303080de01a5f60e
DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
-DIST libreoffice-24.2.5.1.tar.xz 280174152 BLAKE2B 49859807e65a0f4297cd756f2c7234636829e68fede7e0e2b1ad0459e8f2175decdeb6a9df8d250bb0a49b14a568fdcf4f9b87fba64755da13b59cce7e055744 SHA512 2edd225cd690dde92ce1cc5a640300c21af65df7f8a742f43cc6f9de97223bc62100852c915f7d43f91282d46e5e031ae48be48b7bad7e771605da006da2c491
DIST libreoffice-24.2.5.2.tar.xz 280162592 BLAKE2B 59e07ebd9a3471fa03abf3dd9abc9e4b440598a0753564999bfe8e95d864161a8b3a0bb9388a7e8a87aaa4ac75429e7ae12c233b4ef08174224223a37040af74 SHA512 6f2893bc4e00a988e5f16e6288c95c66faf86f366c3fbfdfac3d6d46c6c03501504adb41ab7e51a7eba749be07cac1e124f97805500d29808155653c217b7c07
DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
-DIST libreoffice-help-24.2.5.1.tar.xz 167013956 BLAKE2B d6e11c547a4ad40919a65f40a7c25ad07698d4cdde11939924e7fa0d8992525045bcb2dfe355584a8148c0d4e48f9f81bb9413345a8b30538d6897d0a8556115 SHA512 4341b14775844a1e8e60045e911ad2aa45bb86d183701177298e15374c48dd44a5b2303bc913e815387d1c35f00ccf5aebc02b74f6bd82216cc88b9fa2e51472
DIST libreoffice-help-24.2.5.2.tar.xz 167013608 BLAKE2B 8e05fadd1e61534828ddcbbc4422658002f41715e049b1d92c371a67469d5bcffde9483f106df7d5e74691dd29c4374cb48f144e1d2506ff9829425206e49ce4 SHA512 c7a8c5051797d722c7f250828e53eba7603212db3df119d92b4c4a492e0e79cb9e1da5b016b9664f2133ced6fa414f08a0edcd44cba291757b7ba8e7ae46493d
DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
diff --git a/app-office/libreoffice/libreoffice-24.2.5.1.ebuild b/app-office/libreoffice/libreoffice-24.2.5.1.ebuild
deleted file mode 100644
index d3c64c1742a9..000000000000
--- a/app-office/libreoffice/libreoffice-24.2.5.1.ebuild
+++ /dev/null
@@ -1,702 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="threads(+),xml(+)"
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_PV="${MY_PV/_beta/.beta}"
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make everyone happy.
-DEV_URI="
- https://dev-builds.libreoffice.org/pre-releases/src
- https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
- https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${MY_PV} == *9999* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
-
-# Split modules following git/tarballs; Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${MY_PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
- SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
- # not packaged in Gentoo
- "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
- # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
- "${ADDONS_URI}/dtoa-20180411.tgz"
- # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
- "${ADDONS_URI}/frozen-1.1.1.tar.gz"
- # not packaged in Gentoo, https://skia.org/
- "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
- # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
- "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
- "base? (
- ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
- ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- )"
- # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
- "java? (
- ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
- ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- )"
- # no release for 8 years, should we package it?
- "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
- # Does not build with 1.6 rhino at all
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
- # requirement of rhino
- "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
- # not packageable
- "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-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 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 )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-arch/unzip
- app-arch/zip
- app-crypt/argon2:=
- app-crypt/gpgme:=[cxx]
- app-text/hunspell:=
- >=app-text/libabw-0.1.0
- >=app-text/libebook-0.1
- app-text/libepubgen
- >=app-text/libetonyek-0.1
- app-text/libexttextcat
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.21
- >=app-text/libnumbertext-1.0.6
- >=app-text/libodfgen-0.1.0
- app-text/libqxp
- app-text/libstaroffice
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.4
- app-text/mythes
- >=dev-cpp/clucene-2.3.3.4-r2
- >=dev-cpp/libcmis-0.6.2:0=
- dev-db/unixODBC
- dev-lang/perl
- dev-libs/boost:=[nls]
- dev-libs/expat
- dev-libs/hyphen
- dev-libs/icu:=
- dev-libs/libassuan:=
- dev-libs/libgpg-error
- >=dev-libs/liborcus-0.18.0:0/0.18
- dev-libs/librevenge
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/redland-1.0.16
- >=dev-libs/xmlsec-1.2.35:=[nss]
- >=games-engines/box2d-2.4.1:0
- media-gfx/fontforge
- media-gfx/graphite2
- media-libs/fontconfig
- >=media-libs/freetype-2.11.0-r1:2
- >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
- media-libs/lcms:2
- >=media-libs/libcdr-0.1.0
- >=media-libs/libepoxy-1.3.1[X]
- >=media-libs/libfreehand-0.1.0
- media-libs/libjpeg-turbo:=
- media-libs/libpagemaker
- >=media-libs/libpng-1.4:0=
- >=media-libs/libvisio-0.1.0
- media-libs/libwebp:=
- media-libs/libzmf
- media-libs/openjpeg:=
- media-libs/tiff:=
- media-libs/zxing-cpp:=
- net-misc/curl
- sci-mathematics/lpsolve:=
- sys-libs/zlib
- virtual/opengl
- x11-libs/cairo[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- accessibility? (
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
- )
- bluetooth? (
- dev-libs/glib:2
- net-wireless/bluez
- )
- coinmp? ( sci-libs/coinor-mp )
- cups? ( net-print/cups )
- dbus? ( sys-apps/dbus )
- eds? (
- dev-libs/glib:2
- >=gnome-base/dconf-0.40.0
- gnome-extra/evolution-data-server
- )
- firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- kde? (
- qt5? (
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- qt6? (
- kde-frameworks/kconfig:6
- kde-frameworks/kcoreaddons:6
- kde-frameworks/ki18n:6
- kde-frameworks/kio:6
- kde-frameworks/kwindowsystem:6
- )
- )
- ldap? ( net-nds/openldap:= )
- libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
- libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
- mariadb? ( dev-db/mariadb-connector-c:= )
- !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
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-# tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- dev-perl/Archive-Zip
- >=dev-util/cppunit-1.14.0
- >=dev-util/gperf-3.1
- dev-util/mdds:1/2.1
- media-libs/glm
- x11-base/xorg-proto
- x11-libs/libXt
- x11-libs/libXtst
- java? (
- dev-java/ant:0
- >=virtual/jdk-17
- )
- test? (
- app-crypt/gnupg
- dev-util/cppunit
- media-fonts/dejavu
- media-fonts/liberation-fonts
- )
- valgrind? ( dev-debug/valgrind )
-"
-RDEPEND="${COMMON_DEPEND}
- acct-group/libreoffice
- acct-user/libreoffice
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- media-fonts/liberation-fonts
- || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
- java? ( >=virtual/jre-11 )
- kde? ( kde-frameworks/breeze-icons:* )
-"
-BDEPEND="
- dev-util/intltool
- sys-apps/which
- app-alternatives/yacc
- app-alternatives/lex
- sys-devel/gettext
- virtual/pkgconfig
- clang? (
- || (
- ( sys-devel/clang:18
- sys-devel/llvm:18
- =sys-devel/lld-18* )
- ( sys-devel/clang:17
- sys-devel/llvm:17
- =sys-devel/lld-17* )
- ( sys-devel/clang:16
- sys-devel/llvm:16
- =sys-devel/lld-16* )
- ( sys-devel/clang:15
- sys-devel/llvm:15
- =sys-devel/lld-15* )
- )
- )
- odk? ( >=app-text/doxygen-1.8.4 )
-"
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- RDEPEND+=" !app-office/libreoffice-l10n"
-fi
-
-PATCHES=(
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
- # not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
- "${FILESDIR}/${PN}-6.1-nomancompress.patch"
- "${FILESDIR}/${PN}-24.2-qtdetect.patch"
-
- # TODO: upstream
- "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
- "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
-
- # git master
- # bug #917618, thx to Debian:
- "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch"
- "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch"
- "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-_check_reqs() {
- CHECKREQS_MEMORY="512M"
- if is-flagq "-g*" && ! is-flagq "-g*0" ; then
- CHECKREQS_DISK_BUILD="22G"
- else
- CHECKREQS_DISK_BUILD="6G"
- fi
- check-reqs_$1
-}
-
-pkg_pretend() {
- use base ||
- ewarn "If you plan to use Base application you must enable USE base."
- use java ||
- ewarn "Without USE java, several wizards are not going to be available."
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
- xdg_environment_reset
-
- [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
-}
-
-src_unpack() {
- default
-
- if [[ ${MY_PV} = *9999* ]]; then
- local base_uri branch mypv
- base_uri="https://anongit.freedesktop.org/git"
- branch="master"
- mypv=${MY_PV/.9999}
- [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
- git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
- git-r3_checkout "${base_uri}/${PN}/core"
- LOCOREGIT_VERSION=${EGIT_VERSION}
-
- git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
- git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
- fi
-}
-
-src_prepare() {
- default
-
- # sandbox violations on many systems, we don't need it. Bug #646406
- sed -i \
- -e "/KF5_CONFIG/s/kf5-config/no/" \
- configure.ac || die "Failed to disable kf5-config"
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # sed in the tests
- sed -i \
- -e "s#all : build unitcheck#all : build#g" \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
- -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
- Makefile.in || die
-
- sed -i \
- -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
- -e "s,\$INSTALLDIRNAME.sh,${PN}," \
- bin/distro-install-desktop-integration || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
- fi
-
- # Don't list pdfimport support in desktop when built with none, bug # 605464
- if ! use pdfimport; then
- sed -i \
- -e ":MimeType: s:application/pdf;::" \
- -e ":Keywords: s:pdf;::" \
- sysui/desktop/menus/draw.desktop || die
- fi
-}
-
-src_configure() {
- # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
- # Note: these are for Gentoo use ONLY. For your own distribution, please get
- # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
- # Show flags set at the beginning
- einfo "Preset CFLAGS: ${CFLAGS}"
- einfo "Preset LDFLAGS: ${LDFLAGS}"
-
- # Workaround for bug #915067
- append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
- if use clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- AR=llvm-ar
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- NM=llvm-nm
- RANLIB=llvm-ranlib
- LDFLAGS+=" -fuse-ld=lld"
-
- # Workaround for bug #907905
- filter-lto
-
- # Not implemented by Clang, bug #903889
- filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
- else
- # Force gcc
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- AR=gcc-ar
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- NM=gcc-nm
- RANLIB=gcc-ranlib
-
- # Apparently the Clang flags get used even for GCC builds sometimes.
- # bug #838115
- sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
- fi
-
- if use custom-cflags ; then
- elog "USE=custom-cflags has been selected. You are on your own to make sure that"
- elog "the build succeeds. Good luck!"
- else
- strip-flags
- fi
-
- export LO_CLANG_CC=${CC}
- export LO_CLANG_CXX=${CXX}
-
- # Show flags set at the end
- einfo " Used CFLAGS: ${CFLAGS}"
- einfo " Used LDFLAGS: ${LDFLAGS}"
-
- # Ensure we use correct toolchain
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python enablement:
- 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)/.."
- fi
-
- local gentoo_buildid="Gentoo official package"
- if [[ -n ${LOCOREGIT_VERSION} ]]; then
- gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
- fi
-
- # system headers/libs/...: enforce using system packages
- # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
- # --enable-cairo: ensure that cairo is always required
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- # --without-system-sane: just sane.h header that is used for scan in writer,
- # not linked or anything else, worthless to depend on
- # --disable-pdfium: not yet packaged
- local myeconfargs=(
- --with-system-dicts
- --with-system-epoxy
- --with-system-headers
- --with-system-jars
- --with-system-libs
- --enable-build-opensymbol
- --enable-cairo-canvas
- --enable-largefile
- --enable-mergelibs=more
- --enable-python=system
- --enable-randr
- --enable-release-build
- --disable-atspi-tests # bug 933257
- --disable-breakpad
- --disable-bundle-mariadb
- --disable-ccache
- --disable-epm
- --disable-fetch-external
- --disable-gtk3-kde5
- --disable-online-update
- --disable-openssl
- --disable-pdfium
- --with-extra-buildid="${gentoo_buildid}"
- --enable-extension-integration
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
- --with-external-tar="${DISTDIR}"
- --with-lang=""
- --with-parallelism=$(makeopts_jobs)
- --with-system-openjpeg
- --with-tls=nss
- --with-vendor="Gentoo Foundation"
- --with-x
- --without-fonts
- --without-myspell-dicts
- --with-help="html"
- --without-helppack-integration
- --with-system-gpgmepp
- --without-system-abseil
- --without-system-dragonbox
- --without-system-frozen
- --without-system-jfreereport
- --without-system-libfixmath
- --without-system-sane
- --without-system-zxcvbn
- $(use_enable base report-builder)
- $(use_enable bluetooth sdremote-bluetooth)
- $(use_enable coinmp)
- $(use_enable cups)
- $(use_enable dbus)
- $(use_enable debug)
- $(use_enable eds evolution2)
- $(use_enable firebird firebird-sdbc)
- $(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk gtk3)
- $(use_enable ldap)
- $(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)
- $(use_with googledrive gdrive-client-id ${google_default_client_id})
- $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
- $(use_with java)
- $(use_with odk doxygen)
- $(use_with valgrind)
- )
-
- 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 )
- else
- myeconfargs+=( --disable-dconf --disable-gio )
- fi
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
- else
- myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- myeconfargs+=(
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home="${JAVA_HOME}"
- )
-
- use libreoffice_extensions_scripting-beanshell && \
- myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
- use libreoffice_extensions_scripting-javascript && \
- myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
- fi
-
- tc-is-lto && myeconfargs+=( --enable-lto )
-
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- default
-}
-
-src_test() {
- emake unitcheck
- emake slowcheck
-}
-
-src_install() {
- emake DESTDIR="${D}" distro-pack-install -o build -o check
-
- # bug 593514
- if use gtk; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
-
- # bash completion aliases
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
- fi
-
- # bug 703474
- insinto /usr/include
- doins -r include/LibreOfficeKit
-
- local lodir=/usr/$(get_libdir)/libreoffice
- # patching this would break tests
- cat <<-EOF > "${T}"/uno.py
-import sys, os
-sys.path.append('${EPREFIX}${lodir}/program')
-os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
-EOF
- sed -e "/^import sys/d" -e "/^import os/d" \
- -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
- cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
- cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
-
- # more system pyuno mess
- sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
- -i "${D}"${lodir}/program/officehelper.py || die
-
- python_optimize "${D}"${lodir}/program
- # link python bridge in site-packages, bug 667802
- local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
- for py in uno.py unohelper.py officehelper.py; do
- dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
- while IFS="" read -d $'\0' -r pyc; do
- pyc=${pyc//*\/}
- dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
- done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
- done
-
- newinitd "${FILESDIR}/libreoffice.initd" libreoffice
- newconfd "${FILESDIR}/libreoffice.confd" libreoffice
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-08-10 13:14 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-08-10 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 5ebf712c12896e85a8e386445e0897988c22063c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 12:18:56 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 13:08:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ebf712c
app-office/libreoffice: add 24.2.5.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-24.2.5.2.ebuild | 702 +++++++++++++++++++++
2 files changed, 704 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index e46d607ccff2..4cb050cb79ae 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,10 +22,12 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b
DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
DIST libreoffice-24.2.5.1.tar.xz 280174152 BLAKE2B 49859807e65a0f4297cd756f2c7234636829e68fede7e0e2b1ad0459e8f2175decdeb6a9df8d250bb0a49b14a568fdcf4f9b87fba64755da13b59cce7e055744 SHA512 2edd225cd690dde92ce1cc5a640300c21af65df7f8a742f43cc6f9de97223bc62100852c915f7d43f91282d46e5e031ae48be48b7bad7e771605da006da2c491
+DIST libreoffice-24.2.5.2.tar.xz 280162592 BLAKE2B 59e07ebd9a3471fa03abf3dd9abc9e4b440598a0753564999bfe8e95d864161a8b3a0bb9388a7e8a87aaa4ac75429e7ae12c233b4ef08174224223a37040af74 SHA512 6f2893bc4e00a988e5f16e6288c95c66faf86f366c3fbfdfac3d6d46c6c03501504adb41ab7e51a7eba749be07cac1e124f97805500d29808155653c217b7c07
DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
DIST libreoffice-help-24.2.5.1.tar.xz 167013956 BLAKE2B d6e11c547a4ad40919a65f40a7c25ad07698d4cdde11939924e7fa0d8992525045bcb2dfe355584a8148c0d4e48f9f81bb9413345a8b30538d6897d0a8556115 SHA512 4341b14775844a1e8e60045e911ad2aa45bb86d183701177298e15374c48dd44a5b2303bc913e815387d1c35f00ccf5aebc02b74f6bd82216cc88b9fa2e51472
+DIST libreoffice-help-24.2.5.2.tar.xz 167013608 BLAKE2B 8e05fadd1e61534828ddcbbc4422658002f41715e049b1d92c371a67469d5bcffde9483f106df7d5e74691dd29c4374cb48f144e1d2506ff9829425206e49ce4 SHA512 c7a8c5051797d722c7f250828e53eba7603212db3df119d92b4c4a492e0e79cb9e1da5b016b9664f2133ced6fa414f08a0edcd44cba291757b7ba8e7ae46493d
DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-24.2.5.2.ebuild b/app-office/libreoffice/libreoffice-24.2.5.2.ebuild
new file mode 100644
index 000000000000..d3c64c1742a9
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.5.2.ebuild
@@ -0,0 +1,702 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 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 )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/argon2:=
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ qt5? (
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ qt6? (
+ kde-frameworks/kconfig:6
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/ki18n:6
+ kde-frameworks/kio:6
+ kde-frameworks/kwindowsystem:6
+ )
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !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
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant:0
+ >=virtual/jdk-17
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+ "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
+
+ # git master
+ # bug #917618, thx to Debian:
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch"
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch"
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ 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)/.."
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs=more
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-atspi-tests # bug 933257
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ --without-system-zxcvbn
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable ldap)
+ $(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)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ 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 )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-09-03 16:06 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-09-03 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 77dcabbec9795f9992a45cdd66dcd82fe566722f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 15:34:53 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 16:04:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77dcabbe
app-office/libreoffice: Drop kioclient patch to support kde-open5
kde-open5 has been a compatibility symlink to kde-open for a long time and
is gone from ::gentoo with kde-plasma/kde-cli-tools:6.
Historical reference: ::gentoo commit 0f3b29bb1e019af4afd5b3bc34abb03ddf4f509b
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.9999.ebuild | 1 -
app-office/libreoffice/libreoffice-9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
index 20bf4268cdef..1360d7d1e65e 100644
--- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild
@@ -312,7 +312,6 @@ PATCHES=(
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-24.2-qtdetect.patch"
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 20bf4268cdef..1360d7d1e65e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -312,7 +312,6 @@ PATCHES=(
# "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
- "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-24.2-qtdetect.patch"
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-09-04 6:58 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-09-04 6:58 UTC (permalink / raw
To: gentoo-commits
commit: 4bf4093f1d6a11a51370ba9f13524e394a18a275
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 17:18:36 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 4 06:47:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf4093f
app-office/libreoffice: add 24.2.6.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/Manifest | 2 +
app-office/libreoffice/libreoffice-24.2.6.2.ebuild | 701 +++++++++++++++++++++
2 files changed, 703 insertions(+)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 63d0e5b237ef..4b9c42b9cb88 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -22,10 +22,12 @@ DIST frozen-1.1.1.tar.gz 186589 BLAKE2B 5f103311c49777d0d284cabe026fae55f09bd24b
DIST libreoffice-24.2.3.2-icu-74.tar.xz 28100 BLAKE2B 5c49749f3e8f23d28dc2463001030eb660e3387480aa1b0611460987f80fa2c965adb4a84d822177452994a072ad94dbff41a43d621b89c37d4133875620a591 SHA512 32c906fb4bfc431baecbc7f01bfcb32227da740b10ff97a53288275e179344070344e594e273a79671070c74423bcc3ea68dec88543d6ab89fb20a57f4c2c114
DIST libreoffice-24.2.4.2.tar.xz 279938452 BLAKE2B a950463998c5b5478ac2b17c7ef6e9bf579e01b3434a26edb8cd1eb320dbeb444a63ace5a64cc37c98e2f3e8166b0044a5cc28474f6125b645cce6c16ed353c8 SHA512 a0d10ccfd3c88285519a3ff00c429cbeec3591d779769b2264c2bde67aed3921462b5e5a4fda52217a483088f7fd1f518339d9809907b1a8dea54dc66b86ae3e
DIST libreoffice-24.2.5.2.tar.xz 280162592 BLAKE2B 59e07ebd9a3471fa03abf3dd9abc9e4b440598a0753564999bfe8e95d864161a8b3a0bb9388a7e8a87aaa4ac75429e7ae12c233b4ef08174224223a37040af74 SHA512 6f2893bc4e00a988e5f16e6288c95c66faf86f366c3fbfdfac3d6d46c6c03501504adb41ab7e51a7eba749be07cac1e124f97805500d29808155653c217b7c07
+DIST libreoffice-24.2.6.2.tar.xz 280090508 BLAKE2B f7bc3d1b8cdb1d3212d0aba97b8d7ba2e4b833e8ab796b477b8faa10854b6681d397a239b3085f351c8d28295490d7d3f6c0c62f876b879a367abb0df9053314 SHA512 3609fbfc03d6140e3275e7b8ef23297293df4bede68d9714dc2e7075578ec345ffdba4dfc873eb3dc4ee08080fb7d902daa86c8222f63999fe1df259384858cc
DIST libreoffice-7.6.7.2.tar.xz 282345404 BLAKE2B 7214739ce3e495e07180875834908078975857bed83fbd4f33ccfaaca5b30a0651661da4e42aa59f9c7011fe7ce2c58667c41d48b73f621d2004e8dbbdd0817f SHA512 443d818f35d9cac1af3a911f031b0b8f455eb28afa1a563ee3551b3285810f3b7b19265a64f853eef07e0c550c5d81f95e2774db46bd9dfee7b9aee029eb3747
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-24.2.4.2.tar.xz 167013820 BLAKE2B 9345efdfdd47336c623fe6da872eb22278dc8156e29ab049969ea11d947b374dfe0661388a14318afacfc4f0dbf717d16906f71e0d300f52eed0b18fa909f6e7 SHA512 2dc8c7d5976b4784011ac6d3e7a507e433673bf68451a13cbe243b478d32659cbb46f38af345f44efc24ca90dcd4e74f2d53354fd11d738635070ef57da0c317
DIST libreoffice-help-24.2.5.2.tar.xz 167013608 BLAKE2B 8e05fadd1e61534828ddcbbc4422658002f41715e049b1d92c371a67469d5bcffde9483f106df7d5e74691dd29c4374cb48f144e1d2506ff9829425206e49ce4 SHA512 c7a8c5051797d722c7f250828e53eba7603212db3df119d92b4c4a492e0e79cb9e1da5b016b9664f2133ced6fa414f08a0edcd44cba291757b7ba8e7ae46493d
+DIST libreoffice-help-24.2.6.2.tar.xz 167013048 BLAKE2B 026c783643433da61cf29dcf8edd4dd9d7229d1caf48f47a5a9ced5a9357a3eb9bf780875214189413775742e8fc63c7610549f154911871537563afb4ea4d58 SHA512 0d4ec689649b99e4a1081105d2f4c3966e9230eedd1c1d66c531e507a47fa5cd8a16bc30829b153ae9730d3214be8b75675bb123bfbd2c35a1f8ef7a9300cd4c
DIST libreoffice-help-7.6.7.2.tar.xz 166901284 BLAKE2B 636772e6ba11b00d26f0280f3ac564e4c4ab839808ec21eeefdbec7a16e4fdad512466b523f1e58cfd74bfe29f4bc06b7d203e18e5e2a2b1a6ed5b8ff8ec9093 SHA512 724cdb884b37bd847080b4610d1fe2f9b111479585bc097f2ad2a73141565c542d08eab088a36eb3374a3c85a0b803a7c65e43058234076c3ddc99c6f847e3a8
DIST skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz 10693272 BLAKE2B 67f2bd33d58c58c59f1ee5fb693a6a7e6a1ace52f269ae0fa6617027e93131031b0af9d44c36e371fe5a38c5b7519a61f9bcf4286a13ef5b06ea7e7eb5cb0a0f SHA512 58d50fdd19cc5df640244e0c765aec6addc3e552701b201772584e8bea7cda12047e4a6af41452c6669aadfc026de29a4a4e7c6b31c7dfff30e29e50ed46fe3d
DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9
diff --git a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
new file mode 100644
index 000000000000..4ce7206f0720
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
@@ -0,0 +1,701 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+ https://dev-builds.libreoffice.org/pre-releases/src
+ https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-24.2.3.2-icu-74.tar.xz"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+ SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+ # not packaged in Gentoo
+ "${ADDONS_URI}/dragonbox-1.1.3.tar.gz"
+ # not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+ "${ADDONS_URI}/dtoa-20180411.tgz"
+ # not packaged in Gentoo, https://github.com/serge-sans-paille/frozen
+ "${ADDONS_URI}/frozen-1.1.1.tar.gz"
+ # not packaged in Gentoo, https://skia.org/
+ "${ADDONS_URI}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"
+ # not packaged in Gentoo, https://github.com/tsyrogit/zxcvbn-c
+ "${ADDONS_URI}/zxcvbn-c-2.5.tar.gz"
+ "base? (
+ ${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+ ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ )"
+ # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket
+ "java? (
+ ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz
+ ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ )"
+ # no release for 8 years, should we package it?
+ "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+ # Does not build with 1.6 rhino at all
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ # requirement of rhino
+ "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ # not packageable
+ "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+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 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 )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/argon2:=
+ app-crypt/gpgme:=[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.21
+ >=app-text/libnumbertext-1.0.6
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.6.2:0=
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error
+ >=dev-libs/liborcus-0.18.0:0/0.18
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.35:=[nss]
+ >=games-engines/box2d-2.4.1:0
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.11.0-r1:2
+ >=media-libs/harfbuzz-5.1.0:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libjpeg-turbo:=
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libwebp:=
+ media-libs/libzmf
+ media-libs/openjpeg:=
+ media-libs/tiff:=
+ media-libs/zxing-cpp:=
+ net-misc/curl
+ sci-mathematics/lpsolve:=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ accessibility? (
+ $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+ )
+ bluetooth? (
+ dev-libs/glib:2
+ net-wireless/bluez
+ )
+ coinmp? ( sci-libs/coinor-mp )
+ cups? ( net-print/cups )
+ dbus? ( sys-apps/dbus )
+ eds? (
+ dev-libs/glib:2
+ >=gnome-base/dconf-0.40.0
+ gnome-extra/evolution-data-server
+ )
+ firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ app-accessibility/at-spi2-core:2
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl(+)]
+ x11-libs/gtk+:3[X]
+ x11-libs/pango
+ )
+ kde? (
+ qt5? (
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ qt6? (
+ kde-frameworks/kconfig:6
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/ki18n:6
+ kde-frameworks/kio:6
+ kde-frameworks/kwindowsystem:6
+ )
+ )
+ ldap? ( net-nds/openldap:= )
+ libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+ libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !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
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+# tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ dev-perl/Archive-Zip
+ >=dev-util/cppunit-1.14.0
+ >=dev-util/gperf-3.1
+ dev-util/mdds:1/2.1
+ media-libs/glm
+ x11-base/xorg-proto
+ x11-libs/libXt
+ x11-libs/libXtst
+ java? (
+ dev-java/ant:0
+ >=virtual/jdk-17
+ )
+ test? (
+ app-crypt/gnupg
+ dev-util/cppunit
+ media-fonts/dejavu
+ media-fonts/liberation-fonts
+ )
+ valgrind? ( dev-debug/valgrind )
+"
+RDEPEND="${COMMON_DEPEND}
+ acct-group/libreoffice
+ acct-user/libreoffice
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools:* )
+ java? ( >=virtual/jre-11 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+ dev-util/intltool
+ sys-apps/which
+ app-alternatives/yacc
+ app-alternatives/lex
+ sys-devel/gettext
+ virtual/pkgconfig
+ clang? (
+ || (
+ ( sys-devel/clang:18
+ sys-devel/llvm:18
+ =sys-devel/lld-18* )
+ ( sys-devel/clang:17
+ sys-devel/llvm:17
+ =sys-devel/lld-17* )
+ ( sys-devel/clang:16
+ sys-devel/llvm:16
+ =sys-devel/lld-16* )
+ ( sys-devel/clang:15
+ sys-devel/llvm:15
+ =sys-devel/lld-15* )
+ )
+ )
+ odk? ( >=app-text/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ RDEPEND+=" !app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+ # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+ "${FILESDIR}/${PN}-24.2-qtdetect.patch"
+
+ # TODO: upstream
+ "${FILESDIR}/${PN}-7.6-unused-qt5network.patch"
+ "${FILESDIR}/${PN}-24.2-unused-qt6network.patch"
+
+ # git master
+ # bug #917618, thx to Debian:
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-reviewed-breakIterator-customizations.patch"
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74.2-breakiterator-updates.patch"
+ "${WORKDIR}/${PN}-24.2.3.2-icu-74/${PN}-24.2.3.2-icu-74-unicode.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+ CHECKREQS_MEMORY="512M"
+ if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+ CHECKREQS_DISK_BUILD="22G"
+ else
+ CHECKREQS_DISK_BUILD="6G"
+ fi
+ check-reqs_$1
+}
+
+pkg_pretend() {
+ use base ||
+ ewarn "If you plan to use Base application you must enable USE base."
+ use java ||
+ ewarn "Without USE java, several wizards are not going to be available."
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ python-single-r1_pkg_setup
+ xdg_environment_reset
+
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+ default
+
+ if [[ ${MY_PV} = *9999* ]]; then
+ local base_uri branch mypv
+ base_uri="https://anongit.freedesktop.org/git"
+ branch="master"
+ mypv=${MY_PV/.9999}
+ [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+ git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+ git-r3_checkout "${base_uri}/${PN}/core"
+ LOCOREGIT_VERSION=${EGIT_VERSION}
+
+ git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+ git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+ fi
+}
+
+src_prepare() {
+ default
+
+ # sandbox violations on many systems, we don't need it. Bug #646406
+ sed -i \
+ -e "/KF5_CONFIG/s/kf5-config/no/" \
+ configure.ac || die "Failed to disable kf5-config"
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # sed in the tests
+ sed -i \
+ -e "s#all : build unitcheck#all : build#g" \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+ -e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+ Makefile.in || die
+
+ sed -i \
+ -e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+ -e "s,\$INSTALLDIRNAME.sh,${PN}," \
+ bin/distro-install-desktop-integration || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+ fi
+
+ # Don't list pdfimport support in desktop when built with none, bug # 605464
+ if ! use pdfimport; then
+ sed -i \
+ -e ":MimeType: s:application/pdf;::" \
+ -e ":Keywords: s:pdf;::" \
+ sysui/desktop/menus/draw.desktop || die
+ fi
+}
+
+src_configure() {
+ # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+ # Note: these are for Gentoo use ONLY. For your own distribution, please get
+ # your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+ # Show flags set at the beginning
+ einfo "Preset CFLAGS: ${CFLAGS}"
+ einfo "Preset LDFLAGS: ${LDFLAGS}"
+
+ # Workaround for bug #915067
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+ if use clang ; then
+ # Force clang
+ einfo "Enforcing the use of clang due to USE=clang ..."
+ AR=llvm-ar
+ CC=${CHOST}-clang
+ CXX=${CHOST}-clang++
+ NM=llvm-nm
+ RANLIB=llvm-ranlib
+ LDFLAGS+=" -fuse-ld=lld"
+
+ # Workaround for bug #907905
+ filter-lto
+
+ # Not implemented by Clang, bug #903889
+ filter-flags -Wlto-type-mismatch -Werror=lto-type-mismatch
+ else
+ # Force gcc
+ einfo "Enforcing the use of gcc due to USE=-clang ..."
+ AR=gcc-ar
+ CC=${CHOST}-gcc
+ CXX=${CHOST}-g++
+ NM=gcc-nm
+ RANLIB=gcc-ranlib
+
+ # Apparently the Clang flags get used even for GCC builds sometimes.
+ # bug #838115
+ sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+ fi
+
+ if use custom-cflags ; then
+ elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+ elog "the build succeeds. Good luck!"
+ else
+ strip-flags
+ fi
+
+ export LO_CLANG_CC=${CC}
+ export LO_CLANG_CXX=${CXX}
+
+ # Show flags set at the end
+ einfo " Used CFLAGS: ${CFLAGS}"
+ einfo " Used LDFLAGS: ${LDFLAGS}"
+
+ # Ensure we use correct toolchain
+ tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python enablement:
+ 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)/.."
+ fi
+
+ local gentoo_buildid="Gentoo official package"
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ # --without-system-sane: just sane.h header that is used for scan in writer,
+ # not linked or anything else, worthless to depend on
+ # --disable-pdfium: not yet packaged
+ local myeconfargs=(
+ --with-system-dicts
+ --with-system-epoxy
+ --with-system-headers
+ --with-system-jars
+ --with-system-libs
+ --enable-build-opensymbol
+ --enable-cairo-canvas
+ --enable-largefile
+ --enable-mergelibs=more
+ --enable-python=system
+ --enable-randr
+ --enable-release-build
+ --disable-atspi-tests # bug 933257
+ --disable-breakpad
+ --disable-bundle-mariadb
+ --disable-ccache
+ --disable-epm
+ --disable-fetch-external
+ --disable-gtk3-kde5
+ --disable-online-update
+ --disable-openssl
+ --disable-pdfium
+ --with-extra-buildid="${gentoo_buildid}"
+ --enable-extension-integration
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+ --with-external-tar="${DISTDIR}"
+ --with-lang=""
+ --with-parallelism=$(makeopts_jobs)
+ --with-system-openjpeg
+ --with-tls=nss
+ --with-vendor="Gentoo Foundation"
+ --with-x
+ --without-fonts
+ --without-myspell-dicts
+ --with-help="html"
+ --without-helppack-integration
+ --with-system-gpgmepp
+ --without-system-abseil
+ --without-system-dragonbox
+ --without-system-frozen
+ --without-system-jfreereport
+ --without-system-libfixmath
+ --without-system-sane
+ --without-system-zxcvbn
+ $(use_enable base report-builder)
+ $(use_enable bluetooth sdremote-bluetooth)
+ $(use_enable coinmp)
+ $(use_enable cups)
+ $(use_enable dbus)
+ $(use_enable debug)
+ $(use_enable eds evolution2)
+ $(use_enable firebird firebird-sdbc)
+ $(use_enable gstreamer gstreamer-1-0)
+ $(use_enable gtk gtk3)
+ $(use_enable ldap)
+ $(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)
+ $(use_with googledrive gdrive-client-id ${google_default_client_id})
+ $(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+ $(use_with java)
+ $(use_with odk doxygen)
+ $(use_with valgrind)
+ )
+
+ 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 )
+ else
+ myeconfargs+=( --disable-dconf --disable-gio )
+ fi
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+ else
+ myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ myeconfargs+=(
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home="${JAVA_HOME}"
+ )
+
+ use libreoffice_extensions_scripting-beanshell && \
+ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+ use libreoffice_extensions_scripting-javascript && \
+ myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+ fi
+
+ tc-is-lto && myeconfargs+=( --enable-lto )
+
+ MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ default
+}
+
+src_test() {
+ emake unitcheck
+ emake slowcheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+ # bug 593514
+ if use gtk; then
+ dosym libreoffice/program/liblibreofficekitgtk.so \
+ /usr/$(get_libdir)/liblibreofficekitgtk.so
+ fi
+
+ # bash completion aliases
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+ fi
+
+ # bug 703474
+ insinto /usr/include
+ doins -r include/LibreOfficeKit
+
+ local lodir=/usr/$(get_libdir)/libreoffice
+ # patching this would break tests
+ cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+ sed -e "/^import sys/d" -e "/^import os/d" \
+ -i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+ cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+ cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+ # more system pyuno mess
+ sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+ -i "${D}"${lodir}/program/officehelper.py || die
+
+ python_optimize "${D}"${lodir}/program
+ # link python bridge in site-packages, bug 667802
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+ for py in uno.py unohelper.py officehelper.py; do
+ dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+ while IFS="" read -d $'\0' -r pyc; do
+ pyc=${pyc//*\/}
+ dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+ done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+ done
+
+ newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+ newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-09-05 12:17 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-09-05 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 92d952ba31e48b46e4798a869e7b6eff6625810a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 5 12:15:01 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 12:17:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d952ba
app-office/libreoffice: restore 24.2.6.2 keywords
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.6.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
index 4ce7206f0720..dea7db5c8f02 100644
--- a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
@@ -110,8 +110,8 @@ RESTRICT="!test? ( test )"
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
-#[[ ${MY_PV} == *9999* ]] || \
-#KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-09-09 17:49 Andreas Sturmlechner
0 siblings, 0 replies; 588+ messages in thread
From: Andreas Sturmlechner @ 2024-09-09 17:49 UTC (permalink / raw
To: gentoo-commits
commit: 900255899a4ce57d2a943474f7610107eaa30848
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 9 17:47:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 9 17:49:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90025589
app-office/libreoffice: Drop IUSE qt5 from 9999
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 38 ++++++--------------------
1 file changed, 9 insertions(+), 29 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 1360d7d1e65e..a4aacb61b9f0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -91,13 +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 qt5 qt6 test valgrind vulkan
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
base? ( java )
bluetooth? ( dbus )
- kde? ( || ( qt5 qt6 ) )
+ kde? ( qt6 )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
@@ -209,20 +209,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-libs/pango
)
kde? (
- qt5? (
- kde-frameworks/kconfig:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kio:5
- kde-frameworks/kwindowsystem:5
- )
- qt6? (
- kde-frameworks/kconfig:6
- kde-frameworks/kcoreaddons:6
- kde-frameworks/ki18n:6
- kde-frameworks/kio:6
- kde-frameworks/kwindowsystem:6
- )
+ kde-frameworks/kconfig:6
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/ki18n:6
+ kde-frameworks/kio:6
+ kde-frameworks/kwindowsystem:6
)
ldap? ( net-nds/openldap:= )
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
@@ -231,12 +222,6 @@ 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
@@ -473,9 +458,6 @@ 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)/.."
fi
@@ -520,6 +502,7 @@ src_configure() {
--disable-online-update
--disable-openssl
--disable-pdfium
+ --disable-qt5
--with-extra-buildid="${gentoo_buildid}"
--enable-extension-integration
--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
@@ -554,11 +537,11 @@ src_configure() {
$(use_enable firebird firebird-sdbc)
$(use_enable gstreamer gstreamer-1-0)
$(use_enable gtk gtk3)
+ $(use_enable kde kf6)
$(use_enable ldap)
$(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)
@@ -570,9 +553,6 @@ src_configure() {
$(use_with valgrind)
)
- 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 )
else
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-09-19 16:52 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-09-19 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 227e64cf4f54de4e19fdb3a4e1ac329d5d07f448
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 16:51:35 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 16:51:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227e64cf
app-office/libreoffice: Stabilize 24.2.6.2 amd64, #937718
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
index dea7db5c8f02..8af4f0435a23 100644
--- a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
@@ -111,7 +111,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
@ 2024-09-19 16:52 Arthur Zamarin
0 siblings, 0 replies; 588+ messages in thread
From: Arthur Zamarin @ 2024-09-19 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 578d27dba2cf7c441b50f9227a26187251b5dcdf
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 16:51:41 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 16:51:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578d27db
app-office/libreoffice: Stabilize 24.2.6.2 arm64, #937718
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-office/libreoffice/libreoffice-24.2.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
index 8af4f0435a23..31e34d86323b 100644
--- a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild
@@ -111,7 +111,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
COMMON_DEPEND="${PYTHON_DEPS}
app-arch/unzip
^ permalink raw reply related [flat|nested] 588+ messages in thread
end of thread, other threads:[~2024-09-19 16:52 UTC | newest]
Thread overview: 588+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-06 1:03 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-19 16:52 Arthur Zamarin
2024-09-19 16:52 Arthur Zamarin
2024-09-09 17:49 Andreas Sturmlechner
2024-09-05 12:17 Andreas Sturmlechner
2024-09-04 6:58 Andreas Sturmlechner
2024-09-03 16:06 Andreas Sturmlechner
2024-08-10 13:14 Andreas Sturmlechner
2024-08-10 13:14 Andreas Sturmlechner
2024-07-26 4:57 Arthur Zamarin
2024-06-29 20:05 Arthur Zamarin
2024-06-29 20:05 Arthur Zamarin
2024-06-29 20:05 Arthur Zamarin
2024-06-23 12:15 Andreas Sturmlechner
2024-06-23 1:49 Sam James
2024-06-13 19:32 Arthur Zamarin
2024-06-07 16:18 Andreas Sturmlechner
2024-06-07 16:18 Andreas Sturmlechner
2024-06-05 18:17 Andreas Sturmlechner
2024-05-31 8:31 Arthur Zamarin
2024-05-31 8:31 Arthur Zamarin
2024-05-31 8:31 Arthur Zamarin
2024-05-07 21:53 Andreas Sturmlechner
2024-05-07 21:35 Andreas Sturmlechner
2024-05-07 21:35 Andreas Sturmlechner
2024-04-20 11:56 Andreas Sturmlechner
2024-04-11 20:40 Andreas Sturmlechner
2024-04-11 20:40 Andreas Sturmlechner
2024-04-09 20:02 Andreas Sturmlechner
2024-03-25 12:05 Andreas Sturmlechner
2024-03-11 10:55 Andreas Sturmlechner
2024-03-10 16:30 Andreas Sturmlechner
2024-02-26 18:29 Andreas Sturmlechner
2024-02-25 7:53 Andreas Sturmlechner
2024-02-24 20:40 Andreas Sturmlechner
2024-02-20 5:56 Sam James
2024-02-17 9:55 Arthur Zamarin
2024-02-14 19:55 Andreas Sturmlechner
2024-02-14 19:55 Andreas Sturmlechner
2024-02-14 19:55 Andreas Sturmlechner
2024-02-12 10:31 Sam James
2024-02-02 12:44 Arthur Zamarin
2024-01-28 16:28 Andreas Sturmlechner
2024-01-28 16:28 Andreas Sturmlechner
2024-01-27 0:48 Andreas Sturmlechner
2024-01-27 0:48 Andreas Sturmlechner
2024-01-27 0:48 Andreas Sturmlechner
2024-01-24 6:55 Sam James
2024-01-07 9:29 Andreas Sturmlechner
2024-01-05 5:26 Arthur Zamarin
2024-01-05 5:26 Arthur Zamarin
2024-01-05 5:26 Arthur Zamarin
2024-01-03 10:40 Sam James
2023-12-07 18:50 Andreas Sturmlechner
2023-12-07 18:50 Andreas Sturmlechner
2023-11-29 21:29 Andreas Sturmlechner
2023-11-29 21:21 Matt Turner
2023-11-22 23:10 Andreas Sturmlechner
2023-11-22 8:13 Andreas Sturmlechner
2023-11-22 8:13 Andreas Sturmlechner
2023-11-06 18:13 Andreas Sturmlechner
2023-11-05 23:45 Andreas Sturmlechner
2023-11-05 22:59 Andreas Sturmlechner
2023-11-05 19:14 Arthur Zamarin
2023-11-03 11:16 Andreas Sturmlechner
2023-10-28 4:53 Sam James
2023-10-24 19:36 Arthur Zamarin
2023-10-24 19:36 Arthur Zamarin
2023-10-11 8:30 Sam James
2023-10-08 14:37 Andreas Sturmlechner
2023-09-09 12:53 Andreas Sturmlechner
2023-09-07 18:02 Andreas Sturmlechner
2023-08-21 15:51 Sam James
2023-08-21 15:51 Sam James
2023-08-21 15:51 Sam James
2023-08-20 12:00 Andreas Sturmlechner
2023-08-19 12:39 Arthur Zamarin
2023-08-19 12:19 Arthur Zamarin
2023-08-19 12:19 Arthur Zamarin
2023-07-12 20:29 Andreas Sturmlechner
2023-06-09 6:53 Arthur Zamarin
2023-06-08 14:29 Andreas Sturmlechner
2023-06-02 16:13 Arthur Zamarin
2023-06-01 19:15 Arthur Zamarin
2023-05-23 9:33 Sam James
2023-05-16 1:52 Sam James
2023-05-13 21:25 Andreas Sturmlechner
2023-05-04 13:13 Andreas Sturmlechner
2023-05-04 13:13 Andreas Sturmlechner
2023-05-03 11:31 Andreas Sturmlechner
2023-05-01 1:43 Sam James
2023-04-29 17:16 Arthur Zamarin
2023-04-26 13:34 Arthur Zamarin
2023-04-26 3:51 Sam James
2023-04-16 5:15 Sam James
2023-04-16 4:53 Sam James
2023-04-15 5:40 Sam James
2023-04-14 0:51 Sam James
2023-04-13 18:35 Andreas Sturmlechner
2023-04-11 19:17 WANG Xuerui
2023-04-08 22:56 Andreas Sturmlechner
2023-03-24 19:17 Andreas Sturmlechner
2023-03-24 19:17 Andreas Sturmlechner
2023-03-10 10:15 Andreas Sturmlechner
2023-03-07 0:22 Yixun Lan
2023-03-07 0:18 Yixun Lan
2023-03-03 19:37 Andreas Sturmlechner
2023-03-02 19:27 Andreas Sturmlechner
2023-02-25 10:27 Andreas Sturmlechner
2023-02-22 21:42 Andreas Sturmlechner
2023-02-14 19:07 Andreas Sturmlechner
2023-02-12 11:50 Andreas Sturmlechner
2023-02-12 11:50 Andreas Sturmlechner
2023-02-12 11:50 Andreas Sturmlechner
2023-02-12 11:50 Andreas Sturmlechner
2023-02-04 17:26 Sam James
2023-01-14 23:34 Andreas Sturmlechner
2023-01-12 14:51 Andreas Sturmlechner
2022-12-30 16:20 Andreas Sturmlechner
2022-12-26 23:19 Andreas Sturmlechner
2022-12-26 23:19 Andreas Sturmlechner
2022-12-26 23:19 Andreas Sturmlechner
2022-12-02 18:47 Arthur Zamarin
2022-11-23 2:26 Sam James
2022-11-21 17:52 Arthur Zamarin
2022-11-03 22:25 Andreas Sturmlechner
2022-11-03 7:29 Sam James
2022-11-02 9:07 Andreas Sturmlechner
2022-10-28 17:46 Andreas Sturmlechner
2022-10-28 17:46 Andreas Sturmlechner
2022-10-12 18:22 Andreas Sturmlechner
2022-10-10 8:15 Andreas Sturmlechner
2022-10-09 8:55 Agostino Sarubbo
2022-10-09 8:48 Agostino Sarubbo
2022-09-30 9:26 Andreas Sturmlechner
2022-09-29 13:42 Andreas Sturmlechner
2022-09-15 15:11 Agostino Sarubbo
2022-09-14 7:32 Andreas Sturmlechner
2022-09-08 16:05 Andreas Sturmlechner
2022-09-03 23:22 Sam James
2022-09-02 19:18 Andreas Sturmlechner
2022-09-02 18:26 Andreas Sturmlechner
2022-08-31 21:47 Sam James
2022-08-23 7:41 WANG Xuerui
2022-08-23 7:41 WANG Xuerui
2022-08-15 21:15 Sam James
2022-07-27 7:56 Agostino Sarubbo
2022-07-26 4:46 Sam James
2022-07-21 13:18 Andreas Sturmlechner
2022-07-14 17:29 Andreas Sturmlechner
2022-07-14 11:45 Andreas Sturmlechner
2022-07-14 11:45 Andreas Sturmlechner
2022-07-04 16:29 Andreas Sturmlechner
2022-06-11 14:25 Andreas Sturmlechner
2022-06-11 7:14 Sam James
2022-06-10 3:18 Sam James
2022-06-05 23:50 Sam James
2022-06-05 23:50 Sam James
2022-06-01 7:30 Sam James
2022-05-09 21:48 Sam James
2022-05-09 20:18 Sam James
2022-05-08 13:23 Andreas Sturmlechner
2022-05-08 13:23 Andreas Sturmlechner
2022-05-01 23:36 Sam James
2022-04-29 5:38 Sam James
2022-04-17 22:23 Sam James
2022-04-12 23:49 Sam James
2022-04-10 10:46 Sam James
2022-04-10 10:46 Sam James
2022-04-10 10:46 Sam James
2022-03-30 5:57 Andreas Sturmlechner
2022-03-26 16:40 Andreas Sturmlechner
2022-03-23 1:02 Sam James
2022-03-20 0:53 Sam James
2022-03-19 20:59 Sam James
2022-03-16 16:15 Andreas Sturmlechner
2022-03-10 20:07 Andreas Sturmlechner
2022-03-10 18:14 Andreas Sturmlechner
2022-03-09 10:01 Andreas Sturmlechner
2022-02-27 21:41 Andreas Sturmlechner
2022-02-19 16:27 Andreas Sturmlechner
2022-02-19 16:27 Andreas Sturmlechner
2022-02-17 18:43 Sam James
2022-02-16 15:57 Andreas Sturmlechner
2022-02-12 0:34 Andreas K. Hüttel
2022-02-08 23:23 Andreas K. Hüttel
2022-02-03 3:42 Sam James
2022-02-03 3:42 Sam James
2022-01-07 14:49 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-12-02 19:52 Sam James
2021-12-02 8:39 Andreas Sturmlechner
2021-11-14 5:25 Sam James
2021-11-07 17:23 Andreas Sturmlechner
2021-11-07 17:23 Andreas Sturmlechner
2021-11-05 17:57 Andreas Sturmlechner
2021-11-05 17:57 Andreas Sturmlechner
2021-11-01 10:03 Sam James
2021-11-01 10:03 Sam James
2021-11-01 10:03 Sam James
2021-11-01 10:03 Sam James
2021-09-18 19:16 Andreas Sturmlechner
2021-09-18 18:36 Sam James
2021-09-18 18:36 Sam James
2021-09-14 6:01 Sam James
2021-09-13 5:19 Andreas Sturmlechner
2021-09-07 18:28 Andreas Sturmlechner
2021-07-29 18:03 Andreas Sturmlechner
2021-07-23 6:32 Matt Turner
2021-07-22 20:09 Andreas Sturmlechner
2021-07-22 20:09 Andreas Sturmlechner
2021-06-14 10:51 Andreas Sturmlechner
2021-06-01 9:00 Sam James
2021-06-01 9:00 Sam James
2021-05-06 20:09 Andreas Sturmlechner
2021-05-06 20:09 Andreas Sturmlechner
2021-05-05 1:39 Andreas Sturmlechner
2021-05-04 22:57 Andreas Sturmlechner
2021-05-04 22:57 Andreas Sturmlechner
2021-05-04 8:29 Andreas Sturmlechner
2021-04-23 16:12 Sam James
2021-04-01 21:55 Andreas Sturmlechner
2021-03-13 19:19 Andreas Sturmlechner
2021-03-13 19:19 Andreas Sturmlechner
2021-03-13 15:51 Andreas Sturmlechner
2021-03-11 17:39 Andreas Sturmlechner
2021-03-05 1:04 Andreas Sturmlechner
2021-01-19 20:42 Andreas Sturmlechner
2020-12-28 11:08 Andreas Sturmlechner
2020-12-17 13:31 Andreas Sturmlechner
2020-12-10 21:58 Andreas K. Hüttel
2020-11-28 21:56 Andreas Sturmlechner
2020-11-24 23:03 Robin H. Johnson
2020-11-23 4:52 Sam James
2020-11-23 3:58 Sam James
2020-11-22 22:42 Andreas Sturmlechner
2020-11-22 18:15 Andreas K. Hüttel
2020-11-22 17:08 Andreas K. Hüttel
2020-11-22 17:00 Andreas K. Hüttel
2020-11-22 0:16 Andreas K. Hüttel
2020-11-21 23:27 Andreas K. Hüttel
2020-11-21 23:27 Andreas K. Hüttel
2020-11-21 22:18 Andreas Sturmlechner
2020-11-21 19:02 Andreas K. Hüttel
2020-11-21 19:02 Andreas K. Hüttel
2020-11-21 15:08 Andreas K. Hüttel
2020-10-31 9:23 Andreas Sturmlechner
2020-10-31 9:23 Andreas Sturmlechner
2020-10-29 21:44 Andreas Sturmlechner
2020-10-29 17:32 Andreas Sturmlechner
2020-10-29 10:40 Andreas Sturmlechner
2020-10-29 10:40 Andreas Sturmlechner
2020-10-29 10:40 Andreas Sturmlechner
2020-10-29 10:40 Andreas Sturmlechner
2020-10-18 15:47 Andreas Sturmlechner
2020-10-18 15:11 Thomas Deutschmann
2020-10-04 0:34 Sam James
2020-09-27 17:34 Andreas Sturmlechner
2020-09-27 17:34 Andreas Sturmlechner
2020-09-26 10:54 Andreas K. Hüttel
2020-09-08 18:08 Andreas Sturmlechner
2020-08-18 23:08 Andreas Sturmlechner
2020-08-18 23:08 Andreas Sturmlechner
2020-08-07 23:24 Andreas Sturmlechner
2020-08-07 23:24 Andreas Sturmlechner
2020-08-07 23:24 Andreas Sturmlechner
2020-07-02 21:44 Andreas Sturmlechner
2020-07-02 11:50 Andreas Sturmlechner
2020-06-29 6:32 Andreas Sturmlechner
2020-06-17 16:05 Andreas Sturmlechner
2020-05-31 15:40 Mikle Kolyada
2020-05-22 14:09 Andreas Sturmlechner
2020-05-22 14:09 Andreas Sturmlechner
2020-05-22 14:09 Andreas Sturmlechner
2020-05-19 19:36 Mikle Kolyada
2020-04-16 18:58 Andreas Sturmlechner
2020-04-16 18:52 Andreas Sturmlechner
2020-04-16 18:52 Andreas Sturmlechner
2020-04-10 13:48 Andreas Sturmlechner
2020-04-09 21:37 Andreas Sturmlechner
2020-03-19 20:53 Andreas Sturmlechner
2020-03-19 20:53 Andreas Sturmlechner
2020-03-19 20:53 Andreas Sturmlechner
2020-03-16 21:29 Andreas Sturmlechner
2020-03-16 21:29 Andreas Sturmlechner
2020-03-16 21:29 Andreas Sturmlechner
2020-03-16 21:29 Andreas Sturmlechner
2020-03-16 21:29 Andreas Sturmlechner
2020-02-29 19:42 Andreas Sturmlechner
2020-02-09 16:11 Michał Górny
2020-01-16 8:14 Mikle Kolyada
2020-01-16 8:12 Mikle Kolyada
2019-12-26 10:25 Andreas Sturmlechner
2019-12-26 8:36 Andreas Sturmlechner
2019-12-25 21:20 Andreas Sturmlechner
2019-12-12 14:58 Michał Górny
2019-11-02 15:23 Andreas Sturmlechner
2019-11-01 22:34 Piotr Karbowski
2019-10-31 23:50 Thomas Deutschmann
2019-10-30 8:59 Andreas Sturmlechner
2019-10-17 18:40 Andreas Sturmlechner
2019-09-29 20:07 Andreas Sturmlechner
2019-09-26 15:24 Andreas Sturmlechner
2019-09-07 11:58 Andreas Sturmlechner
2019-09-07 11:58 Andreas Sturmlechner
2019-09-07 11:58 Andreas Sturmlechner
2019-09-07 11:58 Andreas Sturmlechner
2019-08-14 12:03 Andreas Sturmlechner
2019-08-14 11:54 Andreas Sturmlechner
2019-08-13 15:56 Andreas Sturmlechner
2019-08-13 15:56 Andreas Sturmlechner
2019-08-09 12:31 Andreas Sturmlechner
2019-08-08 16:52 Andreas Sturmlechner
2019-08-08 16:52 Andreas Sturmlechner
2019-08-08 16:52 Andreas Sturmlechner
2019-07-24 19:55 Andreas Sturmlechner
2019-07-24 19:55 Andreas Sturmlechner
2019-07-24 17:15 Andreas Sturmlechner
2019-07-18 20:58 Andreas Sturmlechner
2019-07-18 20:58 Andreas Sturmlechner
2019-07-18 15:30 Andreas Sturmlechner
2019-07-18 14:32 Thomas Deutschmann
2019-07-17 10:19 Mikle Kolyada
2019-07-04 19:40 Andreas Sturmlechner
2019-06-27 9:59 Andreas Sturmlechner
2019-06-27 9:59 Andreas Sturmlechner
2019-06-18 18:24 Thomas Deutschmann
2019-06-09 20:16 Mikle Kolyada
2019-05-25 20:59 Andreas Sturmlechner
2019-05-25 11:08 Andreas Sturmlechner
2019-04-11 9:03 Andreas Sturmlechner
2019-04-03 12:02 Andreas Sturmlechner
2019-03-30 10:07 Andreas Sturmlechner
2019-03-30 9:59 Andreas Sturmlechner
2019-03-30 9:59 Andreas Sturmlechner
2019-03-30 9:59 Andreas Sturmlechner
2019-03-16 22:42 Andreas Sturmlechner
2019-03-12 7:10 Andreas Sturmlechner
2019-03-12 7:10 Andreas Sturmlechner
2019-03-11 0:36 Andreas Sturmlechner
2019-03-11 0:17 Andreas Sturmlechner
2019-03-01 19:04 Andreas Sturmlechner
2019-02-17 17:58 Mikle Kolyada
2019-02-17 15:33 Mikle Kolyada
2019-02-14 18:36 Andreas Sturmlechner
2019-02-14 18:36 Andreas Sturmlechner
2019-02-14 18:36 Andreas Sturmlechner
2019-02-14 18:36 Andreas Sturmlechner
2019-02-07 18:50 Andreas Sturmlechner
2019-02-07 18:22 Andreas Sturmlechner
2019-02-05 23:27 Andreas Sturmlechner
2019-02-05 0:30 Andreas Sturmlechner
2019-01-30 22:31 Andreas Sturmlechner
2019-01-30 22:31 Andreas Sturmlechner
2019-01-28 18:15 Andreas Sturmlechner
2019-01-27 23:13 Andreas Sturmlechner
2019-01-27 23:13 Andreas Sturmlechner
2019-01-23 22:53 Andreas Sturmlechner
2019-01-23 17:27 Andreas K. Hüttel
2019-01-20 19:31 Andreas Sturmlechner
2019-01-16 22:08 Andreas Sturmlechner
2019-01-16 9:29 Andreas Sturmlechner
2019-01-10 19:20 Andreas Sturmlechner
2019-01-09 10:00 Andreas Sturmlechner
2019-01-08 19:56 Thomas Deutschmann
2019-01-02 9:57 Mikle Kolyada
2018-12-31 1:51 Andreas Sturmlechner
2018-12-31 1:51 Andreas Sturmlechner
2018-12-31 1:51 Andreas Sturmlechner
2018-12-19 14:23 Andreas Sturmlechner
2018-12-13 11:32 Andreas Sturmlechner
2018-12-03 2:43 Jonathan Callen
2018-11-22 21:48 Andreas Sturmlechner
2018-11-15 23:12 Andreas Sturmlechner
2018-11-15 23:12 Andreas Sturmlechner
2018-11-13 21:30 Andreas Sturmlechner
2018-11-02 8:31 Andreas Sturmlechner
2018-10-01 18:13 Andreas Sturmlechner
2018-10-01 18:13 Andreas Sturmlechner
2018-10-01 18:13 Andreas Sturmlechner
2018-09-19 18:35 Matt Turner
2018-09-18 18:17 Andreas Sturmlechner
2018-09-18 18:17 Andreas Sturmlechner
2018-09-17 17:28 Mart Raudsepp
2018-09-16 22:34 Andreas Sturmlechner
2018-09-16 22:34 Andreas Sturmlechner
2018-09-12 21:13 Andreas Sturmlechner
2018-08-29 13:11 Andreas Sturmlechner
2018-08-29 13:11 Andreas Sturmlechner
2018-08-29 11:02 Andreas Sturmlechner
2018-08-29 10:49 Andreas Sturmlechner
2018-08-24 4:38 Mikle Kolyada
2018-08-24 1:40 Thomas Deutschmann
2018-08-13 21:48 Andreas Sturmlechner
2018-08-09 21:39 Andreas Sturmlechner
2018-08-09 21:39 Andreas Sturmlechner
2018-07-14 16:19 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-13 9:14 Mart Raudsepp
2018-07-12 6:50 Andreas Sturmlechner
2018-06-11 18:45 Andreas Sturmlechner
2018-06-06 22:43 Andreas Sturmlechner
2018-05-29 11:17 Thomas Deutschmann
2018-05-27 21:34 Andreas Sturmlechner
2018-05-27 21:34 Andreas Sturmlechner
2018-05-27 7:16 Andreas Sturmlechner
2018-05-27 7:16 Andreas Sturmlechner
2018-05-22 16:42 Mikle Kolyada
2018-05-10 8:01 Andreas Sturmlechner
2018-05-03 12:51 Andreas Sturmlechner
2018-04-28 11:44 Mikle Kolyada
2018-04-25 16:30 Andreas Sturmlechner
2018-04-25 15:33 Andreas Hüttel
2018-04-22 16:53 Andreas Sturmlechner
2018-04-05 15:55 Andreas Sturmlechner
2018-04-05 15:55 Andreas Sturmlechner
2018-04-05 15:55 Andreas Sturmlechner
2018-04-05 15:55 Andreas Sturmlechner
2018-03-15 15:14 Andreas Sturmlechner
2018-03-07 12:58 Andreas Sturmlechner
2018-03-03 0:06 Andreas Sturmlechner
2018-03-01 15:44 Andreas Sturmlechner
2018-03-01 15:44 Andreas Sturmlechner
2018-02-17 0:18 Andreas Sturmlechner
2018-02-17 0:18 Andreas Sturmlechner
2018-02-16 11:41 Agostino Sarubbo
2018-02-12 21:36 Thomas Deutschmann
2018-02-09 23:08 Andreas Sturmlechner
2018-02-09 23:08 Andreas Sturmlechner
2018-02-03 19:34 Andreas Sturmlechner
2018-02-03 19:34 Andreas Sturmlechner
2018-02-03 13:37 Michael Palimaka
2018-02-01 20:37 Thomas Deutschmann
2018-02-01 16:14 Andreas Sturmlechner
2018-01-28 23:19 Andreas Sturmlechner
2018-01-28 23:19 Andreas Sturmlechner
2018-01-28 23:19 Andreas Sturmlechner
2018-01-27 20:29 Andreas Sturmlechner
2018-01-24 16:24 Andreas Sturmlechner
2018-01-24 12:46 Andreas Sturmlechner
2018-01-24 12:46 Andreas Sturmlechner
2018-01-24 12:46 Andreas Sturmlechner
2018-01-24 12:46 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-09 17:33 Andreas Sturmlechner
2018-01-05 0:35 Andreas Sturmlechner
2017-12-28 19:35 Andreas Sturmlechner
2017-12-20 23:08 Andreas Sturmlechner
2017-12-13 23:19 Andreas Sturmlechner
2017-12-13 23:19 Andreas Sturmlechner
2017-12-13 23:19 Andreas Sturmlechner
2017-12-13 23:19 Andreas Sturmlechner
2017-12-09 15:52 Andreas Sturmlechner
2017-11-28 19:04 Andreas Sturmlechner
2017-11-28 19:04 Andreas Sturmlechner
2017-11-19 0:38 Andreas Sturmlechner
2017-11-16 1:36 Thomas Deutschmann
2017-11-15 23:31 Andreas Sturmlechner
2017-11-14 13:28 Agostino Sarubbo
2017-11-10 19:20 Andreas Sturmlechner
2017-11-09 15:16 Andreas Sturmlechner
2017-11-08 8:55 Andreas Sturmlechner
2017-11-08 8:55 Andreas Sturmlechner
2017-10-21 19:45 Andreas Sturmlechner
2017-08-27 9:35 Andreas Sturmlechner
2017-08-19 20:21 Andreas Sturmlechner
2017-08-17 17:06 Michał Górny
2017-08-06 12:41 Andreas Sturmlechner
2017-08-06 9:20 Andreas Sturmlechner
2017-07-12 21:40 Andreas Sturmlechner
2017-07-12 20:57 Andreas Sturmlechner
2017-07-12 20:57 Andreas Sturmlechner
2017-06-27 16:42 Andreas Sturmlechner
2017-06-26 21:59 Andreas Sturmlechner
2017-06-25 23:49 Andreas Sturmlechner
2017-06-25 23:49 Andreas Sturmlechner
2017-06-25 21:54 Andreas Sturmlechner
2017-06-25 21:54 Andreas Sturmlechner
2017-05-26 19:24 Andreas Hüttel
2017-05-26 19:18 Andreas Hüttel
2017-05-26 14:39 Andreas Hüttel
2017-05-22 6:49 Agostino Sarubbo
2017-05-22 5:54 Andreas Sturmlechner
2017-05-22 5:54 Andreas Sturmlechner
2017-05-06 15:29 Ulrich Müller
2017-04-27 18:15 Andreas Sturmlechner
2017-04-23 12:40 Agostino Sarubbo
2017-04-02 10:08 Andreas Sturmlechner
2017-03-31 19:31 Andreas Sturmlechner
2017-03-30 22:43 Andreas Sturmlechner
2017-03-30 22:43 Andreas Sturmlechner
2017-03-29 17:46 Andreas Sturmlechner
2017-03-29 17:46 Andreas Sturmlechner
2017-03-08 19:42 Andreas Sturmlechner
2017-03-08 19:42 Andreas Sturmlechner
2017-02-28 19:48 Andreas Sturmlechner
2017-02-28 19:48 Andreas Sturmlechner
2017-02-28 18:24 Matt Turner
2017-02-26 20:47 Andreas Sturmlechner
2017-02-03 18:22 Andreas Sturmlechner
2017-02-01 2:30 Andreas Sturmlechner
2016-12-19 22:09 Andreas Hüttel
2016-12-17 15:57 Andreas Hüttel
2016-12-17 15:57 Andreas Hüttel
2016-12-17 15:57 Andreas Hüttel
2016-11-29 20:57 Andreas Hüttel
2016-11-29 18:41 Agostino Sarubbo
2016-11-29 18:40 Agostino Sarubbo
2016-11-26 19:18 Andreas Hüttel
2016-11-19 23:11 Andreas Hüttel
2016-11-19 22:41 Andreas Hüttel
2016-11-17 23:24 Andreas Hüttel
2016-11-13 0:15 Andreas Hüttel
2016-11-06 20:36 Andreas Hüttel
2016-11-05 21:00 Andreas Hüttel
2016-10-01 22:08 Andreas Hüttel
2016-10-01 22:08 Andreas Hüttel
2016-10-01 22:08 Andreas Hüttel
2016-09-17 22:00 Andreas Hüttel
2016-09-17 22:00 Andreas Hüttel
2016-09-17 21:32 Andreas Hüttel
2016-09-17 21:32 Andreas Hüttel
2016-09-17 21:32 Andreas Hüttel
2016-09-17 21:32 Andreas Hüttel
2016-07-29 16:11 Lars Wendler
2016-07-28 15:18 Andreas Hüttel
2016-07-28 14:08 Agostino Sarubbo
2016-07-28 8:43 Agostino Sarubbo
2016-07-05 22:46 Andreas Hüttel
2016-07-03 18:45 Andreas Hüttel
2016-07-02 22:14 Andreas Hüttel
2016-07-02 21:16 Andreas Hüttel
2016-07-02 21:16 Andreas Hüttel
2016-07-02 21:16 Andreas Hüttel
2016-07-02 21:16 Andreas Hüttel
2016-07-02 21:16 Andreas Hüttel
2016-06-03 12:50 Lars Wendler
2016-06-03 12:50 Lars Wendler
2016-06-03 12:50 Lars Wendler
2016-06-03 12:50 Lars Wendler
2016-05-07 11:52 Pacho Ramos
2016-05-04 22:21 Andreas Hüttel
2016-04-16 20:18 Andreas Hüttel
2016-04-08 22:01 Andreas Hüttel
2016-04-08 22:01 Andreas Hüttel
2016-03-27 21:02 Andreas Hüttel
2016-03-25 20:46 Andreas Hüttel
2016-03-19 21:39 Andreas Hüttel
2016-03-03 0:43 Andreas Hüttel
2016-03-02 17:05 Agostino Sarubbo
2016-03-02 17:05 Agostino Sarubbo
2016-03-01 14:53 Andreas Hüttel
2016-02-29 13:10 Andreas Hüttel
2016-02-28 23:06 Andreas Hüttel
2016-02-28 22:10 Andreas Hüttel
2016-02-25 5:00 Andreas Hüttel
2016-02-19 22:05 Lars Wendler
2015-12-19 2:51 Andreas Hüttel
2015-11-24 23:13 Agostino Sarubbo
2015-11-24 23:12 Agostino Sarubbo
2015-11-08 11:07 Andreas Hüttel
2015-11-08 11:07 Andreas Hüttel
2015-10-31 19:42 Andreas Hüttel
2015-10-31 13:04 Andreas Hüttel
2015-10-30 0:24 Andreas Hüttel
2015-10-30 0:05 Andreas Hüttel
2015-10-23 20:01 Andreas Hüttel
2015-10-13 22:16 Andreas Hüttel
2015-10-13 22:16 Andreas Hüttel
2015-10-13 22:16 Andreas Hüttel
2015-10-10 23:27 Andreas Hüttel
2015-10-10 23:27 Andreas Hüttel
2015-10-10 9:46 Andreas Hüttel
2015-10-10 9:29 Andreas Hüttel
2015-09-26 21:08 Andreas Hüttel
2015-09-20 20:58 Andreas Hüttel
2015-09-20 20:58 Andreas Hüttel
2015-09-05 18:03 Agostino Sarubbo
2015-09-05 18:03 Agostino Sarubbo
2015-09-05 17:17 Andreas Hüttel
2015-08-31 20:49 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox