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-cvs: emacs-cvs-23.0.60-r2.ebuild emacs-cvs-23.0.50_pre20080201.ebuild
Date: Sun, 03 Feb 2008 10:27:04
Message-Id: E1JLc3x-0001J7-8n@stork.gentoo.org
1 ulm 08/02/03 10:27:01
2
3 Modified: emacs-cvs-23.0.60-r2.ebuild
4 emacs-cvs-23.0.50_pre20080201.ebuild
5 Log:
6 Reorder image format options alphabetically.
7 (Portage version: 2.1.4.1)
8
9 Revision Changes Path
10 1.5 app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild?r1=1.4&r2=1.5
15
16 Index: emacs-cvs-23.0.60-r2.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- emacs-cvs-23.0.60-r2.ebuild 2 Feb 2008 14:18:11 -0000 1.4
23 +++ emacs-cvs-23.0.60-r2.ebuild 3 Feb 2008 10:27:00 -0000 1.5
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2008 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v 1.4 2008/02/02 14:18:11 ulm Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v 1.5 2008/02/03 10:27:00 ulm Exp $
29
30 ECVS_AUTH="pserver"
31 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
32 @@ -40,9 +40,9 @@
33 x11-misc/emacs-desktop
34 gif? ( media-libs/giflib )
35 jpeg? ( media-libs/jpeg )
36 - tiff? ( media-libs/tiff )
37 png? ( media-libs/libpng )
38 svg? ( >=gnome-base/librsvg-2.0 )
39 + tiff? ( media-libs/tiff )
40 xpm? ( x11-libs/libXpm )
41 xft? (
42 media-libs/fontconfig
43 @@ -129,16 +129,18 @@
44 if use X; then
45 myconf="${myconf} --with-x"
46 myconf="${myconf} $(use_with toolkit-scroll-bars)"
47 + myconf="${myconf} $(use_with gif) $(use_with jpeg)"
48 + myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
49 + myconf="${myconf} $(use_with tiff) $(use_with xpm)"
50 +
51 myconf="${myconf} $(use_enable xft font-backend)"
52 myconf="${myconf} $(use_with xft freetype) $(use_with xft)"
53 if use xft && use libotf; then
54 - myconf="${myconf} --with-libotf"
55 + # disable m17n-flt since m17n-lib-1.3.4 doesn't support it
56 + myconf="${myconf} --with-libotf --without-m17n-flt"
57 else
58 - myconf="${myconf} --without-libotf"
59 + myconf="${myconf} --without-libotf --without-m17n-flt"
60 fi
61 - myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
62 - myconf="${myconf} $(use_with gif) $(use_with png)"
63 - myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)"
64
65 # GTK+ is the default toolkit if USE=gtk is chosen with other
66 # possibilities. Emacs upstream thinks this should be standard
67
68
69
70 1.3 app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild
71
72 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild?rev=1.3&view=markup
73 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild?rev=1.3&content-type=text/plain
74 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild?r1=1.2&r2=1.3
75
76 Index: emacs-cvs-23.0.50_pre20080201.ebuild
77 ===================================================================
78 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v
79 retrieving revision 1.2
80 retrieving revision 1.3
81 diff -u -r1.2 -r1.3
82 --- emacs-cvs-23.0.50_pre20080201.ebuild 2 Feb 2008 09:14:26 -0000 1.2
83 +++ emacs-cvs-23.0.50_pre20080201.ebuild 3 Feb 2008 10:27:00 -0000 1.3
84 @@ -1,6 +1,6 @@
85 # Copyright 1999-2008 Gentoo Foundation
86 # Distributed under the terms of the GNU General Public License v2
87 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v 1.2 2008/02/02 09:14:26 ulm Exp $
88 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v 1.3 2008/02/03 10:27:00 ulm Exp $
89
90 WANT_AUTOCONF="latest"
91 WANT_AUTOMAKE="latest"
92 @@ -33,9 +33,9 @@
93 x11-misc/emacs-desktop
94 gif? ( media-libs/giflib )
95 jpeg? ( media-libs/jpeg )
96 - tiff? ( media-libs/tiff )
97 png? ( media-libs/libpng )
98 svg? ( >=gnome-base/librsvg-2.0 )
99 + tiff? ( media-libs/tiff )
100 xpm? ( x11-libs/libXpm )
101 gtk? ( =x11-libs/gtk+-2* )
102 !gtk? (
103 @@ -106,9 +106,9 @@
104 if use X; then
105 myconf="${myconf} --with-x"
106 myconf="${myconf} $(use_with toolkit-scroll-bars)"
107 - myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
108 - myconf="${myconf} $(use_with gif) $(use_with png)"
109 - myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)"
110 + myconf="${myconf} $(use_with gif) $(use_with jpeg)"
111 + myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
112 + myconf="${myconf} $(use_with tiff) $(use_with xpm)"
113
114 # GTK+ is the default toolkit if USE=gtk is chosen with other
115 # possibilities. Emacs upstream thinks this should be standard
116
117
118
119 --
120 gentoo-commits@l.g.o mailing list