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: Sat, 29 Aug 2020 14:24:31
Message-Id: 1598711053.961e476f84773f3fed5cc35e3f2be6b1f3f0a948.ulm@gentoo
1 commit: 961e476f84773f3fed5cc35e3f2be6b1f3f0a948
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 29 14:08:32 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 29 14:24:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=961e476f
7
8 app-editors/emacs: Fix compilation (slot 18) with glibc-2.32.
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 app-editors/emacs/Manifest | 3 +--
14 app-editors/emacs/emacs-18.59-r13.ebuild | 5 ++---
15 2 files changed, 3 insertions(+), 5 deletions(-)
16
17 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
18 index a7e44ca48b3..2814ce630ed 100644
19 --- a/app-editors/emacs/Manifest
20 +++ b/app-editors/emacs/Manifest
21 @@ -1,5 +1,4 @@
22 -DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 BLAKE2B 0106fe8053b4f65f384d451ca85138991a57afaca16b32035585055bb877c039af826859fa58c4660ec80664d3bfb0ee7a757ad76381c150ebcb22cb333a98d6 SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
23 -DIST emacs-18.59-patches-12.tar.xz 22252 BLAKE2B 14cb456f83447b298b280e11920d486c8cbe824f329ed841ceaa3751e68123bc8c7eda1ed4e2070eaf479d0cf8f8319294ab9f2c31cacc7a9a822bab7a2c70d0 SHA512 24a259383b4fd303d267c9c1bce0e7c99ec8838a45b62ff16ea1f37879d240f000844cdd5e1de5ec6f87fee7cb42b23447dc6958e9fb4b2fc83e5f2d5c21a6b2
24 +DIST emacs-18.59-patches-13.tar.xz 33532 BLAKE2B 17682fb03c3606794743e702f8389a9476fe09a8c0cc970828aa515a5fc2b1d2df620cdc168d4727635492b38da81ab525c05e20cb77c86d5ae691976deb8d94 SHA512 912afbb4e42efb9e42df4e06c21bcf1d7e2f203d35edb2b410b80c9e25f2e4b37dbb28e6fa36691ce44c53da9f3eb57518da164ecca1599147072219244a8b35
25 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
26 DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58
27 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
28
29 diff --git a/app-editors/emacs/emacs-18.59-r13.ebuild b/app-editors/emacs/emacs-18.59-r13.ebuild
30 index c5e4416862a..4f56535c58d 100644
31 --- a/app-editors/emacs/emacs-18.59-r13.ebuild
32 +++ b/app-editors/emacs/emacs-18.59-r13.ebuild
33 @@ -8,8 +8,7 @@ inherit toolchain-funcs flag-o-matic multilib
34 DESCRIPTION="The extensible self-documenting text editor"
35 HOMEPAGE="https://www.gnu.org/software/emacs/"
36 SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
37 - ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
38 - https://dev.gentoo.org/~ulm/emacs/${P}-patches-12.tar.xz"
39 + https://dev.gentoo.org/~ulm/emacs/${P}-patches-13.tar.xz"
40
41 LICENSE="GPL-1+ GPL-2+ BSD HPND"
42 SLOT="18"
43 @@ -35,7 +34,7 @@ BDEPEND="app-eselect/eselect-emacs
44 RDEPEND="${RDEPEND}
45 app-eselect/eselect-emacs"
46
47 -PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
48 +PATCHES="../patch"
49
50 src_prepare() {
51 default