[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Sturmlechner]

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