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