1 |
commit: 400e53e8538ed494cd0f12661abe0e40b95f3b58 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 23 17:07:20 2018 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 23 17:08:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400e53e8 |
7 |
|
8 |
app-editors/emacs-vcs: Reorganise gtk* flags. |
9 |
|
10 |
As discussed with leio in #gentoo-dev and in #gentoo-qa. |
11 |
- USE="gtk -gtk2" for GTK+ version 3, |
12 |
- USE="gtk gtk2" for GTK+ version 2, |
13 |
- USE="-gtk" for no GTK+ (the "gtk2" flag has no effect). |
14 |
|
15 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
16 |
|
17 |
app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild | 24 +++++++++++----------- |
18 |
.../emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild | 24 +++++++++++----------- |
19 |
app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild | 24 +++++++++++----------- |
20 |
app-editors/emacs-vcs/metadata.xml | 2 +- |
21 |
4 files changed, 37 insertions(+), 37 deletions(-) |
22 |
|
23 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild |
24 |
index 79e76df1347..1f69edf59ad 100644 |
25 |
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild |
26 |
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild |
27 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
28 |
|
29 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
30 |
SLOT="26" |
31 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
32 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
33 |
REQUIRED_USE="?? ( aqua X )" |
34 |
RESTRICT="test" |
35 |
|
36 |
@@ -80,14 +80,13 @@ RDEPEND="sys-libs/ncurses:0= |
37 |
) |
38 |
) |
39 |
gtk? ( |
40 |
- xwidgets? ( |
41 |
- net-libs/webkit-gtk:4= |
42 |
+ gtk2? ( x11-libs/gtk+:2 ) |
43 |
+ !gtk2? ( |
44 |
x11-libs/gtk+:3 |
45 |
- x11-libs/libXcomposite |
46 |
- ) |
47 |
- !xwidgets? ( |
48 |
- gtk3? ( x11-libs/gtk+:3 ) |
49 |
- !gtk3? ( x11-libs/gtk+:2 ) |
50 |
+ xwidgets? ( |
51 |
+ net-libs/webkit-gtk:4= |
52 |
+ x11-libs/libXcomposite |
53 |
+ ) |
54 |
) |
55 |
) |
56 |
!gtk? ( |
57 |
@@ -210,11 +209,12 @@ src_configure() { |
58 |
recommended that you compile Emacs with the Athena/Lucid or the |
59 |
Motif toolkit instead. |
60 |
EOF |
61 |
- if use xwidgets; then |
62 |
- myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
63 |
+ if use gtk2; then |
64 |
+ myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" |
65 |
+ use xwidgets && ewarn \ |
66 |
+ "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." |
67 |
else |
68 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
69 |
- myconf+=" --without-xwidgets" |
70 |
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" |
71 |
fi |
72 |
for f in motif Xaw3d athena; do |
73 |
use ${f} && ewarn \ |
74 |
|
75 |
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 |
76 |
index ee8f5f2ac3c..c5898b1c2dd 100644 |
77 |
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild |
78 |
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180731.ebuild |
79 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
80 |
|
81 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
82 |
SLOT="27" |
83 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
84 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
85 |
REQUIRED_USE="?? ( aqua X )" |
86 |
RESTRICT="test" |
87 |
|
88 |
@@ -81,14 +81,13 @@ RDEPEND="sys-libs/ncurses:0= |
89 |
) |
90 |
) |
91 |
gtk? ( |
92 |
- xwidgets? ( |
93 |
- net-libs/webkit-gtk:4= |
94 |
+ gtk2? ( x11-libs/gtk+:2 ) |
95 |
+ !gtk2? ( |
96 |
x11-libs/gtk+:3 |
97 |
- x11-libs/libXcomposite |
98 |
- ) |
99 |
- !xwidgets? ( |
100 |
- gtk3? ( x11-libs/gtk+:3 ) |
101 |
- !gtk3? ( x11-libs/gtk+:2 ) |
102 |
+ xwidgets? ( |
103 |
+ net-libs/webkit-gtk:4= |
104 |
+ x11-libs/libXcomposite |
105 |
+ ) |
106 |
) |
107 |
) |
108 |
!gtk? ( |
109 |
@@ -211,11 +210,12 @@ src_configure() { |
110 |
recommended that you compile Emacs with the Athena/Lucid or the |
111 |
Motif toolkit instead. |
112 |
EOF |
113 |
- if use xwidgets; then |
114 |
- myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
115 |
+ if use gtk2; then |
116 |
+ myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" |
117 |
+ use xwidgets && ewarn \ |
118 |
+ "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." |
119 |
else |
120 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
121 |
- myconf+=" --without-xwidgets" |
122 |
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" |
123 |
fi |
124 |
for f in motif Xaw3d athena; do |
125 |
use ${f} && ewarn \ |
126 |
|
127 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
128 |
index 2fef204a390..3cb2cdf754a 100644 |
129 |
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
130 |
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild |
131 |
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
132 |
|
133 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
134 |
SLOT="27" |
135 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
136 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
137 |
REQUIRED_USE="?? ( aqua X )" |
138 |
RESTRICT="test" |
139 |
|
140 |
@@ -82,14 +82,13 @@ RDEPEND="sys-libs/ncurses:0= |
141 |
) |
142 |
) |
143 |
gtk? ( |
144 |
- xwidgets? ( |
145 |
- net-libs/webkit-gtk:4= |
146 |
+ gtk2? ( x11-libs/gtk+:2 ) |
147 |
+ !gtk2? ( |
148 |
x11-libs/gtk+:3 |
149 |
- x11-libs/libXcomposite |
150 |
- ) |
151 |
- !xwidgets? ( |
152 |
- gtk3? ( x11-libs/gtk+:3 ) |
153 |
- !gtk3? ( x11-libs/gtk+:2 ) |
154 |
+ xwidgets? ( |
155 |
+ net-libs/webkit-gtk:4= |
156 |
+ x11-libs/libXcomposite |
157 |
+ ) |
158 |
) |
159 |
) |
160 |
!gtk? ( |
161 |
@@ -213,11 +212,12 @@ src_configure() { |
162 |
recommended that you compile Emacs with the Athena/Lucid or the |
163 |
Motif toolkit instead. |
164 |
EOF |
165 |
- if use xwidgets; then |
166 |
- myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
167 |
+ if use gtk2; then |
168 |
+ myconf+=" --with-x-toolkit=gtk2 --without-xwidgets" |
169 |
+ use xwidgets && ewarn \ |
170 |
+ "USE flag \"xwidgets\" has no effect if \"gtk2\" is set." |
171 |
else |
172 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
173 |
- myconf+=" --without-xwidgets" |
174 |
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" |
175 |
fi |
176 |
for f in motif Xaw3d athena; do |
177 |
use ${f} && ewarn \ |
178 |
|
179 |
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml |
180 |
index 3562545ef0a..d60762a414d 100644 |
181 |
--- a/app-editors/emacs-vcs/metadata.xml |
182 |
+++ b/app-editors/emacs-vcs/metadata.xml |
183 |
@@ -31,7 +31,7 @@ |
184 |
notification</flag> |
185 |
<flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
186 |
system font name</flag> |
187 |
- <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2 |
188 |
+ <flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3 |
189 |
(<pkg>x11-libs/gtk+</pkg>)</flag> |
190 |
<flag name="gzip-el">Compress bundled Emacs Lisp source</flag> |
191 |
<flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image |