1 |
commit: d7fbd72efd2cc6096a71ac654e1659f12963dfe3 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 12 17:21:17 2020 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 29 11:43:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fbd72e |
7 |
|
8 |
app-editors/emacs: Migrate from X to gui USE flag. |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
12 |
|
13 |
...acs-18.59-r12.ebuild => emacs-18.59-r13.ebuild} | 8 +++--- |
14 |
...emacs-23.4-r18.ebuild => emacs-23.4-r19.ebuild} | 32 ++++++++++------------ |
15 |
.../{emacs-24.5-r7.ebuild => emacs-24.5-r8.ebuild} | 28 +++++++++---------- |
16 |
.../{emacs-25.3-r6.ebuild => emacs-25.3-r7.ebuild} | 28 +++++++++---------- |
17 |
.../{emacs-26.3-r1.ebuild => emacs-26.3-r2.ebuild} | 28 +++++++++---------- |
18 |
.../{emacs-27.1.ebuild => emacs-27.1-r1.ebuild} | 28 +++++++++---------- |
19 |
app-editors/emacs/emacs-27.1.9999-r1.ebuild | 28 +++++++++---------- |
20 |
app-editors/emacs/emacs-28.0.9999.ebuild | 28 +++++++++---------- |
21 |
8 files changed, 103 insertions(+), 105 deletions(-) |
22 |
|
23 |
diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild |
24 |
similarity index 97% |
25 |
rename from app-editors/emacs/emacs-18.59-r12.ebuild |
26 |
rename to app-editors/emacs/emacs-18.59-r13.ebuild |
27 |
index 964b14b1384..c5e4416862a 100644 |
28 |
--- a/app-editors/emacs/emacs-18.59-r12.ebuild |
29 |
+++ b/app-editors/emacs/emacs-18.59-r13.ebuild |
30 |
@@ -14,17 +14,17 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz |
31 |
LICENSE="GPL-1+ GPL-2+ BSD HPND" |
32 |
SLOT="18" |
33 |
KEYWORDS="amd64 x86" |
34 |
-IUSE="abi_x86_x32 X" |
35 |
+IUSE="abi_x86_x32 gui" |
36 |
|
37 |
RDEPEND="sys-libs/ncurses:0= |
38 |
amd64? ( |
39 |
abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] ) |
40 |
!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) |
41 |
) |
42 |
- X? ( x11-libs/libX11 )" |
43 |
+ gui? ( x11-libs/libX11 )" |
44 |
|
45 |
DEPEND="${RDEPEND} |
46 |
- X? ( |
47 |
+ gui? ( |
48 |
x11-base/xorg-proto |
49 |
x11-misc/xbitmaps |
50 |
)" |
51 |
@@ -62,7 +62,7 @@ src_configure() { |
52 |
*) die "Architecture ${ARCH} not yet supported" ;; |
53 |
esac |
54 |
local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/" |
55 |
- use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/" |
56 |
+ use gui && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/" |
57 |
sed -e "${cmd}" src/config.h-dist >src/config.h || die |
58 |
|
59 |
cat <<-END >src/paths.h |
60 |
|
61 |
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r19.ebuild |
62 |
similarity index 95% |
63 |
rename from app-editors/emacs/emacs-23.4-r18.ebuild |
64 |
rename to app-editors/emacs/emacs-23.4-r19.ebuild |
65 |
index a84fad2f8d3..a7ebc3b3470 100644 |
66 |
--- a/app-editors/emacs/emacs-23.4-r18.ebuild |
67 |
+++ b/app-editors/emacs/emacs-23.4-r19.ebuild |
68 |
@@ -14,10 +14,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 |
69 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
70 |
SLOT="23" |
71 |
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
72 |
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" |
73 |
-REQUIRED_USE="?? ( aqua X )" |
74 |
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm" |
75 |
|
76 |
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
77 |
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] |
78 |
net-libs/liblockfile |
79 |
sys-libs/ncurses:0= |
80 |
kerberos? ( virtual/krb5 ) |
81 |
@@ -25,7 +24,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
82 |
games? ( acct-group/gamestat ) |
83 |
gpm? ( sys-libs/gpm ) |
84 |
dbus? ( sys-apps/dbus ) |
85 |
- X? ( |
86 |
+ gui? ( !aqua? ( |
87 |
x11-libs/libICE |
88 |
x11-libs/libSM |
89 |
x11-libs/libX11 |
90 |
@@ -71,15 +70,13 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
91 |
) ) |
92 |
) |
93 |
) |
94 |
- )" |
95 |
+ ) )" |
96 |
|
97 |
DEPEND="${RDEPEND} |
98 |
- X? ( x11-base/xorg-proto )" |
99 |
+ gui? ( !aqua? ( x11-base/xorg-proto ) )" |
100 |
|
101 |
BDEPEND="app-eselect/eselect-emacs |
102 |
- alsa? ( virtual/pkgconfig ) |
103 |
- dbus? ( virtual/pkgconfig ) |
104 |
- X? ( virtual/pkgconfig ) |
105 |
+ virtual/pkgconfig |
106 |
gzip-el? ( app-arch/gzip )" |
107 |
|
108 |
RDEPEND="${RDEPEND} |
109 |
@@ -144,7 +141,14 @@ src_configure() { |
110 |
myconf+=" $(use_with sound)" |
111 |
fi |
112 |
|
113 |
- if use X; then |
114 |
+ if ! use gui; then |
115 |
+ einfo "Configuring to build without window system support" |
116 |
+ myconf+=" --without-x --without-ns" |
117 |
+ elif use aqua; then |
118 |
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" |
119 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
120 |
+ myconf+=" --without-x" |
121 |
+ else |
122 |
myconf+=" --with-x --without-ns" |
123 |
myconf+=" $(use_with gconf)" |
124 |
myconf+=" $(use_with toolkit-scroll-bars)" |
125 |
@@ -191,12 +195,6 @@ src_configure() { |
126 |
einfo "Configuring to build with no toolkit" |
127 |
myconf+=" --with-x-toolkit=no" |
128 |
fi |
129 |
- elif use aqua; then |
130 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
131 |
- myconf+=" --with-ns --disable-ns-self-contained" |
132 |
- myconf+=" --without-x" |
133 |
- else |
134 |
- myconf+=" --without-x --without-ns" |
135 |
fi |
136 |
|
137 |
# According to configure, this option is only used for GNU/Linux |
138 |
@@ -313,7 +311,7 @@ src_install() { |
139 |
it is strongly recommended that you use app-admin/emacs-updater |
140 |
to rebuild all byte-compiled elisp files of the installed Emacs |
141 |
packages." |
142 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
143 |
+ use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
144 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
145 |
machine would satisfy basic Emacs requirements under X11. |
146 |
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
147 |
|
148 |
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r8.ebuild |
149 |
similarity index 95% |
150 |
rename from app-editors/emacs/emacs-24.5-r7.ebuild |
151 |
rename to app-editors/emacs/emacs-24.5-r8.ebuild |
152 |
index e82a60ec1c2..19dd854cd07 100644 |
153 |
--- a/app-editors/emacs/emacs-24.5-r7.ebuild |
154 |
+++ b/app-editors/emacs/emacs-24.5-r8.ebuild |
155 |
@@ -13,10 +13,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
156 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
157 |
SLOT="24" |
158 |
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
159 |
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
160 |
-REQUIRED_USE="?? ( aqua X )" |
161 |
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" |
162 |
|
163 |
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
164 |
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] |
165 |
net-libs/liblockfile |
166 |
sys-libs/ncurses:0= |
167 |
acl? ( virtual/acl ) |
168 |
@@ -30,7 +29,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
169 |
selinux? ( sys-libs/libselinux ) |
170 |
ssl? ( net-libs/gnutls:0= ) |
171 |
zlib? ( sys-libs/zlib ) |
172 |
- X? ( |
173 |
+ gui? ( !aqua? ( |
174 |
x11-libs/libICE |
175 |
x11-libs/libSM |
176 |
x11-libs/libX11 |
177 |
@@ -81,10 +80,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
178 |
) ) |
179 |
) |
180 |
) |
181 |
- )" |
182 |
+ ) )" |
183 |
|
184 |
DEPEND="${RDEPEND} |
185 |
- X? ( x11-base/xorg-proto )" |
186 |
+ gui? ( !aqua? ( x11-base/xorg-proto ) )" |
187 |
|
188 |
BDEPEND="app-eselect/eselect-emacs |
189 |
virtual/pkgconfig |
190 |
@@ -137,7 +136,14 @@ src_configure() { |
191 |
myconf+=" --with-sound=$(usex sound oss)" |
192 |
fi |
193 |
|
194 |
- if use X; then |
195 |
+ if ! use gui; then |
196 |
+ einfo "Configuring to build without window system support" |
197 |
+ myconf+=" --without-x --without-ns" |
198 |
+ elif use aqua; then |
199 |
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" |
200 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
201 |
+ myconf+=" --without-x" |
202 |
+ else |
203 |
myconf+=" --with-x --without-ns" |
204 |
myconf+=" $(use_with gconf)" |
205 |
myconf+=" $(use_with gsettings)" |
206 |
@@ -194,12 +200,6 @@ src_configure() { |
207 |
fi |
208 |
! use gtk && use gtk2 && ewarn \ |
209 |
"USE flag \"gtk2\" has no effect if \"gtk\" is not set." |
210 |
- elif use aqua; then |
211 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
212 |
- myconf+=" --with-ns --disable-ns-self-contained" |
213 |
- myconf+=" --without-x" |
214 |
- else |
215 |
- myconf+=" --without-x --without-ns" |
216 |
fi |
217 |
|
218 |
econf \ |
219 |
@@ -307,7 +307,7 @@ src_install() { |
220 |
\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is |
221 |
strongly recommended that you use app-admin/emacs-updater to rebuild |
222 |
all byte-compiled elisp files of the installed Emacs packages." |
223 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
224 |
+ use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
225 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
226 |
machine would satisfy basic Emacs requirements under X11. |
227 |
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
228 |
|
229 |
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r7.ebuild |
230 |
similarity index 95% |
231 |
rename from app-editors/emacs/emacs-25.3-r6.ebuild |
232 |
rename to app-editors/emacs/emacs-25.3-r7.ebuild |
233 |
index c5fbd04048e..d54d8a9d32f 100644 |
234 |
--- a/app-editors/emacs/emacs-25.3-r6.ebuild |
235 |
+++ b/app-editors/emacs/emacs-25.3-r7.ebuild |
236 |
@@ -13,10 +13,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
237 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
238 |
SLOT="25" |
239 |
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
240 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
241 |
-REQUIRED_USE="?? ( aqua X )" |
242 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" |
243 |
|
244 |
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
245 |
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] |
246 |
net-libs/liblockfile |
247 |
sys-libs/ncurses:0= |
248 |
acl? ( virtual/acl ) |
249 |
@@ -30,7 +29,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
250 |
selinux? ( sys-libs/libselinux ) |
251 |
ssl? ( net-libs/gnutls:0= ) |
252 |
zlib? ( sys-libs/zlib ) |
253 |
- X? ( |
254 |
+ gui? ( !aqua? ( |
255 |
x11-libs/libICE |
256 |
x11-libs/libSM |
257 |
x11-libs/libX11 |
258 |
@@ -84,10 +83,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
259 |
) ) |
260 |
) |
261 |
) |
262 |
- )" |
263 |
+ ) )" |
264 |
|
265 |
DEPEND="${RDEPEND} |
266 |
- X? ( x11-base/xorg-proto )" |
267 |
+ gui? ( !aqua? ( x11-base/xorg-proto ) )" |
268 |
|
269 |
BDEPEND="app-eselect/eselect-emacs |
270 |
virtual/pkgconfig |
271 |
@@ -140,7 +139,14 @@ src_configure() { |
272 |
myconf+=" --with-sound=$(usex sound oss)" |
273 |
fi |
274 |
|
275 |
- if use X; then |
276 |
+ if ! use gui; then |
277 |
+ einfo "Configuring to build without window system support" |
278 |
+ myconf+=" --without-x --without-ns" |
279 |
+ elif use aqua; then |
280 |
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" |
281 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
282 |
+ myconf+=" --without-x" |
283 |
+ else |
284 |
myconf+=" --with-x --without-ns" |
285 |
myconf+=" $(use_with gconf)" |
286 |
myconf+=" $(use_with gsettings)" |
287 |
@@ -202,12 +208,6 @@ src_configure() { |
288 |
fi |
289 |
! use gtk && use gtk2 && ewarn \ |
290 |
"USE flag \"gtk2\" has no effect if \"gtk\" is not set." |
291 |
- elif use aqua; then |
292 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
293 |
- myconf+=" --with-ns --disable-ns-self-contained" |
294 |
- myconf+=" --without-x" |
295 |
- else |
296 |
- myconf+=" --without-x --without-ns" |
297 |
fi |
298 |
|
299 |
econf \ |
300 |
@@ -317,7 +317,7 @@ src_install() { |
301 |
it is strongly recommended that you use app-admin/emacs-updater |
302 |
to rebuild all byte-compiled elisp files of the installed Emacs |
303 |
packages." |
304 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
305 |
+ use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
306 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
307 |
machine would satisfy basic Emacs requirements under X11. |
308 |
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
309 |
|
310 |
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r2.ebuild |
311 |
similarity index 95% |
312 |
rename from app-editors/emacs/emacs-26.3-r1.ebuild |
313 |
rename to app-editors/emacs/emacs-26.3-r2.ebuild |
314 |
index 334f327910f..764b1ea0cc7 100644 |
315 |
--- a/app-editors/emacs/emacs-26.3-r1.ebuild |
316 |
+++ b/app-editors/emacs/emacs-26.3-r2.ebuild |
317 |
@@ -12,10 +12,9 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" |
318 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
319 |
SLOT="26" |
320 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
321 |
-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" |
322 |
-REQUIRED_USE="?? ( aqua X )" |
323 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui 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 Xaw3d xft +xpm xwidgets zlib" |
324 |
|
325 |
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
326 |
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] |
327 |
sys-libs/ncurses:0= |
328 |
acl? ( virtual/acl ) |
329 |
alsa? ( media-libs/alsa-lib ) |
330 |
@@ -32,7 +31,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
331 |
ssl? ( net-libs/gnutls:0= ) |
332 |
systemd? ( sys-apps/systemd ) |
333 |
zlib? ( sys-libs/zlib ) |
334 |
- X? ( |
335 |
+ gui? ( !aqua? ( |
336 |
x11-libs/libICE |
337 |
x11-libs/libSM |
338 |
x11-libs/libX11 |
339 |
@@ -92,10 +91,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
340 |
) ) |
341 |
) |
342 |
) |
343 |
- )" |
344 |
+ ) )" |
345 |
|
346 |
DEPEND="${RDEPEND} |
347 |
- X? ( x11-base/xorg-proto )" |
348 |
+ gui? ( !aqua? ( x11-base/xorg-proto ) )" |
349 |
|
350 |
BDEPEND="app-eselect/eselect-emacs |
351 |
virtual/pkgconfig |
352 |
@@ -143,7 +142,14 @@ src_configure() { |
353 |
myconf+=" --with-sound=$(usex sound oss)" |
354 |
fi |
355 |
|
356 |
- if use X; then |
357 |
+ if ! use gui; then |
358 |
+ einfo "Configuring to build without window system support" |
359 |
+ myconf+=" --without-x --without-ns" |
360 |
+ elif use aqua; then |
361 |
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" |
362 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
363 |
+ myconf+=" --without-x" |
364 |
+ else |
365 |
myconf+=" --with-x --without-ns" |
366 |
myconf+=" $(use_with gconf)" |
367 |
myconf+=" $(use_with gsettings)" |
368 |
@@ -214,12 +220,6 @@ src_configure() { |
369 |
use xwidgets && ewarn \ |
370 |
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
371 |
fi |
372 |
- elif use aqua; then |
373 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
374 |
- myconf+=" --with-ns --disable-ns-self-contained" |
375 |
- myconf+=" --without-x" |
376 |
- else |
377 |
- myconf+=" --without-x --without-ns" |
378 |
fi |
379 |
|
380 |
econf \ |
381 |
@@ -343,7 +343,7 @@ src_install() { |
382 |
it is strongly recommended that you use app-admin/emacs-updater |
383 |
to rebuild all byte-compiled elisp files of the installed Emacs |
384 |
packages." |
385 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
386 |
+ use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
387 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
388 |
machine would satisfy basic Emacs requirements under X11. |
389 |
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
390 |
|
391 |
diff --git a/app-editors/emacs/emacs-27.1.ebuild b/app-editors/emacs/emacs-27.1-r1.ebuild |
392 |
similarity index 95% |
393 |
rename from app-editors/emacs/emacs-27.1.ebuild |
394 |
rename to app-editors/emacs/emacs-27.1-r1.ebuild |
395 |
index 9258d36369f..b2548c76e2c 100644 |
396 |
--- a/app-editors/emacs/emacs-27.1.ebuild |
397 |
+++ b/app-editors/emacs/emacs-27.1-r1.ebuild |
398 |
@@ -40,11 +40,10 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed |
399 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
400 |
|
401 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
402 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz 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" |
403 |
-REQUIRED_USE="?? ( aqua X )" |
404 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz 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 Xaw3d xft +xpm xwidgets zlib" |
405 |
RESTRICT="test" |
406 |
|
407 |
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
408 |
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] |
409 |
sys-libs/ncurses:0= |
410 |
acl? ( virtual/acl ) |
411 |
alsa? ( media-libs/alsa-lib ) |
412 |
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
413 |
ssl? ( net-libs/gnutls:0= ) |
414 |
systemd? ( sys-apps/systemd ) |
415 |
zlib? ( sys-libs/zlib ) |
416 |
- X? ( |
417 |
+ gui? ( !aqua? ( |
418 |
x11-libs/libICE |
419 |
x11-libs/libSM |
420 |
x11-libs/libX11 |
421 |
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
422 |
) ) |
423 |
) |
424 |
) |
425 |
- )" |
426 |
+ ) )" |
427 |
|
428 |
DEPEND="${RDEPEND} |
429 |
- X? ( x11-base/xorg-proto )" |
430 |
+ gui? ( !aqua? ( x11-base/xorg-proto ) )" |
431 |
|
432 |
BDEPEND="app-eselect/eselect-emacs |
433 |
sys-apps/texinfo |
434 |
@@ -182,7 +181,14 @@ src_configure() { |
435 |
myconf+=" --with-sound=$(usex sound oss)" |
436 |
fi |
437 |
|
438 |
- if use X; then |
439 |
+ if ! use gui; then |
440 |
+ einfo "Configuring to build without window system support" |
441 |
+ myconf+=" --without-x --without-ns" |
442 |
+ elif use aqua; then |
443 |
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" |
444 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
445 |
+ myconf+=" --without-x" |
446 |
+ else |
447 |
myconf+=" --with-x --without-ns" |
448 |
myconf+=" $(use_with gconf)" |
449 |
myconf+=" $(use_with gsettings)" |
450 |
@@ -254,12 +260,6 @@ src_configure() { |
451 |
use xwidgets && ewarn \ |
452 |
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
453 |
fi |
454 |
- elif use aqua; then |
455 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
456 |
- myconf+=" --with-ns --disable-ns-self-contained" |
457 |
- myconf+=" --without-x" |
458 |
- else |
459 |
- myconf+=" --without-x --without-ns" |
460 |
fi |
461 |
|
462 |
econf \ |
463 |
@@ -386,7 +386,7 @@ src_install() { |
464 |
it is strongly recommended that you use app-admin/emacs-updater |
465 |
to rebuild all byte-compiled elisp files of the installed Emacs |
466 |
packages." |
467 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
468 |
+ use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
469 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
470 |
machine would satisfy basic Emacs requirements under X11. |
471 |
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
472 |
|
473 |
diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild |
474 |
index 78fc06dd7e0..bd826f2edf1 100644 |
475 |
--- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild |
476 |
+++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild |
477 |
@@ -40,11 +40,10 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed |
478 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
479 |
|
480 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
481 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz 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" |
482 |
-REQUIRED_USE="?? ( aqua X )" |
483 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz 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 Xaw3d xft +xpm xwidgets zlib" |
484 |
RESTRICT="test" |
485 |
|
486 |
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
487 |
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] |
488 |
sys-libs/ncurses:0= |
489 |
acl? ( virtual/acl ) |
490 |
alsa? ( media-libs/alsa-lib ) |
491 |
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
492 |
ssl? ( net-libs/gnutls:0= ) |
493 |
systemd? ( sys-apps/systemd ) |
494 |
zlib? ( sys-libs/zlib ) |
495 |
- X? ( |
496 |
+ gui? ( !aqua? ( |
497 |
x11-libs/libICE |
498 |
x11-libs/libSM |
499 |
x11-libs/libX11 |
500 |
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
501 |
) ) |
502 |
) |
503 |
) |
504 |
- )" |
505 |
+ ) )" |
506 |
|
507 |
DEPEND="${RDEPEND} |
508 |
- X? ( x11-base/xorg-proto )" |
509 |
+ gui? ( !aqua? ( x11-base/xorg-proto ) )" |
510 |
|
511 |
BDEPEND="app-eselect/eselect-emacs |
512 |
sys-apps/texinfo |
513 |
@@ -181,7 +180,14 @@ src_configure() { |
514 |
myconf+=" --with-sound=$(usex sound oss)" |
515 |
fi |
516 |
|
517 |
- if use X; then |
518 |
+ if ! use gui; then |
519 |
+ einfo "Configuring to build without window system support" |
520 |
+ myconf+=" --without-x --without-ns" |
521 |
+ elif use aqua; then |
522 |
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" |
523 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
524 |
+ myconf+=" --without-x" |
525 |
+ else |
526 |
myconf+=" --with-x --without-ns" |
527 |
myconf+=" $(use_with gconf)" |
528 |
myconf+=" $(use_with gsettings)" |
529 |
@@ -253,12 +259,6 @@ src_configure() { |
530 |
use xwidgets && ewarn \ |
531 |
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
532 |
fi |
533 |
- elif use aqua; then |
534 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
535 |
- myconf+=" --with-ns --disable-ns-self-contained" |
536 |
- myconf+=" --without-x" |
537 |
- else |
538 |
- myconf+=" --without-x --without-ns" |
539 |
fi |
540 |
|
541 |
econf \ |
542 |
@@ -385,7 +385,7 @@ src_install() { |
543 |
it is strongly recommended that you use app-admin/emacs-updater |
544 |
to rebuild all byte-compiled elisp files of the installed Emacs |
545 |
packages." |
546 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
547 |
+ use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
548 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
549 |
machine would satisfy basic Emacs requirements under X11. |
550 |
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
551 |
|
552 |
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild |
553 |
index 8137dcdd89b..478d84767fc 100644 |
554 |
--- a/app-editors/emacs/emacs-28.0.9999.ebuild |
555 |
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild |
556 |
@@ -40,11 +40,10 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed |
557 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
558 |
|
559 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
560 |
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gzip-el harfbuzz 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" |
561 |
-REQUIRED_USE="?? ( aqua X )" |
562 |
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gtk2 gui gzip-el harfbuzz 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 Xaw3d xft +xpm xwidgets zlib" |
563 |
RESTRICT="test" |
564 |
|
565 |
-RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
566 |
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] |
567 |
sys-libs/ncurses:0= |
568 |
acl? ( virtual/acl ) |
569 |
alsa? ( media-libs/alsa-lib ) |
570 |
@@ -63,7 +62,7 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
571 |
ssl? ( net-libs/gnutls:0= ) |
572 |
systemd? ( sys-apps/systemd ) |
573 |
zlib? ( sys-libs/zlib ) |
574 |
- X? ( |
575 |
+ gui? ( !aqua? ( |
576 |
x11-libs/libICE |
577 |
x11-libs/libSM |
578 |
x11-libs/libX11 |
579 |
@@ -124,10 +123,10 @@ RDEPEND=">=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
580 |
) ) |
581 |
) |
582 |
) |
583 |
- )" |
584 |
+ ) )" |
585 |
|
586 |
DEPEND="${RDEPEND} |
587 |
- X? ( x11-base/xorg-proto )" |
588 |
+ gui? ( !aqua? ( x11-base/xorg-proto ) )" |
589 |
|
590 |
BDEPEND="app-eselect/eselect-emacs |
591 |
sys-apps/texinfo |
592 |
@@ -180,7 +179,14 @@ src_configure() { |
593 |
myconf+=" --with-sound=$(usex sound oss)" |
594 |
fi |
595 |
|
596 |
- if use X; then |
597 |
+ if ! use gui; then |
598 |
+ einfo "Configuring to build without window system support" |
599 |
+ myconf+=" --without-x --without-ns" |
600 |
+ elif use aqua; then |
601 |
+ einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" |
602 |
+ myconf+=" --with-ns --disable-ns-self-contained" |
603 |
+ myconf+=" --without-x" |
604 |
+ else |
605 |
myconf+=" --with-x --without-ns" |
606 |
myconf+=" $(use_with gconf)" |
607 |
myconf+=" $(use_with gsettings)" |
608 |
@@ -252,12 +258,6 @@ src_configure() { |
609 |
use xwidgets && ewarn \ |
610 |
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
611 |
fi |
612 |
- elif use aqua; then |
613 |
- einfo "Configuring to build with Nextstep (Cocoa) support" |
614 |
- myconf+=" --with-ns --disable-ns-self-contained" |
615 |
- myconf+=" --without-x" |
616 |
- else |
617 |
- myconf+=" --without-x --without-ns" |
618 |
fi |
619 |
|
620 |
econf \ |
621 |
@@ -384,7 +384,7 @@ src_install() { |
622 |
it is strongly recommended that you use app-admin/emacs-updater |
623 |
to rebuild all byte-compiled elisp files of the installed Emacs |
624 |
packages." |
625 |
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
626 |
+ use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
627 |
Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
628 |
machine would satisfy basic Emacs requirements under X11. |
629 |
See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |