From: Andreas Sturmlechner Date: Thu, 13 Dec 2018 11:30:17 +0000 (+0100) Subject: app-office/libreoffice: Sync 6.1.4.2 with *9999 and vice versa X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8495d42ac4c2e780c11714457fd49e857efd0bb6;p=gentoo.git 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 --- 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