Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/files/, dev-lang/erlang/
Date: Mon, 22 Oct 2018 10:38:45
Message-Id: 1540204717.d6f10dc7a02e4acb35a098c3096fd500862bfd4b.jer@gentoo
1 commit: d6f10dc7a02e4acb35a098c3096fd500862bfd4b
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 22 10:38:00 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 22 10:38:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f10dc7
7
8 dev-lang/erlang: Old.
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 dev-lang/erlang/Manifest | 6 -
14 dev-lang/erlang/erlang-20.2.ebuild | 158 --------------
15 dev-lang/erlang/erlang-20.3.2.ebuild | 227 ---------------------
16 dev-lang/erlang/erlang-20.3.8.9.ebuild | 227 ---------------------
17 dev-lang/erlang/erlang-21.0.2.ebuild | 226 --------------------
18 .../erlang/files/erlang-20.2-libressl-2.6.1.patch | 111 ----------
19 6 files changed, 955 deletions(-)
20
21 diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
22 index 3ef7f5536c9..dfbe889e0c1 100644
23 --- a/dev-lang/erlang/Manifest
24 +++ b/dev-lang/erlang/Manifest
25 @@ -1,9 +1,6 @@
26 DIST erlang-19.3.6.12.tar.gz 34004718 BLAKE2B 49f726a4c3f3bb4fcde1d3ff7cee93ef68a0ed0f5cbb00af8fb3585fb640302bf407351b61b0507c6aaefb4311f77dc0de450d2c43c6f8310f6af01ffd424a79 SHA512 9e117cbbc9cf53d908ae87f58f80f5ad4d3e69d5f1c94e3460a1d9c287dc7290d05fccb104ffc7779dd36b6b9377290ac4c5983a8ad3ea3ca518f66e0ab0db3f
27 -DIST erlang-20.3.2.tar.gz 53492641 BLAKE2B 2cdf78b6003801400d99949865a5b3e17d2209bf411bbe07dc12f749c84725710d12f85cb2559bc39ac04a7d6f7a9ae07b5f131a5524cf4ce3eb8559ca0259bc SHA512 060874cd4f72c1ecea178dd102f4b37a644485a810127092ad04fee76b52729ce199ee476335a2a40370bc718b7e03eb76869c3a48d457773856fd9f6d30a20b
28 DIST erlang-20.3.8.10.tar.gz 53511918 BLAKE2B 5f430bda415a5b59e9dec3222abe311264277ee91b2e7e9e69dba1016169492dc621df314c057e39f16b7bfe01686f405b9ccde362f84c5c2f0ffde68a923ffa SHA512 0d5ab27d17ff203d2c719fd5a03d843e3046037240e97ae9ad59d9f0690cf46cfb5fac2569590ce68f62169b1b2b2bc693e9a9b82f6ab0371693c5324bd3288b
29 -DIST erlang-20.3.8.9.tar.gz 53514692 BLAKE2B 1afa37ff8cc462cb0cc719c49c2c10b2684c7160b6912c574834021b2f521737dfa4cfedd0c82c843c1bb1e1977143fac7ae1ec94cfa9df4b2775deffd903a7b SHA512 6318760423f019a1611479da9b4187556a29e97f27bbc900cb36e0b2e0ef7e89ca65c053afbe4154cd9b5eaa3b59085a6d88c26d2990b09b7d2396b1dd5584a7
30 DIST erlang-20.3.8.tar.gz 53499006 BLAKE2B 0c38fb739a9c4f4b79533faea8c533f85c30d680081b5de96e70722a243d53b9317a26c7138a24a78cadd938777bd48a515484fffef2fdfd720819ab12bb8c0c SHA512 2ada142b47fdd0d1807a179e7cd3067e001f94682011436d33e503219a8a93495a187f8192fa2ebcdac48409e489b7b310d538779447981e6ba033a6dde12e1c
31 -DIST erlang-21.0.2.tar.gz 52835517 BLAKE2B bf7e2e166236a7c0a3e3411889f163dce0d938c1a854a6c264c137b601587c4cd4d62d58d9a87cf925406272d6e3d6547e4403927adc8e901716289ee2164162 SHA512 ff736a6df92ac7feec7b9ebb1b6523d511a533d48e536f36aee20fa21b5a1dc33791065d45f6900bbbaa48b4ba80b57a306b416801456a5ac33468786dfb00b7
32 DIST erlang-21.0.9.tar.gz 52842736 BLAKE2B 57de5e94450a70d32eb46bff691be4d3679daa56bee4e9aa2aad156b9447ea5bbe1287b806c304115c0ac4a677b8a04fb23286e269c7e0516f60cebd5ef2b3c7 SHA512 01bc5ce8d5c76823af1a17d389f326509c4ade5add0b0e66830e2c6aec2c7d93906cbbf9fb6b454178bddfa1c96355d632e4c557ab6da2bbdb8c6b0e05d87ee8
33 DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab
34 DIST erlang-21.1.tar.gz 53857079 BLAKE2B ae292f5e98d747a6afb5d82205dd33d55cb6e275e3ebc98a4dbc8378cfcb1ea64f83d5f2d2256fd7208c7fe553b47ff25edf2858287f5316cae50788f2175337 SHA512 9e118e902c33b8dd71266efb4cc4aeb0db0d8be8adb64ac85595a6507dc847b84e5444a9b5c5cbf46b560c885db9f4cd934c74de4aa2e1574785295ea0865348
35 @@ -17,13 +14,10 @@ DIST erlang_doc_man_21.0.tar.gz 1311959 BLAKE2B 70b049c6d7b8bbbb3bf77f7588ccf0eb
36 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f
37 DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
38 DIST otp_doc_html_19.3.tar.gz 35818689 BLAKE2B 30118276fbd817b803ef20700fe2e71a8457645d00f8949b6d3175d92cb5c84d306e4de9899e2f5e0c562d8040dc22db35e1a0f2e314cf1a783794573b3ece59 SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858
39 -DIST otp_doc_html_20.2.tar.gz 33570484 BLAKE2B c47244a601ae780e5304aedbafbc84d514cb21852760c51384b197d8d37602d51448b7123f6205da9afd2c5d2158f518a122dd4d550ca2ff22d3425eb31b6cf7 SHA512 b481930066737cf0ae2496aa9bc0c865da46bd3985fe5ebcf51eb9383539a57ec364e1eed9d3916ba0953d837d0d5d37cfc129a995d4e2a9656846e75cda9397
40 DIST otp_doc_html_20.3.tar.gz 33594990 BLAKE2B 34db68a5c3ae56f097474cc0b776971853d96c57d3d2e058a5db8998aad9c8d498610979a46155e8e935022f363c944f407c10c650fd35174cf1f50697ddf1de SHA512 4b280228fb9cbd9eb62db12ff9d6fad67d6855d0cdbc780839bbc95302ffd907c5b410e6f8519207db8850b753964571a9bf9df9eca53749f5b01d1b27dbc6d4
41 DIST otp_doc_man_19.1.tar.gz 1405580 BLAKE2B 93b79b88f81a00d7cbb934dbac811c6ea0ec59413e073fe613038eab71087908ed4e4bcbb6c8ed2f0c5bdd03ab4a570f20c4460f233c040ae0c4238e1cfa097a SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334
42 DIST otp_doc_man_19.3.tar.gz 1410781 BLAKE2B 78293aa498c2651be27d83f13e14007f25a1816b4dae499f463249f774256eddde3a4e31c435a30edd04fb6f41cee965c968b338de77330c3320f3df6087be92 SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1
43 -DIST otp_doc_man_20.2.tar.gz 1337652 BLAKE2B 416e83c696e30981eabad1f5a7c89abfd0b9d48ff04c9bd86b13dc96302acc9f2b9a73906a2976888ce35c6bfb38b3c006a1e0a041dd1bd5e75908e53bb920c3 SHA512 a67bb975b613c74c4e2418406b6472764ac69dfb9f8a6f64c79c680b1f87edea719431c140b006f776b0088885d958a6f2718267cebaf73ed506eaff721400f4
44 DIST otp_doc_man_20.3.tar.gz 1339710 BLAKE2B 00aba848940914b3d98f9500b8201b0679d7d63d066cee296c8fbb399f132340b989f3cdcdd6c45a46e432efdb7c40c39d8ab4f3dbd64570316d649efc9faed1 SHA512 22c398ce3b42c7ef8abec1db85745eeb4d8804bc679d40b6a786fdc40dc241e43b5551df5d1eccb3ca8d4a64b833bf6663e77044f4564bb49cf67c4b74c5ea25
45 DIST otp_src_19.1.tar.gz 68103074 BLAKE2B 48e06ce5998929a8ca9804e51f07a4153e7fb1c8b1b4b1b60132e255c29c475534ce018a7902ed29b696b783a21daa73d1778435aada1a77064ab46e915af87d SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714
46 DIST otp_src_19.3.tar.gz 68510871 BLAKE2B fc37c493f5fa3533aaa29f545ff751f5851b58d8952f6f21ef50fec433d661a1e3300139b30a41d9c1f16b3eeaf5d98450bf0a2408e7910712d9d98f3af19237 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6
47 -DIST otp_src_20.2.tar.gz 87136848 BLAKE2B f83e652320b67b72cf42be3c23a9251806096fea4e255f73c8170bcb61ea1e008983f1da1c9dc7b46b76e1fd0d96f94097f5d629eb28c08eb424bb1e7a1cee28 SHA512 6c2cbef9fa67f4aa9d0c22bedf87f39b0067994614663afee88c57bb7789eec45cb1970dcbd930d163a27293b8d24b20a90cf6ed30ff1a14492a9ccdd5b59a65
48 DIST otp_src_20.3.tar.gz 88170904 BLAKE2B 3f92641e4eb4079572c0cc1cbc6ba1f56977efd182efcef6c466a0ac6232e18d9481823624cdd49a866feb38e96db6150f40927f25f2daaa64fe4aafd02089b4 SHA512 4169e2e653055c62dd66e214dcab577b49cadb8328dcc43adb8a2d44850b12c02db8323992c21852409697c5a48493068316417be9d97519b039a8f1cde143da
49
50 diff --git a/dev-lang/erlang/erlang-20.2.ebuild b/dev-lang/erlang/erlang-20.2.ebuild
51 deleted file mode 100644
52 index 04a771dbcea..00000000000
53 --- a/dev-lang/erlang/erlang-20.2.ebuild
54 +++ /dev/null
55 @@ -1,158 +0,0 @@
56 -# Copyright 1999-2018 Gentoo Foundation
57 -# Distributed under the terms of the GNU General Public License v2
58 -
59 -EAPI=5
60 -WX_GTK_VER="3.0"
61 -
62 -inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
63 -
64 -# NOTE: If you need symlinks for binaries please tell maintainers or
65 -# open up a bug to let it be created.
66 -
67 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
68 -HOMEPAGE="https://www.erlang.org/"
69 -SRC_URI="http://erlang.org/download/otp_src_${PV}.tar.gz
70 - http://erlang.org/download/otp_doc_man_${PV}.tar.gz
71 - doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
72 -
73 -LICENSE="Apache-2.0"
74 -SLOT="0"
75 -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"
76 -
77 -IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
78 -REQUIRED_USE="dirty-schedulers? ( smp )" #621610
79 -
80 -RDEPEND="
81 - ssl? (
82 - !libressl? ( >=dev-libs/openssl-0.9.7d:0 )
83 - libressl? ( dev-libs/libressl )
84 - )
85 - emacs? ( virtual/emacs )
86 - java? ( >=virtual/jdk-1.2:* )
87 - odbc? ( dev-db/unixODBC )
88 - systemd? ( sys-apps/systemd )"
89 -DEPEND="${RDEPEND}
90 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
91 - sctp? ( net-misc/lksctp-tools )
92 - tk? ( dev-lang/tk )"
93 -
94 -S="${WORKDIR}/otp_src_${PV}"
95 -
96 -SITEFILE=50${PN}-gentoo.el
97 -
98 -src_prepare() {
99 - epatch "${FILESDIR}"/18.2.1-wx3.0.patch
100 - epatch "${FILESDIR}"/${P}-libressl-2.6.1.patch
101 -
102 - use odbc || sed -i 's: odbc : :' lib/Makefile
103 -
104 - # bug 263129, don't ignore LDFLAGS, reported upstream
105 - sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
106 -
107 - # don't ignore LDFLAGS, reported upstream
108 - sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
109 -
110 - if ! use wxwidgets; then
111 - sed -i 's: wx : :' lib/Makefile
112 - rm -rf lib/wx
113 - fi
114 -
115 - # Nasty workaround, reported upstream
116 - cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
117 -
118 - # bug 383697
119 - sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
120 -
121 - cd erts && mv configure.in configure.ac && eautoreconf
122 -}
123 -
124 -src_configure() {
125 - use wxwidgets && need-wxwidgets unicode
126 - use java || export JAVAC=false
127 -
128 - econf \
129 - --enable-threads \
130 - $(use_enable sctp) \
131 - $(use_enable systemd) \
132 - $(use_enable hipe) \
133 - $(use_with ssl ssl "${EPREFIX}"/usr) \
134 - $(use_enable ssl dynamic-ssl-lib) \
135 - $(use_enable kpoll kernel-poll) \
136 - $(use_enable smp smp-support) \
137 - $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
138 - $(use x64-macos && echo "--enable-darwin-64bit") \
139 - $(use_enable dirty-schedulers)
140 -}
141 -
142 -src_compile() {
143 - use java || export JAVAC=false
144 - emake
145 -
146 - if use emacs ; then
147 - pushd lib/tools/emacs
148 - elisp-compile *.el
149 - popd
150 - fi
151 -}
152 -
153 -extract_version() {
154 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
155 -}
156 -
157 -src_install() {
158 - local ERL_LIBDIR=/usr/$(get_libdir)/erlang
159 - local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
160 - local ERL_ERTS_VER=$(extract_version erts VSN)
161 -
162 - emake INSTALL_PREFIX="${D}" install
163 - dodoc AUTHORS README.md
164 -
165 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
166 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
167 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
168 - dosym \
169 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
170 - /usr/bin/erl_call
171 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
172 - use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
173 -
174 - ## Clean up the no longer needed files
175 - rm "${ED}/${ERL_LIBDIR}/Install"
176 -
177 - for i in "${WORKDIR}"/man/man* ; do
178 - dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
179 - done
180 - for file in "${WORKDIR}"/man/man*/*.[1-9]; do
181 - # doman sucks so we can't use it
182 - cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
183 - done
184 - # extend MANPATH, so the normal man command can find it
185 - # see bug 189639
186 - dodir /etc/env.d/
187 - echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
188 -
189 - if use doc ; then
190 - dohtml -A README,erl,hrl,c,h,kwc,info -r \
191 - "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
192 - fi
193 -
194 - if use emacs ; then
195 - pushd "${S}"
196 - elisp-install erlang lib/tools/emacs/*.{el,elc}
197 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
198 - "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
199 - elisp-site-file-install "${T}"/${SITEFILE}
200 - popd
201 - fi
202 -
203 - newinitd "${FILESDIR}"/epmd.init epmd
204 - systemd_dounit "${FILESDIR}"/epmd.service
205 -}
206 -
207 -pkg_postinst() {
208 - use emacs && elisp-site-regen
209 -}
210 -
211 -pkg_postrm() {
212 - use emacs && elisp-site-regen
213 -}
214
215 diff --git a/dev-lang/erlang/erlang-20.3.2.ebuild b/dev-lang/erlang/erlang-20.3.2.ebuild
216 deleted file mode 100644
217 index 8f13394dbd2..00000000000
218 --- a/dev-lang/erlang/erlang-20.3.2.ebuild
219 +++ /dev/null
220 @@ -1,227 +0,0 @@
221 -# Copyright 1999-2018 Gentoo Foundation
222 -# Distributed under the terms of the GNU General Public License v2
223 -
224 -EAPI=6
225 -WX_GTK_VER="3.0"
226 -
227 -inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
228 -
229 -# NOTE: If you need symlinks for binaries please tell maintainers or
230 -# open up a bug to let it be created.
231 -
232 -UPSTREAM_V="$(get_version_component_range 1-2)"
233 -
234 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
235 -HOMEPAGE="https://www.erlang.org/"
236 -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
237 - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
238 - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
239 -
240 -LICENSE="Apache-2.0"
241 -SLOT="0"
242 -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"
243 -
244 -IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk"
245 -REQUIRED_USE="dirty-schedulers? ( smp )" #621610
246 -
247 -RDEPEND="
248 - ssl? (
249 - !libressl? ( >=dev-libs/openssl-0.9.7d:0= )
250 - libressl? ( dev-libs/libressl:0= )
251 - )
252 - emacs? ( virtual/emacs )
253 - java? ( >=virtual/jdk-1.2:* )
254 - odbc? ( dev-db/unixODBC )
255 - systemd? ( sys-apps/systemd )
256 -"
257 -DEPEND="${RDEPEND}
258 - dev-lang/perl
259 - sctp? ( net-misc/lksctp-tools )
260 - sys-libs/zlib
261 - tk? ( dev-lang/tk )
262 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
263 - virtual/glu
264 -"
265 -
266 -S="${WORKDIR}/otp-OTP-${PV}"
267 -
268 -PATCHES=(
269 - "${FILESDIR}/18.2.1-wx3.0.patch"
270 - "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
271 - "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
272 - )
273 -
274 -SITEFILE=50"${PN}"-gentoo.el
275 -
276 -# Taken from the upstream build script, build_otp
277 -erlang_create_lib_configure_in() {
278 - local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
279 - lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
280 - local sdirs=
281 - for lib_app in ${bootstrap_apps}; do
282 - case "${lib_app}" in
283 - lib/*)
284 - if [[ -f "${lib_app}/configure.in" ]]; then
285 - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
286 - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
287 - sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
288 - fi;;
289 - *)
290 - ;;
291 - esac
292 - done
293 -
294 - local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
295 -
296 - sdirs=
297 - for lib_app in lib/*; do
298 - local is_bapp=false
299 - for bapp in ${bootstrap_apps}; do
300 - test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
301 - done
302 - if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
303 - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
304 - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
305 - sdirs="${sdirs} test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
306 - fi
307 - done
308 -
309 - local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
310 -
311 - rm -f lib/configure.in || die
312 - sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
313 -
314 -}
315 -
316 -# Taken from the upstream build script, build_otp
317 -erlang_distribute_config_helpers() {
318 - local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
319 - local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
320 -
321 - local aclocal_master="./erts/aclocal.m4"
322 - local install_sh_master="./erts/autoconf/install-sh"
323 - local config_guess_master="./erts/autoconf/config.guess"
324 - local config_sub_master="./erts/autoconf/config.sub"
325 -
326 - for dir in ${aclocal_dirs}; do
327 - "${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
328 - done
329 -
330 - for dir in ${autoconf_aux_dirs}; do
331 - "${install_sh_master}" -d "${dir}" || die
332 - "${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
333 - "${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
334 - "${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
335 - done
336 -}
337 -
338 -src_prepare() {
339 - default
340 -
341 - # Determines which directories to recurse into with autoconf
342 - erlang_create_lib_configure_in
343 -
344 - # Move local autoconf files into the neccessary directories
345 - erlang_distribute_config_helpers
346 -
347 - java-pkg-opt-2_src_prepare
348 -
349 - eautoreconf
350 -}
351 -
352 -src_configure() {
353 - need-wxwidgets unicode
354 -
355 - econf \
356 - --disable-builtin-zlib \
357 - $(use_enable dirty-schedulers) \
358 - $(use_enable hipe) \
359 - $(use_enable kpoll kernel-poll) \
360 - $(use_with java javac) \
361 - $(use_with odbc) \
362 - $(use_enable sctp) \
363 - $(use_enable smp smp-support) \
364 - $(use_with ssl) \
365 - $(use_with ssl ssl-rpath "no") \
366 - $(use_enable ssl dynamic-ssl-lib) \
367 - $(use_enable systemd) \
368 - --enable-threads
369 -}
370 -
371 -src_compile() {
372 - emake
373 -
374 - if use emacs ; then
375 - pushd lib/tools/emacs &>/dev/null || die
376 - elisp-compile *.el
377 - popd &>/dev/null || die
378 - fi
379 -}
380 -
381 -extract_version() {
382 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
383 -}
384 -
385 -src_install() {
386 - local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
387 - local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
388 - local ERL_ERTS_VER="$(extract_version erts VSN)"
389 - local MY_MANPATH="/usr/share/${PN}/man"
390 -
391 - [[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
392 - [[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
393 -
394 - emake INSTALL_PREFIX="${ED}" install
395 -
396 - if use doc ; then
397 - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
398 - docompress -x /usr/share/doc/${PF}
399 - fi
400 -
401 - einstalldocs
402 -
403 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
404 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
405 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
406 - dosym \
407 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
408 - /usr/bin/erl_call
409 -
410 - if use smp; then
411 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
412 - else
413 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
414 - fi
415 -
416 - ## Clean up the no longer needed files
417 - rm "${ED}/${ERL_LIBDIR}/Install" || die
418 -
419 - insinto "${MY_MANPATH}"
420 -
421 - doins -r "${WORKDIR}"/man/*
422 -
423 - # extend MANPATH, so the normal man command can find it
424 - # see bug 189639
425 - echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
426 - doenvd "${T}/90erlang"
427 -
428 - if use emacs ; then
429 - pushd "${S}" &>/dev/null || die
430 - elisp-install erlang lib/tools/emacs/*.{el,elc}
431 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
432 - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
433 - elisp-site-file-install "${T}/${SITEFILE}"
434 - popd &>/dev/null || die
435 - fi
436 -
437 - newinitd "${FILESDIR}"/epmd.init epmd
438 - systemd_dounit "${FILESDIR}"/epmd.service
439 -}
440 -
441 -pkg_postinst() {
442 - use emacs && elisp-site-regen
443 -}
444 -
445 -pkg_postrm() {
446 - use emacs && elisp-site-regen
447 -}
448
449 diff --git a/dev-lang/erlang/erlang-20.3.8.9.ebuild b/dev-lang/erlang/erlang-20.3.8.9.ebuild
450 deleted file mode 100644
451 index ac47c4ad59c..00000000000
452 --- a/dev-lang/erlang/erlang-20.3.8.9.ebuild
453 +++ /dev/null
454 @@ -1,227 +0,0 @@
455 -# Copyright 1999-2018 Gentoo Foundation
456 -# Distributed under the terms of the GNU General Public License v2
457 -
458 -EAPI=6
459 -WX_GTK_VER="3.0"
460 -
461 -inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
462 -
463 -# NOTE: If you need symlinks for binaries please tell maintainers or
464 -# open up a bug to let it be created.
465 -
466 -UPSTREAM_V="$(get_version_component_range 1-2)"
467 -
468 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
469 -HOMEPAGE="https://www.erlang.org/"
470 -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
471 - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
472 - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
473 -
474 -LICENSE="Apache-2.0"
475 -SLOT="0"
476 -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"
477 -
478 -IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
479 -REQUIRED_USE="dirty-schedulers? ( smp )" #621610
480 -
481 -RDEPEND="
482 - ssl? (
483 - !libressl? ( >=dev-libs/openssl-0.9.7d:0= )
484 - libressl? ( dev-libs/libressl:0= )
485 - )
486 - emacs? ( virtual/emacs )
487 - java? ( >=virtual/jdk-1.2:* )
488 - odbc? ( dev-db/unixODBC )
489 - systemd? ( sys-apps/systemd )
490 -"
491 -DEPEND="${RDEPEND}
492 - dev-lang/perl
493 - sctp? ( net-misc/lksctp-tools )
494 - sys-libs/zlib
495 - tk? ( dev-lang/tk )
496 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
497 - virtual/glu )
498 -"
499 -
500 -S="${WORKDIR}/otp-OTP-${PV}"
501 -
502 -PATCHES=(
503 - "${FILESDIR}/18.2.1-wx3.0.patch"
504 - "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
505 - "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
506 - )
507 -
508 -SITEFILE=50"${PN}"-gentoo.el
509 -
510 -# Taken from the upstream build script, build_otp
511 -erlang_create_lib_configure_in() {
512 - local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
513 - lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
514 - local sdirs=
515 - for lib_app in ${bootstrap_apps}; do
516 - case "${lib_app}" in
517 - lib/*)
518 - if [[ -f "${lib_app}/configure.in" ]]; then
519 - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
520 - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
521 - sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
522 - fi;;
523 - *)
524 - ;;
525 - esac
526 - done
527 -
528 - local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
529 -
530 - sdirs=
531 - for lib_app in lib/*; do
532 - local is_bapp=false
533 - for bapp in ${bootstrap_apps}; do
534 - test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
535 - done
536 - if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
537 - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
538 - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
539 - sdirs="${sdirs} test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
540 - fi
541 - done
542 -
543 - local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
544 -
545 - rm -f lib/configure.in || die
546 - sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
547 -
548 -}
549 -
550 -# Taken from the upstream build script, build_otp
551 -erlang_distribute_config_helpers() {
552 - local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
553 - local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
554 -
555 - local aclocal_master="./erts/aclocal.m4"
556 - local install_sh_master="./erts/autoconf/install-sh"
557 - local config_guess_master="./erts/autoconf/config.guess"
558 - local config_sub_master="./erts/autoconf/config.sub"
559 -
560 - for dir in ${aclocal_dirs}; do
561 - "${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
562 - done
563 -
564 - for dir in ${autoconf_aux_dirs}; do
565 - "${install_sh_master}" -d "${dir}" || die
566 - "${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
567 - "${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
568 - "${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
569 - done
570 -}
571 -
572 -src_prepare() {
573 - default
574 -
575 - # Determines which directories to recurse into with autoconf
576 - erlang_create_lib_configure_in
577 -
578 - # Move local autoconf files into the neccessary directories
579 - erlang_distribute_config_helpers
580 -
581 - java-pkg-opt-2_src_prepare
582 -
583 - eautoreconf
584 -}
585 -
586 -src_configure() {
587 - use wxwidgets && need-wxwidgets unicode
588 -
589 - econf \
590 - --disable-builtin-zlib \
591 - $(use_enable dirty-schedulers) \
592 - $(use_enable hipe) \
593 - $(use_enable kpoll kernel-poll) \
594 - $(use_with java javac) \
595 - $(use_with odbc) \
596 - $(use_enable sctp) \
597 - $(use_enable smp smp-support) \
598 - $(use_with ssl) \
599 - $(use_with ssl ssl-rpath "no") \
600 - $(use_enable ssl dynamic-ssl-lib) \
601 - $(use_enable systemd) \
602 - --enable-threads
603 -}
604 -
605 -src_compile() {
606 - emake
607 -
608 - if use emacs ; then
609 - pushd lib/tools/emacs &>/dev/null || die
610 - elisp-compile *.el
611 - popd &>/dev/null || die
612 - fi
613 -}
614 -
615 -extract_version() {
616 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
617 -}
618 -
619 -src_install() {
620 - local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
621 - local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
622 - local ERL_ERTS_VER="$(extract_version erts VSN)"
623 - local MY_MANPATH="/usr/share/${PN}/man"
624 -
625 - [[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
626 - [[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
627 -
628 - emake INSTALL_PREFIX="${D}" install
629 -
630 - if use doc ; then
631 - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
632 - docompress -x /usr/share/doc/${PF}
633 - fi
634 -
635 - einstalldocs
636 -
637 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
638 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
639 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
640 - dosym \
641 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
642 - /usr/bin/erl_call
643 -
644 - if use smp; then
645 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
646 - else
647 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
648 - fi
649 -
650 - ## Clean up the no longer needed files
651 - rm "${ED}/${ERL_LIBDIR}/Install" || die
652 -
653 - insinto "${MY_MANPATH}"
654 -
655 - doins -r "${WORKDIR}"/man/*
656 -
657 - # extend MANPATH, so the normal man command can find it
658 - # see bug 189639
659 - echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
660 - doenvd "${T}/90erlang"
661 -
662 - if use emacs ; then
663 - pushd "${S}" &>/dev/null || die
664 - elisp-install erlang lib/tools/emacs/*.{el,elc}
665 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
666 - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
667 - elisp-site-file-install "${T}/${SITEFILE}"
668 - popd &>/dev/null || die
669 - fi
670 -
671 - newinitd "${FILESDIR}"/epmd.init epmd
672 - systemd_dounit "${FILESDIR}"/epmd.service
673 -}
674 -
675 -pkg_postinst() {
676 - use emacs && elisp-site-regen
677 -}
678 -
679 -pkg_postrm() {
680 - use emacs && elisp-site-regen
681 -}
682
683 diff --git a/dev-lang/erlang/erlang-21.0.2.ebuild b/dev-lang/erlang/erlang-21.0.2.ebuild
684 deleted file mode 100644
685 index 0986f06d7fb..00000000000
686 --- a/dev-lang/erlang/erlang-21.0.2.ebuild
687 +++ /dev/null
688 @@ -1,226 +0,0 @@
689 -# Copyright 1999-2018 Gentoo Foundation
690 -# Distributed under the terms of the GNU General Public License v2
691 -
692 -EAPI=6
693 -WX_GTK_VER="3.0"
694 -
695 -inherit autotools elisp-common java-pkg-opt-2 systemd versionator wxwidgets
696 -
697 -# NOTE: If you need symlinks for binaries please tell maintainers or
698 -# open up a bug to let it be created.
699 -
700 -UPSTREAM_V="$(get_version_component_range 1-2)"
701 -
702 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
703 -HOMEPAGE="https://www.erlang.org/"
704 -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
705 - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
706 - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
707 -
708 -LICENSE="Apache-2.0"
709 -SLOT="0"
710 -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"
711 -
712 -IUSE="dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
713 -REQUIRED_USE="dirty-schedulers? ( smp )" #621610
714 -
715 -RDEPEND="
716 - ssl? (
717 - !libressl? ( >=dev-libs/openssl-0.9.7d:0= )
718 - libressl? ( dev-libs/libressl:0= )
719 - )
720 - emacs? ( virtual/emacs )
721 - java? ( >=virtual/jdk-1.2:* )
722 - odbc? ( dev-db/unixODBC )
723 - systemd? ( sys-apps/systemd )
724 -"
725 -DEPEND="${RDEPEND}
726 - dev-lang/perl
727 - sctp? ( net-misc/lksctp-tools )
728 - sys-libs/zlib
729 - tk? ( dev-lang/tk )
730 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
731 -"
732 -
733 -S="${WORKDIR}/otp-OTP-${PV}"
734 -
735 -PATCHES=(
736 - "${FILESDIR}/18.2.1-wx3.0.patch"
737 - "${FILESDIR}/${PN}-20.3.2-dont-ignore-LDFLAGS.patch"
738 - "${FILESDIR}/${PN}-add-epmd-pid-file-creation-for-openrc.patch"
739 - )
740 -
741 -SITEFILE=50"${PN}"-gentoo.el
742 -
743 -# Taken from the upstream build script, build_otp
744 -erlang_create_lib_configure_in() {
745 - local bootstrap_apps="erts lib/asn1 lib/compiler lib/hipelib/ic lib/kernel
746 - lib/parsetools lib/sasl lib/snmp lib/stdlib lib/syntax_tools"
747 - local sdirs=
748 - for lib_app in ${bootstrap_apps}; do
749 - case "${lib_app}" in
750 - lib/*)
751 - if [[ -f "${lib_app}/configure.in" ]]; then
752 - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
753 - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"`
754 - sdirs="${sdirs}test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n" || die
755 - fi;;
756 - *)
757 - ;;
758 - esac
759 - done
760 -
761 - local sed_bootstrap="s%@BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
762 -
763 - sdirs=
764 - for lib_app in lib/*; do
765 - local is_bapp=false
766 - for bapp in ${bootstrap_apps}; do
767 - test "${bapp} != ${lib_app}" || { "${is_bapp}"=true; break; }
768 - done
769 - if [[ "${is_bapp}" = false ]] && [[ -f "${lib_app}/configure.in" ]]; then
770 - mv "${lib_app}/configure.in" "${lib_app}/configure.ac" || die
771 - app=`echo "${lib_app}" | sed "s|lib/\(.*\)|\1|"` || die
772 - sdirs="${sdirs} test ! -f ${app}/configure || AC_CONFIG_SUBDIRS(${app}/.)\n"
773 - fi
774 - done
775 -
776 - local sed_non_bootstrap="s%@NON_BOOTSTRAP_CONFIGURE_APPS@%$sdirs%g"
777 -
778 - rm -f lib/configure.in || die
779 - sed "$sed_bootstrap;$sed_non_bootstrap" > lib/configure.ac < lib/configure.in.src || die "Failed to create lib/configure.ac"
780 -
781 -}
782 -
783 -# Taken from the upstream build script, build_otp
784 -erlang_distribute_config_helpers() {
785 - local aclocal_dirs=". ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco"
786 - local autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf"
787 -
788 - local aclocal_master="./erts/aclocal.m4"
789 - local install_sh_master="./erts/autoconf/install-sh"
790 - local config_guess_master="./erts/autoconf/config.guess"
791 - local config_sub_master="./erts/autoconf/config.sub"
792 -
793 - for dir in ${aclocal_dirs}; do
794 - "${install_sh_master}" -m 644 -t "${dir}" "${aclocal_master}" || die
795 - done
796 -
797 - for dir in ${autoconf_aux_dirs}; do
798 - "${install_sh_master}" -d "${dir}" || die
799 - "${install_sh_master}" -t "${dir}" "${install_sh_master}" || die
800 - "${install_sh_master}" -t "${dir}" "${config_guess_master}" || die
801 - "${install_sh_master}" -t "${dir}" "${config_sub_master}" || die
802 - done
803 -}
804 -
805 -src_prepare() {
806 - default
807 -
808 - # Determines which directories to recurse into with autoconf
809 - erlang_create_lib_configure_in
810 -
811 - # Move local autoconf files into the neccessary directories
812 - erlang_distribute_config_helpers
813 -
814 - java-pkg-opt-2_src_prepare
815 -
816 - eautoreconf
817 -}
818 -
819 -src_configure() {
820 - use wxwidgets && need-wxwidgets unicode
821 -
822 - econf \
823 - --disable-builtin-zlib \
824 - $(use_enable dirty-schedulers) \
825 - $(use_enable hipe) \
826 - $(use_enable kpoll kernel-poll) \
827 - $(use_with java javac) \
828 - $(use_with odbc) \
829 - $(use_enable sctp) \
830 - $(use_enable smp smp-support) \
831 - $(use_with ssl) \
832 - $(use_with ssl ssl-rpath "no") \
833 - $(use_enable ssl dynamic-ssl-lib) \
834 - $(use_enable systemd) \
835 - --enable-threads
836 -}
837 -
838 -src_compile() {
839 - emake
840 -
841 - if use emacs ; then
842 - pushd lib/tools/emacs &>/dev/null || die
843 - elisp-compile *.el
844 - popd &>/dev/null || die
845 - fi
846 -}
847 -
848 -extract_version() {
849 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
850 -}
851 -
852 -src_install() {
853 - local ERL_LIBDIR="/usr/$(get_libdir)/erlang"
854 - local ERL_INTERFACE_VER="$(extract_version lib/erl_interface EI_VSN)"
855 - local ERL_ERTS_VER="$(extract_version erts VSN)"
856 - local MY_MANPATH="/usr/share/${PN}/man"
857 -
858 - [[ -z "${ERL_ERTS_VER}" ]] && die "Couldn't determine erts version"
859 - [[ -z "${ERL_INTERFACE_VER}" ]] && die "Couldn't determine interface version"
860 -
861 - emake INSTALL_PREFIX="${ED}" install
862 -
863 - if use doc ; then
864 - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* )
865 - docompress -x /usr/share/doc/${PF}
866 - fi
867 -
868 - einstalldocs
869 -
870 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
871 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
872 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
873 - dosym \
874 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
875 - /usr/bin/erl_call
876 -
877 - if use smp; then
878 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
879 - else
880 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
881 - fi
882 -
883 - ## Clean up the no longer needed files
884 - rm "${ED}/${ERL_LIBDIR}/Install" || die
885 -
886 - insinto "${MY_MANPATH}"
887 -
888 - doins -r "${WORKDIR}"/man/*
889 -
890 - # extend MANPATH, so the normal man command can find it
891 - # see bug 189639
892 - echo "MANPATH=\"${MY_MANPATH}\"" > "${T}/90erlang" || die
893 - doenvd "${T}/90erlang"
894 -
895 - if use emacs ; then
896 - pushd "${S}" &>/dev/null || die
897 - elisp-install erlang lib/tools/emacs/*.{el,elc}
898 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
899 - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
900 - elisp-site-file-install "${T}/${SITEFILE}"
901 - popd &>/dev/null || die
902 - fi
903 -
904 - newinitd "${FILESDIR}"/epmd.init epmd
905 - systemd_dounit "${FILESDIR}"/epmd.service
906 -}
907 -
908 -pkg_postinst() {
909 - use emacs && elisp-site-regen
910 -}
911 -
912 -pkg_postrm() {
913 - use emacs && elisp-site-regen
914 -}
915
916 diff --git a/dev-lang/erlang/files/erlang-20.2-libressl-2.6.1.patch b/dev-lang/erlang/files/erlang-20.2-libressl-2.6.1.patch
917 deleted file mode 100644
918 index 89f8fc8b323..00000000000
919 --- a/dev-lang/erlang/files/erlang-20.2-libressl-2.6.1.patch
920 +++ /dev/null
921 @@ -1,111 +0,0 @@
922 -From b5b6c7695c5377b5aa474d8620df7c3e9a1ba629 Mon Sep 17 00:00:00 2001
923 -From: Hans Nilsson <hans@××××××.org>
924 -Date: Thu, 11 Jan 2018 15:29:23 +0100
925 -Subject: [PATCH] crypto: Disable RSA sslv23 padding for LibreSSL >= 2.6.1
926 -
927 -Not supported in newer LibreSSL.
928 ----
929 - lib/crypto/c_src/crypto.c | 26 +++++++++++++++++++++++---
930 - 1 file changed, 23 insertions(+), 3 deletions(-)
931 -
932 -diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
933 -index 6957d25774..9a3ea07c97 100644
934 ---- a/lib/crypto/c_src/crypto.c
935 -+++ b/lib/crypto/c_src/crypto.c
936 -@@ -179,6 +179,12 @@
937 - # define HAVE_ECB_IVEC_BUG
938 - #endif
939 -
940 -+#define HAVE_RSA_SSLV23_PADDING
941 -+#if defined(HAS_LIBRESSL) \
942 -+ && LIBRESSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(2,6,1)
943 -+# undef HAVE_RSA_SSLV23_PADDING
944 -+#endif
945 -+
946 - #if defined(HAVE_CMAC)
947 - #include <openssl/cmac.h>
948 - #endif
949 -@@ -659,7 +665,9 @@ static ERL_NIF_TERM atom_rsa_oaep_md;
950 - static ERL_NIF_TERM atom_rsa_pad; /* backwards compatibility */
951 - static ERL_NIF_TERM atom_rsa_padding;
952 - static ERL_NIF_TERM atom_rsa_pkcs1_pss_padding;
953 -+#ifdef HAVE_RSA_SSLV23_PADDING
954 - static ERL_NIF_TERM atom_rsa_sslv23_padding;
955 -+#endif
956 - static ERL_NIF_TERM atom_rsa_x931_padding;
957 - static ERL_NIF_TERM atom_rsa_pss_saltlen;
958 - static ERL_NIF_TERM atom_sha224;
959 -@@ -1064,7 +1072,9 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
960 - atom_rsa_pad = enif_make_atom(env,"rsa_pad"); /* backwards compatibility */
961 - atom_rsa_padding = enif_make_atom(env,"rsa_padding");
962 - atom_rsa_pkcs1_pss_padding = enif_make_atom(env,"rsa_pkcs1_pss_padding");
963 -+#ifdef HAVE_RSA_SSLV23_PADDING
964 - atom_rsa_sslv23_padding = enif_make_atom(env,"rsa_sslv23_padding");
965 -+#endif
966 - atom_rsa_x931_padding = enif_make_atom(env,"rsa_x931_padding");
967 - atom_rsa_pss_saltlen = enif_make_atom(env,"rsa_pss_saltlen");
968 - atom_sha224 = enif_make_atom(env,"sha224");
969 -@@ -4449,8 +4459,10 @@ static int get_pkey_crypt_options(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NI
970 - opt->rsa_padding = RSA_PKCS1_PADDING;
971 - } else if (tpl_terms[1] == atom_rsa_pkcs1_oaep_padding) {
972 - opt->rsa_padding = RSA_PKCS1_OAEP_PADDING;
973 -+#ifdef HAVE_RSA_SSLV23_PADDING
974 - } else if (tpl_terms[1] == atom_rsa_sslv23_padding) {
975 - opt->rsa_padding = RSA_SSLV23_PADDING;
976 -+#endif
977 - } else if (tpl_terms[1] == atom_rsa_x931_padding) {
978 - opt->rsa_padding = RSA_X931_PADDING;
979 - } else if (tpl_terms[1] == atom_rsa_no_padding) {
980 -@@ -4516,7 +4528,10 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
981 - #endif
982 - PKeyCryptOptions crypt_opt;
983 - ErlNifBinary in_bin, out_bin, tmp_bin;
984 -- size_t outlen, tmplen;
985 -+ size_t outlen;
986 -+#ifdef HAVE_RSA_SSLV23_PADDING
987 -+ size_t tmplen;
988 -+#endif
989 - int is_private = (argv[4] == atom_true),
990 - is_encrypt = (argv[5] == atom_true);
991 - int algo_init = 0;
992 -@@ -4596,6 +4611,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
993 - if (crypt_opt.signature_md != NULL
994 - && EVP_PKEY_CTX_set_signature_md(ctx, crypt_opt.signature_md) <= 0)
995 - goto badarg;
996 -+#ifdef HAVE_RSA_SSLV23_PADDING
997 - if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
998 - if (is_encrypt) {
999 - RSA *rsa = EVP_PKEY_get1_RSA(pkey);
1000 -@@ -4607,9 +4623,11 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
1001 - in_bin = tmp_bin;
1002 - }
1003 - if (EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_NO_PADDING) <= 0) goto badarg;
1004 -- } else {
1005 -+ } else
1006 -+#endif
1007 -+ {
1008 - if (EVP_PKEY_CTX_set_rsa_padding(ctx, crypt_opt.rsa_padding) <= 0) goto badarg;
1009 -- }
1010 -+ }
1011 - #ifdef HAVE_RSA_OAEP_MD
1012 - if (crypt_opt.rsa_padding == RSA_PKCS1_OAEP_PADDING) {
1013 - if (crypt_opt.rsa_oaep_md != NULL
1014 -@@ -4728,6 +4746,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
1015 - #endif
1016 -
1017 - if ((i > 0) && argv[0] == atom_rsa && !is_encrypt) {
1018 -+#ifdef HAVE_RSA_SSLV23_PADDING
1019 - if (crypt_opt.rsa_padding == RSA_SSLV23_PADDING) {
1020 - RSA *rsa = EVP_PKEY_get1_RSA(pkey);
1021 - unsigned char *p;
1022 -@@ -4745,6 +4764,7 @@ static ERL_NIF_TERM pkey_crypt_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
1023 - i = 1;
1024 - }
1025 - }
1026 -+#endif
1027 - }
1028 -
1029 - if (tmp_bin.data != NULL) {
1030 ---
1031 -2.16.0
1032 -