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-vcs: emacs-vcs-24.0.9999-r3.ebuild ChangeLog emacs-vcs-23.4.9999.ebuild
Date: Sat, 28 Jan 2012 11:44:50
Message-Id: 20120128114438.DF8D32004B@flycatcher.gentoo.org
1 ulm 12/01/28 11:44:38
2
3 Modified: emacs-vcs-24.0.9999-r3.ebuild ChangeLog
4 emacs-vcs-23.4.9999.ebuild
5 Log:
6 USE="athena Xaw3d" is a valid combination, so don't warn.
7 Add a warning for USE="-gtk gtk3".
8
9 (Portage version: 2.1.10.44/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.2 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild?r1=1.1&r2=1.2
17
18 Index: emacs-vcs-24.0.9999-r3.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- emacs-vcs-24.0.9999-r3.ebuild 13 Jan 2012 23:07:05 -0000 1.1
25 +++ emacs-vcs-24.0.9999-r3.ebuild 28 Jan 2012 11:44:38 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild,v 1.1 2012/01/13 23:07:05 ulm Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild,v 1.2 2012/01/28 11:44:38 ulm Exp $
31
32 EAPI=4
33
34 @@ -144,7 +144,7 @@
35 fi
36
37 if use X; then
38 - myconf="${myconf} --with-x"
39 + myconf="${myconf} --with-x --without-ns"
40 myconf="${myconf} $(use_with gconf)"
41 myconf="${myconf} $(use_with gsettings)"
42 myconf="${myconf} $(use_with toolkit-scroll-bars)"
43 @@ -168,9 +168,16 @@
44 if use gtk; then
45 einfo "Configuring to build with GIMP Toolkit (GTK+)"
46 myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
47 - elif use Xaw3d || use athena; then
48 + local f
49 + for f in athena Xaw3d motif; do
50 + use ${f} && ewarn "USE flag \"${f}\" ignored" \
51 + "(superseded by \"gtk\")"
52 + done
53 + elif use athena || use Xaw3d; then
54 einfo "Configuring to build with Athena/Lucid toolkit"
55 myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
56 + use motif && ewarn "USE flag \"motif\" ignored" \
57 + "(superseded by \"athena\" or \"Xaw3d\")"
58 elif use motif; then
59 einfo "Configuring to build with Motif toolkit"
60 myconf="${myconf} --with-x-toolkit=motif"
61 @@ -179,15 +186,10 @@
62 myconf="${myconf} --with-x-toolkit=no"
63 fi
64
65 - local f tk=
66 - for f in gtk Xaw3d athena motif; do
67 - use ${f} || continue
68 - [[ ${tk} ]] \
69 - && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
70 - tk="${tk}${tk:+ }${f}"
71 - done
72 + ! use gtk && use gtk3 \
73 + && ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
74 else
75 - myconf="${myconf} --without-x"
76 + myconf="${myconf} --without-x --without-ns"
77 fi
78
79 if [[ ${PV##*.} = 9999 ]]; then
80
81
82
83 1.80 app-editors/emacs-vcs/ChangeLog
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.80&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.80&content-type=text/plain
87 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.79&r2=1.80
88
89 Index: ChangeLog
90 ===================================================================
91 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
92 retrieving revision 1.79
93 retrieving revision 1.80
94 diff -u -r1.79 -r1.80
95 --- ChangeLog 22 Jan 2012 10:27:44 -0000 1.79
96 +++ ChangeLog 28 Jan 2012 11:44:38 -0000 1.80
97 @@ -1,6 +1,11 @@
98 # ChangeLog for app-editors/emacs-vcs
99 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
100 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.79 2012/01/22 10:27:44 ulm Exp $
101 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.80 2012/01/28 11:44:38 ulm Exp $
102 +
103 + 28 Jan 2012; Ulrich Müller <ulm@g.o> emacs-vcs-23.4.9999.ebuild,
104 + emacs-vcs-24.0.9999-r3.ebuild:
105 + USE="athena Xaw3d" is a valid combination, so don't warn.
106 + Add a warning for USE="-gtk gtk3".
107
108 *emacs-vcs-23.4.9999 (22 Jan 2012)
109
110
111
112
113 1.2 app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild?rev=1.2&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild?rev=1.2&content-type=text/plain
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild?r1=1.1&r2=1.2
118
119 Index: emacs-vcs-23.4.9999.ebuild
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild,v
122 retrieving revision 1.1
123 retrieving revision 1.2
124 diff -u -r1.1 -r1.2
125 --- emacs-vcs-23.4.9999.ebuild 22 Jan 2012 10:27:44 -0000 1.1
126 +++ emacs-vcs-23.4.9999.ebuild 28 Jan 2012 11:44:38 -0000 1.2
127 @@ -1,6 +1,6 @@
128 # Copyright 1999-2012 Gentoo Foundation
129 # Distributed under the terms of the GNU General Public License v2
130 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild,v 1.1 2012/01/22 10:27:44 ulm Exp $
131 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild,v 1.2 2012/01/28 11:44:38 ulm Exp $
132
133 EAPI=4
134 WANT_AUTOMAKE="none"
135 @@ -142,7 +142,7 @@
136 fi
137
138 if use X; then
139 - myconf="${myconf} --with-x"
140 + myconf="${myconf} --with-x --without-ns"
141 myconf="${myconf} $(use_with gconf)"
142 myconf="${myconf} $(use_with toolkit-scroll-bars)"
143 myconf="${myconf} $(use_with gif) $(use_with jpeg)"
144 @@ -166,9 +166,16 @@
145 if use gtk; then
146 einfo "Configuring to build with GIMP Toolkit (GTK+)"
147 myconf="${myconf} --with-x-toolkit=gtk"
148 - elif use Xaw3d || use athena; then
149 + local f
150 + for f in athena Xaw3d motif; do
151 + use ${f} && ewarn "USE flag \"${f}\" ignored" \
152 + "(superseded by \"gtk\")"
153 + done
154 + elif use athena || use Xaw3d; then
155 einfo "Configuring to build with Athena/Lucid toolkit"
156 myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
157 + use motif && ewarn "USE flag \"motif\" ignored" \
158 + "(superseded by \"athena\" or \"Xaw3d\")"
159 elif use motif; then
160 einfo "Configuring to build with Motif toolkit"
161 myconf="${myconf} --with-x-toolkit=motif"
162 @@ -176,16 +183,8 @@
163 einfo "Configuring to build with no toolkit"
164 myconf="${myconf} --with-x-toolkit=no"
165 fi
166 -
167 - local f tk=
168 - for f in gtk Xaw3d athena motif; do
169 - use ${f} || continue
170 - [[ ${tk} ]] \
171 - && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
172 - tk="${tk}${tk:+ }${f}"
173 - done
174 else
175 - myconf="${myconf} --without-x"
176 + myconf="${myconf} --without-x --without-ns"
177 fi
178
179 if [[ ${PV##*.} = 9999 ]]; then
Report Message
Find on MARC Find on Google Groups