[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs-vcs/

[Ulrich Müller]

commit:     f22db19d51921a529f174d9a71c6d27a69804014
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 24 05:25:45 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 24 05:25:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22db19d

app-editors/emacs-vcs: Output warning message for USE="-gtk gtk2".

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild           | 8 ++++++--
 app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild | 8 ++++++--
 app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild           | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index 1f69edf59ad..4b2ebe730b2 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -234,8 +234,12 @@ src_configure() {
                        einfo "Configuring to build with no toolkit"
                        myconf+=" --with-x-toolkit=no"
                fi
-               ! use gtk && use xwidgets && ewarn \
-                       "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+               if ! use gtk; then
+                       use gtk2 && ewarn \
+                               "USE flag \"gtk2\" has no effect if \"gtk\" is 
not set."
+                       use xwidgets && ewarn \
+                               "USE flag \"xwidgets\" has no effect if \"gtk\" 
is not set."
+               fi
        elif use aqua; then
                einfo "Configuring to build with Nextstep (Cocoa) support"
                myconf+=" --with-ns --disable-ns-self-contained"

diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
index c5898b1c2dd..65e8e0a1bba 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild
@@ -235,8 +235,12 @@ src_configure() {
                        einfo "Configuring to build with no toolkit"
                        myconf+=" --with-x-toolkit=no"
                fi
-               ! use gtk && use xwidgets && ewarn \
-                       "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+               if ! use gtk; then
+                       use gtk2 && ewarn \
+                               "USE flag \"gtk2\" has no effect if \"gtk\" is 
not set."
+                       use xwidgets && ewarn \
+                               "USE flag \"xwidgets\" has no effect if \"gtk\" 
is not set."
+               fi
        elif use aqua; then
                einfo "Configuring to build with Nextstep (Cocoa) support"
                myconf+=" --with-ns --disable-ns-self-contained"

diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index 3cb2cdf754a..2862235ef56 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -237,8 +237,12 @@ src_configure() {
                        einfo "Configuring to build with no toolkit"
                        myconf+=" --with-x-toolkit=no"
                fi
-               ! use gtk && use xwidgets && ewarn \
-                       "USE flag \"xwidgets\" has no effect if \"gtk\" is not 
set."
+               if ! use gtk; then
+                       use gtk2 && ewarn \
+                               "USE flag \"gtk2\" has no effect if \"gtk\" is 
not set."
+                       use xwidgets && ewarn \
+                               "USE flag \"xwidgets\" has no effect if \"gtk\" 
is not set."
+               fi
        elif use aqua; then
                einfo "Configuring to build with Nextstep (Cocoa) support"
                myconf+=" --with-ns --disable-ns-self-contained"