summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-12-13 12:30:17 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-12-13 12:31:05 +0100
commit8495d42ac4c2e780c11714457fd49e857efd0bb6 (patch)
tree6408ae8625cd59232de537831cf3d941efb44f34
parentdev-python/prometheus_flask_exporter: Inital version (diff)
downloadgentoo-8495d42ac4c2e780c11714457fd49e857efd0bb6.tar.gz
gentoo-8495d42ac4c2e780c11714457fd49e857efd0bb6.tar.bz2
gentoo-8495d42ac4c2e780c11714457fd49e857efd0bb6.zip
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>
-rw-r--r--app-office/libreoffice/libreoffice-6.1.4.2.ebuild4
-rw-r--r--app-office/libreoffice/libreoffice-6.1.9999.ebuild2
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild2
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 6070b09e9e5d..40fe93ee5350 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 66a19c368806..29174b9eb1cd 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 dd57ab797485..de17c67160e6 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