diff options
author | Julian Ospald <hasufell@gentoo.org> | 2015-10-10 11:26:04 +0200 |
---|---|---|
committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2015-10-10 11:26:04 +0200 |
commit | 03b579da264b3afe9bd3cfea9ffe6cd44528e686 (patch) | |
tree | 313e6529d30237571a91d743e2f25a8d735294a2 /app-office | |
parent | dev-python/numpy: arm stable, bug #560190 (diff) | |
download | gentoo-03b579da264b3afe9bd3cfea9ffe6cd44528e686.tar.gz gentoo-03b579da264b3afe9bd3cfea9ffe6cd44528e686.tar.bz2 gentoo-03b579da264b3afe9bd3cfea9ffe6cd44528e686.zip |
app-office/libreoffice: Drop pyhton-3.3 support, add libressl support
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/libreoffice/libreoffice-5.0.9999.ebuild | 7 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild index c361e86486a4..626b19c87a3d 100644 --- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_4 ) PYTHON_REQ_USE="threads,xml" # experimental ; release ; old @@ -73,7 +73,7 @@ unset EXT_URI unset ADDONS_SRC IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc" ++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc" LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" # Unpackaged separate extensions: @@ -122,7 +122,8 @@ COMMON_DEPEND=" >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 + !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) + libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index f5894cc879fa..35ca08e2aaa1 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" KDE_SCM="git" CMAKE_REQUIRED="never" -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) +PYTHON_COMPAT=( python2_7 python3_4 ) PYTHON_REQ_USE="threads,xml" # experimental ; release ; old @@ -73,7 +73,7 @@ unset EXT_URI unset ADDONS_SRC IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer -+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc" ++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc" LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" # Unpackaged separate extensions: @@ -122,7 +122,8 @@ COMMON_DEPEND=" >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 >=dev-lang/perl-5.0 - >=dev-libs/openssl-1.0.0d:0 + !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) + libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 media-gfx/graphite2 >=media-libs/fontconfig-2.8.0 |