1 |
commit: a9a025171a9a42ae039bdc3ae3dd49f988b55193 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 24 05:24:13 2018 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 24 05:24:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a02517 |
7 |
|
8 |
app-editors/emacs: Output warning message for USE="-gtk gtk2". |
9 |
|
10 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
11 |
|
12 |
app-editors/emacs/emacs-24.5-r6.ebuild | 2 ++ |
13 |
app-editors/emacs/emacs-25.3-r5.ebuild | 2 ++ |
14 |
app-editors/emacs/emacs-26.1-r2.ebuild | 8 ++++++-- |
15 |
3 files changed, 10 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/app-editors/emacs/emacs-24.5-r6.ebuild b/app-editors/emacs/emacs-24.5-r6.ebuild |
18 |
index 3babea9437c..3f797276d19 100644 |
19 |
--- a/app-editors/emacs/emacs-24.5-r6.ebuild |
20 |
+++ b/app-editors/emacs/emacs-24.5-r6.ebuild |
21 |
@@ -194,6 +194,8 @@ src_configure() { |
22 |
einfo "Configuring to build with no toolkit" |
23 |
myconf+=" --with-x-toolkit=no" |
24 |
fi |
25 |
+ ! use gtk && use gtk2 && ewarn \ |
26 |
+ "USE flag \"gtk2\" has no effect if \"gtk\" is not set." |
27 |
elif use aqua; then |
28 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
29 |
myconf+=" --with-ns --disable-ns-self-contained" |
30 |
|
31 |
diff --git a/app-editors/emacs/emacs-25.3-r5.ebuild b/app-editors/emacs/emacs-25.3-r5.ebuild |
32 |
index ad5be25089c..4860c32fe92 100644 |
33 |
--- a/app-editors/emacs/emacs-25.3-r5.ebuild |
34 |
+++ b/app-editors/emacs/emacs-25.3-r5.ebuild |
35 |
@@ -201,6 +201,8 @@ src_configure() { |
36 |
einfo "Configuring to build with no toolkit" |
37 |
myconf+=" --with-x-toolkit=no" |
38 |
fi |
39 |
+ ! use gtk && use gtk2 && ewarn \ |
40 |
+ "USE flag \"gtk2\" has no effect if \"gtk\" is not set." |
41 |
elif use aqua; then |
42 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
43 |
myconf+=" --with-ns --disable-ns-self-contained" |
44 |
|
45 |
diff --git a/app-editors/emacs/emacs-26.1-r2.ebuild b/app-editors/emacs/emacs-26.1-r2.ebuild |
46 |
index 123cb6e277c..d2dd29112e5 100644 |
47 |
--- a/app-editors/emacs/emacs-26.1-r2.ebuild |
48 |
+++ b/app-editors/emacs/emacs-26.1-r2.ebuild |
49 |
@@ -214,8 +214,12 @@ src_configure() { |
50 |
einfo "Configuring to build with no toolkit" |
51 |
myconf+=" --with-x-toolkit=no" |
52 |
fi |
53 |
- ! use gtk && use xwidgets && ewarn \ |
54 |
- "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
55 |
+ if ! use gtk; then |
56 |
+ use gtk2 && ewarn \ |
57 |
+ "USE flag \"gtk2\" has no effect if \"gtk\" is not set." |
58 |
+ use xwidgets && ewarn \ |
59 |
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
60 |
+ fi |
61 |
elif use aqua; then |
62 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
63 |
myconf+=" --with-ns --disable-ns-self-contained" |