Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/erlang/
Date: Wed, 28 Mar 2018 19:01:27
Message-Id: 1522263675.07f10c9e699bf118744db2549435e920316f8a34.pacho@gentoo
1 commit: 07f10c9e699bf118744db2549435e920316f8a34
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 28 19:00:56 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 28 19:01:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f10c9e
7
8 dev-lang/erlang: Drop old
9
10 Package-Manager: Portage-2.3.26, Repoman-2.3.7
11
12 dev-lang/erlang/Manifest | 9 ---
13 dev-lang/erlang/erlang-18.3.ebuild | 161 -------------------------------------
14 dev-lang/erlang/erlang-20.0.ebuild | 157 ------------------------------------
15 dev-lang/erlang/erlang-20.1.ebuild | 157 ------------------------------------
16 dev-lang/erlang/metadata.xml | 1 -
17 5 files changed, 485 deletions(-)
18
19 diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
20 index 8f283640448..1ae89304109 100644
21 --- a/dev-lang/erlang/Manifest
22 +++ b/dev-lang/erlang/Manifest
23 @@ -1,18 +1,9 @@
24 -DIST otp_doc_html_18.3.tar.gz 34285271 BLAKE2B 416b7e1c39ad69fb8fc00c5ea1345408616a21760b3627e079b80c01d94b06388872e682e29ae6f242770887e7cbc3355bb6dc18c22aa60d7f95b069868f66d1 SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659
25 DIST otp_doc_html_19.1.tar.gz 34624316 BLAKE2B e3a5edfe1645d58e4cbd6537c775190716eed7613610ddfa112692fdbace2077b1ccdf7df5987973d2ae4ef529e4ec45d44a240265157816e2a15dabe9232b83 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8
26 DIST otp_doc_html_19.3.tar.gz 35818689 BLAKE2B 30118276fbd817b803ef20700fe2e71a8457645d00f8949b6d3175d92cb5c84d306e4de9899e2f5e0c562d8040dc22db35e1a0f2e314cf1a783794573b3ece59 SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858
27 -DIST otp_doc_html_20.0.tar.gz 33948386 BLAKE2B 1b71457631692edeb9ed6c8d5011667caf2d949822592f35c47944cb3b913d079dd93e6573f96fda8cfd7750257cb1f964a24da436fdd05ac7c40b63486d2aee SHA512 a183943a3a2636489cfdf3e7ede8dc4233db84a271b4b8bd655b57b4abac597b797f035d77087be72e823638898d202e08c53decb565fc10f2e444dcc6da8628
28 -DIST otp_doc_html_20.1.tar.gz 33059931 BLAKE2B 9fd7c5ba3048e506e469ca7c8dfc39fb9c77135ca9bcb7eb4ab8edb72d3d0e0b19970c967d934c99819e65d969d5fe4c2d04406e04c9d0c1a37a3623a6eda083 SHA512 c2eb6cb63f71727ada79ea14a1b8f0b7291bc1d3cdb43bf8978b7b8948d466b9492571d3a45adc96de0eebf46eee213d27c0502ee4d9963ec7c5c0d976f257d9
29 DIST otp_doc_html_20.2.tar.gz 33570484 BLAKE2B c47244a601ae780e5304aedbafbc84d514cb21852760c51384b197d8d37602d51448b7123f6205da9afd2c5d2158f518a122dd4d550ca2ff22d3425eb31b6cf7 SHA512 b481930066737cf0ae2496aa9bc0c865da46bd3985fe5ebcf51eb9383539a57ec364e1eed9d3916ba0953d837d0d5d37cfc129a995d4e2a9656846e75cda9397
30 -DIST otp_doc_man_18.3.tar.gz 1395166 BLAKE2B 47b7149472be5e6e4e3ed5c059abad43e70d65b4ce1dd6c5788eff9e1223c6468cf7691a5304cbba37ff8bed5ac4424b3f043c7a9f6a3485fc6305fbe3dc1fdf SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325
31 DIST otp_doc_man_19.1.tar.gz 1405580 BLAKE2B 93b79b88f81a00d7cbb934dbac811c6ea0ec59413e073fe613038eab71087908ed4e4bcbb6c8ed2f0c5bdd03ab4a570f20c4460f233c040ae0c4238e1cfa097a SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334
32 DIST otp_doc_man_19.3.tar.gz 1410781 BLAKE2B 78293aa498c2651be27d83f13e14007f25a1816b4dae499f463249f774256eddde3a4e31c435a30edd04fb6f41cee965c968b338de77330c3320f3df6087be92 SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1
33 -DIST otp_doc_man_20.0.tar.gz 1430939 BLAKE2B c8fb2fa8a790a9e975cc9fdd6c8a9ce5b85eff30edc465b76ddb38cac4997f759e5e7234dafe42cc60fc265f3e3d31e245a10e96ac368348880dac73742e361d SHA512 8f3c9b39c5574c239fe4f8d220884667d9d8b8231e923da8caebedc2cfd4db61a3b71a45788c3d63ae4cecc11884df9143e164c544356145977010f31c388e99
34 -DIST otp_doc_man_20.1.tar.gz 1334036 BLAKE2B 544da078ff1501f280759e0f9fadc5bd351c3d9e1a48039c1a2a12b4c4ad4dccada0d6575a1f168631441967e1d74b4f738bc49602b9ba7317656b09c763c572 SHA512 d64cb7e78f1cbc86eccfa338ebe211b4e67ada842d780cf73dac7aadab8209a845de305644b758ed23d939688146012cd5172e005fee207307d6e24c7b7d2345
35 DIST otp_doc_man_20.2.tar.gz 1337652 BLAKE2B 416e83c696e30981eabad1f5a7c89abfd0b9d48ff04c9bd86b13dc96302acc9f2b9a73906a2976888ce35c6bfb38b3c006a1e0a041dd1bd5e75908e53bb920c3 SHA512 a67bb975b613c74c4e2418406b6472764ac69dfb9f8a6f64c79c680b1f87edea719431c140b006f776b0088885d958a6f2718267cebaf73ed506eaff721400f4
36 -DIST otp_src_18.3.tar.gz 68292101 BLAKE2B f8f1326ec81695a353bc8f5d2f967e59140a65ac2e1f942c1baf8a1d955c6b8fb7795b9108156ef38e182cbfd1e05b35ff1cbbdbb36f14f90032ad44118c6ef8 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014
37 DIST otp_src_19.1.tar.gz 68103074 BLAKE2B 48e06ce5998929a8ca9804e51f07a4153e7fb1c8b1b4b1b60132e255c29c475534ce018a7902ed29b696b783a21daa73d1778435aada1a77064ab46e915af87d SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714
38 DIST otp_src_19.3.tar.gz 68510871 BLAKE2B fc37c493f5fa3533aaa29f545ff751f5851b58d8952f6f21ef50fec433d661a1e3300139b30a41d9c1f16b3eeaf5d98450bf0a2408e7910712d9d98f3af19237 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6
39 -DIST otp_src_20.0.tar.gz 87346046 BLAKE2B bface127f95c1c1e6b16451541f4414beaf7cd618938b4f60e3594550cc7313775aab1508186ae1dcc8f07a4c59a5f35a6ba8d6ead794d3c33a52dd42f999e69 SHA512 f73ea74fd149392c72925ea163eafe62ed4470405c61d1c7e557c4f3c94546b4385b073d5d53017f1f5422bdf203ea346fa3d672f49bca4cceec26c51de68951
40 -DIST otp_src_20.1.tar.gz 87342296 BLAKE2B 21f93369bc4fe082e3cdc6849463cb638ac8c53b6dc038da6c5e973d1250bd6ccf61474af3d8e35044d849db3b834588c0423aa6aaac0c3a7f0c1442f15576cc SHA512 76b5fcfcdd501636ae8b8392e563d03ca351fce055fca3c92354fa7fe78e150701fcfbc607e09afcc13ca04d5cbba33b15ef03b77e1f4af766dd0e6b152df7a2
41 DIST otp_src_20.2.tar.gz 87136848 BLAKE2B f83e652320b67b72cf42be3c23a9251806096fea4e255f73c8170bcb61ea1e008983f1da1c9dc7b46b76e1fd0d96f94097f5d629eb28c08eb424bb1e7a1cee28 SHA512 6c2cbef9fa67f4aa9d0c22bedf87f39b0067994614663afee88c57bb7789eec45cb1970dcbd930d163a27293b8d24b20a90cf6ed30ff1a14492a9ccdd5b59a65
42
43 diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
44 deleted file mode 100644
45 index 70bcb521e11..00000000000
46 --- a/dev-lang/erlang/erlang-18.3.ebuild
47 +++ /dev/null
48 @@ -1,161 +0,0 @@
49 -# Copyright 1999-2017 Gentoo Foundation
50 -# Distributed under the terms of the GNU General Public License v2
51 -
52 -EAPI=5
53 -WX_GTK_VER="3.0"
54 -
55 -inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
56 -
57 -# NOTE: If you need symlinks for binaries please tell maintainers or
58 -# open up a bug to let it be created.
59 -
60 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
61 -HOMEPAGE="http://www.erlang.org/"
62 -SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
63 - http://erlang.org/download/otp_doc_man_${PV}.tar.gz
64 - doc? ( http://erlang.org/download/otp_doc_html_${PV}.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="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
70 -
71 -RDEPEND="
72 - ssl? (
73 - !libressl? ( >=dev-libs/openssl-0.9.7d:0 )
74 - libressl? ( dev-libs/libressl )
75 - )
76 - emacs? ( virtual/emacs )
77 - java? ( >=virtual/jdk-1.2:* )
78 - odbc? ( dev-db/unixODBC )
79 - systemd? ( sys-apps/systemd )"
80 -DEPEND="${RDEPEND}
81 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
82 - sctp? ( net-misc/lksctp-tools )
83 - tk? ( dev-lang/tk )"
84 -
85 -S="${WORKDIR}/otp_src_${PV}"
86 -
87 -SITEFILE=50${PN}-gentoo.el
88 -
89 -pkg_setup() {
90 - if use halfword ; then
91 - use amd64 || die "halfword support is limited to amd64"
92 - fi
93 -}
94 -
95 -src_prepare() {
96 - epatch "${FILESDIR}"/18.2.1-wx3.0.patch
97 -
98 - use odbc || sed -i 's: odbc : :' lib/Makefile
99 -
100 - # bug 263129, don't ignore LDFLAGS, reported upstream
101 - sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
102 -
103 - # don't ignore LDFLAGS, reported upstream
104 - sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
105 -
106 - if ! use wxwidgets; then
107 - sed -i 's: wx : :' lib/Makefile
108 - rm -rf lib/wx
109 - fi
110 -
111 - # Nasty workaround, reported upstream
112 - cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
113 -
114 - # bug 383697
115 - sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
116 -
117 - cd erts && mv configure.in configure.ac && eautoreconf
118 -}
119 -
120 -src_configure() {
121 - use wxwidgets && need-wxwidgets unicode
122 - use java || export JAVAC=false
123 -
124 - econf \
125 - --enable-threads \
126 - $(use_enable sctp) \
127 - $(use_enable systemd) \
128 - $(use_enable halfword halfword-emulator) \
129 - $(use_enable hipe) \
130 - $(use_with ssl ssl "${EPREFIX}"/usr) \
131 - $(use_enable ssl dynamic-ssl-lib) \
132 - $(use_enable kpoll kernel-poll) \
133 - $(use_enable smp smp-support) \
134 - $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
135 - $(use x64-macos && echo "--enable-darwin-64bit")
136 -}
137 -
138 -src_compile() {
139 - use java || export JAVAC=false
140 - emake
141 -
142 - if use emacs ; then
143 - pushd lib/tools/emacs
144 - elisp-compile *.el
145 - popd
146 - fi
147 -}
148 -
149 -extract_version() {
150 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
151 -}
152 -
153 -src_install() {
154 - local ERL_LIBDIR=/usr/$(get_libdir)/erlang
155 - local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
156 - local ERL_ERTS_VER=$(extract_version erts VSN)
157 -
158 - emake INSTALL_PREFIX="${D}" install
159 - dodoc AUTHORS README.md
160 -
161 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
162 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
163 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
164 - dosym \
165 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
166 - /usr/bin/erl_call
167 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
168 - use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
169 -
170 - ## Clean up the no longer needed files
171 - rm "${ED}/${ERL_LIBDIR}/Install"
172 -
173 - for i in "${WORKDIR}"/man/man* ; do
174 - dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
175 - done
176 - for file in "${WORKDIR}"/man/man*/*.[1-9]; do
177 - # doman sucks so we can't use it
178 - cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
179 - done
180 - # extend MANPATH, so the normal man command can find it
181 - # see bug 189639
182 - dodir /etc/env.d/
183 - echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
184 -
185 - if use doc ; then
186 - dohtml -A README,erl,hrl,c,h,kwc,info -r \
187 - "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
188 - fi
189 -
190 - if use emacs ; then
191 - pushd "${S}"
192 - elisp-install erlang lib/tools/emacs/*.{el,elc}
193 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
194 - "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
195 - elisp-site-file-install "${T}"/${SITEFILE}
196 - popd
197 - fi
198 -
199 - newinitd "${FILESDIR}"/epmd.init epmd
200 - systemd_dounit "${FILESDIR}"/epmd.service
201 -}
202 -
203 -pkg_postinst() {
204 - use emacs && elisp-site-regen
205 -}
206 -
207 -pkg_postrm() {
208 - use emacs && elisp-site-regen
209 -}
210
211 diff --git a/dev-lang/erlang/erlang-20.0.ebuild b/dev-lang/erlang/erlang-20.0.ebuild
212 deleted file mode 100644
213 index 68a6119c6dc..00000000000
214 --- a/dev-lang/erlang/erlang-20.0.ebuild
215 +++ /dev/null
216 @@ -1,157 +0,0 @@
217 -# Copyright 1999-2017 Gentoo Foundation
218 -# Distributed under the terms of the GNU General Public License v2
219 -
220 -EAPI=5
221 -WX_GTK_VER="3.0"
222 -
223 -inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
224 -
225 -# NOTE: If you need symlinks for binaries please tell maintainers or
226 -# open up a bug to let it be created.
227 -
228 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
229 -HOMEPAGE="http://www.erlang.org/"
230 -SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
231 - http://erlang.org/download/otp_doc_man_${PV}.tar.gz
232 - doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
233 -
234 -LICENSE="Apache-2.0"
235 -SLOT="0"
236 -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"
237 -
238 -IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
239 -REQUIRED_USE="dirty-schedulers? ( smp )" #621610
240 -
241 -RDEPEND="
242 - ssl? (
243 - !libressl? ( >=dev-libs/openssl-0.9.7d:0 )
244 - libressl? ( dev-libs/libressl )
245 - )
246 - emacs? ( virtual/emacs )
247 - java? ( >=virtual/jdk-1.2:* )
248 - odbc? ( dev-db/unixODBC )
249 - systemd? ( sys-apps/systemd )"
250 -DEPEND="${RDEPEND}
251 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
252 - sctp? ( net-misc/lksctp-tools )
253 - tk? ( dev-lang/tk )"
254 -
255 -S="${WORKDIR}/otp_src_${PV}"
256 -
257 -SITEFILE=50${PN}-gentoo.el
258 -
259 -src_prepare() {
260 - epatch "${FILESDIR}"/18.2.1-wx3.0.patch
261 -
262 - use odbc || sed -i 's: odbc : :' lib/Makefile
263 -
264 - # bug 263129, don't ignore LDFLAGS, reported upstream
265 - sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
266 -
267 - # don't ignore LDFLAGS, reported upstream
268 - sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
269 -
270 - if ! use wxwidgets; then
271 - sed -i 's: wx : :' lib/Makefile
272 - rm -rf lib/wx
273 - fi
274 -
275 - # Nasty workaround, reported upstream
276 - cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
277 -
278 - # bug 383697
279 - sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
280 -
281 - cd erts && mv configure.in configure.ac && eautoreconf
282 -}
283 -
284 -src_configure() {
285 - use wxwidgets && need-wxwidgets unicode
286 - use java || export JAVAC=false
287 -
288 - econf \
289 - --enable-threads \
290 - $(use_enable sctp) \
291 - $(use_enable systemd) \
292 - $(use_enable hipe) \
293 - $(use_with ssl ssl "${EPREFIX}"/usr) \
294 - $(use_enable ssl dynamic-ssl-lib) \
295 - $(use_enable kpoll kernel-poll) \
296 - $(use_enable smp smp-support) \
297 - $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
298 - $(use x64-macos && echo "--enable-darwin-64bit") \
299 - $(use_enable dirty-schedulers)
300 -}
301 -
302 -src_compile() {
303 - use java || export JAVAC=false
304 - emake
305 -
306 - if use emacs ; then
307 - pushd lib/tools/emacs
308 - elisp-compile *.el
309 - popd
310 - fi
311 -}
312 -
313 -extract_version() {
314 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
315 -}
316 -
317 -src_install() {
318 - local ERL_LIBDIR=/usr/$(get_libdir)/erlang
319 - local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
320 - local ERL_ERTS_VER=$(extract_version erts VSN)
321 -
322 - emake INSTALL_PREFIX="${D}" install
323 - dodoc AUTHORS README.md
324 -
325 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
326 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
327 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
328 - dosym \
329 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
330 - /usr/bin/erl_call
331 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
332 - use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
333 -
334 - ## Clean up the no longer needed files
335 - rm "${ED}/${ERL_LIBDIR}/Install"
336 -
337 - for i in "${WORKDIR}"/man/man* ; do
338 - dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
339 - done
340 - for file in "${WORKDIR}"/man/man*/*.[1-9]; do
341 - # doman sucks so we can't use it
342 - cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
343 - done
344 - # extend MANPATH, so the normal man command can find it
345 - # see bug 189639
346 - dodir /etc/env.d/
347 - echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
348 -
349 - if use doc ; then
350 - dohtml -A README,erl,hrl,c,h,kwc,info -r \
351 - "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
352 - fi
353 -
354 - if use emacs ; then
355 - pushd "${S}"
356 - elisp-install erlang lib/tools/emacs/*.{el,elc}
357 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
358 - "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
359 - elisp-site-file-install "${T}"/${SITEFILE}
360 - popd
361 - fi
362 -
363 - newinitd "${FILESDIR}"/epmd.init epmd
364 - systemd_dounit "${FILESDIR}"/epmd.service
365 -}
366 -
367 -pkg_postinst() {
368 - use emacs && elisp-site-regen
369 -}
370 -
371 -pkg_postrm() {
372 - use emacs && elisp-site-regen
373 -}
374
375 diff --git a/dev-lang/erlang/erlang-20.1.ebuild b/dev-lang/erlang/erlang-20.1.ebuild
376 deleted file mode 100644
377 index 68a6119c6dc..00000000000
378 --- a/dev-lang/erlang/erlang-20.1.ebuild
379 +++ /dev/null
380 @@ -1,157 +0,0 @@
381 -# Copyright 1999-2017 Gentoo Foundation
382 -# Distributed under the terms of the GNU General Public License v2
383 -
384 -EAPI=5
385 -WX_GTK_VER="3.0"
386 -
387 -inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
388 -
389 -# NOTE: If you need symlinks for binaries please tell maintainers or
390 -# open up a bug to let it be created.
391 -
392 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
393 -HOMEPAGE="http://www.erlang.org/"
394 -SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
395 - http://erlang.org/download/otp_doc_man_${PV}.tar.gz
396 - doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
397 -
398 -LICENSE="Apache-2.0"
399 -SLOT="0"
400 -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"
401 -
402 -IUSE="compat-ethread dirty-schedulers doc emacs hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
403 -REQUIRED_USE="dirty-schedulers? ( smp )" #621610
404 -
405 -RDEPEND="
406 - ssl? (
407 - !libressl? ( >=dev-libs/openssl-0.9.7d:0 )
408 - libressl? ( dev-libs/libressl )
409 - )
410 - emacs? ( virtual/emacs )
411 - java? ( >=virtual/jdk-1.2:* )
412 - odbc? ( dev-db/unixODBC )
413 - systemd? ( sys-apps/systemd )"
414 -DEPEND="${RDEPEND}
415 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
416 - sctp? ( net-misc/lksctp-tools )
417 - tk? ( dev-lang/tk )"
418 -
419 -S="${WORKDIR}/otp_src_${PV}"
420 -
421 -SITEFILE=50${PN}-gentoo.el
422 -
423 -src_prepare() {
424 - epatch "${FILESDIR}"/18.2.1-wx3.0.patch
425 -
426 - use odbc || sed -i 's: odbc : :' lib/Makefile
427 -
428 - # bug 263129, don't ignore LDFLAGS, reported upstream
429 - sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
430 -
431 - # don't ignore LDFLAGS, reported upstream
432 - sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
433 -
434 - if ! use wxwidgets; then
435 - sed -i 's: wx : :' lib/Makefile
436 - rm -rf lib/wx
437 - fi
438 -
439 - # Nasty workaround, reported upstream
440 - cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
441 -
442 - # bug 383697
443 - sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
444 -
445 - cd erts && mv configure.in configure.ac && eautoreconf
446 -}
447 -
448 -src_configure() {
449 - use wxwidgets && need-wxwidgets unicode
450 - use java || export JAVAC=false
451 -
452 - econf \
453 - --enable-threads \
454 - $(use_enable sctp) \
455 - $(use_enable systemd) \
456 - $(use_enable hipe) \
457 - $(use_with ssl ssl "${EPREFIX}"/usr) \
458 - $(use_enable ssl dynamic-ssl-lib) \
459 - $(use_enable kpoll kernel-poll) \
460 - $(use_enable smp smp-support) \
461 - $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
462 - $(use x64-macos && echo "--enable-darwin-64bit") \
463 - $(use_enable dirty-schedulers)
464 -}
465 -
466 -src_compile() {
467 - use java || export JAVAC=false
468 - emake
469 -
470 - if use emacs ; then
471 - pushd lib/tools/emacs
472 - elisp-compile *.el
473 - popd
474 - fi
475 -}
476 -
477 -extract_version() {
478 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
479 -}
480 -
481 -src_install() {
482 - local ERL_LIBDIR=/usr/$(get_libdir)/erlang
483 - local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
484 - local ERL_ERTS_VER=$(extract_version erts VSN)
485 -
486 - emake INSTALL_PREFIX="${D}" install
487 - dodoc AUTHORS README.md
488 -
489 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
490 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
491 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
492 - dosym \
493 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
494 - /usr/bin/erl_call
495 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
496 - use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
497 -
498 - ## Clean up the no longer needed files
499 - rm "${ED}/${ERL_LIBDIR}/Install"
500 -
501 - for i in "${WORKDIR}"/man/man* ; do
502 - dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
503 - done
504 - for file in "${WORKDIR}"/man/man*/*.[1-9]; do
505 - # doman sucks so we can't use it
506 - cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
507 - done
508 - # extend MANPATH, so the normal man command can find it
509 - # see bug 189639
510 - dodir /etc/env.d/
511 - echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
512 -
513 - if use doc ; then
514 - dohtml -A README,erl,hrl,c,h,kwc,info -r \
515 - "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
516 - fi
517 -
518 - if use emacs ; then
519 - pushd "${S}"
520 - elisp-install erlang lib/tools/emacs/*.{el,elc}
521 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
522 - "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
523 - elisp-site-file-install "${T}"/${SITEFILE}
524 - popd
525 - fi
526 -
527 - newinitd "${FILESDIR}"/epmd.init epmd
528 - systemd_dounit "${FILESDIR}"/epmd.service
529 -}
530 -
531 -pkg_postinst() {
532 - use emacs && elisp-site-regen
533 -}
534 -
535 -pkg_postrm() {
536 - use emacs && elisp-site-regen
537 -}
538
539 diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
540 index d4a1337a2e1..9da736baffe 100644
541 --- a/dev-lang/erlang/metadata.xml
542 +++ b/dev-lang/erlang/metadata.xml
543 @@ -4,7 +4,6 @@
544 <!-- maintainer-needed -->
545 <use>
546 <flag name="hipe">HIgh Performance Erlang extension</flag>
547 - <flag name="halfword">Enable halfword emulator</flag>
548 <flag name="kpoll">Enable kernel polling support</flag>
549 <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
550 <flag name="dirty-schedulers">Enable dirty schedulers</flag>