[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ - 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, 02 Sep 2018 11:16:19
Message-Id:	`1535886953.599a1b010fa1ff7f0f88763840dfaa3d92a08273.ulm@gentoo`

1

commit:     599a1b010fa1ff7f0f88763840dfaa3d92a08273

2

Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

3

AuthorDate: Sun Sep  2 10:54:30 2018 +0000

4

Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

5

CommitDate: Sun Sep  2 11:15:53 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599a1b01

7

8

app-editors/emacs: Fix support for >=media-gfx/imagemagick-7.

9

10

Closes: https://bugs.gentoo.org/665058

11

Package-Manager: Portage-2.3.48, Repoman-2.3.10

12

13

 app-editors/emacs/Manifest                                    |  3 +++

14

 .../emacs/{emacs-24.5-r6.ebuild => emacs-24.5-r7.ebuild}      |  5 ++---

15

 .../emacs/{emacs-25.3-r5.ebuild => emacs-25.3-r6.ebuild}      | 11 +++++------

16

 .../emacs/{emacs-26.1-r2.ebuild => emacs-26.1-r3.ebuild}      |  9 ++++-----

17

 4 files changed, 14 insertions(+), 14 deletions(-)

18

19

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest

20

index f652673f266..250f80a9668 100644

21

--- a/app-editors/emacs/Manifest

22

+++ b/app-editors/emacs/Manifest

23

@@ -4,8 +4,11 @@ DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3

24

 DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48

25

 DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296

26

 DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5

27

+DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae

28

 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677

29

 DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e6440ab4727fced17aa26f00fd5665b755d3add254a764f579736bbfbc90716ff800e3ad5b8e7bd5d5c2370d31451e4b1 SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15

30

+DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4

31

 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f

32

 DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207e9af29ffb27753b6aa00327e30cc06b3cd7ed339b214b12fb00137654521c21e2252ecd83a79258bb9636406ab032c SHA512 6e4b0bdbf98d5130a6cd41fb0a8c3d641bf0b8d46f150d1f10f2d659e0418c14198d8990df13f3266437bb128f5fc7db8456458f5f547f2c12cc59da4fea3c8e

33

+DIST emacs-26.1-patches-2.tar.xz 2740 BLAKE2B 43a58137d6096fd6b49688192b65e97446cd31691b18c2e69c8980ff1d93caa66ff670f06456df91411fd74396deaa1899c7afb6c0a4bbc98d4c2d9bd7ed7d40 SHA512 31c1714d130a02692c65dd1371662100f9fbf33a8df30b8bad8fa688ab993e0a596101a4765a7859801d1f66e729c9fca748e70b9919e5b2a777d39fcbe92c21

34

 DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2

35

36

diff --git a/app-editors/emacs/emacs-24.5-r6.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild

37

similarity index 98%

38

rename from app-editors/emacs/emacs-24.5-r6.ebuild

39

rename to app-editors/emacs/emacs-24.5-r7.ebuild

40

index 422d3699a1b..84430156d63 100644

41

--- a/app-editors/emacs/emacs-24.5-r6.ebuild

42

+++ b/app-editors/emacs/emacs-24.5-r7.ebuild

43

@@ -8,7 +8,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1

44

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"

45

 HOMEPAGE="https://www.gnu.org/software/emacs/"

46

 SRC_URI="mirror://gnu/emacs/${P}.tar.xz

47

-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"

48

+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"

49

50

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"

51

 SLOT="24"

52

@@ -46,8 +46,7 @@ RDEPEND="sys-libs/ncurses:0=

53

 		svg? ( >=gnome-base/librsvg-2.0 )

54

 		tiff? ( media-libs/tiff:0 )

55

 		xpm? ( x11-libs/libXpm )

56

-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=

57

-			<media-gfx/imagemagick-7:0= )

58

+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )

59

 		xft? (

60

 			media-libs/fontconfig

61

 			media-libs/freetype

62

63

diff --git a/app-editors/emacs/emacs-25.3-r5.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild

64

similarity index 97%

65

rename from app-editors/emacs/emacs-25.3-r5.ebuild

66

rename to app-editors/emacs/emacs-25.3-r6.ebuild

67

index df6905c6fd1..bbce550ba36 100644

68

--- a/app-editors/emacs/emacs-25.3-r5.ebuild

69

+++ b/app-editors/emacs/emacs-25.3-r6.ebuild

70

@@ -3,12 +3,12 @@

71

72

 EAPI=7

73

74

-inherit elisp-common flag-o-matic multilib readme.gentoo-r1

75

+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1

76

77

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"

78

 HOMEPAGE="https://www.gnu.org/software/emacs/"

79

 SRC_URI="mirror://gnu/emacs/${P}.tar.xz

80

-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"

81

+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"

82

83

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"

84

 SLOT="25"

85

@@ -48,8 +48,7 @@ RDEPEND="sys-libs/ncurses:0=

86

 		svg? ( >=gnome-base/librsvg-2.0 )

87

 		tiff? ( media-libs/tiff:0 )

88

 		xpm? ( x11-libs/libXpm )

89

-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=

90

-			<media-gfx/imagemagick-7:0= )

91

+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )

92

 		xft? (

93

 			media-libs/fontconfig

94

 			media-libs/freetype

95

@@ -113,8 +112,8 @@ src_prepare() {

96

 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \

97

 		|| die "unable to sed ctags.1"

98

99

-	#AT_M4DIR=m4 eautoreconf

100

-	#touch src/stamp-h.in || die

101

+	AT_M4DIR=m4 eautoreconf

102

+	touch src/stamp-h.in || die

103

}

104

105

 src_configure() {

106

107

diff --git a/app-editors/emacs/emacs-26.1-r2.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild

108

similarity index 98%

109

rename from app-editors/emacs/emacs-26.1-r2.ebuild

110

rename to app-editors/emacs/emacs-26.1-r3.ebuild

111

index c3771c860ab..54dac8fb3a7 100644

112

--- a/app-editors/emacs/emacs-26.1-r2.ebuild

113

+++ b/app-editors/emacs/emacs-26.1-r3.ebuild

114

@@ -3,12 +3,12 @@

115

116

 EAPI=7

117

118

-inherit elisp-common flag-o-matic multilib readme.gentoo-r1

119

+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1

120

121

 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"

122

 HOMEPAGE="https://www.gnu.org/software/emacs/"

123

 SRC_URI="mirror://gnu/emacs/${P}.tar.xz

124

-	https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"

125

+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"

126

127

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"

128

 SLOT="26"

129

@@ -51,8 +51,7 @@ RDEPEND="sys-libs/ncurses:0=

130

 		svg? ( >=gnome-base/librsvg-2.0 )

131

 		tiff? ( media-libs/tiff:0 )

132

 		xpm? ( x11-libs/libXpm )

133

-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=

134

-			<media-gfx/imagemagick-7:0= )

135

+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )

136

 		xft? (

137

 			media-libs/fontconfig

138

 			media-libs/freetype

139

@@ -122,7 +121,7 @@ src_prepare() {

140

 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \

141

 		|| die "unable to sed ctags.1"

142

143

-	#AT_M4DIR=m4 eautoreconf

144

+	AT_M4DIR=m4 eautoreconf

145

}

146

147

 src_configure() {

1	commit: 599a1b010fa1ff7f0f88763840dfaa3d92a08273
2	Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3	AuthorDate: Sun Sep 2 10:54:30 2018 +0000
4	Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5	CommitDate: Sun Sep 2 11:15:53 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599a1b01
7
8	app-editors/emacs: Fix support for >=media-gfx/imagemagick-7.
9
10	Closes: https://bugs.gentoo.org/665058
11	Package-Manager: Portage-2.3.48, Repoman-2.3.10
12
13	app-editors/emacs/Manifest \| 3 +++
14	.../emacs/{emacs-24.5-r6.ebuild => emacs-24.5-r7.ebuild} \| 5 ++---
15	.../emacs/{emacs-25.3-r5.ebuild => emacs-25.3-r6.ebuild} \| 11 +++++------
16	.../emacs/{emacs-26.1-r2.ebuild => emacs-26.1-r3.ebuild} \| 9 ++++-----
17	4 files changed, 14 insertions(+), 14 deletions(-)
18
19	diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
20	index f652673f266..250f80a9668 100644
21	--- a/app-editors/emacs/Manifest
22	+++ b/app-editors/emacs/Manifest
23	@@ -4,8 +4,11 @@ DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3
24	DIST emacs-23.4-patches-21.tar.xz 19604 BLAKE2B 97327f2079c496c28122203d233a12199a3c11a8c4efb2107247a4ca4483b898467d73d19d4f0570ec7be2a49dc5f6bd1bc9ee0811f932e7deb6b1c4ca96e362 SHA512 135eda432de64200797456d594f7de811275a7adf792d10a1c3a51ca4bbbbaa3a2c682b9fd577c4d93fbce967ca08d4ac47eb45f031477c3e44c69c14d5d5b48
25	DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
26	DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
27	+DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae
28	DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
29	DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e6440ab4727fced17aa26f00fd5665b755d3add254a764f579736bbfbc90716ff800e3ad5b8e7bd5d5c2370d31451e4b1 SHA512 09371a789a7c742b4e18f45a4c4e063a5392d0684899eb8be8c7415af9fe3c306083c62f18abc6a15c4fe76dd6ae3ac5c9b002c962971e59379cc187926a0c15
30	+DIST emacs-25.3-patches-2.tar.xz 2488 BLAKE2B 93c6a18e7f729a5b4d299974581c99835e5f197215888253f75827645e440f6579da16d4cd8340f2732f8bf8a6a15713e29848953033dc62b573a1c1fab455bf SHA512 f171cc5699f06523a007aba5aa1a4274c9a875358a60405aa77cdc96ebb229082cb73453940e8c9e76dd7b86979cefc261883db0c130142543befb7a097475f4
31	DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
32	DIST emacs-26.1-patches-1.tar.xz 1296 BLAKE2B 5e3cef3130b35a362d67f853686625d207e9af29ffb27753b6aa00327e30cc06b3cd7ed339b214b12fb00137654521c21e2252ecd83a79258bb9636406ab032c SHA512 6e4b0bdbf98d5130a6cd41fb0a8c3d641bf0b8d46f150d1f10f2d659e0418c14198d8990df13f3266437bb128f5fc7db8456458f5f547f2c12cc59da4fea3c8e
33	+DIST emacs-26.1-patches-2.tar.xz 2740 BLAKE2B 43a58137d6096fd6b49688192b65e97446cd31691b18c2e69c8980ff1d93caa66ff670f06456df91411fd74396deaa1899c7afb6c0a4bbc98d4c2d9bd7ed7d40 SHA512 31c1714d130a02692c65dd1371662100f9fbf33a8df30b8bad8fa688ab993e0a596101a4765a7859801d1f66e729c9fca748e70b9919e5b2a777d39fcbe92c21
34	DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25d13ec5e0bee9ec6a65e80c52c870162b4671e80a82f8310784c802924609f2f87d504b1a97617c44d859566f SHA512 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2
35
36	diff --git a/app-editors/emacs/emacs-24.5-r6.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
37	similarity index 98%
38	rename from app-editors/emacs/emacs-24.5-r6.ebuild
39	rename to app-editors/emacs/emacs-24.5-r7.ebuild
40	index 422d3699a1b..84430156d63 100644
41	--- a/app-editors/emacs/emacs-24.5-r6.ebuild
42	+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
43	@@ -8,7 +8,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
44	DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
45	HOMEPAGE="https://www.gnu.org/software/emacs/"
46	SRC_URI="mirror://gnu/emacs/${P}.tar.xz
47	- https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
48	+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz"
49
50	LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
51	SLOT="24"
52	@@ -46,8 +46,7 @@ RDEPEND="sys-libs/ncurses:0=
53	svg? ( >=gnome-base/librsvg-2.0 )
54	tiff? ( media-libs/tiff:0 )
55	xpm? ( x11-libs/libXpm )
56	- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
57	- <media-gfx/imagemagick-7:0= )
58	+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
59	xft? (
60	media-libs/fontconfig
61	media-libs/freetype
62
63	diff --git a/app-editors/emacs/emacs-25.3-r5.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
64	similarity index 97%
65	rename from app-editors/emacs/emacs-25.3-r5.ebuild
66	rename to app-editors/emacs/emacs-25.3-r6.ebuild
67	index df6905c6fd1..bbce550ba36 100644
68	--- a/app-editors/emacs/emacs-25.3-r5.ebuild
69	+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
70	@@ -3,12 +3,12 @@
71
72	EAPI=7
73
74	-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
75	+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
76
77	DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
78	HOMEPAGE="https://www.gnu.org/software/emacs/"
79	SRC_URI="mirror://gnu/emacs/${P}.tar.xz
80	- https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
81	+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
82
83	LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
84	SLOT="25"
85	@@ -48,8 +48,7 @@ RDEPEND="sys-libs/ncurses:0=
86	svg? ( >=gnome-base/librsvg-2.0 )
87	tiff? ( media-libs/tiff:0 )
88	xpm? ( x11-libs/libXpm )
89	- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
90	- <media-gfx/imagemagick-7:0= )
91	+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
92	xft? (
93	media-libs/fontconfig
94	media-libs/freetype
95	@@ -113,8 +112,8 @@ src_prepare() {
96	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
97	\|\| die "unable to sed ctags.1"
98
99	- #AT_M4DIR=m4 eautoreconf
100	- #touch src/stamp-h.in \|\| die
101	+ AT_M4DIR=m4 eautoreconf
102	+ touch src/stamp-h.in \|\| die
103	}
104
105	src_configure() {
106
107	diff --git a/app-editors/emacs/emacs-26.1-r2.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild
108	similarity index 98%
109	rename from app-editors/emacs/emacs-26.1-r2.ebuild
110	rename to app-editors/emacs/emacs-26.1-r3.ebuild
111	index c3771c860ab..54dac8fb3a7 100644
112	--- a/app-editors/emacs/emacs-26.1-r2.ebuild
113	+++ b/app-editors/emacs/emacs-26.1-r3.ebuild
114	@@ -3,12 +3,12 @@
115
116	EAPI=7
117
118	-inherit elisp-common flag-o-matic multilib readme.gentoo-r1
119	+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
120
121	DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
122	HOMEPAGE="https://www.gnu.org/software/emacs/"
123	SRC_URI="mirror://gnu/emacs/${P}.tar.xz
124	- https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
125	+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
126
127	LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
128	SLOT="26"
129	@@ -51,8 +51,7 @@ RDEPEND="sys-libs/ncurses:0=
130	svg? ( >=gnome-base/librsvg-2.0 )
131	tiff? ( media-libs/tiff:0 )
132	xpm? ( x11-libs/libXpm )
133	- imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
134	- <media-gfx/imagemagick-7:0= )
135	+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
136	xft? (
137	media-libs/fontconfig
138	media-libs/freetype
139	@@ -122,7 +121,7 @@ src_prepare() {
140	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
141	\|\| die "unable to sed ctags.1"
142
143	- #AT_M4DIR=m4 eautoreconf
144	+ AT_M4DIR=m4 eautoreconf
145	}
146
147	src_configure() {

Gentoo Archives: gentoo-commits