app-office/libreoffice: Drop USE=qt5 from 6.0.x

So unusable it does not make sense just yet, simplifies ebuild.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 5fca4ae10c0194e7e7929b1acef65793e98316e2..5b58caa856a0a18d063b1385b34f1629e1ce0b39 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.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 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc
+gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
@@ -163,16 +163,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
        mysql? ( dev-db/mysql-connector-c++ )
        pdfimport? ( app-text/poppler:=[cxx] )
        postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-       qt4? (
+       kde? (
                dev-qt/qtcore:4
                dev-qt/qtgui:4
                kde-frameworks/kdelibs
        )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtwidgets:5
-               kde-frameworks/kcoreaddons:5
-       )
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -235,12 +230,10 @@ DEPEND="${COMMON_DEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
        bluetooth? ( dbus )
-       kde? ( || ( qt4 qt5 ) )
        libreoffice_extensions_nlpsolver? ( java )
        libreoffice_extensions_scripting-beanshell? ( java )
        libreoffice_extensions_scripting-javascript? ( java )
        libreoffice_extensions_wiki-publisher? ( java )
-       qt4? ( kde )
 "
 
 PATCHES=(
@@ -254,9 +247,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."
 
@@ -369,17 +359,12 @@ src_configure() {
        export PYTHON_CFLAGS=$(python_get_CFLAGS)
        export PYTHON_LIBS=$(python_get_LIBS)
 
-       if use qt4; then
+       if use kde; then
                # bug 544108, bug 599076
                export QMAKE4="$(qt4_get_bindir)/qmake"
                export MOCQT4="$(qt4_get_bindir)/moc"
        fi
 
-       if use qt5; then
-               export QT5DIR="$(qt5_get_bindir)/../"
-               export MOC5="$(qt5_get_bindir)/moc"
-       fi
-
        # system headers/libs/...: enforce using system packages
        # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
        # --enable-cairo: ensure that cairo is always required
@@ -413,6 +398,7 @@ src_configure() {
                --disable-gstreamer-0-10
                --disable-online-update
                --disable-pdfium
+               --disable-qt5
                --disable-report-builder
                --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
                --with-build-version="Gentoo official package"
@@ -446,8 +432,7 @@ src_configure() {
                $(use_enable odk)
                $(use_enable pdfimport)
                $(use_enable postgres postgresql-sdbc)
-               $(use_enable qt4 kde4)
-               $(use_enable qt5)
+               $(use_enable kde kde4)
                $(use_enable vlc)
                $(use_with coinmp system-coinmp)
                $(use_with googledrive gdrive-client-id ${google_default_client_id})