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: metadata.xml ChangeLog emacs-vcs-24.0.9999-r1.ebuild
Date: Fri, 01 Jul 2011 18:39:24
Message-Id: 20110701183913.948262004B@flycatcher.gentoo.org
1 ulm 11/07/01 18:39:13
2
3 Modified: metadata.xml ChangeLog
4 emacs-vcs-24.0.9999-r1.ebuild
5 Log:
6 Support gtk3 toolkit. New USE flags gsettings, gtk3, and wide-int.
7
8 (Portage version: 2.1.10.3/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.6 app-editors/emacs-vcs/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/metadata.xml?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/metadata.xml?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/metadata.xml?r1=1.5&r2=1.6
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/metadata.xml,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- metadata.xml 28 Feb 2011 16:31:09 -0000 1.5
24 +++ metadata.xml 1 Jul 2011 18:39:13 -0000 1.6
25 @@ -22,6 +22,10 @@
26 <use>
27 <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
28 font name</flag>
29 + <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
30 + system font name</flag>
31 + <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
32 + version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
33 <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
34 <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
35 <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
36 @@ -30,5 +34,6 @@
37 of the internal Lisp implementations</flag>
38 <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
39 preference to Emacs' own scrollbars</flag>
40 + <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit)</flag>
41 </use>
42 </pkgmetadata>
43
44
45
46 1.56 app-editors/emacs-vcs/ChangeLog
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.56&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.56&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.55&r2=1.56
51
52 Index: ChangeLog
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
55 retrieving revision 1.55
56 retrieving revision 1.56
57 diff -u -r1.55 -r1.56
58 --- ChangeLog 19 Mar 2011 09:34:59 -0000 1.55
59 +++ ChangeLog 1 Jul 2011 18:39:13 -0000 1.56
60 @@ -1,6 +1,10 @@
61 # ChangeLog for app-editors/emacs-vcs
62 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
63 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.55 2011/03/19 09:34:59 ulm Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.56 2011/07/01 18:39:13 ulm Exp $
65 +
66 + 01 Jul 2011; Ulrich Mueller <ulm@g.o> emacs-vcs-24.0.9999-r1.ebuild,
67 + metadata.xml:
68 + Support gtk3 toolkit. New USE flags gsettings, gtk3, and wide-int.
69
70 19 Mar 2011; Ulrich Mueller <ulm@g.o> emacs-vcs-23.3.9999.ebuild,
71 emacs-vcs-24.0.9999-r1.ebuild:
72
73
74
75 1.10 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild?rev=1.10&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild?rev=1.10&content-type=text/plain
79 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild?r1=1.9&r2=1.10
80
81 Index: emacs-vcs-24.0.9999-r1.ebuild
82 ===================================================================
83 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v
84 retrieving revision 1.9
85 retrieving revision 1.10
86 diff -u -r1.9 -r1.10
87 --- emacs-vcs-24.0.9999-r1.ebuild 19 Mar 2011 09:34:59 -0000 1.9
88 +++ emacs-vcs-24.0.9999-r1.ebuild 1 Jul 2011 18:39:13 -0000 1.10
89 @@ -1,6 +1,6 @@
90 # Copyright 1999-2011 Gentoo Foundation
91 # Distributed under the terms of the GNU General Public License v2
92 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.9 2011/03/19 09:34:59 ulm Exp $
93 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.10 2011/07/01 18:39:13 ulm Exp $
94
95 EAPI=4
96
97 @@ -30,7 +30,7 @@
98 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
99 SLOT="24"
100 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
101 -IUSE="alsa dbus gconf gif gnutls gpm gtk gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
102 +IUSE="alsa dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
103 RESTRICT="strip"
104
105 RDEPEND="sys-libs/ncurses
106 @@ -47,7 +47,8 @@
107 x11-libs/libXmu
108 x11-libs/libXt
109 x11-misc/xbitmaps
110 - gconf? ( >=gnome-base/gconf-2.26.2 )
111 + gsettings? ( >=dev-libs/glib-2.28.6 )
112 + !gsettings? ( gconf? ( >=gnome-base/gconf-2.26.2 ) )
113 libxml2? ( >=dev-libs/libxml2-2.2.0 )
114 gif? ( media-libs/giflib )
115 jpeg? ( virtual/jpeg )
116 @@ -65,7 +66,10 @@
117 >=dev-libs/m17n-lib-1.5.1
118 )
119 )
120 - gtk? ( x11-libs/gtk+:2 )
121 + gtk? (
122 + gtk3? ( x11-libs/gtk+:3 )
123 + !gtk3? ( x11-libs/gtk+:2 )
124 + )
125 !gtk? (
126 Xaw3d? ( x11-libs/Xaw3d )
127 !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
128 @@ -147,28 +151,41 @@
129
130 if use X; then
131 myconf="${myconf} --with-x"
132 - myconf="${myconf} $(use_with gconf) $(use_with libxml2 xml2)"
133 + myconf="${myconf} $(use_with libxml2 xml2)"
134 myconf="${myconf} $(use_with toolkit-scroll-bars)"
135 + myconf="${myconf} $(use_with wide-int)"
136 myconf="${myconf} $(use_with gif) $(use_with jpeg)"
137 myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
138 myconf="${myconf} $(use_with tiff) $(use_with xpm)"
139 - myconf="${myconf} $(use_with imagemagick) $(use_with xft)"
140 + myconf="${myconf} $(use_with imagemagick)"
141 +
142 + if use gsettings; then
143 + myconf="${myconf} --with-gsettings --without-gconf"
144 + use gconf && ewarn \
145 + "USE flag \"gconf\" has no effect if \"gsettings\" is also set."
146 + else
147 + myconf="${myconf} --without-gsettings $(use_with gconf)"
148 + fi
149
150 if use xft; then
151 + myconf="${myconf} --with-xft"
152 myconf="${myconf} $(use_with m17n-lib libotf)"
153 myconf="${myconf} $(use_with m17n-lib m17n-flt)"
154 else
155 + myconf="${myconf} --without-xft"
156 myconf="${myconf} --without-libotf --without-m17n-flt"
157 use m17n-lib && ewarn \
158 - "USE flag \"m17n-lib\" has no effect because xft is not set."
159 + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
160 fi
161
162 - # GTK+ is the default toolkit if USE=gtk is chosen with other
163 - # possibilities. Emacs upstream thinks this should be standard
164 - # policy on all distributions
165 if use gtk; then
166 - einfo "Configuring to build with GIMP Toolkit (GTK+)"
167 - myconf="${myconf} --with-x-toolkit=gtk"
168 + if use gtk3; then
169 + einfo "Configuring to build with GIMP Toolkit (GTK+ 3)"
170 + myconf="${myconf} --with-x-toolkit=gtk3"
171 + else
172 + einfo "Configuring to build with GIMP Toolkit (GTK+ 2)"
173 + myconf="${myconf} --with-x-toolkit=gtk"
174 + fi
175 elif use Xaw3d; then
176 einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
177 myconf="${myconf} --with-x-toolkit=athena"