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
