1 |
ulm 11/01/31 20:33:26 |
2 |
|
3 |
Modified: ChangeLog emacs-23.2-r3.ebuild |
4 |
Log: |
5 |
Add explicit --without-ns configure option. |
6 |
|
7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.407 app-editors/emacs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.407&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.407&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.406&r2=1.407 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
19 |
retrieving revision 1.406 |
20 |
retrieving revision 1.407 |
21 |
diff -u -r1.406 -r1.407 |
22 |
--- ChangeLog 30 Jan 2011 08:42:03 -0000 1.406 |
23 |
+++ ChangeLog 31 Jan 2011 20:33:26 -0000 1.407 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for app-editors/emacs |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.406 2011/01/30 08:42:03 ulm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.407 2011/01/31 20:33:26 ulm Exp $ |
29 |
+ |
30 |
+ 31 Jan 2011; Ulrich Mueller <ulm@g.o> emacs-23.2-r3.ebuild: |
31 |
+ Add explicit --without-ns configure option. |
32 |
|
33 |
*emacs-23.2-r3 (30 Jan 2011) |
34 |
*emacs-22.3-r7 (30 Jan 2011) |
35 |
|
36 |
|
37 |
|
38 |
1.2 app-editors/emacs/emacs-23.2-r3.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: emacs-23.2-r3.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- emacs-23.2-r3.ebuild 30 Jan 2011 08:42:03 -0000 1.1 |
51 |
+++ emacs-23.2-r3.ebuild 31 Jan 2011 20:33:26 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2011 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.1 2011/01/30 08:42:03 ulm Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r3.ebuild,v 1.2 2011/01/31 20:33:26 ulm Exp $ |
57 |
|
58 |
EAPI=4 |
59 |
WANT_AUTOMAKE="none" |
60 |
@@ -141,13 +141,8 @@ |
61 |
myconf="${myconf} $(use_with sound)" |
62 |
fi |
63 |
|
64 |
- if use aqua; then |
65 |
- einfo "Configuring to build with Cocoa support" |
66 |
- use X && ewarn "aqua USE flag disables X." |
67 |
- myconf="${myconf} --with-ns --disable-ns-self-contained" |
68 |
- myconf="${myconf} --without-x" |
69 |
- elif use X; then |
70 |
- myconf="${myconf} --with-x" |
71 |
+ if use X; then |
72 |
+ myconf="${myconf} --with-x --without-ns" |
73 |
myconf="${myconf} $(use_with gconf)" |
74 |
myconf="${myconf} $(use_with toolkit-scroll-bars)" |
75 |
myconf="${myconf} $(use_with gif) $(use_with jpeg)" |
76 |
@@ -188,8 +183,13 @@ |
77 |
&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" |
78 |
tk="${tk}${tk:+ }${f}" |
79 |
done |
80 |
- else |
81 |
+ elif use aqua; then |
82 |
+ einfo "Configuring to build with Cocoa support" |
83 |
+ use X && ewarn "aqua USE flag disables X." |
84 |
+ myconf="${myconf} --with-ns --disable-ns-self-contained" |
85 |
myconf="${myconf} --without-x" |
86 |
+ else |
87 |
+ myconf="${myconf} --without-x --without-ns" |
88 |
fi |
89 |
|
90 |
myconf="${myconf} $(use_with hesiod)" |