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 101C8139083 for ; Sat, 9 Dec 2017 15:52:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEB78E0FCC; Sat, 9 Dec 2017 15:52:51 +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 A506AE0FCC for ; Sat, 9 Dec 2017 15:52:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 13B5033BF01 for ; Sat, 9 Dec 2017 15:52:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA10AAE6B for ; Sat, 9 Dec 2017 15:52:48 +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: <1512834756.025869b527860b938e2ca7a9edd9b909b4eda648.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: 025869b527860b938e2ca7a9edd9b909b4eda648 X-VCS-Branch: master Date: Sat, 9 Dec 2017 15:52:48 +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: b0167792-2e11-481a-aa5d-3322447d071d X-Archives-Hash: cad2892fd0b2b0e153e40fa8a96e4c5c commit: 025869b527860b938e2ca7a9edd9b909b4eda648 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 15:50:28 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 15:52:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025869b5 app-office/libreoffice: Merge USE=gnome into gtk3 It makes no sense to keep them split. Simplifies REQUIRED_USE. No difference for USE=eds users in terms of dependencies. Negligible depgraph change for USE=gtk3 users. Bug: https://bugs.gentoo.org/638012 Package-Manager: Portage-2.3.17, Repoman-2.3.6 app-office/libreoffice/libreoffice-5.4.9999.ebuild | 17 ++++++++--------- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 17 ++++++++--------- app-office/libreoffice/libreoffice-9999.ebuild | 17 ++++++++--------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild index 92815ff4ba5..201395b5c80 100644 --- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive +IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" @@ -125,13 +125,13 @@ COMMON_DEPEND="${PYTHON_DEPS} net-misc/curl net-nds/openldap sci-mathematics/lpsolve + virtual/glu + virtual/jpeg:0 + virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender - virtual/glu - virtual/jpeg:0 - virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) @@ -143,7 +143,6 @@ COMMON_DEPEND="${PYTHON_DEPS} ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) - gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -155,6 +154,7 @@ COMMON_DEPEND="${PYTHON_DEPS} gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection + gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) @@ -231,8 +231,7 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) collada? ( gltf ) - eds? ( gnome ) - gnome? ( gtk ) + eds? ( gtk3 ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -463,11 +462,11 @@ src_configure() { $(use_enable eds evolution2) \ $(use_enable firebird firebird-sdbc) \ $(use_enable gltf) \ - $(use_enable gnome gio) \ - $(use_enable gnome dconf) \ $(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) \ diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index a9461079bcb..6033b315d7e 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -63,7 +63,7 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive +IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" @@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS} net-misc/curl net-nds/openldap sci-mathematics/lpsolve + virtual/glu + virtual/jpeg:0 + virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender - virtual/glu - virtual/jpeg:0 - virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) @@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS} gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) - gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS} gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection + gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) @@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - eds? ( gnome ) - gnome? ( gtk ) + eds? ( gtk3 ) kde? ( || ( qt4 qt5 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) @@ -466,11 +465,11 @@ src_configure() { $(use_enable dbus) \ $(use_enable eds evolution2) \ $(use_enable firebird firebird-sdbc) \ - $(use_enable gnome gio) \ - $(use_enable gnome dconf) \ $(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) \ diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index a9461079bcb..6033b315d7e 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -63,7 +63,7 @@ unset ADDONS_SRC # Extensions that need extra work: LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" -IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird gnome googledrive +IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" @@ -126,13 +126,13 @@ COMMON_DEPEND="${PYTHON_DEPS} net-misc/curl net-nds/openldap sci-mathematics/lpsolve + virtual/glu + virtual/jpeg:0 + virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender - virtual/glu - virtual/jpeg:0 - virtual/opengl bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) @@ -142,7 +142,6 @@ COMMON_DEPEND="${PYTHON_DEPS} gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) - gnome? ( gnome-base/dconf ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -154,6 +153,7 @@ COMMON_DEPEND="${PYTHON_DEPS} gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection + gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) @@ -234,8 +234,7 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - eds? ( gnome ) - gnome? ( gtk ) + eds? ( gtk3 ) kde? ( || ( qt4 qt5 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) @@ -466,11 +465,11 @@ src_configure() { $(use_enable dbus) \ $(use_enable eds evolution2) \ $(use_enable firebird firebird-sdbc) \ - $(use_enable gnome gio) \ - $(use_enable gnome dconf) \ $(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) \