| 1 |
commit: 47092007862525d557490731b85c257b32255813 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 7 20:42:40 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 15 23:31:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47092007 |
| 7 |
|
| 8 |
app-office/libreoffice: Add USE=qt4,qt5 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
| 11 |
|
| 12 |
app-office/libreoffice/libreoffice-9999.ebuild | 31 ++++++++++++++++++-------- |
| 13 |
1 file changed, 22 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 16 |
index 2125f380146..f2184e67ea3 100644 |
| 17 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 18 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 19 |
@@ -64,7 +64,7 @@ unset ADDONS_SRC |
| 20 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 21 |
|
| 22 |
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive |
| 23 |
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc |
| 24 |
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc |
| 25 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 26 |
|
| 27 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
| 28 |
@@ -157,16 +157,21 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 29 |
x11-libs/gtk+:3 |
| 30 |
) |
| 31 |
jemalloc? ( dev-libs/jemalloc ) |
| 32 |
- kde? ( |
| 33 |
- dev-qt/qtcore:4 |
| 34 |
- dev-qt/qtgui:4 |
| 35 |
- kde-frameworks/kdelibs |
| 36 |
- ) |
| 37 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
| 38 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 39 |
mysql? ( dev-db/mysql-connector-c++ ) |
| 40 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 41 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 42 |
+ qt4? ( |
| 43 |
+ dev-qt/qtcore:4 |
| 44 |
+ dev-qt/qtgui:4 |
| 45 |
+ kde-frameworks/kdelibs |
| 46 |
+ ) |
| 47 |
+ qt5? ( |
| 48 |
+ dev-qt/qtcore:5 |
| 49 |
+ dev-qt/qtwidgets:5 |
| 50 |
+ kde-frameworks/kcoreaddons:5 |
| 51 |
+ ) |
| 52 |
" |
| 53 |
|
| 54 |
RDEPEND="${COMMON_DEPEND} |
| 55 |
@@ -231,10 +236,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 56 |
bluetooth? ( dbus ) |
| 57 |
eds? ( gnome ) |
| 58 |
gnome? ( gtk ) |
| 59 |
+ kde? ( || ( qt4 qt5 ) ) |
| 60 |
libreoffice_extensions_nlpsolver? ( java ) |
| 61 |
libreoffice_extensions_scripting-beanshell? ( java ) |
| 62 |
libreoffice_extensions_scripting-javascript? ( java ) |
| 63 |
libreoffice_extensions_wiki-publisher? ( java ) |
| 64 |
+ qt4? ( kde ) |
| 65 |
" |
| 66 |
|
| 67 |
PATCHES=( |
| 68 |
@@ -389,12 +396,17 @@ src_configure() { |
| 69 |
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" |
| 70 |
fi |
| 71 |
|
| 72 |
- if use kde; then |
| 73 |
+ if use qt4; then |
| 74 |
# bug 544108, bug 599076 |
| 75 |
- export QMAKEQT4="$(qt4_get_bindir)/qmake" |
| 76 |
+ export QMAKE4="$(qt4_get_bindir)/qmake" |
| 77 |
export MOCQT4="$(qt4_get_bindir)/moc" |
| 78 |
fi |
| 79 |
|
| 80 |
+ if use qt5; then |
| 81 |
+ export QT5DIR="$(qt5_get_bindir)/../" |
| 82 |
+ export MOC5="$(qt5_get_bindir)/moc" |
| 83 |
+ fi |
| 84 |
+ |
| 85 |
# system headers/libs/...: enforce using system packages |
| 86 |
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
| 87 |
# --enable-cairo: ensure that cairo is always required |
| 88 |
@@ -459,11 +471,12 @@ src_configure() { |
| 89 |
$(use_enable gstreamer gstreamer-1-0) \ |
| 90 |
$(use_enable gtk) \ |
| 91 |
$(use_enable gtk3) \ |
| 92 |
- $(use_enable kde kde4) \ |
| 93 |
$(use_enable mysql ext-mariadb-connector) \ |
| 94 |
$(use_enable odk) \ |
| 95 |
$(use_enable pdfimport) \ |
| 96 |
$(use_enable postgres postgresql-sdbc) \ |
| 97 |
+ $(use_enable qt4 kde4) \ |
| 98 |
+ $(use_enable qt5) \ |
| 99 |
$(use_enable vlc) \ |
| 100 |
$(use_with coinmp system-coinmp) \ |
| 101 |
$(use_with googledrive gdrive-client-id ${google_default_client_id}) \ |
Archives