From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 68C5F139083 for ; Wed, 13 Dec 2017 23:19:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29411E0E8B; Wed, 13 Dec 2017 23:19:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAAE7E0E8B for ; Wed, 13 Dec 2017 23:19:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 515C233BF0F for ; Wed, 13 Dec 2017 23:19:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D5721AD73 for ; Wed, 13 Dec 2017 23:19:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1513207118.2d79721b639c9a5870f808685c9a2c0a367ed9f9.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-5.4.9999.ebuild app-office/libreoffice/libreoffice-6.0.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2d79721b639c9a5870f808685c9a2c0a367ed9f9 X-VCS-Branch: master Date: Wed, 13 Dec 2017 23:19:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a584bd39-157f-4aa0-a211-abe7eb4f871b X-Archives-Hash: 64ee4cc9b1d935842fa74a7390756c87 commit: 2d79721b639c9a5870f808685c9a2c0a367ed9f9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Dec 13 21:18:37 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 13 23:18:38 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d79721b app-office/libreoffice: Add gnome-base/dconf to USE=eds as well It simplifies REQUIRED_USE further, esp. with gtk3 still not being stable. Package-Manager: Portage-2.3.18, Repoman-2.3.6 app-office/libreoffice/libreoffice-5.4.9999.ebuild | 18 +++++++++++------- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 18 +++++++++++------- app-office/libreoffice/libreoffice-9999.ebuild | 18 +++++++++++------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild index 201395b5c80..7215809cdb3 100644 --- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild @@ -139,6 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 + gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) @@ -231,7 +232,6 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) collada? ( gltf ) - eds? ( gtk3 ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -349,8 +349,7 @@ src_prepare() { } src_configure() { - local java_opts - local ext_opts + local ext_opts gtk_opts java_opts # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys # Note: these are for Gentoo use ONLY. For your own distribution, please get @@ -378,6 +377,12 @@ src_configure() { fi done + if use eds || use gtk3; then + gtk_opts=( --enable-dconf --enable-gio ) + else + gtk_opts=( --disable-dconf --disable-gio ) + fi + if use java; then # hsqldb: system one is too new java_opts=" @@ -465,8 +470,6 @@ src_configure() { $(use_enable gstreamer gstreamer-1-0) \ $(use_enable gtk) \ $(use_enable gtk3) \ - $(use_enable gtk3 dconf) \ - $(use_enable gtk3 gio) \ $(use_enable kde kde4) \ $(use_enable mysql ext-mariadb-connector) \ $(use_enable odk) \ @@ -482,8 +485,9 @@ src_configure() { $(use_with java) \ $(use_with mysql system-mysql-cppconn) \ $(use_with odk doxygen) \ - ${java_opts} \ - ${ext_opts} + ${ext_opts} \ + ${gtk_opts[@]} \ + ${java_opts} } src_compile() { diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 6033b315d7e..e489cde34e3 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -139,6 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 + gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) @@ -234,7 +235,6 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - eds? ( gtk3 ) kde? ( || ( qt4 qt5 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) @@ -354,8 +354,7 @@ src_prepare() { } src_configure() { - local java_opts - local ext_opts + local ext_opts gtk_opts java_opts # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys # Note: these are for Gentoo use ONLY. For your own distribution, please get @@ -378,6 +377,12 @@ src_configure() { fi done + if use eds || use gtk3; then + gtk_opts=( --enable-dconf --enable-gio ) + else + gtk_opts=( --disable-dconf --disable-gio ) + fi + if use java; then # hsqldb: system one is too new java_opts=" @@ -468,8 +473,6 @@ src_configure() { $(use_enable gstreamer gstreamer-1-0) \ $(use_enable gtk) \ $(use_enable gtk3) \ - $(use_enable gtk3 dconf) \ - $(use_enable gtk3 gio) \ $(use_enable mysql ext-mariadb-connector) \ $(use_enable odk) \ $(use_enable pdfimport) \ @@ -483,8 +486,9 @@ src_configure() { $(use_with java) \ $(use_with mysql system-mysql-cppconn) \ $(use_with odk doxygen) \ - ${java_opts} \ - ${ext_opts} + ${ext_opts} \ + ${gtk_opts[@]} \ + ${java_opts} } src_compile() { diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 6033b315d7e..e489cde34e3 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -139,6 +139,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 + gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) @@ -234,7 +235,6 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - eds? ( gtk3 ) kde? ( || ( qt4 qt5 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) @@ -354,8 +354,7 @@ src_prepare() { } src_configure() { - local java_opts - local ext_opts + local ext_opts gtk_opts java_opts # Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys # Note: these are for Gentoo use ONLY. For your own distribution, please get @@ -378,6 +377,12 @@ src_configure() { fi done + if use eds || use gtk3; then + gtk_opts=( --enable-dconf --enable-gio ) + else + gtk_opts=( --disable-dconf --disable-gio ) + fi + if use java; then # hsqldb: system one is too new java_opts=" @@ -468,8 +473,6 @@ src_configure() { $(use_enable gstreamer gstreamer-1-0) \ $(use_enable gtk) \ $(use_enable gtk3) \ - $(use_enable gtk3 dconf) \ - $(use_enable gtk3 gio) \ $(use_enable mysql ext-mariadb-connector) \ $(use_enable odk) \ $(use_enable pdfimport) \ @@ -483,8 +486,9 @@ src_configure() { $(use_with java) \ $(use_with mysql system-mysql-cppconn) \ $(use_with odk doxygen) \ - ${java_opts} \ - ${ext_opts} + ${ext_opts} \ + ${gtk_opts[@]} \ + ${java_opts} } src_compile() {