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

From:	Patrick Lauer <patrick@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/
Date:	Sun, 03 Mar 2019 16:44:51
Message-Id:	`1551631470.6dba6219e86cc94876e3f0b32cc3218a4bf538e8.patrick@gentoo`

1

commit:     6dba6219e86cc94876e3f0b32cc3218a4bf538e8

2

Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>

3

AuthorDate: Sun Mar  3 16:44:03 2019 +0000

4

Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>

5

CommitDate: Sun Mar  3 16:44:30 2019 +0000

6

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

7

8

dev-lang/erlang: Bump

9

10

... and keep the friggin' wxwidgets useflag default off

11

12

Package-Manager: Portage-2.3.62, Repoman-2.3.12

13

Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

14

15

 dev-lang/erlang/Manifest                           |   4 +

16

 dev-lang/erlang/erlang-20.3.8.20.ebuild            | 227 +++++++++++++++++++++

17

 dev-lang/erlang/erlang-21.1.1.ebuild               |   2 +-

18

 .../{erlang-21.1.1.ebuild => erlang-21.2.6.ebuild} |   4 +-

19

 4 files changed, 234 insertions(+), 3 deletions(-)

20

21

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

22

index cb20abb0052..5b82689e495 100644

23

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

24

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

25

@@ -1,9 +1,13 @@

26

 DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b

27

+DIST erlang-20.3.8.20.tar.gz 53523729 BLAKE2B d245f0bd80d8ee41b8e832b30864d4539f5333a84d8a74126adcc99203a7646af933d6c80efdbb1f88b955107a7e637487c00ed951baf767f09082c41a8dc8eb SHA512 463c9563ed114f7a4d0364640f7c0e20e234b443d4b9d72687113fbbf106d52b07adad890a58473101311dcb34d072cb27b7ce871c61edc38ba2bd65024fa9cc

28

 DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab

29

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

30

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

31

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

32

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

33

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

34

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

35

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

36

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

37

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

38

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

39

40

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

41

new file mode 100644

42

index 00000000000..22c4fe4d937

43

--- /dev/null

44

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

45

@@ -0,0 +1,227 @@

46

+# Copyright 1999-2019 Gentoo Authors

47

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

48

+

49

+EAPI=6

50

+WX_GTK_VER="3.0"

51

+

52

+inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets

53

+

54

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

55

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

56

+

57

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

58

+

59

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

60

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

61

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

62

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

63

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

64

+

65

+LICENSE="Apache-2.0"

66

+SLOT="0"

67

+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"

68

+

69

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

70

+REQUIRED_USE="dirty-schedulers? ( smp )" #621610

71

+

72

+RDEPEND="

73

+	ssl? (

74

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

75

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

76

+	)

77

+	emacs? ( virtual/emacs )

78

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

79

+	odbc? ( dev-db/unixODBC )

80

+	systemd? ( sys-apps/systemd )

81

+"

82

+DEPEND="${RDEPEND}

83

+	dev-lang/perl

84

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

85

+	sys-libs/zlib

86

+	tk? ( dev-lang/tk )

87

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

88

+		virtual/glu )

89

+"

90

+

91

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

92

+

93

+PATCHES=(

94

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

95

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

96

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

97

+	)

98

+

99

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

100

+

101

+# Taken from the upstream build script, build_otp

102

+erlang_create_lib_configure_in() {

103

+	local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel

104

+			 lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"

105

+	local sdirs=

106

+	for lib_app in ${bootstrap_apps}; do

107

+		case "${lib_app}" in

108

+			lib/*)

109

+				if [[ -f "${lib_app}/configure.in" ]]; then

110

+					mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die

111

+					app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`

112

+					sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die

113

+				fi;;

114

+			*)

115

+			;;

116

+		esac

117

+	done

118

+

119

+	local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"

120

+

121

+	sdirs=

122

+	for lib_app in lib/*; do

123

+		local is_bapp=false

124

+		for bapp in ${bootstrap_apps}; do

125

+			test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }

126

+		done

127

+		if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then

128

+			mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die

129

+			app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die

130

+			sdirs="${sdirs}    test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"

131

+		fi

132

+	done

133

+

134

+	local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"

135

+

136

+	rm -f lib/configure.in || die

137

+	sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"

138

+

139

+}

140

+

141

+# Taken from the upstream build script, build_otp

142

+erlang_distribute_config_helpers() {

143

+	local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"

144

+	local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"

145

+

146

+	local aclocal_master="./erts/aclocal.m4"

147

+	local install_sh_master="./erts/autoconf/install-sh"

148

+	local config_guess_master="./erts/autoconf/config.guess"

149

+	local config_sub_master="./erts/autoconf/config.sub"

150

+

151

+	for dir in ${aclocal_dirs}; do

152

+		"${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die

153

+	done

154

+

155

+	for dir in ${autoconf_aux_dirs}; do

156

+		"${install_sh_master}" -d "${dir}" || die

157

+		"${install_sh_master}" -t "${dir}" "${install_sh_master}" || die

158

+		"${install_sh_master}" -t "${dir}" "${config_guess_master}" || die

159

+		"${install_sh_master}" -t "${dir}" "${config_sub_master}" || die

160

+	done

161

+}

162

+

163

+src_prepare() {

164

+	default

165

+

166

+	# Determines which directories to recurse into with autoconf

167

+	erlang_create_lib_configure_in

168

+

169

+	# Move local autoconf files into the neccessary directories

170

+	erlang_distribute_config_helpers

171

+

172

+	java-pkg-opt-2_src_prepare

173

+

174

+	eautoreconf

175

+}

176

+

177

+src_configure() {

178

+	use wxwidgets && need-wxwidgets unicode

179

+

180

+	econf \

181

+		--disable-builtin-zlib \

182

+		$(use_enable dirty-schedulers) \

183

+		$(use_enable hipe) \

184

+		$(use_enable kpoll kernel-poll) \

185

+		$(use_with java javac) \

186

+		$(use_with odbc) \

187

+		$(use_enable sctp) \

188

+		$(use_enable smp smp-support) \

189

+		$(use_with ssl) \

190

+		$(use_with ssl ssl-rpath "no") \

191

+		$(use_enable ssl dynamic-ssl-lib) \

192

+		$(use_enable systemd) \

193

+		--enable-threads

194

+}

195

+

196

+src_compile() {

197

+	emake

198

+

199

+	if use emacs ; then

200

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

201

+		elisp-compile *.el

202

+		popd &>/dev/null || die

203

+	fi

204

+}

205

+

206

+extract_version() {

207

+	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"

208

+}

209

+

210

+src_install() {

211

+	local ERL_LIBDIR="/usr/$(get_libdir)/erlang"

212

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

213

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

214

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

215

+

216

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

217

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

218

+

219

+	emake INSTALL_PREFIX="${D}" install

220

+

221

+	if use doc ; then

222

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

223

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

224

+	fi

225

+

226

+	einstalldocs

227

+

228

+	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl

229

+	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc

230

+	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript

231

+	dosym \

232

+		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \

233

+		/usr/bin/erl_call

234

+

235

+	if use smp; then

236

+		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp

237

+	else

238

+		dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam

239

+	fi

240

+

241

+	## Clean up the no longer needed files

242

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

243

+

244

+	insinto "${MY_MANPATH}"

245

+

246

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

247

+

248

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

249

+	# see bug 189639

250

+	echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die

251

+	doenvd "${T}/90erlang"

252

+

253

+	if use emacs ; then

254

+		pushd "${S}" &>/dev/null || die

255

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

256

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

257

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

258

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

259

+		popd &>/dev/null || die

260

+	fi

261

+

262

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

263

+	systemd_dounit "${FILESDIR}"/epmd.service

264

+}

265

+

266

+pkg_postinst() {

267

+	use emacs && elisp-site-regen

268

+}

269

+

270

+pkg_postrm() {

271

+	use emacs && elisp-site-regen

272

+}

273

274

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

275

index a5255ff4af0..d18a1dd37f6 100644

276

--- a/dev-lang/erlang/erlang-21.1.1.ebuild

277

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

278

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

279

 LICENSE="Apache-2.0"

280

 SLOT="0"

281

 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"

282

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

283

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

284

285

 RDEPEND="

286

 	sys-libs/ncurses:0

287

288

diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.2.6.ebuild

289

similarity index 96%

290

copy from dev-lang/erlang/erlang-21.1.1.ebuild

291

copy to dev-lang/erlang/erlang-21.2.6.ebuild

292

index a5255ff4af0..c6f58edf023 100644

293

--- a/dev-lang/erlang/erlang-21.1.1.ebuild

294

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

295

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

296

297

 LICENSE="Apache-2.0"

298

 SLOT="0"

299

-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"

300

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

301

+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"

302

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

303

304

 RDEPEND="

305

 	sys-libs/ncurses:0

1	commit: 6dba6219e86cc94876e3f0b32cc3218a4bf538e8
2	Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
3	AuthorDate: Sun Mar 3 16:44:03 2019 +0000
4	Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
5	CommitDate: Sun Mar 3 16:44:30 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dba6219
7
8	dev-lang/erlang: Bump
9
10	... and keep the friggin' wxwidgets useflag default off
11
12	Package-Manager: Portage-2.3.62, Repoman-2.3.12
13	Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
14
15	dev-lang/erlang/Manifest \| 4 +
16	dev-lang/erlang/erlang-20.3.8.20.ebuild \| 227 +++++++++++++++++++++
17	dev-lang/erlang/erlang-21.1.1.ebuild \| 2 +-
18	.../{erlang-21.1.1.ebuild => erlang-21.2.6.ebuild} \| 4 +-
19	4 files changed, 234 insertions(+), 3 deletions(-)
20
21	diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
22	index cb20abb0052..5b82689e495 100644
23	--- a/dev-lang/erlang/Manifest
24	+++ b/dev-lang/erlang/Manifest
25	@@ -1,9 +1,13 @@
26	DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b
27	+DIST erlang-20.3.8.20.tar.gz 53523729 BLAKE2B d245f0bd80d8ee41b8e832b30864d4539f5333a84d8a74126adcc99203a7646af933d6c80efdbb1f88b955107a7e637487c00ed951baf767f09082c41a8dc8eb SHA512 463c9563ed114f7a4d0364640f7c0e20e234b443d4b9d72687113fbbf106d52b07adad890a58473101311dcb34d072cb27b7ce871c61edc38ba2bd65024fa9cc
28	DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab
29	+DIST erlang-21.2.6.tar.gz 53956256 BLAKE2B a39e57df65afef7a746ef5b6feb6041621607e9209fa3e81f91be31a4b736238c7fef73db436d3ae57ab3cee856531684d2ffb8ea5bc608b4166c81d1cd8a3ea SHA512 0d43a5eb6e9d01e2997b7c82a15b2bd7483a0623f86f8aaff3ec59b5da6aa2cd8135d48cf66233e28c780473f83b90ad56c076374273cefa79b79622e57027f9
30	DIST erlang_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
31	DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
32	+DIST erlang_doc_html_21.2.tar.gz 32798331 BLAKE2B 7c0606186caa36fe9ff6099a11930cf457f5f67dc276d5d75bd4c2934943e0adaa71658d701b5ef9102063db07a67fd66c5fe0c74f4839ac24f96d845a9e8902 SHA512 a7be67ff704aee78377b986e2425691937a1d53253ab3ec520eb689fcb7cf7595dae8026dc2b5dab73e25ae2ae76f8458a034eb0dfeb320ddc61306dcf52f3f9
33	DIST erlang_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
34	DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
35	+DIST erlang_doc_man_21.2.tar.gz 1325975 BLAKE2B c46e0f8a9198f4deee46e3f845cfd5bb6f7cf306ecf3165960add0e3d09beb1ac9221d630c10d3d7d3ff874c7579db9ff04b3c5c1251a4bdf102ce573db6f6ea SHA512 adfb62815ced0010585772f2de4ca8fc4fa513929881ed5dc5ec5367ff279778f4f69fffcb05b52ef9bf3a6d79c3999c7343fafd9920a9a5570f8a09ef6b50cc
36	DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
37	DIST otp_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
38	DIST otp_doc_man_19.1.tar.gz 1405580 BLAKE2B 93b79b88f81a00d7cbb934dbac811c6ea0ec59413e073fe613038eab71087908ed4e4bcbb6c8ed2f0c5bdd03ab4a570f20c4460f233c040ae0c4238e1cfa097a SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334
39
40	diff --git a/dev-lang/erlang/erlang-20.3.8.20.ebuild b/dev-lang/erlang/erlang-20.3.8.20.ebuild
41	new file mode 100644
42	index 00000000000..22c4fe4d937
43	--- /dev/null
44	+++ b/dev-lang/erlang/erlang-20.3.8.20.ebuild
45	@@ -0,0 +1,227 @@
46	+# Copyright 1999-2019 Gentoo Authors
47	+# Distributed under the terms of the GNU General Public License v2
48	+
49	+EAPI=6
50	+WX_GTK_VER="3.0"
51	+
52	+inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
53	+
54	+# NOTE: If you need symlinks for binaries please tell maintainers or
55	+# open up a bug to let it be created.
56	+
57	+UPSTREAM_V="$(get_version_component_range 1-2)"
58	+
59	+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
60	+HOMEPAGE="https://www.erlang.org/"
61	+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
62	+ http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
63	+ doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
64	+
65	+LICENSE="Apache-2.0"
66	+SLOT="0"
67	+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"
68	+
69	+IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
70	+REQUIRED_USE="dirty-schedulers? ( smp )" #621610
71	+
72	+RDEPEND="
73	+ ssl? (
74	+ !libressl? ( >=dev-libs/openssl-0.9.7d:0= )
75	+ libressl? ( dev-libs/libressl:0= )
76	+ )
77	+ emacs? ( virtual/emacs )
78	+ java? ( >=virtual/jdk-1.2:* )
79	+ odbc? ( dev-db/unixODBC )
80	+ systemd? ( sys-apps/systemd )
81	+"
82	+DEPEND="${RDEPEND}
83	+ dev-lang/perl
84	+ sctp? ( net-misc/lksctp-tools )
85	+ sys-libs/zlib
86	+ tk? ( dev-lang/tk )
87	+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
88	+ virtual/glu )
89	+"
90	+
91	+S="${WORKDIR}/otp-OTP-${PV}"
92	+
93	+PATCHES=(
94	+ "${FILESDIR}/18.2.1-wx3.0.patch"
95	+ "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
96	+ "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
97	+ )
98	+
99	+SITEFILE=50"${PN}"-gentoo.el
100	+
101	+# Taken from the upstream build script, build_otp
102	+erlang_create_lib_configure_in() {
103	+ local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
104	+ lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
105	+ local sdirs=
106	+ for lib_app in ${bootstrap_apps}; do
107	+ case "${lib_app}" in
108	+ lib/*)
109	+ if [[ -f "${lib_app}/configure.in" ]]; then
110	+ mv "${lib_app}/configure.in" "${lib_app}/configure.ac" \|\| die
111	+ app=`echo "${lib_app}" \| sed "s\|lib/\(.*\)\|\1\|"`
112	+ sdirs="${sdirs}test ! -f ${app}/configure \|\| AC_CONFIG_SUBDIRS(${app}/.)\n" \|\| die
113	+ fi;;
114	+ *)
115	+ ;;
116	+ esac
117	+ done
118	+
119	+ local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
120	+
121	+ sdirs=
122	+ for lib_app in lib/*; do
123	+ local is_bapp=false
124	+ for bapp in ${bootstrap_apps}; do
125	+ test "${bapp} != ${lib_app}" \|\| { "${is_bapp}"=true; break; }
126	+ done
127	+ if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
128	+ mv "${lib_app}/configure.in" "${lib_app}/configure.ac" \|\| die
129	+ app=`echo "${lib_app}" \| sed "s\|lib/\(.*\)\|\1\|"` \|\| die
130	+ sdirs="${sdirs} test ! -f ${app}/configure \|\| AC_CONFIG_SUBDIRS(${app}/.)\n"
131	+ fi
132	+ done
133	+
134	+ local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
135	+
136	+ rm -f lib/configure.in \|\| die
137	+ sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src \|\| die "Failed to create lib/configure.ac"
138	+
139	+}
140	+
141	+# Taken from the upstream build script, build_otp
142	+erlang_distribute_config_helpers() {
143	+ local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
144	+ local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
145	+
146	+ local aclocal_master="./erts/aclocal.m4"
147	+ local install_sh_master="./erts/autoconf/install-sh"
148	+ local config_guess_master="./erts/autoconf/config.guess"
149	+ local config_sub_master="./erts/autoconf/config.sub"
150	+
151	+ for dir in ${aclocal_dirs}; do
152	+ "${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" \|\| die
153	+ done
154	+
155	+ for dir in ${autoconf_aux_dirs}; do
156	+ "${install_sh_master}" -d "${dir}" \|\| die
157	+ "${install_sh_master}" -t "${dir}" "${install_sh_master}" \|\| die
158	+ "${install_sh_master}" -t "${dir}" "${config_guess_master}" \|\| die
159	+ "${install_sh_master}" -t "${dir}" "${config_sub_master}" \|\| die
160	+ done
161	+}
162	+
163	+src_prepare() {
164	+ default
165	+
166	+ # Determines which directories to recurse into with autoconf
167	+ erlang_create_lib_configure_in
168	+
169	+ # Move local autoconf files into the neccessary directories
170	+ erlang_distribute_config_helpers
171	+
172	+ java-pkg-opt-2_src_prepare
173	+
174	+ eautoreconf
175	+}
176	+
177	+src_configure() {
178	+ use wxwidgets && need-wxwidgets unicode
179	+
180	+ econf \
181	+ --disable-builtin-zlib \
182	+ $(use_enable dirty-schedulers) \
183	+ $(use_enable hipe) \
184	+ $(use_enable kpoll kernel-poll) \
185	+ $(use_with java javac) \
186	+ $(use_with odbc) \
187	+ $(use_enable sctp) \
188	+ $(use_enable smp smp-support) \
189	+ $(use_with ssl) \
190	+ $(use_with ssl ssl-rpath "no") \
191	+ $(use_enable ssl dynamic-ssl-lib) \
192	+ $(use_enable systemd) \
193	+ --enable-threads
194	+}
195	+
196	+src_compile() {
197	+ emake
198	+
199	+ if use emacs ; then
200	+ pushd lib/tools/emacs &>/dev/null \|\| die
201	+ elisp-compile *.el
202	+ popd &>/dev/null \|\| die
203	+ fi
204	+}
205	+
206	+extract_version() {
207	+ sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
208	+}
209	+
210	+src_install() {
211	+ local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
212	+ local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
213	+ local ERL_ERTS_VER="$(extract_version erts VSN)"
214	+ local MY_MANPATH="/usr/share/${PN}/man"
215	+
216	+ [[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
217	+ [[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
218	+
219	+ emake INSTALL_PREFIX="${D}" install
220	+
221	+ if use doc ; then
222	+ local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
223	+ docompress -x /usr/share/doc/${PF}
224	+ fi
225	+
226	+ einstalldocs
227	+
228	+ dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
229	+ dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
230	+ dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
231	+ dosym \
232	+ "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
233	+ /usr/bin/erl_call
234	+
235	+ if use smp; then
236	+ dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
237	+ else
238	+ dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
239	+ fi
240	+
241	+ ## Clean up the no longer needed files
242	+ rm "${ED}/${ERL_LIBDIR}/Install" \|\| die
243	+
244	+ insinto "${MY_MANPATH}"
245	+
246	+ doins -r "${WORKDIR}"/man/*
247	+
248	+ # extend MANPATH, so the normal man command can find it
249	+ # see bug 189639
250	+ echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" \|\| die
251	+ doenvd "${T}/90erlang"
252	+
253	+ if use emacs ; then
254	+ pushd "${S}" &>/dev/null \|\| die
255	+ elisp-install erlang lib/tools/emacs/*.{el,elc}
256	+ sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
257	+ "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" \|\| die
258	+ elisp-site-file-install "${T}/${SITEFILE}"
259	+ popd &>/dev/null \|\| die
260	+ fi
261	+
262	+ newinitd "${FILESDIR}"/epmd.init epmd
263	+ systemd_dounit "${FILESDIR}"/epmd.service
264	+}
265	+
266	+pkg_postinst() {
267	+ use emacs && elisp-site-regen
268	+}
269	+
270	+pkg_postrm() {
271	+ use emacs && elisp-site-regen
272	+}
273
274	diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild
275	index a5255ff4af0..d18a1dd37f6 100644
276	--- a/dev-lang/erlang/erlang-21.1.1.ebuild
277	+++ b/dev-lang/erlang/erlang-21.1.1.ebuild
278	@@ -20,7 +20,7 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
279	LICENSE="Apache-2.0"
280	SLOT="0"
281	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"
282	-IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk +wxwidgets"
283	+IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
284
285	RDEPEND="
286	sys-libs/ncurses:0
287
288	diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.2.6.ebuild
289	similarity index 96%
290	copy from dev-lang/erlang/erlang-21.1.1.ebuild
291	copy to dev-lang/erlang/erlang-21.2.6.ebuild
292	index a5255ff4af0..c6f58edf023 100644
293	--- a/dev-lang/erlang/erlang-21.1.1.ebuild
294	+++ b/dev-lang/erlang/erlang-21.2.6.ebuild
295	@@ -19,8 +19,8 @@ SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
296
297	LICENSE="Apache-2.0"
298	SLOT="0"
299	-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"
300	-IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk +wxwidgets"
301	+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"
302	+IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidgets"
303
304	RDEPEND="
305	sys-libs/ncurses:0

Gentoo Archives: gentoo-commits