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-22.1-r3.ebuild emacs-21.4-r14.ebuild
Date: Wed, 30 Jan 2008 20:37:03
Message-Id: E1JKJg4-0007gY-9c@stork.gentoo.org
1 ulm 08/01/30 20:37:00
2
3 Modified: ChangeLog emacs-22.1-r3.ebuild
4 emacs-21.4-r14.ebuild
5 Log:
6 Replace ALSA disable patch by sed magic. Add missing dependency on pkgconfig.
7 (Portage version: 2.1.4)
8
9 Revision Changes Path
10 1.231 app-editors/emacs/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.231&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.231&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.230&r2=1.231
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
19 retrieving revision 1.230
20 retrieving revision 1.231
21 diff -u -r1.230 -r1.231
22 --- ChangeLog 22 Jan 2008 10:06:44 -0000 1.230
23 +++ ChangeLog 30 Jan 2008 20:36:59 -0000 1.231
24 @@ -1,6 +1,11 @@
25 # ChangeLog for app-editors/emacs
26 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.230 2008/01/22 10:06:44 ulm Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.231 2008/01/30 20:36:59 ulm Exp $
29 +
30 + 30 Jan 2008; Ulrich Mueller <ulm@g.o>
31 + -files/emacs-22.1-disable_alsa_detection.patch, emacs-21.4-r14.ebuild,
32 + emacs-22.1-r3.ebuild:
33 + Replace ALSA disable patch by sed magic. Add missing dependency on pkgconfig.
34
35 22 Jan 2008; Ulrich Mueller <ulm@g.o> -emacs-21.4-r4.ebuild:
36 Remove old.
37
38
39
40 1.17 app-editors/emacs/emacs-22.1-r3.ebuild
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?rev=1.17&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?rev=1.17&content-type=text/plain
44 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild?r1=1.16&r2=1.17
45
46 Index: emacs-22.1-r3.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v
49 retrieving revision 1.16
50 retrieving revision 1.17
51 diff -u -r1.16 -r1.17
52 --- emacs-22.1-r3.ebuild 22 Jan 2008 07:56:54 -0000 1.16
53 +++ emacs-22.1-r3.ebuild 30 Jan 2008 20:36:59 -0000 1.17
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2008 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.16 2008/01/22 07:56:54 vapier Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r3.ebuild,v 1.17 2008/01/30 20:36:59 ulm Exp $
59
60 WANT_AUTOCONF="2.5"
61 WANT_AUTOMAKE="latest"
62 @@ -44,6 +44,8 @@
63 )"
64
65 DEPEND="${RDEPEND}
66 + alsa? ( dev-util/pkgconfig )
67 + gtk? ( dev-util/pkgconfig )
68 gzip-el? ( app-arch/gzip )"
69
70 # FULL_VERSION keeps the full version number, which is needed in order to
71 @@ -54,9 +56,24 @@
72 unpack ${A}
73 cd "${S}"
74
75 + epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
76 + epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
77 + epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
78 + epatch "${FILESDIR}/${P}-backup-buffer.patch"
79 + epatch "${FILESDIR}/${P}-hack-local-variables.patch"
80 + epatch "${FILESDIR}/${P}-format-int.patch"
81 + epatch "${FILESDIR}/${P}-s390x-non-multilib.patch"
82 +
83 sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
84 -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
85 "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
86 +
87 + if ! use alsa; then
88 + # ALSA is detected even if not requested by its USE flag.
89 + # Suppress it by supplying pkg-config with a wrong library name.
90 + sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
91 + || die "unable to sed configure.in"
92 + fi
93 if ! use gzip-el; then
94 # Emacs' build system automatically detects the gzip binary and
95 # compresses el files. We don't want that so confuse it with a
96 @@ -65,17 +82,6 @@
97 || die "unable to sed configure.in"
98 fi
99
100 - epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
101 - epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
102 - epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
103 - epatch "${FILESDIR}/${P}-backup-buffer.patch"
104 - epatch "${FILESDIR}/${P}-hack-local-variables.patch"
105 - epatch "${FILESDIR}/${P}-format-int.patch"
106 - epatch "${FILESDIR}/${P}-s390x-non-multilib.patch"
107 - # ALSA is detected and used even if not requested by the USE=alsa flag.
108 - # So remove the automagic check
109 - use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
110 -
111 eautoreconf
112 }
113
114
115
116
117 1.13 app-editors/emacs/emacs-21.4-r14.ebuild
118
119 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?rev=1.13&view=markup
120 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?rev=1.13&content-type=text/plain
121 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild?r1=1.12&r2=1.13
122
123 Index: emacs-21.4-r14.ebuild
124 ===================================================================
125 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v
126 retrieving revision 1.12
127 retrieving revision 1.13
128 diff -u -r1.12 -r1.13
129 --- emacs-21.4-r14.ebuild 22 Jan 2008 07:56:54 -0000 1.12
130 +++ emacs-21.4-r14.ebuild 30 Jan 2008 20:36:59 -0000 1.13
131 @@ -1,6 +1,6 @@
132 # Copyright 1999-2008 Gentoo Foundation
133 # Distributed under the terms of the GNU General Public License v2
134 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.12 2008/01/22 07:56:54 vapier Exp $
135 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r14.ebuild,v 1.13 2008/01/30 20:36:59 ulm Exp $
136
137 WANT_AUTOCONF="2.1"
138
139 @@ -42,13 +42,13 @@
140 unpack ${A}
141 cd "${S}"
142
143 + EPATCH_SUFFIX=patch epatch
144 +
145 sed -i \
146 -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
147 -e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
148 "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
149
150 - EPATCH_SUFFIX=patch epatch
151 -
152 # install emacsclient.1 man page (#165466)
153 sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
154
155
156
157
158 --
159 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups