| 1 |
commit: 03b579da264b3afe9bd3cfea9ffe6cd44528e686 |
| 2 |
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 10 09:26:04 2015 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 10 09:26:04 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03b579da |
| 7 |
|
| 8 |
app-office/libreoffice: Drop pyhton-3.3 support, add libressl support |
| 9 |
|
| 10 |
app-office/libreoffice/libreoffice-5.0.9999.ebuild | 7 ++++--- |
| 11 |
app-office/libreoffice/libreoffice-9999.ebuild | 7 ++++--- |
| 12 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild |
| 15 |
index c361e86..626b19c 100644 |
| 16 |
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild |
| 17 |
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild |
| 18 |
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" |
| 19 |
KDE_SCM="git" |
| 20 |
CMAKE_REQUIRED="never" |
| 21 |
|
| 22 |
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) |
| 23 |
+PYTHON_COMPAT=( python2_7 python3_4 ) |
| 24 |
PYTHON_REQ_USE="threads,xml" |
| 25 |
|
| 26 |
# experimental ; release ; old |
| 27 |
@@ -73,7 +73,7 @@ unset EXT_URI |
| 28 |
unset ADDONS_SRC |
| 29 |
|
| 30 |
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer |
| 31 |
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc" |
| 32 |
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc" |
| 33 |
|
| 34 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 35 |
# Unpackaged separate extensions: |
| 36 |
@@ -122,7 +122,8 @@ COMMON_DEPEND=" |
| 37 |
>=dev-libs/nspr-4.8.8 |
| 38 |
>=dev-libs/nss-3.12.9 |
| 39 |
>=dev-lang/perl-5.0 |
| 40 |
- >=dev-libs/openssl-1.0.0d:0 |
| 41 |
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
| 42 |
+ libressl? ( dev-libs/libressl ) |
| 43 |
>=dev-libs/redland-1.0.16 |
| 44 |
media-gfx/graphite2 |
| 45 |
>=media-libs/fontconfig-2.8.0 |
| 46 |
|
| 47 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 48 |
index f5894cc..35ca08e 100644 |
| 49 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 50 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 51 |
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" |
| 52 |
KDE_SCM="git" |
| 53 |
CMAKE_REQUIRED="never" |
| 54 |
|
| 55 |
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) |
| 56 |
+PYTHON_COMPAT=( python2_7 python3_4 ) |
| 57 |
PYTHON_REQ_USE="threads,xml" |
| 58 |
|
| 59 |
# experimental ; release ; old |
| 60 |
@@ -73,7 +73,7 @@ unset EXT_URI |
| 61 |
unset ADDONS_SRC |
| 62 |
|
| 63 |
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer |
| 64 |
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc" |
| 65 |
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc" |
| 66 |
|
| 67 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 68 |
# Unpackaged separate extensions: |
| 69 |
@@ -122,7 +122,8 @@ COMMON_DEPEND=" |
| 70 |
>=dev-libs/nspr-4.8.8 |
| 71 |
>=dev-libs/nss-3.12.9 |
| 72 |
>=dev-lang/perl-5.0 |
| 73 |
- >=dev-libs/openssl-1.0.0d:0 |
| 74 |
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) |
| 75 |
+ libressl? ( dev-libs/libressl ) |
| 76 |
>=dev-libs/redland-1.0.16 |
| 77 |
media-gfx/graphite2 |
| 78 |
>=media-libs/fontconfig-2.8.0 |
Archives