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, 29 Aug 2019 13:49:27
Message-Id: 1567086545.64ad6e7961ede65ba19425b8bc264c788912a105.ulm@gentoo
1 commit: 64ad6e7961ede65ba19425b8bc264c788912a105
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 29 13:47:51 2019 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 29 13:49:05 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ad6e79
7
8 app-editors/emacs: Fix compilation with glibc-2.28 for slot 18.
9
10 Bug: https://bugs.gentoo.org/681904
11 Package-Manager: Portage-2.3.73, Repoman-2.3.17
12 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
13
14 app-editors/emacs/Manifest | 2 +-
15 app-editors/emacs/emacs-18.59-r12.ebuild | 6 +++---
16 2 files changed, 4 insertions(+), 4 deletions(-)
17
18 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
19 index 005091428ef..2157dcec7af 100644
20 --- a/app-editors/emacs/Manifest
21 +++ b/app-editors/emacs/Manifest
22 @@ -1,5 +1,5 @@
23 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
24 -DIST emacs-18.59-patches-11.tar.xz 22032 BLAKE2B cfdb85aeefa7a71dfd0719de893e9ea3f7118baa0b8c5aa97b3800c1a5743e77d63c35ab1e4afb13c284f5c6dda522d1e2e37f8bfd9bbba052e543af7401565b SHA512 cac3f2efc8b3f18cdf43474453acc406c5b469ecc11955f8216083a4deced887aea4a73221aa36f0bc6b7480788606f969ee1df15a8932ee771fdf790e98c00c
25 +DIST emacs-18.59-patches-12.tar.xz 22252 BLAKE2B 14cb456f83447b298b280e11920d486c8cbe824f329ed841ceaa3751e68123bc8c7eda1ed4e2070eaf479d0cf8f8319294ab9f2c31cacc7a9a822bab7a2c70d0 SHA512 24a259383b4fd303d267c9c1bce0e7c99ec8838a45b62ff16ea1f37879d240f000844cdd5e1de5ec6f87fee7cb42b23447dc6958e9fb4b2fc83e5f2d5c21a6b2
26 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
27 DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
28 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
29
30 diff --git a/app-editors/emacs/emacs-18.59-r12.ebuild b/app-editors/emacs/emacs-18.59-r12.ebuild
31 index 17824bc3445..a159d361190 100644
32 --- a/app-editors/emacs/emacs-18.59-r12.ebuild
33 +++ b/app-editors/emacs/emacs-18.59-r12.ebuild
34 @@ -1,4 +1,4 @@
35 -# Copyright 1999-2018 Gentoo Foundation
36 +# Copyright 1999-2019 Gentoo Authors
37 # Distributed under the terms of the GNU General Public License v2
38
39 EAPI=7
40 @@ -9,7 +9,7 @@ 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-11.tar.xz"
45 + https://dev.gentoo.org/~ulm/emacs/${P}-patches-12.tar.xz"
46
47 LICENSE="GPL-1+ GPL-2+ BSD HPND"
48 SLOT="18"
49 @@ -83,7 +83,7 @@ src_configure() {
50 }
51
52 src_compile() {
53 - addpredict /var/lib/emacs/lock
54 + addpredict /var/lib/emacs/lock #nowarn
55 emake --jobs=1 \
56 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
57 LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"