Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/emacs: ChangeLog emacs-23.4_rc1.ebuild emacs-23.3-r4.ebuild
Date: Sat, 28 Jan 2012 10:54:44
Message-Id: 20120128105433.EC8632004B@flycatcher.gentoo.org
1 ulm 12/01/28 10:54:33
2
3 Modified: ChangeLog emacs-23.4_rc1.ebuild
4 emacs-23.3-r4.ebuild
5 Log:
6 USE="athena Xaw3d" is a valid combination, so don't warn.
7
8 (Portage version: 2.1.10.44/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.471 app-editors/emacs/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.471&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.471&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.470&r2=1.471
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
20 retrieving revision 1.470
21 retrieving revision 1.471
22 diff -u -r1.470 -r1.471
23 --- ChangeLog 19 Jan 2012 19:15:17 -0000 1.470
24 +++ ChangeLog 28 Jan 2012 10:54:33 -0000 1.471
25 @@ -1,6 +1,10 @@
26 # ChangeLog for app-editors/emacs
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.470 2012/01/19 19:15:17 ulm Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.471 2012/01/28 10:54:33 ulm Exp $
30 +
31 + 28 Jan 2012; Ulrich Müller <ulm@g.o> emacs-23.3-r4.ebuild,
32 + emacs-23.4_rc1.ebuild:
33 + USE="athena Xaw3d" is a valid combination, so don't warn.
34
35 *emacs-23.4_rc1 (19 Jan 2012)
36
37
38
39
40 1.2 app-editors/emacs/emacs-23.4_rc1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4_rc1.ebuild?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4_rc1.ebuild?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.4_rc1.ebuild?r1=1.1&r2=1.2
45
46 Index: emacs-23.4_rc1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4_rc1.ebuild,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- emacs-23.4_rc1.ebuild 19 Jan 2012 19:15:17 -0000 1.1
53 +++ emacs-23.4_rc1.ebuild 28 Jan 2012 10:54:33 -0000 1.2
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2012 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4_rc1.ebuild,v 1.1 2012/01/19 19:15:17 ulm Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4_rc1.ebuild,v 1.2 2012/01/28 10:54:33 ulm Exp $
59
60 EAPI=4
61 WANT_AUTOMAKE="none"
62 @@ -149,9 +149,16 @@
63 if use gtk; then
64 einfo "Configuring to build with GIMP Toolkit (GTK+)"
65 myconf="${myconf} --with-x-toolkit=gtk"
66 - elif use Xaw3d || use athena; then
67 + local f
68 + for f in athena Xaw3d motif; do
69 + use ${f} && ewarn "USE flag \"${f}\" ignored" \
70 + "(superseded by \"gtk\")"
71 + done
72 + elif use athena || use Xaw3d; then
73 einfo "Configuring to build with Athena/Lucid toolkit"
74 myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
75 + use motif && ewarn "USE flag \"motif\" ignored" \
76 + "(superseded by \"athena\" or \"Xaw3d\")"
77 elif use motif; then
78 einfo "Configuring to build with Motif toolkit"
79 myconf="${myconf} --with-x-toolkit=motif"
80 @@ -159,14 +166,6 @@
81 einfo "Configuring to build with no toolkit"
82 myconf="${myconf} --with-x-toolkit=no"
83 fi
84 -
85 - local f tk=
86 - for f in gtk Xaw3d athena motif; do
87 - use ${f} || continue
88 - [[ ${tk} ]] \
89 - && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
90 - tk="${tk}${tk:+ }${f}"
91 - done
92 elif use aqua; then
93 einfo "Configuring to build with Cocoa support"
94 myconf="${myconf} --with-ns --disable-ns-self-contained"
95
96
97
98 1.7 app-editors/emacs/emacs-23.3-r4.ebuild
99
100 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild?rev=1.7&view=markup
101 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild?rev=1.7&content-type=text/plain
102 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild?r1=1.6&r2=1.7
103
104 Index: emacs-23.3-r4.ebuild
105 ===================================================================
106 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild,v
107 retrieving revision 1.6
108 retrieving revision 1.7
109 diff -u -r1.6 -r1.7
110 --- emacs-23.3-r4.ebuild 16 Jan 2012 03:00:17 -0000 1.6
111 +++ emacs-23.3-r4.ebuild 28 Jan 2012 10:54:33 -0000 1.7
112 @@ -1,6 +1,6 @@
113 # Copyright 1999-2012 Gentoo Foundation
114 # Distributed under the terms of the GNU General Public License v2
115 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild,v 1.6 2012/01/16 03:00:17 jer Exp $
116 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r4.ebuild,v 1.7 2012/01/28 10:54:33 ulm Exp $
117
118 EAPI=4
119 WANT_AUTOMAKE="none"
120 @@ -149,9 +149,16 @@
121 if use gtk; then
122 einfo "Configuring to build with GIMP Toolkit (GTK+)"
123 myconf="${myconf} --with-x-toolkit=gtk"
124 - elif use Xaw3d || use athena; then
125 + local f
126 + for f in athena Xaw3d motif; do
127 + use ${f} && ewarn "USE flag \"${f}\" ignored" \
128 + "(superseded by \"gtk\")"
129 + done
130 + elif use athena || use Xaw3d; then
131 einfo "Configuring to build with Athena/Lucid toolkit"
132 myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
133 + use motif && ewarn "USE flag \"motif\" ignored" \
134 + "(superseded by \"athena\" or \"Xaw3d\")"
135 elif use motif; then
136 einfo "Configuring to build with Motif toolkit"
137 myconf="${myconf} --with-x-toolkit=motif"
138 @@ -159,14 +166,6 @@
139 einfo "Configuring to build with no toolkit"
140 myconf="${myconf} --with-x-toolkit=no"
141 fi
142 -
143 - local f tk=
144 - for f in gtk Xaw3d athena motif; do
145 - use ${f} || continue
146 - [[ ${tk} ]] \
147 - && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
148 - tk="${tk}${tk:+ }${f}"
149 - done
150 elif use aqua; then
151 einfo "Configuring to build with Cocoa support"
152 myconf="${myconf} --with-ns --disable-ns-self-contained"
Report Message
Find on MARC Find on Google Groups