[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/help2man/, sys-apps/help2man/files/ - gentoo-commits

From:	Michael Haubenwallner <haubi@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/help2man/, sys-apps/help2man/files/
Date:	Wed, 30 Jan 2019 11:50:32
Message-Id:	`1548848973.cf1d7089b78745643edceb113a8455b63371d789.haubi@gentoo`

1

commit:     cf1d7089b78745643edceb113a8455b63371d789

2

Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>

3

AuthorDate: Wed Jan 30 11:49:20 2019 +0000

4

Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>

5

CommitDate: Wed Jan 30 11:49:33 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cf1d7089

7

8

sys-apps/help2man: sync, rebase cygwin patch

9

10

Package-Manager: Portage-2.3.55.1-prefix, Repoman-2.3.12

11

Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>

12

13

 sys-apps/help2man/Manifest                         |  8 ++--

14

 .../files/help2man-1.36.4-respect-LDFLAGS.patch    | 11 -----

15

 .../help2man/files/help2man-1.38.4-linguas.patch   | 53 ----------------------

16

 ...lp2man-1.47.3.ebuild => help2man-1.47.6.ebuild} | 17 +++----

17

 ...lp2man-1.46.6.ebuild => help2man-1.47.7.ebuild} | 22 +++++----

18

 ...lp2man-1.47.4.ebuild => help2man-1.47.8.ebuild} | 16 +++----

19

 6 files changed, 34 insertions(+), 93 deletions(-)

20

21

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest

22

index 80885a36e9..2fc8570c78 100644

23

--- a/sys-apps/help2man/Manifest

24

+++ b/sys-apps/help2man/Manifest

25

@@ -1,4 +1,4 @@

26

-DIST help2man-1.46.6.tar.xz 171044 BLAKE2B 41e5edddac3d7e9683b92aef2c5b1fc57c3a3684e13e17a58707bb2f332b4290841a80bd47913f9466e9d2cb02fcacaa515b4f4bb7053993988d599baff6256d SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c

27

-DIST help2man-1.47.3.tar.xz 184832 BLAKE2B fbad208e8f00ace7a87bbfdd7991a5bd3dccc7df1d49a3717cb15e5102df891f24fcdf896f36f1dec07ec547b7522860bc997d1eeb83e8c7b8fd2f967416c80a SHA512 c6c41e6492f7a84a3c8c45473f4fa797d243a10b56bbba6029aec5b84a7b5f5054fb55211f5057a5cade7f7d666f5445c528eb6d519b862fe01d0adc64257501

28

-DIST help2man-1.47.4-1.40.4-cygwin-nls.patch 5371 SHA256 ceacfbf45855fdd4da8955eeefbec2d2bb3cde4aeb08b73de326bac9d22110bd SHA512 f21e82a5d96b886c7859205937f04ad8e83408ffa1a223106dd055a7a722dccf2d1e428b9e354cd49f0e38059e92fcc72da7aeb39984463492f801bd54b5d5c6 WHIRLPOOL 2ea313c74466cf9a52d2d052adf8c6d116ad3e3a9d740da825f203fe0ebb1fd10bc60ef61ef9bbed417fd875a9bb4391122fa54e6a1fb0e4905d571a3e9e92ee

29

-DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd

30

+DIST help2man-1.40.4-cygwin-nls.patch 5371 BLAKE2B 998988ee4c66d3e029d2279b4acd3c02d68df9fbd0d780670d03a5246e8308d1ba7c0c98e810d9527ed27ac11331a26c2b74dedcd0e722e7d78dd1cf8c95c851 SHA512 f21e82a5d96b886c7859205937f04ad8e83408ffa1a223106dd055a7a722dccf2d1e428b9e354cd49f0e38059e92fcc72da7aeb39984463492f801bd54b5d5c6

31

+DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942

32

+DIST help2man-1.47.7.tar.xz 200128 BLAKE2B bdac9d1db29b03bbb8e41caecfdf3a7273b69d9b9fa2e206b2e6c28d1144c3104b8d4b7d4a43aab1b405bffd6e097db63a2f4e97a76dfcd980ee5d8a9ffc2114 SHA512 e6ec25d973df68edde87d3314b1bef2e679d57d4c9e024bca17362b9da058c80314050e1ae61d73179b8c2662c8692caa1f223fc48b8d02f2d4f040d16e51d14

33

+DIST help2man-1.47.8.tar.xz 200264 BLAKE2B 2650909986649a471cfa13db96fda34e864312aab96ffa2692c2d38cbb9b36149d90a398b3ea9568992b9da01ab7aeeab8022ee74edebf2e7c83cac48c951e7c SHA512 05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6

34

35

diff --git a/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch b/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch

36

deleted file mode 100644

37

index e6d1f6f081..0000000000

38

--- a/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch

39

+++ /dev/null

40

@@ -1,11 +0,0 @@

41

---- Makefile.in

42

-+++ Makefile.in

43

-@@ -102,7 +102,7 @@

44

-

45

- preload: $(preload).so

46

- $(preload).so: $(srcdir)/$(preload).c

47

--	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)

48

-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)

49

-

50

- man: $(target).1

51

- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m

52

53

diff --git a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch b/sys-apps/help2man/files/help2man-1.38.4-linguas.patch

54

deleted file mode 100644

55

index 080166c506..0000000000

56

--- a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch

57

+++ /dev/null

58

@@ -1,53 +0,0 @@

59

-respect user LINGUAS

60

-

61

-+++ b/Makefile.in

62

-@@ -16,7 +16,12 @@

63

- export VPATH = .:$(srcdir)

64

-

65

- DESTDIR =

66

--LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))

67

-+ALL_LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))

68

-+ifeq ($(LINGUAS),)

69

-+INSTALL_LINGUAS = $(ALL_LINGUAS)

70

-+else

71

-+INSTALL_LINGUAS = $(filter $(LINGUAS),$(ALL_LINGUAS))

72

-+endif

73

-

74

- CC = @CC@

75

- PERL = @PERL@

76

-@@ -56,7 +62,7 @@

77

- 	$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)

78

-

79

- install_l10n: install_dirs msg_l10n man_l10n

80

--	for lang in $(LINGUAS); \

81

-+	for lang in $(INSTALL_LINGUAS); \

82

- 	do \

83

- 	    $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \

84

- 	    $(INSTALL_DATA) $(call vpath_file,po/$$lang.gmo) \

85

-@@ -124,7 +130,7 @@

86

- 	$(MAKE) $(target).h2m

87

- 	./$(target) --include=$(target).h2m --output=$@ ./$(target)

88

-

89

--msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(LINGUAS)))

90

-+msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(ALL_LINGUAS)))

91

- po/%.gmo: $(srcdir)/po/%.po

92

- 	test -d po || mkdir po

93

- 	$(MSGFMT) -o $@ $?

94

-@@ -134,7 +140,7 @@

95

- 	$(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \

96

- 	$(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo

97

-

98

--man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS)))

99

-+man_l10n: $(addprefix $(target).,$(addsuffix .1,$(ALL_LINGUAS)))

100

- $(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL \

101

-     $(srcdir)/po/%.po

102

- 	lang=$(patsubst $(target).%.1,%,$@); \

103

-@@ -164,7 +170,7 @@

104

- 	./config.status

105

-

106

- update-po: $(srcdir)/po/$(target).pot

107

--	for lang in $(LINGUAS); \

108

-+	for lang in $(ALL_LINGUAS); \

109

- 	do \

110

- 	    echo -n "Updating $$lang "; \

111

- 	    msgmerge -U $(srcdir)/po/$$lang.po $(srcdir)/po/$(target).pot; \

112

113

diff --git a/sys-apps/help2man/help2man-1.47.3.ebuild b/sys-apps/help2man/help2man-1.47.6.ebuild

114

similarity index 64%

115

rename from sys-apps/help2man/help2man-1.47.3.ebuild

116

rename to sys-apps/help2man/help2man-1.47.6.ebuild

117

index b06944c215..c6386779e3 100644

118

--- a/sys-apps/help2man/help2man-1.47.3.ebuild

119

+++ b/sys-apps/help2man/help2man-1.47.6.ebuild

120

@@ -1,9 +1,7 @@

121

-# Copyright 1999-2017 Gentoo Foundation

122

+# Copyright 1999-2019 Gentoo Authors

123

 # Distributed under the terms of the GNU General Public License v2

124

-# $Id$

125

126

-EAPI=5

127

-inherit eutils

128

+EAPI=6

129

130

 DESCRIPTION="GNU utility to convert program --help output to a man page"

131

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

132

@@ -11,14 +9,18 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"

133

134

 LICENSE="GPL-3"

135

 SLOT="0"

136

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

137

+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

138

 IUSE="nls"

139

140

 RDEPEND="dev-lang/perl

141

 	nls? ( dev-perl/Locale-gettext )"

142

 DEPEND=${RDEPEND}

143

144

-DOCS="debian/changelog NEWS README THANKS" #385753

145

+DOCS=( debian/changelog NEWS README THANKS ) #385753

146

+

147

+PATCHES=(

148

+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch

149

+)

150

151

 src_prepare() {

152

 	if [[ ${CHOST} == *-darwin* ]] ; then

153

@@ -26,8 +28,7 @@ src_prepare() {

154

 			-e 's/-shared/-bundle/' \

155

 			Makefile.in || die

156

fi

157

-	epatch \

158

-		"${FILESDIR}"/${PN}-1.46.1-linguas.patch

159

+	default

160

}

161

162

 src_configure() {

163

164

diff --git a/sys-apps/help2man/help2man-1.46.6.ebuild b/sys-apps/help2man/help2man-1.47.7.ebuild

165

similarity index 50%

166

rename from sys-apps/help2man/help2man-1.46.6.ebuild

167

rename to sys-apps/help2man/help2man-1.47.7.ebuild

168

index 27f40946d1..c6386779e3 100644

169

--- a/sys-apps/help2man/help2man-1.46.6.ebuild

170

+++ b/sys-apps/help2man/help2man-1.47.7.ebuild

171

@@ -1,9 +1,7 @@

172

-# Copyright 1999-2017 Gentoo Foundation

173

+# Copyright 1999-2019 Gentoo Authors

174

 # Distributed under the terms of the GNU General Public License v2

175

-# $Id$

176

177

-EAPI=4

178

-inherit eutils

179

+EAPI=6

180

181

 DESCRIPTION="GNU utility to convert program --help output to a man page"

182

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

183

@@ -11,18 +9,26 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"

184

185

 LICENSE="GPL-3"

186

 SLOT="0"

187

-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

188

+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

189

 IUSE="nls"

190

191

 RDEPEND="dev-lang/perl

192

 	nls? ( dev-perl/Locale-gettext )"

193

 DEPEND=${RDEPEND}

194

195

-DOCS="debian/changelog NEWS README THANKS" #385753

196

+DOCS=( debian/changelog NEWS README THANKS ) #385753

197

+

198

+PATCHES=(

199

+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch

200

+)

201

202

 src_prepare() {

203

-	epatch \

204

-		"${FILESDIR}"/${PN}-1.46.1-linguas.patch

205

+	if [[ ${CHOST} == *-darwin* ]] ; then

206

+		sed -i \

207

+			-e 's/-shared/-bundle/' \

208

+			Makefile.in || die

209

+	fi

210

+	default

211

}

212

213

 src_configure() {

214

215

diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.8.ebuild

216

similarity index 70%

217

rename from sys-apps/help2man/help2man-1.47.4.ebuild

218

rename to sys-apps/help2man/help2man-1.47.8.ebuild

219

index d2ced772c3..20cca7decc 100644

220

--- a/sys-apps/help2man/help2man-1.47.4.ebuild

221

+++ b/sys-apps/help2man/help2man-1.47.8.ebuild

222

@@ -1,9 +1,7 @@

223

-# Copyright 1999-2017 Gentoo Foundation

224

+# Copyright 1999-2019 Gentoo Authors

225

 # Distributed under the terms of the GNU General Public License v2

226

-# $Id$

227

228

-EAPI=5

229

-inherit eutils

230

+EAPI=6

231

232

 DESCRIPTION="GNU utility to convert program --help output to a man page"

233

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

234

@@ -12,19 +10,19 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"

235

 CYGWIN_PATCHREV="60ae068c5e01fbed4ee3f86107f7df64d596a864"

236

 CYGWIN_PATCH="1.40.4-cygwin-nls.patch"

237

 SRC_URI+=" elibc_Cygwin? (

238

-https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${P}-${CYGWIN_PATCH}

239

+https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${PN}-${CYGWIN_PATCH}

240

)"

241

242

 LICENSE="GPL-3"

243

 SLOT="0"

244

-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

245

+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

246

 IUSE="nls"

247

248

 RDEPEND="dev-lang/perl

249

 	nls? ( dev-perl/Locale-gettext )"

250

 DEPEND=${RDEPEND}

251

252

-DOCS="debian/changelog NEWS README THANKS" #385753

253

+DOCS=( debian/changelog NEWS README THANKS ) #385753

254

255

 PATCHES=(

256

 	"${FILESDIR}"/${PN}-1.46.1-linguas.patch

257

@@ -36,8 +34,8 @@ src_prepare() {

258

 			-e 's/-shared/-bundle/' \

259

 			Makefile.in || die

260

fi

261

-	epatch "${PATCHES[@]}"

262

-	use elibc_Cygwin && epatch "${DISTDIR}/${P}-${CYGWIN_PATCH}"

263

+	default

264

+	use elibc_Cygwin && eapply -p2 "${DISTDIR}/${PN}-${CYGWIN_PATCH}"

265

}

266

267

 src_configure() {

1	commit: cf1d7089b78745643edceb113a8455b63371d789
2	Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
3	AuthorDate: Wed Jan 30 11:49:20 2019 +0000
4	Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
5	CommitDate: Wed Jan 30 11:49:33 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cf1d7089
7
8	sys-apps/help2man: sync, rebase cygwin patch
9
10	Package-Manager: Portage-2.3.55.1-prefix, Repoman-2.3.12
11	Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
12
13	sys-apps/help2man/Manifest \| 8 ++--
14	.../files/help2man-1.36.4-respect-LDFLAGS.patch \| 11 -----
15	.../help2man/files/help2man-1.38.4-linguas.patch \| 53 ----------------------
16	...lp2man-1.47.3.ebuild => help2man-1.47.6.ebuild} \| 17 +++----
17	...lp2man-1.46.6.ebuild => help2man-1.47.7.ebuild} \| 22 +++++----
18	...lp2man-1.47.4.ebuild => help2man-1.47.8.ebuild} \| 16 +++----
19	6 files changed, 34 insertions(+), 93 deletions(-)
20
21	diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
22	index 80885a36e9..2fc8570c78 100644
23	--- a/sys-apps/help2man/Manifest
24	+++ b/sys-apps/help2man/Manifest
25	@@ -1,4 +1,4 @@
26	-DIST help2man-1.46.6.tar.xz 171044 BLAKE2B 41e5edddac3d7e9683b92aef2c5b1fc57c3a3684e13e17a58707bb2f332b4290841a80bd47913f9466e9d2cb02fcacaa515b4f4bb7053993988d599baff6256d SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c
27	-DIST help2man-1.47.3.tar.xz 184832 BLAKE2B fbad208e8f00ace7a87bbfdd7991a5bd3dccc7df1d49a3717cb15e5102df891f24fcdf896f36f1dec07ec547b7522860bc997d1eeb83e8c7b8fd2f967416c80a SHA512 c6c41e6492f7a84a3c8c45473f4fa797d243a10b56bbba6029aec5b84a7b5f5054fb55211f5057a5cade7f7d666f5445c528eb6d519b862fe01d0adc64257501
28	-DIST help2man-1.47.4-1.40.4-cygwin-nls.patch 5371 SHA256 ceacfbf45855fdd4da8955eeefbec2d2bb3cde4aeb08b73de326bac9d22110bd SHA512 f21e82a5d96b886c7859205937f04ad8e83408ffa1a223106dd055a7a722dccf2d1e428b9e354cd49f0e38059e92fcc72da7aeb39984463492f801bd54b5d5c6 WHIRLPOOL 2ea313c74466cf9a52d2d052adf8c6d116ad3e3a9d740da825f203fe0ebb1fd10bc60ef61ef9bbed417fd875a9bb4391122fa54e6a1fb0e4905d571a3e9e92ee
29	-DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
30	+DIST help2man-1.40.4-cygwin-nls.patch 5371 BLAKE2B 998988ee4c66d3e029d2279b4acd3c02d68df9fbd0d780670d03a5246e8308d1ba7c0c98e810d9527ed27ac11331a26c2b74dedcd0e722e7d78dd1cf8c95c851 SHA512 f21e82a5d96b886c7859205937f04ad8e83408ffa1a223106dd055a7a722dccf2d1e428b9e354cd49f0e38059e92fcc72da7aeb39984463492f801bd54b5d5c6
31	+DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
32	+DIST help2man-1.47.7.tar.xz 200128 BLAKE2B bdac9d1db29b03bbb8e41caecfdf3a7273b69d9b9fa2e206b2e6c28d1144c3104b8d4b7d4a43aab1b405bffd6e097db63a2f4e97a76dfcd980ee5d8a9ffc2114 SHA512 e6ec25d973df68edde87d3314b1bef2e679d57d4c9e024bca17362b9da058c80314050e1ae61d73179b8c2662c8692caa1f223fc48b8d02f2d4f040d16e51d14
33	+DIST help2man-1.47.8.tar.xz 200264 BLAKE2B 2650909986649a471cfa13db96fda34e864312aab96ffa2692c2d38cbb9b36149d90a398b3ea9568992b9da01ab7aeeab8022ee74edebf2e7c83cac48c951e7c SHA512 05e420560b143042418db2e992beaef45cc5a568cdbf640c7b285ba2dc322290d14e0df978ff4c412a99f4346e38f6fb9796ebda695ddc002a3d0e74e85725d6
34
35	diff --git a/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch b/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch
36	deleted file mode 100644
37	index e6d1f6f081..0000000000
38	--- a/sys-apps/help2man/files/help2man-1.36.4-respect-LDFLAGS.patch
39	+++ /dev/null
40	@@ -1,11 +0,0 @@
41	---- Makefile.in
42	-+++ Makefile.in
43	-@@ -102,7 +102,7 @@
44	-
45	- preload: $(preload).so
46	- $(preload).so: $(srcdir)/$(preload).c
47	-- $(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
48	-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
49	-
50	- man: $(target).1
51	- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
52
53	diff --git a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch b/sys-apps/help2man/files/help2man-1.38.4-linguas.patch
54	deleted file mode 100644
55	index 080166c506..0000000000
56	--- a/sys-apps/help2man/files/help2man-1.38.4-linguas.patch
57	+++ /dev/null
58	@@ -1,53 +0,0 @@
59	-respect user LINGUAS
60	-
61	-+++ b/Makefile.in
62	-@@ -16,7 +16,12 @@
63	- export VPATH = .:$(srcdir)
64	-
65	- DESTDIR =
66	--LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
67	-+ALL_LINGUAS = $(basename $(notdir $(wildcard $(srcdir)/po/*.po)))
68	-+ifeq ($(LINGUAS),)
69	-+INSTALL_LINGUAS = $(ALL_LINGUAS)
70	-+else
71	-+INSTALL_LINGUAS = $(filter $(LINGUAS),$(ALL_LINGUAS))
72	-+endif
73	-
74	- CC = @CC@
75	- PERL = @PERL@
76	-@@ -56,7 +62,7 @@
77	- $(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir)
78	-
79	- install_l10n: install_dirs msg_l10n man_l10n
80	-- for lang in $(LINGUAS); \
81	-+ for lang in $(INSTALL_LINGUAS); \
82	- do \
83	- $(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
84	- $(INSTALL_DATA) $(call vpath_file,po/$$lang.gmo) \
85	-@@ -124,7 +130,7 @@
86	- $(MAKE) $(target).h2m
87	- ./$(target) --include=$(target).h2m --output=$@ ./$(target)
88	-
89	--msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(LINGUAS)))
90	-+msg_l10n: $(addprefix po/,$(addsuffix .gmo,$(ALL_LINGUAS)))
91	- po/%.gmo: $(srcdir)/po/%.po
92	- test -d po \|\| mkdir po
93	- $(MSGFMT) -o $@ $?
94	-@@ -134,7 +140,7 @@
95	- $(MKINSTALLDIRS) localetmp/$$lang/LC_MESSAGES && \
96	- $(INSTALL_DATA) po/$$lang.gmo localetmp/$$lang/LC_MESSAGES/$(target).mo
97	-
98	--man_l10n: $(addprefix $(target).,$(addsuffix .1,$(LINGUAS)))
99	-+man_l10n: $(addprefix $(target).,$(addsuffix .1,$(ALL_LINGUAS)))
100	- $(target).%.1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL \
101	- $(srcdir)/po/%.po
102	- lang=$(patsubst $(target).%.1,%,$@); \
103	-@@ -164,7 +170,7 @@
104	- ./config.status
105	-
106	- update-po: $(srcdir)/po/$(target).pot
107	-- for lang in $(LINGUAS); \
108	-+ for lang in $(ALL_LINGUAS); \
109	- do \
110	- echo -n "Updating $$lang "; \
111	- msgmerge -U $(srcdir)/po/$$lang.po $(srcdir)/po/$(target).pot; \
112
113	diff --git a/sys-apps/help2man/help2man-1.47.3.ebuild b/sys-apps/help2man/help2man-1.47.6.ebuild
114	similarity index 64%
115	rename from sys-apps/help2man/help2man-1.47.3.ebuild
116	rename to sys-apps/help2man/help2man-1.47.6.ebuild
117	index b06944c215..c6386779e3 100644
118	--- a/sys-apps/help2man/help2man-1.47.3.ebuild
119	+++ b/sys-apps/help2man/help2man-1.47.6.ebuild
120	@@ -1,9 +1,7 @@
121	-# Copyright 1999-2017 Gentoo Foundation
122	+# Copyright 1999-2019 Gentoo Authors
123	# Distributed under the terms of the GNU General Public License v2
124	-# $Id$
125
126	-EAPI=5
127	-inherit eutils
128	+EAPI=6
129
130	DESCRIPTION="GNU utility to convert program --help output to a man page"
131	HOMEPAGE="https://www.gnu.org/software/help2man/"
132	@@ -11,14 +9,18 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
133
134	LICENSE="GPL-3"
135	SLOT="0"
136	-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
137	+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
138	IUSE="nls"
139
140	RDEPEND="dev-lang/perl
141	nls? ( dev-perl/Locale-gettext )"
142	DEPEND=${RDEPEND}
143
144	-DOCS="debian/changelog NEWS README THANKS" #385753
145	+DOCS=( debian/changelog NEWS README THANKS ) #385753
146	+
147	+PATCHES=(
148	+ "${FILESDIR}"/${PN}-1.46.1-linguas.patch
149	+)
150
151	src_prepare() {
152	if [[ ${CHOST} == -darwin ]] ; then
153	@@ -26,8 +28,7 @@ src_prepare() {
154	-e 's/-shared/-bundle/' \
155	Makefile.in \|\| die
156	fi
157	- epatch \
158	- "${FILESDIR}"/${PN}-1.46.1-linguas.patch
159	+ default
160	}
161
162	src_configure() {
163
164	diff --git a/sys-apps/help2man/help2man-1.46.6.ebuild b/sys-apps/help2man/help2man-1.47.7.ebuild
165	similarity index 50%
166	rename from sys-apps/help2man/help2man-1.46.6.ebuild
167	rename to sys-apps/help2man/help2man-1.47.7.ebuild
168	index 27f40946d1..c6386779e3 100644
169	--- a/sys-apps/help2man/help2man-1.46.6.ebuild
170	+++ b/sys-apps/help2man/help2man-1.47.7.ebuild
171	@@ -1,9 +1,7 @@
172	-# Copyright 1999-2017 Gentoo Foundation
173	+# Copyright 1999-2019 Gentoo Authors
174	# Distributed under the terms of the GNU General Public License v2
175	-# $Id$
176
177	-EAPI=4
178	-inherit eutils
179	+EAPI=6
180
181	DESCRIPTION="GNU utility to convert program --help output to a man page"
182	HOMEPAGE="https://www.gnu.org/software/help2man/"
183	@@ -11,18 +9,26 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
184
185	LICENSE="GPL-3"
186	SLOT="0"
187	-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
188	+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
189	IUSE="nls"
190
191	RDEPEND="dev-lang/perl
192	nls? ( dev-perl/Locale-gettext )"
193	DEPEND=${RDEPEND}
194
195	-DOCS="debian/changelog NEWS README THANKS" #385753
196	+DOCS=( debian/changelog NEWS README THANKS ) #385753
197	+
198	+PATCHES=(
199	+ "${FILESDIR}"/${PN}-1.46.1-linguas.patch
200	+)
201
202	src_prepare() {
203	- epatch \
204	- "${FILESDIR}"/${PN}-1.46.1-linguas.patch
205	+ if [[ ${CHOST} == -darwin ]] ; then
206	+ sed -i \
207	+ -e 's/-shared/-bundle/' \
208	+ Makefile.in \|\| die
209	+ fi
210	+ default
211	}
212
213	src_configure() {
214
215	diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.8.ebuild
216	similarity index 70%
217	rename from sys-apps/help2man/help2man-1.47.4.ebuild
218	rename to sys-apps/help2man/help2man-1.47.8.ebuild
219	index d2ced772c3..20cca7decc 100644
220	--- a/sys-apps/help2man/help2man-1.47.4.ebuild
221	+++ b/sys-apps/help2man/help2man-1.47.8.ebuild
222	@@ -1,9 +1,7 @@
223	-# Copyright 1999-2017 Gentoo Foundation
224	+# Copyright 1999-2019 Gentoo Authors
225	# Distributed under the terms of the GNU General Public License v2
226	-# $Id$
227
228	-EAPI=5
229	-inherit eutils
230	+EAPI=6
231
232	DESCRIPTION="GNU utility to convert program --help output to a man page"
233	HOMEPAGE="https://www.gnu.org/software/help2man/"
234	@@ -12,19 +10,19 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
235	CYGWIN_PATCHREV="60ae068c5e01fbed4ee3f86107f7df64d596a864"
236	CYGWIN_PATCH="1.40.4-cygwin-nls.patch"
237	SRC_URI+=" elibc_Cygwin? (
238	-https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${P}-${CYGWIN_PATCH}
239	+https://raw.githubusercontent.com/cygwinports/help2man/${CYGWIN_PATCHREV}/${CYGWIN_PATCH} -> ${PN}-${CYGWIN_PATCH}
240	)"
241
242	LICENSE="GPL-3"
243	SLOT="0"
244	-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
245	+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
246	IUSE="nls"
247
248	RDEPEND="dev-lang/perl
249	nls? ( dev-perl/Locale-gettext )"
250	DEPEND=${RDEPEND}
251
252	-DOCS="debian/changelog NEWS README THANKS" #385753
253	+DOCS=( debian/changelog NEWS README THANKS ) #385753
254
255	PATCHES=(
256	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
257	@@ -36,8 +34,8 @@ src_prepare() {
258	-e 's/-shared/-bundle/' \
259	Makefile.in \|\| die
260	fi
261	- epatch "${PATCHES[@]}"
262	- use elibc_Cygwin && epatch "${DISTDIR}/${P}-${CYGWIN_PATCH}"
263	+ default
264	+ use elibc_Cygwin && eapply -p2 "${DISTDIR}/${PN}-${CYGWIN_PATCH}"
265	}
266
267	src_configure() {

Gentoo Archives: gentoo-commits