[gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/, dev-lang/erlang/ - gentoo-commits

From:	"Anthony G. Basile" <blueness@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/, dev-lang/erlang/
Date:	Tue, 04 Jun 2019 17:24:54
Message-Id:	`1559669009.f2c6efc25875aed7e2ef3c0f57ed03fb03c2cc81.blueness@gentoo`

1

commit:     f2c6efc25875aed7e2ef3c0f57ed03fb03c2cc81

2

Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>

3

AuthorDate: Tue Jun  4 17:23:29 2019 +0000

4

Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>

5

CommitDate: Tue Jun  4 17:23:29 2019 +0000

6

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

7

8

dev-lang/erlang: version bump to 22.0.2

9

10

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

11

Package-Manager: Portage-2.3.66, Repoman-2.3.11

12

13

 dev-lang/erlang/Manifest                           |   3 +

14

 dev-lang/erlang/erlang-22.0.2.ebuild               | 148 +++++++++++++++++++++

15

 .../files/erlang-22.0-dont-ignore-LDFLAGS.patch    |  27 ++++

16

 3 files changed, 178 insertions(+)

17

18

diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest

19

index c59eb74f26a..48cc77bed4f 100644

20

--- a/dev-lang/erlang/Manifest

21

+++ b/dev-lang/erlang/Manifest

22

@@ -4,14 +4,17 @@ DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c5739

23

 DIST erlang-21.2.6.tar.gz 53956256 BLAKE2B a39e57df65afef7a746ef5b6feb6041621607e9209fa3e81f91be31a4b736238c7fef73db436d3ae57ab3cee856531684d2ffb8ea5bc608b4166c81d1cd8a3ea SHA512 0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9

24

 DIST erlang-21.2.7.tar.gz 53954838 BLAKE2B 1f81e439a9f6cc6f560791043c6f84847fa1dd71a94b0195e1141d805e9c327b88afda233dc426215679107661b22c5b93448b7d1a1b55af5669e3fdd6753356 SHA512 2a5cec5b9e0ae7b8f53060c95ac1d7a61dbf7b591199c7bc2d527d643dd2a09484ae27055bf3135fb32a69500dbbae8ae95258cea22f2c100ea9f892b87715f7

25

 DIST erlang-21.3.tar.gz 54021160 BLAKE2B 1a65fa67df3a7227abb1fd99eb5c77a60cf5e156dd54b2dfca89befeb85c6eb30ab8afec1ae1d54ac57b574b3b6a915e758b93e89234f668478cf7cfd933cc43 SHA512 7001b6a37597e8d78b9b071d517e7be449592d7d7f9f8bf6f555dd3ed58caec429644adf52d9c5669c2e06dafc61149544a730f3dae138a8c25da0f61d06ba83

26

+DIST erlang-22.0.2.tar.gz 54805264 BLAKE2B d30fd8a7a4ada892f4b8e14c82ab7e20f77caa78573774d0b591a1abcc26c63ae5e0a65ae5c30f0f5cc8a6e4c5e13d167929eb049cbb172fcf2899d61f5ec8dc SHA512 6dbc3705a8b9ba5c8b6694e256c226c882521d87c3af4deb9212c33fff83b510191ea547888d15ced17dd66857fb1d7ba72d9fbd54a5c63091aa86680b960436

27

 DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4

28

 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f

29

 DIST erlang_doc_html_21.2.tar.gz 32798331 BLAKE2B 7c0606186caa36fe9ff6099a11930cf457f5f67dc276d5d75bd4c2934943e0adaa71658d701b5ef9102063db07a67fd66c5fe0c74f4839ac24f96d845a9e8902 SHA512 a7be67ff704aee78377b986e2425691937a1d53253ab3ec520eb689fcb7cf7595dae8026dc2b5dab73e25ae2ae76f8458a034eb0dfeb320ddc61306dcf52f3f9

30

 DIST erlang_doc_html_21.3.tar.gz 33069226 BLAKE2B d2a9b3154b1b91d15864d9398e145ce18c2a9a409e01b12d726946836939a5a7dc80221da9ec493471f97d854e9fb385ff589f23a6ab584188d55a423c49c69d SHA512 eaa3bd14717cf5f27bdc605b215d20b63126c4e0b7201c28e3f59dd560bf90c239d79bf028e1862318db511135ba7237b27a2f701964d14df3e7763a73a28a34

31

+DIST erlang_doc_html_22.0.tar.gz 33737075 BLAKE2B f49aba36e9b84e5bc4422052e33aab5cb407dfcf2086ddb8a2370003dc63842acc79a67d9d453ee9e59d7b69416b23527e2d9f564b2d8a58d4c46bc3a93881c4 SHA512 89229a97fb5c78246ce9fa6a2d23446c6c3c2de15617911739e133b7e58714a91b1360af64bf61659d96808a816d84e4c410f8c8efe1e544930f88d73242b6e7

32

 DIST erlang_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25

33

 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f

34

 DIST erlang_doc_man_21.2.tar.gz 1325975 BLAKE2B c46e0f8a9198f4deee46e3f845cfd5bb6f7cf306ecf3165960add0e3d09beb1ac9221d630c10d3d7d3ff874c7579db9ff04b3c5c1251a4bdf102ce573db6f6ea SHA512 adfb62815ced0010585772f2de4ca8fc4fa513929881ed5dc5ec5367ff279778f4f69fffcb05b52ef9bf3a6d79c3999c7343fafd9920a9a5570f8a09ef6b50cc

35

 DIST erlang_doc_man_21.3.tar.gz 1332545 BLAKE2B 964c8031203d384053366ec27a7731af5c257afee44730f98a081e387e4ca08b220db8880c8939f4257acbed4c093527459615c64ca165d8218880e8cd5f6c11 SHA512 24e012a30436d63cfef10d53696b03cd5564ca0988850b5d497f526d7afed33354824f04ce937d43063d8a5745e427380920d50a2fe9b67adb84195569dc65f2

36

+DIST erlang_doc_man_22.0.tar.gz 1347830 BLAKE2B 52fd7adf46c9727dba70edc73150b2c7e9b96728ccb0af6d717ab9881bcb38fd98cd1d9d8ff9b28688889cf162230dc0f054377446a21d9114ad70e706aef863 SHA512 f980439d21aea6e1487afbd2e22a1a909cee40bd2464569219159bd38048d7d8d7adc9c5c639c04d5fe3160d090b51f2fd33b3ef479969731ce1861338278e41

37

 DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8

38

 DIST otp_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4

39

 DIST otp_doc_man_19.1.tar.gz 1405580 BLAKE2B 93b79b88f81a00d7cbb934dbac811c6ea0ec59413e073fe613038eab71087908ed4e4bcbb6c8ed2f0c5bdd03ab4a570f20c4460f233c040ae0c4238e1cfa097a SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334

40

41

diff --git a/dev-lang/erlang/erlang-22.0.2.ebuild b/dev-lang/erlang/erlang-22.0.2.ebuild

42

new file mode 100644

43

index 00000000000..3168e0bd83f

44

--- /dev/null

45

+++ b/dev-lang/erlang/erlang-22.0.2.ebuild

46

@@ -0,0 +1,148 @@

47

+# Copyright 1999-2019 Gentoo Authors

48

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

49

+

50

+EAPI=6

51

+WX_GTK_VER="3.0"

52

+

53

+inherit eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets

54

+

55

+# NOTE: If you need symlinks for binaries please tell maintainers or

56

+# open up a bug to let it be created.

57

+

58

+UPSTREAM_V="$(ver_cut 1-2)"

59

+

60

+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"

61

+HOMEPAGE="https://www.erlang.org/"

62

+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz

63

+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz

64

+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"

65

+

66

+LICENSE="Apache-2.0"

67

+SLOT="0"

68

+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"

69

+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"

70

+

71

+RDEPEND="

72

+	sys-libs/ncurses:0

73

+	sys-libs/zlib

74

+	emacs? ( virtual/emacs )

75

+	java? ( >=virtual/jdk-1.8:* )

76

+	odbc? ( dev-db/unixODBC )

77

+	sctp? ( net-misc/lksctp-tools )

78

+	ssl? (

79

+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )

80

+		libressl? ( dev-libs/libressl:0= )

81

+	)

82

+	systemd? ( sys-apps/systemd )

83

+	tk? ( dev-lang/tk:0 )

84

+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )

85

+"

86

+DEPEND="${RDEPEND}

87

+	dev-lang/perl

88

+"

89

+

90

+S="${WORKDIR}/otp-OTP-${PV}"

91

+

92

+PATCHES=(

93

+	"${FILESDIR}/18.2.1-wx3.0.patch"

94

+	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"

95

+	"${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"

96

+)

97

+

98

+

99

+SITEFILE=50"${PN}"-gentoo.el

100

+

101

+src_prepare() {

102

+	default

103

+

104

+	./otp_build autoconf

105

+}

106

+

107

+src_configure() {

108

+	use wxwidgets && setup-wxwidgets

109

+

110

+	local myconf=(

111

+		--disable-builtin-zlib

112

+		$(use_enable hipe)

113

+		$(use_enable kpoll kernel-poll)

114

+		$(use_with java javac)

115

+		$(use_enable sctp)

116

+		$(use_with ssl ssl "${EPREFIX}"/usr)

117

+		$(use_enable ssl dynamic-ssl-lib)

118

+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")

119

+	)

120

+	econf "${myconf[@]}"

121

+}

122

+

123

+src_compile() {

124

+	emake

125

+

126

+	if use emacs ; then

127

+		pushd lib/tools/emacs &>/dev/null || die

128

+		elisp-compile *.el

129

+		popd &>/dev/null || die

130

+	fi

131

+}

132

+

133

+extract_version() {

134

+	local path="$1"

135

+	local var_name="$2"

136

+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"

137

+}

138

+

139

+src_install() {

140

+	local erl_libdir_rel="$(get_libdir)/erlang"

141

+	local erl_libdir="/usr/${erl_libdir_rel}"

142

+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"

143

+	local erl_erts_ver="$(extract_version erts VSN)"

144

+	local my_manpath="/usr/share/${PN}/man"

145

+

146

+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"

147

+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"

148

+

149

+	emake INSTALL_PREFIX="${D}" install

150

+

151

+	if use doc ; then

152

+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )

153

+		docompress -x /usr/share/doc/${PF}

154

+	else

155

+		local DOCS=("README.md")

156

+	fi

157

+

158

+	einstalldocs

159

+

160

+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl

161

+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc

162

+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript

163

+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call

164

+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp

165

+

166

+	## Clean up the no longer needed files

167

+	rm "${ED}/${erl_libdir}/Install" || die

168

+

169

+	insinto "${my_manpath}"

170

+	doins -r "${WORKDIR}"/man/*

171

+	# extend MANPATH, so the normal man command can find it

172

+	# see bug 189639

173

+	newenvd - "90erlang" <<-_EOF_

174

+		MANPATH="${my_manpath}"

175

+	_EOF_

176

+

177

+	if use emacs ; then

178

+		elisp-install erlang lib/tools/emacs/*.{el,elc}

179

+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \

180

+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die

181

+		elisp-site-file-install "${T}/${SITEFILE}"

182

+	fi

183

+

184

+	newinitd "${FILESDIR}"/epmd.init epmd

185

+	use systemd && systemd_dounit "${FILESDIR}"/epmd.service

186

+}

187

+

188

+pkg_postinst() {

189

+	use emacs && elisp-site-regen

190

+}

191

+

192

+pkg_postrm() {

193

+	use emacs && elisp-site-regen

194

+}

195

196

diff --git a/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch b/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch

197

new file mode 100644

198

index 00000000000..3591c551fa6

199

--- /dev/null

200

+++ b/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch

201

@@ -0,0 +1,27 @@

202

+This is a forward port of erlang-20.3.2-dont-ignore-LDFLAGS.patch

203

+Anthony G. Basile <blueness@g.o>

204

+

205

+diff -Naur otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in otp-OTP-22.0/lib/megaco/src/flex/Makefile.in

206

+--- otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in	2019-05-10 12:42:49.000000000 +0000

207

++++ otp-OTP-22.0/lib/megaco/src/flex/Makefile.in	2019-06-04 15:53:37.899372564 +0000

208

+@@ -47,7 +47,7 @@

209

+ CC      = @DED_CC@

210

+ CFLAGS_MT = $(CFLAGS) @DED_THR_DEFS@

211

+ LD      = @DED_LD@

212

+-LDFLAGS = @DED_LDFLAGS@

213

++LDFLAGS += @DED_LDFLAGS@

214

+ LEX     = @LEX@

215

+ LEXLIB  = @LEXLIB@

216

+ PERL    = @PERL@

217

+diff -Naur otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in otp-OTP-22.0/lib/odbc/c_src/Makefile.in

218

+--- otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in	2019-05-10 12:42:49.000000000 +0000

219

++++ otp-OTP-22.0/lib/odbc/c_src/Makefile.in	2019-06-04 15:53:37.900372572 +0000

220

+@@ -82,7 +82,7 @@

221

+ CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@

222

+ EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)

223

+ LD = @LD@

224

+-LDFLAGS =  $(ODBC_LIB) $(EI_LDFLAGS)

225

++LDFLAGS += $(ODBC_LIB) $(EI_LDFLAGS)

226

+ LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB)

227

+ INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE)

228

+ TARGET_FLAGS =  @TARGET_FLAGS@

1	commit: f2c6efc25875aed7e2ef3c0f57ed03fb03c2cc81
2	Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3	AuthorDate: Tue Jun 4 17:23:29 2019 +0000
4	Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5	CommitDate: Tue Jun 4 17:23:29 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c6efc2
7
8	dev-lang/erlang: version bump to 22.0.2
9
10	Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11	Package-Manager: Portage-2.3.66, Repoman-2.3.11
12
13	dev-lang/erlang/Manifest \| 3 +
14	dev-lang/erlang/erlang-22.0.2.ebuild \| 148 +++++++++++++++++++++
15	.../files/erlang-22.0-dont-ignore-LDFLAGS.patch \| 27 ++++
16	3 files changed, 178 insertions(+)
17
18	diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
19	index c59eb74f26a..48cc77bed4f 100644
20	--- a/dev-lang/erlang/Manifest
21	+++ b/dev-lang/erlang/Manifest
22	@@ -4,14 +4,17 @@ DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c5739
23	DIST erlang-21.2.6.tar.gz 53956256 BLAKE2B a39e57df65afef7a746ef5b6feb6041621607e9209fa3e81f91be31a4b736238c7fef73db436d3ae57ab3cee856531684d2ffb8ea5bc608b4166c81d1cd8a3ea SHA512 0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9
24	DIST erlang-21.2.7.tar.gz 53954838 BLAKE2B 1f81e439a9f6cc6f560791043c6f84847fa1dd71a94b0195e1141d805e9c327b88afda233dc426215679107661b22c5b93448b7d1a1b55af5669e3fdd6753356 SHA512 2a5cec5b9e0ae7b8f53060c95ac1d7a61dbf7b591199c7bc2d527d643dd2a09484ae27055bf3135fb32a69500dbbae8ae95258cea22f2c100ea9f892b87715f7
25	DIST erlang-21.3.tar.gz 54021160 BLAKE2B 1a65fa67df3a7227abb1fd99eb5c77a60cf5e156dd54b2dfca89befeb85c6eb30ab8afec1ae1d54ac57b574b3b6a915e758b93e89234f668478cf7cfd933cc43 SHA512 7001b6a37597e8d78b9b071d517e7be449592d7d7f9f8bf6f555dd3ed58caec429644adf52d9c5669c2e06dafc61149544a730f3dae138a8c25da0f61d06ba83
26	+DIST erlang-22.0.2.tar.gz 54805264 BLAKE2B d30fd8a7a4ada892f4b8e14c82ab7e20f77caa78573774d0b591a1abcc26c63ae5e0a65ae5c30f0f5cc8a6e4c5e13d167929eb049cbb172fcf2899d61f5ec8dc SHA512 6dbc3705a8b9ba5c8b6694e256c226c882521d87c3af4deb9212c33fff83b510191ea547888d15ced17dd66857fb1d7ba72d9fbd54a5c63091aa86680b960436
27	DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
28	DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
29	DIST erlang_doc_html_21.2.tar.gz 32798331 BLAKE2B 7c0606186caa36fe9ff6099a11930cf457f5f67dc276d5d75bd4c2934943e0adaa71658d701b5ef9102063db07a67fd66c5fe0c74f4839ac24f96d845a9e8902 SHA512 a7be67ff704aee78377b986e2425691937a1d53253ab3ec520eb689fcb7cf7595dae8026dc2b5dab73e25ae2ae76f8458a034eb0dfeb320ddc61306dcf52f3f9
30	DIST erlang_doc_html_21.3.tar.gz 33069226 BLAKE2B d2a9b3154b1b91d15864d9398e145ce18c2a9a409e01b12d726946836939a5a7dc80221da9ec493471f97d854e9fb385ff589f23a6ab584188d55a423c49c69d SHA512 eaa3bd14717cf5f27bdc605b215d20b63126c4e0b7201c28e3f59dd560bf90c239d79bf028e1862318db511135ba7237b27a2f701964d14df3e7763a73a28a34
31	+DIST erlang_doc_html_22.0.tar.gz 33737075 BLAKE2B f49aba36e9b84e5bc4422052e33aab5cb407dfcf2086ddb8a2370003dc63842acc79a67d9d453ee9e59d7b69416b23527e2d9f564b2d8a58d4c46bc3a93881c4 SHA512 89229a97fb5c78246ce9fa6a2d23446c6c3c2de15617911739e133b7e58714a91b1360af64bf61659d96808a816d84e4c410f8c8efe1e544930f88d73242b6e7
32	DIST erlang_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
33	DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
34	DIST erlang_doc_man_21.2.tar.gz 1325975 BLAKE2B c46e0f8a9198f4deee46e3f845cfd5bb6f7cf306ecf3165960add0e3d09beb1ac9221d630c10d3d7d3ff874c7579db9ff04b3c5c1251a4bdf102ce573db6f6ea SHA512 adfb62815ced0010585772f2de4ca8fc4fa513929881ed5dc5ec5367ff279778f4f69fffcb05b52ef9bf3a6d79c3999c7343fafd9920a9a5570f8a09ef6b50cc
35	DIST erlang_doc_man_21.3.tar.gz 1332545 BLAKE2B 964c8031203d384053366ec27a7731af5c257afee44730f98a081e387e4ca08b220db8880c8939f4257acbed4c093527459615c64ca165d8218880e8cd5f6c11 SHA512 24e012a30436d63cfef10d53696b03cd5564ca0988850b5d497f526d7afed33354824f04ce937d43063d8a5745e427380920d50a2fe9b67adb84195569dc65f2
36	+DIST erlang_doc_man_22.0.tar.gz 1347830 BLAKE2B 52fd7adf46c9727dba70edc73150b2c7e9b96728ccb0af6d717ab9881bcb38fd98cd1d9d8ff9b28688889cf162230dc0f054377446a21d9114ad70e706aef863 SHA512 f980439d21aea6e1487afbd2e22a1a909cee40bd2464569219159bd38048d7d8d7adc9c5c639c04d5fe3160d090b51f2fd33b3ef479969731ce1861338278e41
37	DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
38	DIST otp_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
39	DIST otp_doc_man_19.1.tar.gz 1405580 BLAKE2B 93b79b88f81a00d7cbb934dbac811c6ea0ec59413e073fe613038eab71087908ed4e4bcbb6c8ed2f0c5bdd03ab4a570f20c4460f233c040ae0c4238e1cfa097a SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334
40
41	diff --git a/dev-lang/erlang/erlang-22.0.2.ebuild b/dev-lang/erlang/erlang-22.0.2.ebuild
42	new file mode 100644
43	index 00000000000..3168e0bd83f
44	--- /dev/null
45	+++ b/dev-lang/erlang/erlang-22.0.2.ebuild
46	@@ -0,0 +1,148 @@
47	+# Copyright 1999-2019 Gentoo Authors
48	+# Distributed under the terms of the GNU General Public License v2
49	+
50	+EAPI=6
51	+WX_GTK_VER="3.0"
52	+
53	+inherit eapi7-ver elisp-common java-pkg-opt-2 systemd wxwidgets
54	+
55	+# NOTE: If you need symlinks for binaries please tell maintainers or
56	+# open up a bug to let it be created.
57	+
58	+UPSTREAM_V="$(ver_cut 1-2)"
59	+
60	+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
61	+HOMEPAGE="https://www.erlang.org/"
62	+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
63	+ http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
64	+ doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
65	+
66	+LICENSE="Apache-2.0"
67	+SLOT="0"
68	+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
69	+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
70	+
71	+RDEPEND="
72	+ sys-libs/ncurses:0
73	+ sys-libs/zlib
74	+ emacs? ( virtual/emacs )
75	+ java? ( >=virtual/jdk-1.8:* )
76	+ odbc? ( dev-db/unixODBC )
77	+ sctp? ( net-misc/lksctp-tools )
78	+ ssl? (
79	+ !libressl? ( >=dev-libs/openssl-0.9.7d:0= )
80	+ libressl? ( dev-libs/libressl:0= )
81	+ )
82	+ systemd? ( sys-apps/systemd )
83	+ tk? ( dev-lang/tk:0 )
84	+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
85	+"
86	+DEPEND="${RDEPEND}
87	+ dev-lang/perl
88	+"
89	+
90	+S="${WORKDIR}/otp-OTP-${PV}"
91	+
92	+PATCHES=(
93	+ "${FILESDIR}/18.2.1-wx3.0.patch"
94	+ "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
95	+ "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
96	+)
97	+
98	+
99	+SITEFILE=50"${PN}"-gentoo.el
100	+
101	+src_prepare() {
102	+ default
103	+
104	+ ./otp_build autoconf
105	+}
106	+
107	+src_configure() {
108	+ use wxwidgets && setup-wxwidgets
109	+
110	+ local myconf=(
111	+ --disable-builtin-zlib
112	+ $(use_enable hipe)
113	+ $(use_enable kpoll kernel-poll)
114	+ $(use_with java javac)
115	+ $(use_enable sctp)
116	+ $(use_with ssl ssl "${EPREFIX}"/usr)
117	+ $(use_enable ssl dynamic-ssl-lib)
118	+ $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
119	+ )
120	+ econf "${myconf[@]}"
121	+}
122	+
123	+src_compile() {
124	+ emake
125	+
126	+ if use emacs ; then
127	+ pushd lib/tools/emacs &>/dev/null \|\| die
128	+ elisp-compile *.el
129	+ popd &>/dev/null \|\| die
130	+ fi
131	+}
132	+
133	+extract_version() {
134	+ local path="$1"
135	+ local var_name="$2"
136	+ sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" \|\| die "extract_version() failed"
137	+}
138	+
139	+src_install() {
140	+ local erl_libdir_rel="$(get_libdir)/erlang"
141	+ local erl_libdir="/usr/${erl_libdir_rel}"
142	+ local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
143	+ local erl_erts_ver="$(extract_version erts VSN)"
144	+ local my_manpath="/usr/share/${PN}/man"
145	+
146	+ [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
147	+ [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
148	+
149	+ emake INSTALL_PREFIX="${D}" install
150	+
151	+ if use doc ; then
152	+ local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
153	+ docompress -x /usr/share/doc/${PF}
154	+ else
155	+ local DOCS=("README.md")
156	+ fi
157	+
158	+ einstalldocs
159	+
160	+ dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
161	+ dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
162	+ dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
163	+ dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
164	+ dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
165	+
166	+ ## Clean up the no longer needed files
167	+ rm "${ED}/${erl_libdir}/Install" \|\| die
168	+
169	+ insinto "${my_manpath}"
170	+ doins -r "${WORKDIR}"/man/*
171	+ # extend MANPATH, so the normal man command can find it
172	+ # see bug 189639
173	+ newenvd - "90erlang" <<-_EOF_
174	+ MANPATH="${my_manpath}"
175	+ _EOF_
176	+
177	+ if use emacs ; then
178	+ elisp-install erlang lib/tools/emacs/*.{el,elc}
179	+ sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
180	+ "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" \|\| die
181	+ elisp-site-file-install "${T}/${SITEFILE}"
182	+ fi
183	+
184	+ newinitd "${FILESDIR}"/epmd.init epmd
185	+ use systemd && systemd_dounit "${FILESDIR}"/epmd.service
186	+}
187	+
188	+pkg_postinst() {
189	+ use emacs && elisp-site-regen
190	+}
191	+
192	+pkg_postrm() {
193	+ use emacs && elisp-site-regen
194	+}
195
196	diff --git a/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch b/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch
197	new file mode 100644
198	index 00000000000..3591c551fa6
199	--- /dev/null
200	+++ b/dev-lang/erlang/files/erlang-22.0-dont-ignore-LDFLAGS.patch
201	@@ -0,0 +1,27 @@
202	+This is a forward port of erlang-20.3.2-dont-ignore-LDFLAGS.patch
203	+Anthony G. Basile <blueness@g.o>
204	+
205	+diff -Naur otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in otp-OTP-22.0/lib/megaco/src/flex/Makefile.in
206	+--- otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in 2019-05-10 12:42:49.000000000 +0000
207	++++ otp-OTP-22.0/lib/megaco/src/flex/Makefile.in 2019-06-04 15:53:37.899372564 +0000
208	+@@ -47,7 +47,7 @@
209	+ CC = @DED_CC@
210	+ CFLAGS_MT = $(CFLAGS) @DED_THR_DEFS@
211	+ LD = @DED_LD@
212	+-LDFLAGS = @DED_LDFLAGS@
213	++LDFLAGS += @DED_LDFLAGS@
214	+ LEX = @LEX@
215	+ LEXLIB = @LEXLIB@
216	+ PERL = @PERL@
217	+diff -Naur otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in otp-OTP-22.0/lib/odbc/c_src/Makefile.in
218	+--- otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in 2019-05-10 12:42:49.000000000 +0000
219	++++ otp-OTP-22.0/lib/odbc/c_src/Makefile.in 2019-06-04 15:53:37.900372572 +0000
220	+@@ -82,7 +82,7 @@
221	+ CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@
222	+ EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)
223	+ LD = @LD@
224	+-LDFLAGS = $(ODBC_LIB) $(EI_LDFLAGS)
225	++LDFLAGS += $(ODBC_LIB) $(EI_LDFLAGS)
226	+ LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB)
227	+ INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE)
228	+ TARGET_FLAGS = @TARGET_FLAGS@

Gentoo Archives: gentoo-commits