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

[Ulrich Müller]

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

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

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 app-editors/emacs/emacs-24.5-r6.ebuild | 2 ++
 app-editors/emacs/emacs-25.3-r5.ebuild | 2 ++
 app-editors/emacs/emacs-26.1-r2.ebuild | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-editors/emacs/emacs-24.5-r6.ebuild 
b/app-editors/emacs/emacs-24.5-r6.ebuild
index 3babea9437c..3f797276d19 100644
--- a/app-editors/emacs/emacs-24.5-r6.ebuild
+++ b/app-editors/emacs/emacs-24.5-r6.ebuild
@@ -194,6 +194,8 @@ src_configure() {
                        einfo "Configuring to build with no toolkit"
                        myconf+=" --with-x-toolkit=no"
                fi
+               ! use gtk && use gtk2 && ewarn \
+                       "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
        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/emacs-25.3-r5.ebuild 
b/app-editors/emacs/emacs-25.3-r5.ebuild
index ad5be25089c..4860c32fe92 100644
--- a/app-editors/emacs/emacs-25.3-r5.ebuild
+++ b/app-editors/emacs/emacs-25.3-r5.ebuild
@@ -201,6 +201,8 @@ src_configure() {
                        einfo "Configuring to build with no toolkit"
                        myconf+=" --with-x-toolkit=no"
                fi
+               ! use gtk && use gtk2 && ewarn \
+                       "USE flag \"gtk2\" has no effect if \"gtk\" is not set."
        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/emacs-26.1-r2.ebuild 
b/app-editors/emacs/emacs-26.1-r2.ebuild
index 123cb6e277c..d2dd29112e5 100644
--- a/app-editors/emacs/emacs-26.1-r2.ebuild
+++ b/app-editors/emacs/emacs-26.1-r2.ebuild
@@ -214,8 +214,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"