| 1 |
commit: e78c849e93a233b6db6fd501c364f285e967c20c |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 9 15:19:00 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 9 17:27:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e78c849e |
| 7 |
|
| 8 |
app-office/libreoffice: Drop USE=qt5 from 6.0.x |
| 9 |
|
| 10 |
So unusable it does not make sense just yet, simplifies ebuild. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 13 |
|
| 14 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 25 +++++----------------- |
| 15 |
1 file changed, 5 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 18 |
index 5fca4ae10c0..5b58caa856a 100644 |
| 19 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 20 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 21 |
@@ -64,7 +64,7 @@ unset ADDONS_SRC |
| 22 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 23 |
|
| 24 |
IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive |
| 25 |
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc |
| 26 |
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc |
| 27 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 28 |
|
| 29 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
| 30 |
@@ -163,16 +163,11 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 31 |
mysql? ( dev-db/mysql-connector-c++ ) |
| 32 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 33 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 34 |
- qt4? ( |
| 35 |
+ kde? ( |
| 36 |
dev-qt/qtcore:4 |
| 37 |
dev-qt/qtgui:4 |
| 38 |
kde-frameworks/kdelibs |
| 39 |
) |
| 40 |
- qt5? ( |
| 41 |
- dev-qt/qtcore:5 |
| 42 |
- dev-qt/qtwidgets:5 |
| 43 |
- kde-frameworks/kcoreaddons:5 |
| 44 |
- ) |
| 45 |
" |
| 46 |
|
| 47 |
RDEPEND="${COMMON_DEPEND} |
| 48 |
@@ -235,12 +230,10 @@ DEPEND="${COMMON_DEPEND} |
| 49 |
|
| 50 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 51 |
bluetooth? ( dbus ) |
| 52 |
- kde? ( || ( qt4 qt5 ) ) |
| 53 |
libreoffice_extensions_nlpsolver? ( java ) |
| 54 |
libreoffice_extensions_scripting-beanshell? ( java ) |
| 55 |
libreoffice_extensions_scripting-javascript? ( java ) |
| 56 |
libreoffice_extensions_wiki-publisher? ( java ) |
| 57 |
- qt4? ( kde ) |
| 58 |
" |
| 59 |
|
| 60 |
PATCHES=( |
| 61 |
@@ -254,9 +247,6 @@ PATCHES=( |
| 62 |
) |
| 63 |
|
| 64 |
pkg_pretend() { |
| 65 |
- use qt5 && \ |
| 66 |
- ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!" |
| 67 |
- |
| 68 |
use java || \ |
| 69 |
ewarn "If you plan to use Base application you should enable java or you will get various crashes." |
| 70 |
|
| 71 |
@@ -369,17 +359,12 @@ src_configure() { |
| 72 |
export PYTHON_CFLAGS=$(python_get_CFLAGS) |
| 73 |
export PYTHON_LIBS=$(python_get_LIBS) |
| 74 |
|
| 75 |
- if use qt4; then |
| 76 |
+ if use kde; then |
| 77 |
# bug 544108, bug 599076 |
| 78 |
export QMAKE4="$(qt4_get_bindir)/qmake" |
| 79 |
export MOCQT4="$(qt4_get_bindir)/moc" |
| 80 |
fi |
| 81 |
|
| 82 |
- if use qt5; then |
| 83 |
- export QT5DIR="$(qt5_get_bindir)/../" |
| 84 |
- export MOC5="$(qt5_get_bindir)/moc" |
| 85 |
- fi |
| 86 |
- |
| 87 |
# system headers/libs/...: enforce using system packages |
| 88 |
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
| 89 |
# --enable-cairo: ensure that cairo is always required |
| 90 |
@@ -413,6 +398,7 @@ src_configure() { |
| 91 |
--disable-gstreamer-0-10 |
| 92 |
--disable-online-update |
| 93 |
--disable-pdfium |
| 94 |
+ --disable-qt5 |
| 95 |
--disable-report-builder |
| 96 |
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") |
| 97 |
--with-build-version="Gentoo official package" |
| 98 |
@@ -446,8 +432,7 @@ src_configure() { |
| 99 |
$(use_enable odk) |
| 100 |
$(use_enable pdfimport) |
| 101 |
$(use_enable postgres postgresql-sdbc) |
| 102 |
- $(use_enable qt4 kde4) |
| 103 |
- $(use_enable qt5) |
| 104 |
+ $(use_enable kde kde4) |
| 105 |
$(use_enable vlc) |
| 106 |
$(use_with coinmp system-coinmp) |
| 107 |
$(use_with googledrive gdrive-client-id ${google_default_client_id}) |
Archives