diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
commit | 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch) | |
tree | 6fce284d5bfddaf597a490ac66069d16c6a485db /app-office/libreoffice/libreoffice-9999.ebuild | |
parent | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff) |
gentoo resync : 25.01.2018
Diffstat (limited to 'app-office/libreoffice/libreoffice-9999.ebuild')
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 664bacbda8ea..1142e018d213 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc +gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS} =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl - dev-libs/boost:= + >=dev-libs/boost-1.65.0:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= @@ -148,30 +148,31 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/gst-plugins-base:1.0 ) gtk? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - mysql? ( dev-db/mysql-connector-c++ ) - pdfimport? ( app-text/poppler:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 ) - qt5? ( + kde? ( dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 + kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + mysql? ( dev-db/mysql-connector-c++ ) + pdfimport? ( app-text/poppler:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " RDEPEND="${COMMON_DEPEND} @@ -234,12 +235,11 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - kde? ( || ( qt4 qt5 ) ) + kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java ) - qt4? ( kde ) " PATCHES=( @@ -252,9 +252,6 @@ PATCHES=( ) pkg_pretend() { - use qt5 && \ - ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!" - use java || \ ewarn "If you plan to use Base application you should enable java or you will get various crashes." @@ -367,13 +364,8 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt4; then - # bug 544108, bug 599076 - export QMAKE4="$(qt4_get_bindir)/qmake" - export MOCQT4="$(qt4_get_bindir)/moc" - fi - - if use qt5; then + if use kde; then + export QT_SELECT=5 # bug 639620 needs proper fix though export QT5DIR="$(qt5_get_bindir)/../" export MOC5="$(qt5_get_bindir)/moc" fi @@ -438,14 +430,15 @@ src_configure() { $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk) - $(use_enable gtk3) + $(use_enable gtk gtk3) + $(use_enable gtk2 gtk) + $(use_enable kde qt5) + $(use_enable kde kde5) + $(use_enable kde gtk3-kde5) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt4 kde4) - $(use_enable qt5) $(use_enable vlc) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id}) @@ -455,7 +448,7 @@ src_configure() { $(use_with odk doxygen) ) - if use eds || use gtk3; then + if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else myeconfargs+=( --disable-dconf --disable-gio ) @@ -532,7 +525,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # bug 593514 - if use gtk3; then + if use gtk; then dosym libreoffice/program/liblibreofficekitgtk.so \ /usr/$(get_libdir)/liblibreofficekitgtk.so fi |