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@gentoo.org>

diff --git a/app-office/libreoffice/libreoffice-6.1.4.2.ebuild b/app-office/libreoffice/libreoffice-6.1.4.2.ebuild
index 6070b09e9e5d3dcfcd8e8bafbec9e7938faf45da..40fe93ee5350b68b8f7578d8baa02156833597b0 100644 (file)
--- 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 66a19c36880662f5ad8d51e24c2058f54c47a9a0..29174b9eb1cd5c7effee442f7666247a27b425ac 100644 (file)
--- 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 dd57ab7974852aa5a0ae2dcf6844fc9790ebd2d7..de17c67160e68ff43cd89ad4493b1f4fc4d141b2 100644 (file)
--- 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