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/
Date: Fri, 03 Nov 2017 16:15:21
Message-Id: 1509725713.07b7f8584656427ed6a9f957c118fbe9e1690973.jer@gentoo
1 commit: 07b7f8584656427ed6a9f957c118fbe9e1690973
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 3 16:14:43 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 3 16:15:13 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b7f858
7
8 dev-lang/erlang: Old.
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 dev-lang/erlang/Manifest | 3 -
13 dev-lang/erlang/erlang-18.3.ebuild | 161 -------------------------------------
14 dev-lang/erlang/metadata.xml | 1 -
15 3 files changed, 165 deletions(-)
16
17 diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
18 index 184072cbde9..ab11a5c2434 100644
19 --- a/dev-lang/erlang/Manifest
20 +++ b/dev-lang/erlang/Manifest
21 @@ -1,14 +1,11 @@
22 -DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659 WHIRLPOOL 7d64c2ec433b4bc2da4c56290ad6d21b85d15f72fe9b78654955d27e65b26e1b929d0c9b7d5f60c25c1f16db8d22e36c2ad6ca2a75044707ccd1eea1197fa15d
23 DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
24 DIST otp_doc_html_19.3.tar.gz 35818689 SHA256 dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858 WHIRLPOOL 468cd8b9761fbcaa8892405f451c53bf1014067022966384db96520855366afcfb09aa9ddf1390931da2288c0620b909588637c9c4501f753413752b293a9cbe
25 DIST otp_doc_html_20.0.tar.gz 33948386 SHA256 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a SHA512 a183943a3a2636489cfdf3e7ede8dc4233db84a271b4b8bd655b57b4abac597b797f035d77087be72e823638898d202e08c53decb565fc10f2e444dcc6da8628 WHIRLPOOL 953bf75da7f6aa46e26e4fb6f12d22834d2a41a43e5449e3bbefbe7359f67b7a0affbb0dd6dbfebdecae9294f080a69c0637741ddcf5dbcd0db488ab5a6ddd1a
26 DIST otp_doc_html_20.1.tar.gz 33059931 SHA256 442c9b75a33be685a1af67414cc8758a4ef40e27cdcab9e432d4d9c6f3254dcf SHA512 c2eb6cb63f71727ada79ea14a1b8f0b7291bc1d3cdb43bf8978b7b8948d466b9492571d3a45adc96de0eebf46eee213d27c0502ee4d9963ec7c5c0d976f257d9 WHIRLPOOL f03eff4df31352534b49b2bf8d577d16467784ed14cc9c760e4156b486caef5922a32f8676346ed38b6825507395e0e871f89ad82993e3fb59015dad9ac43da7
27 -DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
28 DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
29 DIST otp_doc_man_19.3.tar.gz 1410781 SHA256 f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1 WHIRLPOOL b7fb4954a46670c672eec02df8713fe68eeb4c15fa8c56e37c802f384bafeb77d88b257ebd1f8f7a0e35e3020853211b9f46ecb01fbe16c19254a3cd992c0fc1
30 DIST otp_doc_man_20.0.tar.gz 1430939 SHA256 b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc SHA512 8f3c9b39c5574c239fe4f8d220884667d9d8b8231e923da8caebedc2cfd4db61a3b71a45788c3d63ae4cecc11884df9143e164c544356145977010f31c388e99 WHIRLPOOL 16b1c1448cdd3a35b340f66131a41af88e679e2e5e5383f5586f4cd386462f4a306512a068bbac8020209d6f72ef2ac57db07e4075b1d48bd0dcc0b3dfd9657a
31 DIST otp_doc_man_20.1.tar.gz 1334036 SHA256 05ccf82ff85316e2eb1bebf1a1741dfac1ee450ed49cf0be365f9d4fec6d7b46 SHA512 d64cb7e78f1cbc86eccfa338ebe211b4e67ada842d780cf73dac7aadab8209a845de305644b758ed23d939688146012cd5172e005fee207307d6e24c7b7d2345 WHIRLPOOL c772d8febcece3d6b3d7b4a576424aba5f33b9d5aaf5312e5bd0e44bc7350d2e562a93d62d48288cf3dd8e050b83727da624ccf267fd60fa5ac3b28166521148
32 -DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
33 DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
34 DIST otp_src_19.3.tar.gz 68510871 SHA256 fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6 WHIRLPOOL ae5b65001872dc855e45a7fbadef278a373935b66819342f4d222055043e1e1ad8974356468e2b1821b36246f5cd621c06cb2e287abab290d6891ea6cd8b698a
35 DIST otp_src_20.0.tar.gz 87346046 SHA256 fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811 SHA512 f73ea74fd149392c72925ea163eafe62ed4470405c61d1c7e557c4f3c94546b4385b073d5d53017f1f5422bdf203ea346fa3d672f49bca4cceec26c51de68951 WHIRLPOOL df800cc5dd9a79a32ebb14376ced74482cbfd85bb4e6d3af7c7b70f32c7080b1c3dee08d9769fa1e296b248c05e3aebb5a3b486f7f6f6f3e1e36486fd3044b56
36
37 diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
38 deleted file mode 100644
39 index 70bcb521e11..00000000000
40 --- a/dev-lang/erlang/erlang-18.3.ebuild
41 +++ /dev/null
42 @@ -1,161 +0,0 @@
43 -# Copyright 1999-2017 Gentoo Foundation
44 -# Distributed under the terms of the GNU General Public License v2
45 -
46 -EAPI=5
47 -WX_GTK_VER="3.0"
48 -
49 -inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
50 -
51 -# NOTE: If you need symlinks for binaries please tell maintainers or
52 -# open up a bug to let it be created.
53 -
54 -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
55 -HOMEPAGE="http://www.erlang.org/"
56 -SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
57 - http://erlang.org/download/otp_doc_man_${PV}.tar.gz
58 - doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
59 -
60 -LICENSE="Apache-2.0"
61 -SLOT="0"
62 -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"
63 -IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
64 -
65 -RDEPEND="
66 - ssl? (
67 - !libressl? ( >=dev-libs/openssl-0.9.7d:0 )
68 - libressl? ( dev-libs/libressl )
69 - )
70 - emacs? ( virtual/emacs )
71 - java? ( >=virtual/jdk-1.2:* )
72 - odbc? ( dev-db/unixODBC )
73 - systemd? ( sys-apps/systemd )"
74 -DEPEND="${RDEPEND}
75 - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
76 - sctp? ( net-misc/lksctp-tools )
77 - tk? ( dev-lang/tk )"
78 -
79 -S="${WORKDIR}/otp_src_${PV}"
80 -
81 -SITEFILE=50${PN}-gentoo.el
82 -
83 -pkg_setup() {
84 - if use halfword ; then
85 - use amd64 || die "halfword support is limited to amd64"
86 - fi
87 -}
88 -
89 -src_prepare() {
90 - epatch "${FILESDIR}"/18.2.1-wx3.0.patch
91 -
92 - use odbc || sed -i 's: odbc : :' lib/Makefile
93 -
94 - # bug 263129, don't ignore LDFLAGS, reported upstream
95 - sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
96 -
97 - # don't ignore LDFLAGS, reported upstream
98 - sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
99 -
100 - if ! use wxwidgets; then
101 - sed -i 's: wx : :' lib/Makefile
102 - rm -rf lib/wx
103 - fi
104 -
105 - # Nasty workaround, reported upstream
106 - cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
107 -
108 - # bug 383697
109 - sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
110 -
111 - cd erts && mv configure.in configure.ac && eautoreconf
112 -}
113 -
114 -src_configure() {
115 - use wxwidgets && need-wxwidgets unicode
116 - use java || export JAVAC=false
117 -
118 - econf \
119 - --enable-threads \
120 - $(use_enable sctp) \
121 - $(use_enable systemd) \
122 - $(use_enable halfword halfword-emulator) \
123 - $(use_enable hipe) \
124 - $(use_with ssl ssl "${EPREFIX}"/usr) \
125 - $(use_enable ssl dynamic-ssl-lib) \
126 - $(use_enable kpoll kernel-poll) \
127 - $(use_enable smp smp-support) \
128 - $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
129 - $(use x64-macos && echo "--enable-darwin-64bit")
130 -}
131 -
132 -src_compile() {
133 - use java || export JAVAC=false
134 - emake
135 -
136 - if use emacs ; then
137 - pushd lib/tools/emacs
138 - elisp-compile *.el
139 - popd
140 - fi
141 -}
142 -
143 -extract_version() {
144 - sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
145 -}
146 -
147 -src_install() {
148 - local ERL_LIBDIR=/usr/$(get_libdir)/erlang
149 - local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
150 - local ERL_ERTS_VER=$(extract_version erts VSN)
151 -
152 - emake INSTALL_PREFIX="${D}" install
153 - dodoc AUTHORS README.md
154 -
155 - dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
156 - dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
157 - dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
158 - dosym \
159 - "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
160 - /usr/bin/erl_call
161 - dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
162 - use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
163 -
164 - ## Clean up the no longer needed files
165 - rm "${ED}/${ERL_LIBDIR}/Install"
166 -
167 - for i in "${WORKDIR}"/man/man* ; do
168 - dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
169 - done
170 - for file in "${WORKDIR}"/man/man*/*.[1-9]; do
171 - # doman sucks so we can't use it
172 - cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
173 - done
174 - # extend MANPATH, so the normal man command can find it
175 - # see bug 189639
176 - dodir /etc/env.d/
177 - echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
178 -
179 - if use doc ; then
180 - dohtml -A README,erl,hrl,c,h,kwc,info -r \
181 - "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
182 - fi
183 -
184 - if use emacs ; then
185 - pushd "${S}"
186 - elisp-install erlang lib/tools/emacs/*.{el,elc}
187 - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
188 - "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
189 - elisp-site-file-install "${T}"/${SITEFILE}
190 - popd
191 - fi
192 -
193 - newinitd "${FILESDIR}"/epmd.init epmd
194 - systemd_dounit "${FILESDIR}"/epmd.service
195 -}
196 -
197 -pkg_postinst() {
198 - use emacs && elisp-site-regen
199 -}
200 -
201 -pkg_postrm() {
202 - use emacs && elisp-site-regen
203 -}
204
205 diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
206 index d4a1337a2e1..9da736baffe 100644
207 --- a/dev-lang/erlang/metadata.xml
208 +++ b/dev-lang/erlang/metadata.xml
209 @@ -4,7 +4,6 @@
210 <!-- maintainer-needed -->
211 <use>
212 <flag name="hipe">HIgh Performance Erlang extension</flag>
213 - <flag name="halfword">Enable halfword emulator</flag>
214 <flag name="kpoll">Enable kernel polling support</flag>
215 <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
216 <flag name="dirty-schedulers">Enable dirty schedulers</flag>