summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2018-08-24 07:24:13 +0200
committerUlrich Müller <ulm@gentoo.org>2018-08-24 07:24:13 +0200
commita9a025171a9a42ae039bdc3ae3dd49f988b55193 (patch)
tree30485212a008dca2a40987019c4249ab23328a7d /app-editors/emacs
parentapp-office/libreoffice: amd64 stable wrt bug #659024 (diff)
downloadgentoo-a9a025171a9a42ae039bdc3ae3dd49f988b55193.tar.gz
gentoo-a9a025171a9a42ae039bdc3ae3dd49f988b55193.tar.bz2
gentoo-a9a025171a9a42ae039bdc3ae3dd49f988b55193.zip
app-editors/emacs: Output warning message for USE="-gtk gtk2".
Package-Manager: Portage-2.3.47, Repoman-2.3.10
Diffstat (limited to 'app-editors/emacs')
-rw-r--r--app-editors/emacs/emacs-24.5-r6.ebuild2
-rw-r--r--app-editors/emacs/emacs-25.3-r5.ebuild2
-rw-r--r--app-editors/emacs/emacs-26.1-r2.ebuild8
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 3babea9437c9..3f797276d196 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 ad5be25089c5..4860c32fe92a 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 123cb6e277cc..d2dd29112e54 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"