[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, 16 May 2021 07:31:01
Message-Id:	`1621150250.c84fe1a9f1f351895a8069b8d92fae892150b08d.ulm@gentoo`

1

commit:     c84fe1a9f1f351895a8069b8d92fae892150b08d

2

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

3

AuthorDate: Sun May 16 07:17:16 2021 +0000

4

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

5

CommitDate: Sun May 16 07:30:50 2021 +0000

6

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

7

8

app-editors/emacs: Add some die statements after rm commands

9

10

Package-Manager: Portage-3.0.18, Repoman-3.0.3

11

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

12

13

 app-editors/emacs/emacs-23.4-r20.ebuild  | 16 ++++++++--------

14

 app-editors/emacs/emacs-24.5-r10.ebuild  | 12 ++++++------

15

 app-editors/emacs/emacs-25.3-r9.ebuild   | 12 ++++++------

16

 app-editors/emacs/emacs-26.3-r4.ebuild   | 14 +++++++-------

17

 app-editors/emacs/emacs-27.1-r4.ebuild   | 14 +++++++-------

18

 app-editors/emacs/emacs-27.2.9999.ebuild | 14 +++++++-------

19

 app-editors/emacs/emacs-27.2.ebuild      | 14 +++++++-------

20

 app-editors/emacs/emacs-28.0.9999.ebuild | 14 +++++++-------

21

 8 files changed, 55 insertions(+), 55 deletions(-)

22

23

diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild

24

index 245667931c0..f46ce1b68c8 100644

25

--- a/app-editors/emacs/emacs-23.4-r20.ebuild

26

+++ b/app-editors/emacs/emacs-23.4-r20.ebuild

27

@@ -255,15 +255,15 @@ src_install() {

28

 	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail

29

30

 	# avoid collision between slots, see bug #169033 e.g.

31

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

32

-	rm -rf "${ED}"/usr/share/{applications,icons}

33

-	rm -rf "${ED}"/var

34

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

35

+	rm -rf "${ED}"/usr/share/{applications,icons} || die

36

+	rm -rf "${ED}"/var || die

37

38

 	# remove unused <version>/site-lisp dir

39

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

40

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

41

42

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

43

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

44

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

45

46

 	local cdir

47

 	if use source; then

48

@@ -273,8 +273,8 @@ src_install() {

49

 		# C source you might find via find-function

50

 		doins src/*.{c,h,m}

51

 		doins -r src/{m,s}

52

-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c

53

-		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README

54

+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die

55

+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README || die

56

 	elif has installsources ${FEATURES}; then

57

 		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"

58

fi

59

@@ -303,7 +303,7 @@ src_install() {

60

61

 	if use gui && use aqua; then

62

 		dodir /Applications/Gentoo

63

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

64

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

65

 		mv nextstep/Emacs.app \

66

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

67

fi

68

69

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

70

index 3358010308c..c9d98111c2b 100644

71

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

72

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

73

@@ -244,15 +244,15 @@ src_install() {

74

 	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail

75

76

 	# avoid collision between slots, see bug #169033 e.g.

77

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

78

-	rm -rf "${ED}"/usr/share/{applications,icons}

79

-	rm -rf "${ED}"/var

80

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

81

+	rm -rf "${ED}"/usr/share/{applications,icons} || die

82

+	rm -rf "${ED}"/var || die

83

84

 	# remove unused <version>/site-lisp dir

85

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

86

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

87

88

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

89

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

90

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

91

92

 	if use gzip-el; then

93

 		# compress .el files when a corresponding .elc exists

94

@@ -296,7 +296,7 @@ src_install() {

95

96

 	if use gui && use aqua; then

97

 		dodir /Applications/Gentoo

98

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

99

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

100

 		mv nextstep/Emacs.app \

101

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

102

fi

103

104

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

105

index 2ef65527eee..c41040407de 100644

106

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

107

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

108

@@ -253,15 +253,15 @@ src_install() {

109

 	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail

110

111

 	# avoid collision between slots, see bug #169033 e.g.

112

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

113

-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}

114

-	rm -rf "${ED}"/var

115

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

116

+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die

117

+	rm -rf "${ED}"/var || die

118

119

 	# remove unused <version>/site-lisp dir

120

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

121

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

122

123

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

124

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

125

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

126

127

 	if use gzip-el; then

128

 		# compress .el files when a corresponding .elc exists

129

@@ -305,7 +305,7 @@ src_install() {

130

131

 	if use gui && use aqua; then

132

 		dodir /Applications/Gentoo

133

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

134

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

135

 		mv nextstep/Emacs.app \

136

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

137

fi

138

139

diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild

140

index 34237af4f67..4dc17e9bd91 100644

141

--- a/app-editors/emacs/emacs-26.3-r4.ebuild

142

+++ b/app-editors/emacs/emacs-26.3-r4.ebuild

143

@@ -262,16 +262,16 @@ src_install() {

144

fi

145

146

 	# avoid collision between slots, see bug #169033 e.g.

147

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

148

-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}

149

-	rm -rf "${ED}/usr/$(get_libdir)"

150

-	rm -rf "${ED}"/var

151

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

152

+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die

153

+	rm -rf "${ED}/usr/$(get_libdir)" || die

154

+	rm -rf "${ED}"/var || die

155

156

 	# remove unused <version>/site-lisp dir

157

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

158

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

159

160

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

161

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

162

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

163

164

 	if use systemd; then

165

 		insinto /usr/lib/systemd/user

166

@@ -324,7 +324,7 @@ src_install() {

167

168

 	if use gui && use aqua; then

169

 		dodir /Applications/Gentoo

170

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

171

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

172

 		mv nextstep/Emacs.app \

173

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

174

fi

175

176

diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild

177

index f7ad194e0ef..a296afd19d0 100644

178

--- a/app-editors/emacs/emacs-27.1-r4.ebuild

179

+++ b/app-editors/emacs/emacs-27.1-r4.ebuild

180

@@ -325,16 +325,16 @@ src_install() {

181

fi

182

183

 	# avoid collision between slots, see bug #169033 e.g.

184

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

185

-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}

186

-	rm -rf "${ED}/usr/$(get_libdir)"

187

-	rm -rf "${ED}"/var

188

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

189

+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die

190

+	rm -rf "${ED}/usr/$(get_libdir)" || die

191

+	rm -rf "${ED}"/var || die

192

193

 	# remove unused <version>/site-lisp dir

194

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

195

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

196

197

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

198

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

199

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

200

201

 	if use systemd; then

202

 		insinto /usr/lib/systemd/user

203

@@ -387,7 +387,7 @@ src_install() {

204

205

 	if use gui && use aqua; then

206

 		dodir /Applications/Gentoo

207

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

208

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

209

 		mv nextstep/Emacs.app \

210

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

211

fi

212

213

diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild

214

index 7f3c223e9ed..d565c8aad9a 100644

215

--- a/app-editors/emacs/emacs-27.2.9999.ebuild

216

+++ b/app-editors/emacs/emacs-27.2.9999.ebuild

217

@@ -324,16 +324,16 @@ src_install() {

218

fi

219

220

 	# avoid collision between slots, see bug #169033 e.g.

221

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

222

-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}

223

-	rm -rf "${ED}/usr/$(get_libdir)"

224

-	rm -rf "${ED}"/var

225

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

226

+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die

227

+	rm -rf "${ED}/usr/$(get_libdir)" || die

228

+	rm -rf "${ED}"/var || die

229

230

 	# remove unused <version>/site-lisp dir

231

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

232

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

233

234

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

235

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

236

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

237

238

 	if use systemd; then

239

 		insinto /usr/lib/systemd/user

240

@@ -386,7 +386,7 @@ src_install() {

241

242

 	if use gui && use aqua; then

243

 		dodir /Applications/Gentoo

244

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

245

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

246

 		mv nextstep/Emacs.app \

247

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

248

fi

249

250

diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild

251

index c3f5c07c149..45899a7477f 100644

252

--- a/app-editors/emacs/emacs-27.2.ebuild

253

+++ b/app-editors/emacs/emacs-27.2.ebuild

254

@@ -324,16 +324,16 @@ src_install() {

255

fi

256

257

 	# avoid collision between slots, see bug #169033 e.g.

258

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

259

-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}

260

-	rm -rf "${ED}/usr/$(get_libdir)"

261

-	rm -rf "${ED}"/var

262

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

263

+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die

264

+	rm -rf "${ED}/usr/$(get_libdir)" || die

265

+	rm -rf "${ED}"/var || die

266

267

 	# remove unused <version>/site-lisp dir

268

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

269

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

270

271

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

272

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

273

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

274

275

 	if use systemd; then

276

 		insinto /usr/lib/systemd/user

277

@@ -386,7 +386,7 @@ src_install() {

278

279

 	if use gui && use aqua; then

280

 		dodir /Applications/Gentoo

281

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

282

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

283

 		mv nextstep/Emacs.app \

284

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

285

fi

286

287

diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild

288

index 80e296098e7..d1f8dc79560 100644

289

--- a/app-editors/emacs/emacs-28.0.9999.ebuild

290

+++ b/app-editors/emacs/emacs-28.0.9999.ebuild

291

@@ -308,16 +308,16 @@ src_install() {

292

fi

293

294

 	# avoid collision between slots, see bug #169033 e.g.

295

-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el

296

-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}

297

-	rm -rf "${ED}/usr/$(get_libdir)"

298

-	rm -rf "${ED}"/var

299

+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die

300

+	rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die

301

+	rm -rf "${ED}/usr/$(get_libdir)" || die

302

+	rm -rf "${ED}"/var || die

303

304

 	# remove unused <version>/site-lisp dir

305

-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp

306

+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die

307

308

 	# remove COPYING file (except for etc/COPYING used by describe-copying)

309

-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING

310

+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die

311

312

 	if use systemd; then

313

 		insinto /usr/lib/systemd/user

314

@@ -370,7 +370,7 @@ src_install() {

315

316

 	if use gui && use aqua; then

317

 		dodir /Applications/Gentoo

318

-		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app

319

+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

320

 		mv nextstep/Emacs.app \

321

 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die

322

fi

1	commit: c84fe1a9f1f351895a8069b8d92fae892150b08d
2	Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3	AuthorDate: Sun May 16 07:17:16 2021 +0000
4	Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5	CommitDate: Sun May 16 07:30:50 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84fe1a9
7
8	app-editors/emacs: Add some die statements after rm commands
9
10	Package-Manager: Portage-3.0.18, Repoman-3.0.3
11	Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13	app-editors/emacs/emacs-23.4-r20.ebuild \| 16 ++++++++--------
14	app-editors/emacs/emacs-24.5-r10.ebuild \| 12 ++++++------
15	app-editors/emacs/emacs-25.3-r9.ebuild \| 12 ++++++------
16	app-editors/emacs/emacs-26.3-r4.ebuild \| 14 +++++++-------
17	app-editors/emacs/emacs-27.1-r4.ebuild \| 14 +++++++-------
18	app-editors/emacs/emacs-27.2.9999.ebuild \| 14 +++++++-------
19	app-editors/emacs/emacs-27.2.ebuild \| 14 +++++++-------
20	app-editors/emacs/emacs-28.0.9999.ebuild \| 14 +++++++-------
21	8 files changed, 55 insertions(+), 55 deletions(-)
22
23	diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild
24	index 245667931c0..f46ce1b68c8 100644
25	--- a/app-editors/emacs/emacs-23.4-r20.ebuild
26	+++ b/app-editors/emacs/emacs-23.4-r20.ebuild
27	@@ -255,15 +255,15 @@ src_install() {
28	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
29
30	# avoid collision between slots, see bug #169033 e.g.
31	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
32	- rm -rf "${ED}"/usr/share/{applications,icons}
33	- rm -rf "${ED}"/var
34	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
35	+ rm -rf "${ED}"/usr/share/{applications,icons} \|\| die
36	+ rm -rf "${ED}"/var \|\| die
37
38	# remove unused <version>/site-lisp dir
39	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
40	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
41
42	# remove COPYING file (except for etc/COPYING used by describe-copying)
43	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
44	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
45
46	local cdir
47	if use source; then
48	@@ -273,8 +273,8 @@ src_install() {
49	# C source you might find via find-function
50	doins src/*.{c,h,m}
51	doins -r src/{m,s}
52	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
53	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
54	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c \|\| die
55	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README \|\| die
56	elif has installsources ${FEATURES}; then
57	cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
58	fi
59	@@ -303,7 +303,7 @@ src_install() {
60
61	if use gui && use aqua; then
62	dodir /Applications/Gentoo
63	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
64	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
65	mv nextstep/Emacs.app \
66	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
67	fi
68
69	diff --git a/app-editors/emacs/emacs-24.5-r10.ebuild b/app-editors/emacs/emacs-24.5-r10.ebuild
70	index 3358010308c..c9d98111c2b 100644
71	--- a/app-editors/emacs/emacs-24.5-r10.ebuild
72	+++ b/app-editors/emacs/emacs-24.5-r10.ebuild
73	@@ -244,15 +244,15 @@ src_install() {
74	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
75
76	# avoid collision between slots, see bug #169033 e.g.
77	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
78	- rm -rf "${ED}"/usr/share/{applications,icons}
79	- rm -rf "${ED}"/var
80	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
81	+ rm -rf "${ED}"/usr/share/{applications,icons} \|\| die
82	+ rm -rf "${ED}"/var \|\| die
83
84	# remove unused <version>/site-lisp dir
85	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
86	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
87
88	# remove COPYING file (except for etc/COPYING used by describe-copying)
89	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
90	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
91
92	if use gzip-el; then
93	# compress .el files when a corresponding .elc exists
94	@@ -296,7 +296,7 @@ src_install() {
95
96	if use gui && use aqua; then
97	dodir /Applications/Gentoo
98	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
99	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
100	mv nextstep/Emacs.app \
101	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
102	fi
103
104	diff --git a/app-editors/emacs/emacs-25.3-r9.ebuild b/app-editors/emacs/emacs-25.3-r9.ebuild
105	index 2ef65527eee..c41040407de 100644
106	--- a/app-editors/emacs/emacs-25.3-r9.ebuild
107	+++ b/app-editors/emacs/emacs-25.3-r9.ebuild
108	@@ -253,15 +253,15 @@ src_install() {
109	fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
110
111	# avoid collision between slots, see bug #169033 e.g.
112	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
113	- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
114	- rm -rf "${ED}"/var
115	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
116	+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} \|\| die
117	+ rm -rf "${ED}"/var \|\| die
118
119	# remove unused <version>/site-lisp dir
120	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
121	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
122
123	# remove COPYING file (except for etc/COPYING used by describe-copying)
124	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
125	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
126
127	if use gzip-el; then
128	# compress .el files when a corresponding .elc exists
129	@@ -305,7 +305,7 @@ src_install() {
130
131	if use gui && use aqua; then
132	dodir /Applications/Gentoo
133	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
134	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
135	mv nextstep/Emacs.app \
136	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
137	fi
138
139	diff --git a/app-editors/emacs/emacs-26.3-r4.ebuild b/app-editors/emacs/emacs-26.3-r4.ebuild
140	index 34237af4f67..4dc17e9bd91 100644
141	--- a/app-editors/emacs/emacs-26.3-r4.ebuild
142	+++ b/app-editors/emacs/emacs-26.3-r4.ebuild
143	@@ -262,16 +262,16 @@ src_install() {
144	fi
145
146	# avoid collision between slots, see bug #169033 e.g.
147	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
148	- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
149	- rm -rf "${ED}/usr/$(get_libdir)"
150	- rm -rf "${ED}"/var
151	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
152	+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} \|\| die
153	+ rm -rf "${ED}/usr/$(get_libdir)" \|\| die
154	+ rm -rf "${ED}"/var \|\| die
155
156	# remove unused <version>/site-lisp dir
157	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
158	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
159
160	# remove COPYING file (except for etc/COPYING used by describe-copying)
161	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
162	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
163
164	if use systemd; then
165	insinto /usr/lib/systemd/user
166	@@ -324,7 +324,7 @@ src_install() {
167
168	if use gui && use aqua; then
169	dodir /Applications/Gentoo
170	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
171	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
172	mv nextstep/Emacs.app \
173	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
174	fi
175
176	diff --git a/app-editors/emacs/emacs-27.1-r4.ebuild b/app-editors/emacs/emacs-27.1-r4.ebuild
177	index f7ad194e0ef..a296afd19d0 100644
178	--- a/app-editors/emacs/emacs-27.1-r4.ebuild
179	+++ b/app-editors/emacs/emacs-27.1-r4.ebuild
180	@@ -325,16 +325,16 @@ src_install() {
181	fi
182
183	# avoid collision between slots, see bug #169033 e.g.
184	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
185	- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
186	- rm -rf "${ED}/usr/$(get_libdir)"
187	- rm -rf "${ED}"/var
188	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
189	+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} \|\| die
190	+ rm -rf "${ED}/usr/$(get_libdir)" \|\| die
191	+ rm -rf "${ED}"/var \|\| die
192
193	# remove unused <version>/site-lisp dir
194	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
195	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
196
197	# remove COPYING file (except for etc/COPYING used by describe-copying)
198	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
199	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
200
201	if use systemd; then
202	insinto /usr/lib/systemd/user
203	@@ -387,7 +387,7 @@ src_install() {
204
205	if use gui && use aqua; then
206	dodir /Applications/Gentoo
207	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
208	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
209	mv nextstep/Emacs.app \
210	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
211	fi
212
213	diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild
214	index 7f3c223e9ed..d565c8aad9a 100644
215	--- a/app-editors/emacs/emacs-27.2.9999.ebuild
216	+++ b/app-editors/emacs/emacs-27.2.9999.ebuild
217	@@ -324,16 +324,16 @@ src_install() {
218	fi
219
220	# avoid collision between slots, see bug #169033 e.g.
221	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
222	- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
223	- rm -rf "${ED}/usr/$(get_libdir)"
224	- rm -rf "${ED}"/var
225	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
226	+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} \|\| die
227	+ rm -rf "${ED}/usr/$(get_libdir)" \|\| die
228	+ rm -rf "${ED}"/var \|\| die
229
230	# remove unused <version>/site-lisp dir
231	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
232	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
233
234	# remove COPYING file (except for etc/COPYING used by describe-copying)
235	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
236	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
237
238	if use systemd; then
239	insinto /usr/lib/systemd/user
240	@@ -386,7 +386,7 @@ src_install() {
241
242	if use gui && use aqua; then
243	dodir /Applications/Gentoo
244	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
245	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
246	mv nextstep/Emacs.app \
247	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
248	fi
249
250	diff --git a/app-editors/emacs/emacs-27.2.ebuild b/app-editors/emacs/emacs-27.2.ebuild
251	index c3f5c07c149..45899a7477f 100644
252	--- a/app-editors/emacs/emacs-27.2.ebuild
253	+++ b/app-editors/emacs/emacs-27.2.ebuild
254	@@ -324,16 +324,16 @@ src_install() {
255	fi
256
257	# avoid collision between slots, see bug #169033 e.g.
258	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
259	- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
260	- rm -rf "${ED}/usr/$(get_libdir)"
261	- rm -rf "${ED}"/var
262	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
263	+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} \|\| die
264	+ rm -rf "${ED}/usr/$(get_libdir)" \|\| die
265	+ rm -rf "${ED}"/var \|\| die
266
267	# remove unused <version>/site-lisp dir
268	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
269	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
270
271	# remove COPYING file (except for etc/COPYING used by describe-copying)
272	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
273	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
274
275	if use systemd; then
276	insinto /usr/lib/systemd/user
277	@@ -386,7 +386,7 @@ src_install() {
278
279	if use gui && use aqua; then
280	dodir /Applications/Gentoo
281	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
282	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
283	mv nextstep/Emacs.app \
284	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
285	fi
286
287	diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
288	index 80e296098e7..d1f8dc79560 100644
289	--- a/app-editors/emacs/emacs-28.0.9999.ebuild
290	+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
291	@@ -308,16 +308,16 @@ src_install() {
292	fi
293
294	# avoid collision between slots, see bug #169033 e.g.
295	- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
296	- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
297	- rm -rf "${ED}/usr/$(get_libdir)"
298	- rm -rf "${ED}"/var
299	+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el \|\| die
300	+ rm -rf "${ED}"/usr/share/{appdata,applications,icons} \|\| die
301	+ rm -rf "${ED}/usr/$(get_libdir)" \|\| die
302	+ rm -rf "${ED}"/var \|\| die
303
304	# remove unused <version>/site-lisp dir
305	- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
306	+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp \|\| die
307
308	# remove COPYING file (except for etc/COPYING used by describe-copying)
309	- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
310	+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING \|\| die
311
312	if use systemd; then
313	insinto /usr/lib/systemd/user
314	@@ -370,7 +370,7 @@ src_install() {
315
316	if use gui && use aqua; then
317	dodir /Applications/Gentoo
318	- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
319	+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
320	mv nextstep/Emacs.app \
321	"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app \|\| die
322	fi

Gentoo Archives: gentoo-commits