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: emacs-18.59-r9.ebuild ChangeLog
Date: Thu, 03 Oct 2013 09:21:56
Message-Id: 20131003092149.7ACA92004C@flycatcher.gentoo.org
1 ulm 13/10/03 09:21:49
2
3 Modified: ChangeLog
4 Added: emacs-18.59-r9.ebuild
5 Log:
6 Bump ebuild to EAPI 5. Depend on multilib-enabled ncurses on amd64.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
9
10 Revision Changes Path
11 1.600 app-editors/emacs/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.600&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?rev=1.600&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/ChangeLog?r1=1.599&r2=1.600
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v
20 retrieving revision 1.599
21 retrieving revision 1.600
22 diff -u -r1.599 -r1.600
23 --- ChangeLog 19 Sep 2013 06:48:28 -0000 1.599
24 +++ ChangeLog 3 Oct 2013 09:21:49 -0000 1.600
25 @@ -1,6 +1,11 @@
26 # ChangeLog for app-editors/emacs
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.599 2013/09/19 06:48:28 ulm Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.600 2013/10/03 09:21:49 ulm Exp $
30 +
31 +*emacs-18.59-r9 (03 Oct 2013)
32 +
33 + 03 Oct 2013; Ulrich Müller <ulm@g.o> +emacs-18.59-r9.ebuild:
34 + Bump ebuild to EAPI 5. Depend on multilib-enabled ncurses on amd64.
35
36 19 Sep 2013; Ulrich Müller <ulm@g.o> -emacs-24.3-r1.ebuild:
37 Remove old.
38
39
40
41 1.1 app-editors/emacs/emacs-18.59-r9.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild?rev=1.1&content-type=text/plain
45
46 Index: emacs-18.59-r9.ebuild
47 ===================================================================
48 # Copyright 1999-2013 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild,v 1.1 2013/10/03 09:21:49 ulm Exp $
51
52 EAPI=5
53
54 inherit eutils toolchain-funcs flag-o-matic multilib
55
56 DESCRIPTION="The extensible self-documenting text editor"
57 HOMEPAGE="http://www.gnu.org/software/emacs/"
58 SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
59 ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
60 mirror://gentoo/${P}-patches-8.tar.bz2"
61
62 LICENSE="GPL-1+ GPL-2+ BSD" #HPND
63 SLOT="18"
64 KEYWORDS="~amd64 ~x86"
65 IUSE="+abi_x86_32 abi_x86_x32"
66 REQUIRED_USE="amd64? ( || ( abi_x86_32 abi_x86_x32 ) )"
67
68 RDEPEND="sys-libs/ncurses
69 >=app-admin/eselect-emacs-1.2
70 amd64? (
71 sys-libs/ncurses[abi_x86_x32(-)?]
72 !abi_x86_x32? ( sys-libs/ncurses[abi_x86_32(-)?] )
73 )"
74 # X? ( x11-libs/libX11[-xcb] )
75 DEPEND="${RDEPEND}
76 virtual/pkgconfig"
77
78 src_prepare() {
79 epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
80 EPATCH_SUFFIX=patch epatch
81 epatch_user
82 }
83
84 src_configure() {
85 # autoconf? What's autoconf? We are living in 1992. ;-)
86 local arch
87 case ${ARCH} in
88 amd64)
89 if use abi_x86_x32; then
90 arch=x86-x32
91 multilib_toolchain_setup x32
92 elif use abi_x86_32; then
93 arch=intel386
94 multilib_toolchain_setup x86
95 else
96 die "Need 32 bit ABI on amd64"
97 fi
98 ;;
99 x86) arch=intel386 ;;
100 *) die "Architecture ${ARCH} not yet supported" ;;
101 esac
102 local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
103 #use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
104 sed -e "${cmd}" src/config.h-dist >src/config.h || die
105
106 cat <<-END >src/paths.h
107 #define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
108 #define PATH_EXEC "/usr/share/emacs/${PV}/etc"
109 #define PATH_LOCK "/var/lib/emacs/lock/"
110 #define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
111 END
112
113 sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
114 -e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
115 src/s-linux.h || die
116
117 # -O3 and -finline-functions cause segmentation faults at run time.
118 filter-flags -finline-functions
119 replace-flags -O[3-9] -O2
120 strip-flags
121 }
122
123 src_compile() {
124 # Do not use the sandbox, or the dumped Emacs will be twice as large
125 export SANDBOX_ON=0
126 emake --jobs=1 \
127 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
128 LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
129 }
130
131 src_install() {
132 local basedir="/usr/share/emacs/${PV}" i
133
134 dodir ${basedir}
135 dodir /usr/share/man/man1
136 emake --jobs=1 \
137 LIBDIR="${D}"${basedir} \
138 BINDIR="${D}"/usr/bin \
139 MANDIR="${D}"/usr/share/man/man1 \
140 install
141
142 rmdir "${D}"${basedir}/lock || die
143 find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
144 -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
145 fperms -R go-w ${basedir}
146
147 # remove duplicate DOC file
148 rm "${D}"${basedir}/etc/DOC || die
149
150 # move executables to the correct place
151 mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
152 for i in etags ctags emacsclient; do
153 mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
154 rm "${D}"${basedir}/etc/${i} || die
155 done
156
157 dodir /usr/libexec/emacs/${PV}
158 for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
159 yow env server
160 do
161 mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
162 dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
163 done
164 for i in test-distrib make-docfile; do
165 rm "${D}"${basedir}/etc/${i} || die
166 done
167
168 # move man page
169 mv "${D}"/usr/share/man/man1/emacs{,-emacs-${SLOT}}.1 || die
170
171 # move Info files
172 dodir /usr/share/info
173 mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
174 dosym ../../info/emacs-${SLOT} "${basedir}"/info
175 docompress -x /usr/share/info
176
177 # move Info dir to avoid collisions with the dir file generated by portage
178 mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
179 touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
180
181 dodir /var/lib/emacs
182 diropts -m0777
183 keepdir /var/lib/emacs/lock
184
185 dodoc README PROBLEMS
186 }
187
188 pkg_preinst() {
189 # move Info dir file to correct name
190 if [[ -d "${D}"/usr/share/info ]]; then
191 mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
192 fi
193
194 # remove symlink and directory installed by -r6 and earlier
195 if [[ -L "${ROOT}"/usr/share/info/emacs-${SLOT} ]]; then
196 ewarn "Removing old symlink /usr/share/info/emacs-${SLOT}"
197 rm "${ROOT}"/usr/share/info/emacs-${SLOT} || die
198 fi
199 if [[ -d "${ROOT}"/usr/share/emacs/${PV}/info \
200 && ! -L "${ROOT}"/usr/share/emacs/${PV}/info ]]; then
201 ewarn "Removing old directory /usr/share/emacs/${PV}/info"
202 rm -r "${ROOT}"/usr/share/emacs/${PV}/info || die
203 fi
204 }
205
206 pkg_postinst() {
207 eselect emacs update ifunset
208 }
209
210 pkg_postrm() {
211 eselect emacs update ifunset
212 }