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: Thu, 25 May 2017 11:00:56
Message-Id: 1495710036.d8d7b6b0898ec523568691b6329a2074531e39b6.ulm@gentoo
1 commit: d8d7b6b0898ec523568691b6329a2074531e39b6
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 25 10:54:11 2017 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Thu May 25 11:00:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d7b6b0
7
8 app-editors/emacs: Remove old.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 app-editors/emacs/Manifest | 2 -
13 app-editors/emacs/emacs-24.4-r4.ebuild | 334 ---------------------------------
14 2 files changed, 336 deletions(-)
15
16 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
17 index 94019e6592c..22781f51be0 100644
18 --- a/app-editors/emacs/Manifest
19 +++ b/app-editors/emacs/Manifest
20 @@ -4,8 +4,6 @@ DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba036709
21 DIST emacs-23.4-patches-19.tar.xz 17684 SHA256 078f5e103af9b9950afefcb8575eefd7b07eb0a241ab67ddb3b8b6d31f657abb SHA512 118d58cd5c8a74b39642bf45920fed25687af2e4a076affe985bf359862950eeba4f2ca99c6482c17c311466fbfaab3f4d583466821da4917fae9bec6e95940a WHIRLPOOL f6fe96f5cb0c2de2a48e6eda2cd26c9c724cd2da661ef4d3e4e4dd14382299615aac4b95bd4e7a21caae74b7630a70d160d65e89f6ac5fa91ad8d9bedaddded4
22 DIST emacs-23.4-patches-20.tar.xz 18544 SHA256 3ea6d9211b03ee5566674bf1ae3d4032c0921234c1612af66407e880f7e52749 SHA512 cf98090327a1963625b91149d8ff66e9ec4dc8c0bb1054eee138429b5c0d39c2a4662ae5425d7f06e7e69a17d28353f163ca38f6fe786d10def8e143f8a6b1d6 WHIRLPOOL ac3283271d71dc43595fc95dd8930e5888ef7d22cbd19c4701206ebc5aaac8178f462b789a058bb3ae6c9a17c63c0f2a16185708c4517566de50fc035298fe31
23 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
24 -DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc
25 -DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
26 DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140faae361aa556e6ded64b7ab26819f07 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc WHIRLPOOL c16cbfda1040b205ced4c1ed120aad6f65285fb315ce89dc936e6a357fbc8f9215fb178b696d2a914c53c6869384f0b1b56fcb6b84c5438f026101b4989de6c5
27 DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3
28 DIST emacs-25.1.tar.xz 42498944 SHA256 19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33 SHA512 67442b9027869c44430e1d4c3e92e74601e667c9aef7e3da16f20a562b5e3fa8c64efdd4b4055919550523093d32eac73c094b644f6573fed41b4e0938668922 WHIRLPOOL 77cf4e126580634ec5aa2d2252a5d3334b6880a2abc32c54543b8df1a7dc9687bf41c54994044be7517b397bcfc2fc1094286ff4c05a7d6f64a8ef8376a4abfb
29
30 diff --git a/app-editors/emacs/emacs-24.4-r4.ebuild b/app-editors/emacs/emacs-24.4-r4.ebuild
31 deleted file mode 100644
32 index c5172e8204d..00000000000
33 --- a/app-editors/emacs/emacs-24.4-r4.ebuild
34 +++ /dev/null
35 @@ -1,334 +0,0 @@
36 -# Copyright 1999-2017 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -
41 -inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
42 -
43 -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
44 -HOMEPAGE="https://www.gnu.org/software/emacs/"
45 -SRC_URI="mirror://gnu/emacs/${P}.tar.xz
46 - https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
47 -
48 -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
49 -SLOT="24"
50 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
51 -IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
52 -REQUIRED_USE="?? ( aqua X )"
53 -
54 -RDEPEND="sys-libs/ncurses:0=
55 - >=app-eselect/eselect-emacs-1.16
56 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?]
57 - net-libs/liblockfile
58 - acl? ( virtual/acl )
59 - alsa? ( media-libs/alsa-lib )
60 - dbus? ( sys-apps/dbus )
61 - gfile? ( >=dev-libs/glib-2.28.6 )
62 - gnutls? ( net-libs/gnutls )
63 - gpm? ( sys-libs/gpm )
64 - hesiod? ( net-dns/hesiod )
65 - kerberos? ( virtual/krb5 )
66 - libxml2? ( >=dev-libs/libxml2-2.2.0 )
67 - selinux? ( sys-libs/libselinux )
68 - zlib? ( sys-libs/zlib )
69 - X? (
70 - x11-libs/libXmu
71 - x11-libs/libXt
72 - x11-misc/xbitmaps
73 - gconf? ( >=gnome-base/gconf-2.26.2 )
74 - gsettings? ( >=dev-libs/glib-2.28.6 )
75 - gif? ( media-libs/giflib:0= )
76 - jpeg? ( virtual/jpeg:0= )
77 - png? ( >=media-libs/libpng-1.4:0= )
78 - svg? ( >=gnome-base/librsvg-2.0 )
79 - tiff? ( media-libs/tiff:0 )
80 - xpm? ( x11-libs/libXpm )
81 - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
82 - xft? (
83 - media-libs/fontconfig
84 - media-libs/freetype
85 - x11-libs/libXft
86 - m17n-lib? (
87 - >=dev-libs/libotf-0.9.4
88 - >=dev-libs/m17n-lib-1.5.1
89 - )
90 - )
91 - gtk? (
92 - gtk3? ( x11-libs/gtk+:3 )
93 - !gtk3? ( x11-libs/gtk+:2 )
94 - )
95 - !gtk? (
96 - motif? ( >=x11-libs/motif-2.3:0 )
97 - !motif? (
98 - Xaw3d? ( x11-libs/libXaw3d )
99 - !Xaw3d? ( athena? ( x11-libs/libXaw ) )
100 - )
101 - )
102 - )"
103 -
104 -DEPEND="${RDEPEND}
105 - virtual/pkgconfig
106 - gzip-el? ( app-arch/gzip )
107 - pax_kernel? ( sys-apps/attr )"
108 -
109 -RDEPEND="${RDEPEND}
110 - !<app-editors/emacs-vcs-${PV}"
111 -
112 -EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
113 -SITEFILE="20${PN}-${SLOT}-gentoo.el"
114 -# FULL_VERSION keeps the full version number, which is needed in
115 -# order to determine some path information correctly for copy/move
116 -# operations later on
117 -FULL_VERSION="${PV%%_*}"
118 -S="${WORKDIR}/emacs-${FULL_VERSION}"
119 -
120 -src_prepare() {
121 - EPATCH_SUFFIX=patch epatch
122 - epatch_user
123 -
124 - # Fix filename reference in redirected man page
125 - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
126 - || die "unable to sed ctags.1"
127 -
128 - AT_M4DIR=m4 eautoreconf
129 -}
130 -
131 -src_configure() {
132 - strip-flags
133 - filter-flags -pie #526948
134 -
135 - if use sh; then
136 - replace-flags "-O[1-9]" -O0 #262359
137 - elif use ia64; then
138 - replace-flags "-O[2-9]" -O1 #325373
139 - else
140 - replace-flags "-O[3-9]" -O2
141 - fi
142 -
143 - local myconf
144 -
145 - if use alsa; then
146 - use sound || ewarn \
147 - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
148 - myconf+=" --with-sound=alsa"
149 - else
150 - myconf+=" --with-sound=$(usex sound oss)"
151 - fi
152 -
153 - if use X; then
154 - myconf+=" --with-x --without-ns"
155 - myconf+=" $(use_with gconf)"
156 - myconf+=" $(use_with gsettings)"
157 - myconf+=" $(use_with toolkit-scroll-bars)"
158 - myconf+=" $(use_with gif)"
159 - myconf+=" $(use_with jpeg)"
160 - myconf+=" $(use_with png)"
161 - myconf+=" $(use_with svg rsvg)"
162 - myconf+=" $(use_with tiff)"
163 - myconf+=" $(use_with xpm)"
164 - myconf+=" $(use_with imagemagick)"
165 -
166 - if use xft; then
167 - myconf+=" --with-xft"
168 - myconf+=" $(use_with m17n-lib libotf)"
169 - myconf+=" $(use_with m17n-lib m17n-flt)"
170 - else
171 - myconf+=" --without-xft"
172 - myconf+=" --without-libotf --without-m17n-flt"
173 - use m17n-lib && ewarn \
174 - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
175 - fi
176 -
177 - local f
178 - if use gtk; then
179 - einfo "Configuring to build with GIMP Toolkit (GTK+)"
180 - myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
181 - for f in motif Xaw3d athena; do
182 - use ${f} && ewarn \
183 - "USE flag \"${f}\" has no effect if \"gtk\" is set."
184 - done
185 - elif use motif; then
186 - einfo "Configuring to build with Motif toolkit"
187 - myconf+=" --with-x-toolkit=motif"
188 - for f in Xaw3d athena; do
189 - use ${f} && ewarn \
190 - "USE flag \"${f}\" has no effect if \"motif\" is set."
191 - done
192 - elif use athena || use Xaw3d; then
193 - einfo "Configuring to build with Athena/Lucid toolkit"
194 - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
195 - else
196 - einfo "Configuring to build with no toolkit"
197 - myconf+=" --with-x-toolkit=no"
198 - fi
199 - elif use aqua; then
200 - einfo "Configuring to build with Nextstep (Cocoa) support"
201 - myconf+=" --with-ns --disable-ns-self-contained"
202 - myconf+=" --without-x"
203 - else
204 - myconf+=" --without-x --without-ns"
205 - fi
206 -
207 - # Save version information in the Emacs binary. It will be available
208 - # in variable "system-configuration-options".
209 - myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
210 -
211 - econf \
212 - --program-suffix="-${EMACS_SUFFIX}" \
213 - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
214 - --localstatedir="${EPREFIX}"/var \
215 - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
216 - --with-gameuser=":gamestat" \
217 - --without-compress-install \
218 - --with-file-notification=$(usev gfile || usev inotify || echo no) \
219 - $(use_enable acl) \
220 - $(use_with dbus) \
221 - $(use_with gnutls) \
222 - $(use_with gpm) \
223 - $(use_with hesiod) \
224 - $(use_with kerberos) $(use_with kerberos kerberos5) \
225 - $(use_with libxml2 xml2) \
226 - $(use_with selinux) \
227 - $(use_with wide-int) \
228 - $(use_with zlib) \
229 - ${myconf}
230 -}
231 -
232 -src_compile() {
233 - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
234 - emake
235 -}
236 -
237 -src_install () {
238 - emake DESTDIR="${D}" NO_BIN_LINK=t install
239 -
240 - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
241 - || die "moving emacs executable failed"
242 - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
243 - || die "moving emacs man page failed"
244 -
245 - # move info dir to avoid collisions with the dir file generated by portage
246 - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
247 - || die "moving info dir failed"
248 - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
249 - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
250 -
251 - # avoid collision between slots, see bug #169033 e.g.
252 - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
253 - rm -rf "${ED}"/usr/share/{applications,icons}
254 - rm -rf "${ED}"/var
255 -
256 - # remove unused <version>/site-lisp dir
257 - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
258 -
259 - # remove COPYING file (except for etc/COPYING used by describe-copying)
260 - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
261 -
262 - if use gzip-el; then
263 - # compress .el files when a corresponding .elc exists
264 - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
265 - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
266 - assert "gzip .el failed"
267 - fi
268 -
269 - local cdir
270 - if use source; then
271 - cdir="/usr/share/emacs/${FULL_VERSION}/src"
272 - insinto "${cdir}"
273 - # This is not meant to install all the source -- just the
274 - # C source you might find via find-function
275 - doins src/*.{c,h,m}
276 - elif has installsources ${FEATURES}; then
277 - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
278 - fi
279 -
280 - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
281 - X
282 - ;;; ${PN}-${SLOT} site-lisp configuration
283 - X
284 - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
285 - Y (setq find-function-C-source-directory
286 - Y "${EPREFIX}${cdir}")
287 - X (let ((path (getenv "INFOPATH"))
288 - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
289 - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
290 - X (and path
291 - X ;; move Emacs Info dir before anything else in /usr/share/info
292 - X (let* ((p (cons nil (split-string path ":" t))) (q p))
293 - X (while (and (cdr q) (not (string-match re (cadr q))))
294 - X (setq q (cdr q)))
295 - X (setcdr q (cons dir (delete dir (cdr q))))
296 - X (setq Info-directory-list (prune-directory-list (cdr p)))))))
297 - EOF
298 - elisp-site-file-install "${T}/${SITEFILE}" || die
299 -
300 - dodoc README BUGS
301 -
302 - if use aqua; then
303 - dodir /Applications/Gentoo
304 - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
305 - mv nextstep/Emacs.app \
306 - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
307 - fi
308 -
309 - DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
310 - through the Emacs eselect module, which also redirects man and info
311 - pages. Therefore, several Emacs versions can be installed at the
312 - same time. \"man emacs.eselect\" for details.
313 - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
314 - strongly recommended that you use app-admin/emacs-updater to rebuild
315 - all byte-compiled elisp files of the installed Emacs packages."
316 - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
317 - Installing media-fonts/font-adobe-{75,100}dpi on the X server's
318 - machine would satisfy basic Emacs requirements under X11.
319 - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
320 - for how to enable anti-aliased fonts."
321 - use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
322 - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
323 - it into /Applications by yourself."
324 - readme.gentoo_create_doc
325 -}
326 -
327 -pkg_preinst() {
328 - # move Info dir file to correct name
329 - local infodir=/usr/share/info/${EMACS_SUFFIX} f
330 - if [[ -f ${ED}${infodir}/dir.orig ]]; then
331 - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
332 - elif [[ -d "${ED}"${infodir} ]]; then
333 - # this should not happen in EAPI 4
334 - ewarn "Regenerating Info directory index in ${infodir} ..."
335 - rm -f "${ED}"${infodir}/dir{,.*}
336 - for f in "${ED}"${infodir}/*; do
337 - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
338 - install-info --info-dir="${ED}"${infodir} "${f}" \
339 - || die "install-info failed"
340 - fi
341 - done
342 - fi
343 -}
344 -
345 -pkg_postinst() {
346 - elisp-site-regen
347 -
348 - local pvr
349 - for pvr in ${REPLACING_VERSIONS}; do
350 - [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
351 - done
352 - readme.gentoo_print_elog
353 -
354 - if use livecd; then
355 - # force an update of the emacs symlink for the livecd/dvd,
356 - # because some microemacs packages set it with USE=livecd
357 - eselect emacs update
358 - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
359 - # refresh symlinks in case any installed files have changed
360 - eselect emacs set ${EMACS_SUFFIX}
361 - else
362 - eselect emacs update ifunset
363 - fi
364 -}
365 -
366 -pkg_postrm() {
367 - elisp-site-regen
368 - eselect emacs update ifunset
369 -}