[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Sturmlechner]

commit:     77d3323740bcbc150d8a4273cedc96a86f2c0861
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 11:01:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 11:02:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d33237

app-office/libreoffice: Decouple gtk3-kde5 from USE=kde

But let it build if USE=gtk,kde are selected.
USE=kde will only enable qt5/kde5 VCLs from now on.

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-office/libreoffice/libreoffice-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 8654bb522fb..d081a3a350e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -69,7 +69,6 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
-	kde? ( gtk )
 	libreoffice_extensions_nlpsolver? ( java )
 	libreoffice_extensions_scripting-beanshell? ( java )
 	libreoffice_extensions_scripting-javascript? ( java )
@@ -433,7 +432,6 @@ src_configure() {
 		$(use_enable gstreamer gstreamer-1-0)
 		$(use_enable gtk gtk3)
 		$(use_enable gtk2 gtk)
-		$(use_enable kde gtk3-kde5)
 		$(use_enable kde kde5)
 		$(use_enable kde qt5)
 		$(use_enable mysql ext-mariadb-connector)
@@ -449,6 +447,10 @@ src_configure() {
 		$(use_with odk doxygen)
 	)
 
+	if use gtk && use kde; then
+		myeconfargs+=( --enable-gtk3-kde5 )
+	fi
+
 	if use eds || use gtk; then
 		myeconfargs+=( --enable-dconf --enable-gio )
 	else