1 |
ulm 11/09/08 14:10:03 |
2 |
|
3 |
Modified: ChangeLog emacs-23.3-r2.ebuild |
4 |
Log: |
5 |
Backport some changes from the emacs-vcs live ebuild. |
6 |
|
7 |
(Portage version: 2.1.10.14/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.429 app-editors/emacs/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.429&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.429&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.428&r2=1.429 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v |
19 |
retrieving revision 1.428 |
20 |
retrieving revision 1.429 |
21 |
diff -u -r1.428 -r1.429 |
22 |
--- ChangeLog 29 Aug 2011 16:28:42 -0000 1.428 |
23 |
+++ ChangeLog 8 Sep 2011 14:10:03 -0000 1.429 |
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.428 2011/08/29 16:28:42 ulm Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.429 2011/09/08 14:10:03 ulm Exp $ |
29 |
+ |
30 |
+ 02 Sep 2011; Ulrich Mueller <ulm@g.o> emacs-23.3-r2.ebuild: |
31 |
+ Backport some changes from the emacs-vcs live ebuild. |
32 |
|
33 |
29 Aug 2011; Ulrich Mueller <ulm@g.o> emacs-23.3-r1.ebuild, |
34 |
emacs-23.3-r2.ebuild: |
35 |
|
36 |
|
37 |
|
38 |
1.3 app-editors/emacs/emacs-23.3-r2.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild?rev=1.3&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild?rev=1.3&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild?r1=1.2&r2=1.3 |
43 |
|
44 |
Index: emacs-23.3-r2.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v |
47 |
retrieving revision 1.2 |
48 |
retrieving revision 1.3 |
49 |
diff -u -r1.2 -r1.3 |
50 |
--- emacs-23.3-r2.ebuild 29 Aug 2011 16:28:42 -0000 1.2 |
51 |
+++ emacs-23.3-r2.ebuild 8 Sep 2011 14:10:03 -0000 1.3 |
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.3-r2.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.3 2011/09/08 14:10:03 ulm Exp $ |
57 |
|
58 |
EAPI=4 |
59 |
WANT_AUTOMAKE="none" |
60 |
@@ -127,15 +127,16 @@ |
61 |
myconf="${myconf} $(use_with gif) $(use_with jpeg)" |
62 |
myconf="${myconf} $(use_with png) $(use_with svg rsvg)" |
63 |
myconf="${myconf} $(use_with tiff) $(use_with xpm)" |
64 |
- myconf="${myconf} $(use_with xft)" |
65 |
|
66 |
if use xft; then |
67 |
+ myconf="${myconf} --with-xft" |
68 |
myconf="${myconf} $(use_with m17n-lib libotf)" |
69 |
myconf="${myconf} $(use_with m17n-lib m17n-flt)" |
70 |
else |
71 |
+ myconf="${myconf} --without-xft" |
72 |
myconf="${myconf} --without-libotf --without-m17n-flt" |
73 |
use m17n-lib && ewarn \ |
74 |
- "USE flag \"m17n-lib\" has no effect because xft is not set." |
75 |
+ "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
76 |
fi |
77 |
|
78 |
# GTK+ is the default toolkit if USE=gtk is chosen with other |
79 |
@@ -146,7 +147,7 @@ |
80 |
myconf="${myconf} --with-x-toolkit=gtk" |
81 |
elif use Xaw3d; then |
82 |
einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit" |
83 |
- myconf="${myconf} --with-x-toolkit=athena" |
84 |
+ myconf="${myconf} --with-x-toolkit=lucid" |
85 |
elif use motif; then |
86 |
einfo "Configuring to build with Motif toolkit" |
87 |
myconf="${myconf} --with-x-toolkit=motif" |