Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/
Date: Sun, 05 Aug 2018 08:09:49
Message-Id: 1533456498.c42e007ccf67643c3bc16a548b9f0caa80dc691e.ulm@gentoo
1 commit: c42e007ccf67643c3bc16a548b9f0caa80dc691e
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 5 08:08:18 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 5 08:08:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42e007c
7
8 app-editors/emacs: Remove old.
9
10 Package-Manager: Portage-2.3.44, Repoman-2.3.10
11
12 app-editors/emacs/Manifest | 1 -
13 app-editors/emacs/emacs-18.59-r11.ebuild | 157 -------------------------------
14 2 files changed, 158 deletions(-)
15
16 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
17 index ab5ba0a1174..f652673f266 100644
18 --- a/app-editors/emacs/Manifest
19 +++ b/app-editors/emacs/Manifest
20 @@ -1,5 +1,4 @@
21 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
22 -DIST emacs-18.59-patches-10.tar.xz 21496 BLAKE2B bfa0202511a9e41d3278c63f43f174cca4ba95f42675796d85139fc43654ca3b9bc56a8c547029eaae967df66ec1e520d3bcdc67c4d53261fea70def6641574c SHA512 c0255d9d02e047cc2173cebb916677e268d8f5043c9dd08041b78019df208cdd02eb8eb49256acde7a3d5b004a7227ee9a1220d7b1e24580bdb5a5258216fc39
23 DIST emacs-18.59-patches-11.tar.xz 22032 BLAKE2B cfdb85aeefa7a71dfd0719de893e9ea3f7118baa0b8c5aa97b3800c1a5743e77d63c35ab1e4afb13c284f5c6dda522d1e2e37f8bfd9bbba052e543af7401565b SHA512 cac3f2efc8b3f18cdf43474453acc406c5b469ecc11955f8216083a4deced887aea4a73221aa36f0bc6b7480788606f969ee1df15a8932ee771fdf790e98c00c
24 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
25 DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48
26
27 diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
28 deleted file mode 100644
29 index 91fad29d2a6..00000000000
30 --- a/app-editors/emacs/emacs-18.59-r11.ebuild
31 +++ /dev/null
32 @@ -1,157 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -inherit toolchain-funcs flag-o-matic multilib
39 -
40 -DESCRIPTION="The extensible self-documenting text editor"
41 -HOMEPAGE="https://www.gnu.org/software/emacs/"
42 -SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
43 - ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
44 - https://dev.gentoo.org/~ulm/emacs/${P}-patches-10.tar.xz"
45 -
46 -LICENSE="GPL-1+ GPL-2+ BSD" #HPND
47 -SLOT="18"
48 -KEYWORDS="amd64 x86"
49 -IUSE="abi_x86_x32"
50 -
51 -RDEPEND=">=app-eselect/eselect-emacs-1.16
52 - sys-libs/ncurses:0=
53 - amd64? (
54 - abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_x32(-)?] )
55 - !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] )
56 - )"
57 -# X? ( x11-libs/libX11[-xcb] )
58 -DEPEND="${RDEPEND}
59 - virtual/pkgconfig"
60 -
61 -PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
62 -
63 -src_prepare() {
64 - default
65 -
66 - # Do not use the sandbox, or the dumped Emacs will be twice as large
67 - sed -i -e 's:\./temacs.*dump:SANDBOX_ON=0 LD_PRELOAD= env &:' \
68 - src/ymakefile || die
69 -}
70 -
71 -src_configure() {
72 - # autoconf? What's autoconf? We are living in 1992. ;-)
73 - local arch
74 - case ${ARCH} in
75 - amd64)
76 - if use abi_x86_x32; then
77 - arch=x86-x32
78 - multilib_toolchain_setup x32
79 - else
80 - arch=intel386
81 - multilib_toolchain_setup x86
82 - fi
83 - ;;
84 - x86) arch=intel386 ;;
85 - *) die "Architecture ${ARCH} not yet supported" ;;
86 - esac
87 - local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
88 - #use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
89 - sed -e "${cmd}" src/config.h-dist >src/config.h || die
90 -
91 - cat <<-END >src/paths.h
92 - #define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
93 - #define PATH_EXEC "/usr/share/emacs/${PV}/etc"
94 - #define PATH_LOCK "/var/lib/emacs/lock/"
95 - #define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
96 - END
97 -
98 - sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
99 - -e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
100 - src/s-linux.h || die
101 -
102 - # -O3 and -finline-functions cause segmentation faults at run time.
103 - # -Wno-implicit will quieten GCC 5; feel free to submit a patch
104 - # adding all those missing prototypes.
105 - strip-flags
106 - filter-flags -finline-functions -fpie
107 - append-flags -Wno-implicit
108 - append-ldflags $(test-flags -no-pie) #639562
109 - replace-flags -O[3-9] -O2
110 -}
111 -
112 -src_compile() {
113 - addpredict /var/lib/emacs/lock
114 - emake --jobs=1 \
115 - CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
116 - LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
117 -}
118 -
119 -src_install() {
120 - local basedir="/usr/share/emacs/${PV}" i
121 -
122 - dodir ${basedir}
123 - dodir /usr/share/man/man1
124 - emake --jobs=1 \
125 - LIBDIR="${D}"${basedir} \
126 - BINDIR="${D}"/usr/bin \
127 - MANDIR="${D}"/usr/share/man/man1 \
128 - install
129 -
130 - rmdir "${D}"${basedir}/lock || die
131 - find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
132 - -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
133 - fperms -R go-w ${basedir}
134 -
135 - # remove duplicate DOC file
136 - rm "${D}"${basedir}/etc/DOC || die
137 -
138 - # move executables to the correct place
139 - mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
140 - for i in etags ctags emacsclient; do
141 - mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
142 - rm "${D}"${basedir}/etc/${i} || die
143 - done
144 -
145 - dodir /usr/libexec/emacs/${PV}
146 - for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
147 - yow env server
148 - do
149 - mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
150 - dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
151 - done
152 - for i in test-distrib make-docfile; do
153 - rm "${D}"${basedir}/etc/${i} || die
154 - done
155 -
156 - # move man page
157 - mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
158 -
159 - # move Info files
160 - dodir /usr/share/info
161 - mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
162 - dosym ../../info/emacs-${SLOT} "${basedir}"/info
163 - docompress -x /usr/share/info
164 -
165 - # move Info dir to avoid collisions with the dir file generated by portage
166 - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
167 - touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
168 -
169 - dodir /var/lib/emacs
170 - diropts -m0777
171 - keepdir /var/lib/emacs/lock
172 -
173 - dodoc README PROBLEMS
174 -}
175 -
176 -pkg_preinst() {
177 - # move Info dir file to correct name
178 - if [[ -d "${D}"/usr/share/info ]]; then
179 - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
180 - fi
181 -}
182 -
183 -pkg_postinst() {
184 - eselect emacs update ifunset
185 -}
186 -
187 -pkg_postrm() {
188 - eselect emacs update ifunset
189 -}