diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /dev-lang/erlang | |
parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) |
gentoo resync : 12.05.2022
Diffstat (limited to 'dev-lang/erlang')
-rw-r--r-- | dev-lang/erlang/Manifest | 17 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-23.3.4.12.ebuild | 2 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-23.3.4.14-r1.ebuild (renamed from dev-lang/erlang/erlang-23.3.4.ebuild) | 5 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-24.2.2.ebuild | 162 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-24.3.3.ebuild | 2 | ||||
-rw-r--r-- | dev-lang/erlang/erlang-24.3.4.ebuild (renamed from dev-lang/erlang/erlang-24.3.2.ebuild) | 0 | ||||
-rw-r--r-- | dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch | 137 |
7 files changed, 149 insertions, 176 deletions
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 2d94f326f3a2..8a5e442013c1 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -6,21 +6,18 @@ AUX epmd.init-r2 388 BLAKE2B cf8f1b3bfaf5c0bb1a7acebf41e1c1138b880e91a5c732cf3f8 AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24 +AUX erlang-23.3.4.14-emacs28-compat.patch 6237 BLAKE2B b5b8f0c7bfd1f217805d7279d85b7d09189d069814afde10b32446031c221aaac58aa7adaf993da7261c1d8889b5bef6cabbfc73b4062a6eeadae5e0d923c39d SHA512 e47364afaf8d29b1e9e1f6548bfe5efa110e56777d9db87fefd24ee201d5689f46e3e4d34c32b3a95353411500ae10fc1064f9ed155d5d6d97f442d749e38f9b AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335 DIST erlang-23.3.4.12.tar.gz 57278064 BLAKE2B 3620dd2e49cfd75e49bf573ad1a8f8952c232ce2bf734ee845d8e8bb26053e34df96b472a9490c1cdf77ae6c106732f6a68b2f5d31808fd941bddb616004819f SHA512 d4f468393116d2d24a5170d7efe04305d221baccccfc273d4740b701ec23d1e55268cc49eeb99722afa636431e6e50faa5c11758484aa71e29c2fb3ed7c2ad25 -DIST erlang-23.3.4.tar.gz 56664814 BLAKE2B ef8aa8d5a6fd1efc02a35459d1cb15eecf5f948127266bf782544e1da9a59765aca15070ea92df5558a4de017cc810e3542e2393e9470243fc6d9be13e9f37b6 SHA512 c8c5a9676163058276c703a0db0373508fad0ed9dff0aa9806ce59115ca766ff1d343c5a3917a920b249655fe188b974482ff378e9173c9fe00ea3907e618da5 -DIST erlang-24.2.2.tar.gz 59091659 BLAKE2B 6b845e3de787e7aed4239284ffa81c483504c0a095c3cc3030fb8f3a0a236d0507f4290beb69096a1edbd3d13e9a4d5f2940eb6c268aaceb4a7d3bacf01dfaa0 SHA512 791bd9cc299168d4a209bcdc797a9671a39d03924dc18c9e0520393adf4eb54922c48eecde44601bde55b4fa80b91e0eddbfc486c5f45a611da60b47c63208c7 -DIST erlang-24.3.2.tar.gz 59302675 BLAKE2B 265ab89c4b09c55cd65d046c79a6bbbef1fdbdc9b69bc1b61f2edc8ab731e9ecdf09e189861ebf57b97e60bb06244af9bb0cafe4460dbc53cf34326079a8992b SHA512 811f50f4fa34dade0e2051decc7f8d7e96949cc9a9f11f507d3bdab43e65a654ddd6d0d49edbc03cc169d9d81f7937a195be5f103918e13b8083c31bdea2df2b +DIST erlang-23.3.4.14.tar.gz 57288870 BLAKE2B 64c53eac18f970d7b6e560ec678c34cab7e9ecd77af1789843c17c072e05034bef00d0985a294b118890f30cd40e429db19d309626172deabcd2ee1328f04584 SHA512 1a1e5eebd471a919dbbbdfcdea32285d3c8f51d5ba4a4f16081c1ffc00cc118e2056ffb84040147ee70175a3cad4419501ec892dccd59cfa133d473eee3f00e9 DIST erlang-24.3.3.tar.gz 59296830 BLAKE2B 1792274c77001b6f49e84f1584620a247cf3acdf075a8d581403f31a2b4cfe32e7b8104d325f3c1a999595d94484cb74b7996a35599e9ef8935931a133a554f6 SHA512 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e +DIST erlang-24.3.4.tar.gz 59298534 BLAKE2B 66e8cb2148392229fb24fb0994b09510ede89229b90708df7149393d4f522ccc98774fad9f924d2c1f806f099303e097e05b1f91348674e86057c0a8952e133e SHA512 bd3fb31d69ef64a87fc436f610409308bdb44493422974ae563bdf001dabd0a5aadfcdb0334b430ebb385f7e91f629e793fdf03801ab48df5f265472e3af540a DIST erlang_doc_html_23.3.tar.gz 36224657 BLAKE2B 7e2a3e16f4cfa0f15c01074740e02af7a45b480b4a94e764463717658ab7e5d0281f928c3ec585582b10168645e3e06cfe72cf6a0ba1b88f539b80f2b7ad99be SHA512 8be4aae46839239604b875b39339e7b6b6c677c099b3d749d5f1041c4508c1c3b4aa8136a93df12b1e5cb6333ef907276f5965c9726ed2b9e77a6043c8ef53b1 -DIST erlang_doc_html_24.2.tar.gz 36604264 BLAKE2B edc870e53cb89a42ec1022b4250942ab03d47d81dfa86d767c179ef89ec67e2ed7df2274acfe2e1469e5344691e9a0a33174c5237e48e2fc6203518c39978d19 SHA512 de3957676970419953043cbf130194b1bfcb0f2664e2a6148ccfdf7fbd3bc797fa76a19f2e8362e176afd81408b937c5b8b0b126703326b757cfaf396d5e3e79 DIST erlang_doc_html_24.3.tar.gz 36645792 BLAKE2B ef90b7d05ed43656ab1ffdbbd0833c9da08a867ad7a99ec0f7f1eb59697c1f9cd5ccd150b2e564af80b2098f063da0c76121d4444b5444e603581442ad1c7bc8 SHA512 b8d3832ffdbdede656b362d719474f7b9ff04a32ea7235e77d63755629cf9305c203cd6cd9ae089171b2cee694f9641d6ed5d0197e2acf893a31d25696096f1e DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e -DIST erlang_doc_man_24.2.tar.gz 1673926 BLAKE2B 17cf3c1e296c883e9c930cd540d439f7dd71a40048bbe80efd6f46dd5b4d9faf51177d2bb133f782742b0b367c8f54c27ed2b2cce277372a98dd55bb629f3b55 SHA512 359bfca20835eb2a6b6d199e2b108537c453369896b8bd4bd7db05c797421a734c31aea41ddf819b703718353f43186c5fd8f37d1a7d8624e767a41a922c01b9 DIST erlang_doc_man_24.3.tar.gz 1680242 BLAKE2B 3311eb6ed6dcaa2d611adf7a08269f67e3f31d106f6b6d04e5cc91efa8efc382ddb6b230f218fa543390bf4ec37f477e0c4979c82632ebfb6ccda8c5de1fbc41 SHA512 72876911a1ec82071225e7b71de0462254becd64892a5459239b9e44b20601f6b6990a12cd36a8320e81e5307bcf7b5e5057e42baec12403be4a0eda00cdf62c -EBUILD erlang-23.3.4.12.ebuild 4504 BLAKE2B e63ea0e16f947850be6aebe215c2ad2528b870aca44e25c71d77897c4aed98a0c4eae63d7a7dfcbdbf034006e3d5777ae349bc579069f1280cb269c476065936 SHA512 d5cff6be8101af8924b71d547695a106e07123aa9865246384a41b403bfad7528094fb08ee7ea54c42dce653d7274085c13e54798071c533d2951cf5d4651b14 -EBUILD erlang-23.3.4.ebuild 4499 BLAKE2B 06891eb432ae12d43e860ce0773eb01768ea75ec4f16c365fbe16c22093039e5b18aaa4d3ca558f7a64cada0fc405ac0ba898065b80c778ad9253197302c5145 SHA512 09397c1f46fcf92ef160dee067b9dbf9e0a9125e112f28748180166ddd0394ad34f03e0ddcf32dccff101485927f41c1b1a4376a66bbfd52c8fb2f74bfac27d5 -EBUILD erlang-24.2.2.ebuild 4705 BLAKE2B fce076709aac7b8fa9625fb2bf98dda1929d16c22dcfcde8923ca639831ec38b9eadf70105b8c17fd38ea5a73ea0f828ad3147bf8524ff5c857866fb6ef837e3 SHA512 fb701f8428efe2cf8b816104f28d3955bb72a9a202837e25257b1f79be97b678dca05f0564806bf1c301a80142971125b512562664a99088477e53612ae90a0f -EBUILD erlang-24.3.2.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125 -EBUILD erlang-24.3.3.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125 +EBUILD erlang-23.3.4.12.ebuild 4499 BLAKE2B f5d60f5e4daf2766f1a8dce36ddfce00e220bb771ffb02da6448ae4526d499f433dff704d9381c9aa73cd9e3ccd0899a83441a394c0372e791786a7193694fdd SHA512 fd0a6b91636133698c5d9c9348e5db379547f84f5b1fe9a7541f5d8de3ae4205cc0ea0727d76d885908e1d19ae84dcbd2743d749e11bad4c9f76fdec0b82a7da +EBUILD erlang-23.3.4.14-r1.ebuild 4556 BLAKE2B 814062c5bef24e854efcbecc84743aff69103e6f03ab6aa98e6e0aeb31924f54ce1adf22c2f68a5a1ee811cf84c9ac97cdf5a59cd38c02f4c00b998cf5113022 SHA512 ba33d1a2e9bf1ffcf8fd57929cd5e09dab4ac7ff5f4d2f8560ee88c90c7dd5e8e71d2ed956677842cf0f53711c92452273ec463d856ac8f270e6eeccdbf1ae4b +EBUILD erlang-24.3.3.ebuild 4783 BLAKE2B db44c0614d88101ffc13edb07ca6b2dd7c119b0ddb0c099b18ad37fd751596fbeb5f982712e8cd69e9a2cb000f5d3aded0197d4fab8d512ca4d4d9349a9de4e6 SHA512 e2cc06e3c2e11d874b135a4c2dcc2dcd84592d32964f22a68ce25dd45b7a36143e691c39e350227ce284b5964cb6f00b961c08f30916e540338e5f12801fb7bd +EBUILD erlang-24.3.4.ebuild 4788 BLAKE2B a770984061152835a9452bd8d57f13394d6af4198d4291d6b78d14a03b48d5ef886fa696b5372e32e7927e6bd7466a2be1a505922ea1b7772e1bad69f35a622c SHA512 60f3edf46bf5169b0c205bafa1bb9858dbc3e1cc190616111bdb7950139e9a6adba3d61aa11f490ba98406a7a2b02d261a86b1583474a5ac48b339bcf4ab4125 MISC metadata.xml 735 BLAKE2B 6deb116831085a15f4a06368d1d1f3e9d57501799236c7d1fe9fa8aa9a72da0151e92fa13e14427177679c361f8849379784e9c0124f28468f71e2eb54b78bbc SHA512 8ac9f9f29494b5aa9ff023460009c8b69cc3dbc4cc88ab419b62f715066ea3789a4575eab545eed5a430a95f4d0709e069fd240f2cb256eca4dfca7ce3838ab8 diff --git a/dev-lang/erlang/erlang-23.3.4.12.ebuild b/dev-lang/erlang/erlang-23.3.4.12.ebuild index 689ece693ee0..d87e1a997ebf 100644 --- a/dev-lang/erlang/erlang-23.3.4.12.ebuild +++ b/dev-lang/erlang/erlang-23.3.4.12.ebuild @@ -22,7 +22,7 @@ LICENSE="Apache-2.0" # same build of ERTS that was used when compiling the code. See # http://erlang.org/doc/system_principles/misc.html for more information. SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets" RDEPEND=" diff --git a/dev-lang/erlang/erlang-23.3.4.ebuild b/dev-lang/erlang/erlang-23.3.4.14-r1.ebuild index fd509078eb66..4ec3b42e084e 100644 --- a/dev-lang/erlang/erlang-23.3.4.ebuild +++ b/dev-lang/erlang/erlang-23.3.4.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ LICENSE="Apache-2.0" # same build of ERTS that was used when compiling the code. See # http://erlang.org/doc/system_principles/misc.html for more information. SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs +hipe java +kpoll odbc sctp ssl systemd tk wxwidgets" RDEPEND=" @@ -47,6 +47,7 @@ S="${WORKDIR}/otp-OTP-${PV}" PATCHES=( "${FILESDIR}"/18.2.1-wx3.0.patch "${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch + "${FILESDIR}"/${PN}-23.3.4.14-emacs28-compat.patch ) SITEFILE=50"${PN}"-gentoo.el diff --git a/dev-lang/erlang/erlang-24.2.2.ebuild b/dev-lang/erlang/erlang-24.2.2.ebuild deleted file mode 100644 index 3386a6004c14..000000000000 --- a/dev-lang/erlang/erlang-24.2.2.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0-gtk3" - -inherit elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets - -# NOTE: If you need symlinks for binaries please tell maintainers or -# open up a bug to let it be created. - -UPSTREAM_V="$(ver_cut 1-2)" - -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" -HOMEPAGE="https://www.erlang.org/" -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" - -LICENSE="Apache-2.0" -# We use this subslot because Compiled HiPE Code can be loaded on the exact -# same build of ERTS that was used when compiling the code. See -# http://erlang.org/doc/system_principles/misc.html for more information. -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets" - -RDEPEND=" - acct-group/epmd - acct-user/epmd - sys-libs/ncurses:0 - sys-libs/zlib - emacs? ( >=app-editors/emacs-23.1:* ) - java? ( >=virtual/jdk-1.8:* ) - odbc? ( dev-db/unixODBC ) - sctp? ( net-misc/lksctp-tools ) - ssl? ( >=dev-libs/openssl-0.9.7d:0= ) - systemd? ( sys-apps/systemd ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) -" -DEPEND="${RDEPEND} - dev-lang/perl -" - -S="${WORKDIR}/otp-OTP-${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch - "${FILESDIR}"/${PN}-24.0.2-serial-configure.patch -) - -SITEFILE=50"${PN}"-gentoo.el - -src_prepare() { - default - - tc-export AR CPP CXX LD - - # bug #797886: erlang's VM does unsafe casts for ints - # to pointers and back. This breaks on gcc-11 -flto. - append-flags -fno-strict-aliasing -} - -src_configure() { - use wxwidgets && setup-wxwidgets - - local myconf=( - --disable-builtin-zlib - - # don't search for static zlib - --with-ssl-zlib=no - - $(use_enable kpoll kernel-poll) - $(use_with java javac) - $(use_enable sctp) - $(use_with ssl ssl) - $(use_enable ssl dynamic-ssl-lib) - $(use_enable systemd) - $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") - ) - econf "${myconf[@]}" -} - -src_compile() { - emake - - if use emacs ; then - pushd lib/tools/emacs &>/dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - local path="$1" - local var_name="$2" - sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" -} - -src_install() { - local erl_libdir_rel="$(get_libdir)/erlang" - local erl_libdir="/usr/${erl_libdir_rel}" - local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" - local erl_erts_ver="$(extract_version erts VSN)" - local my_manpath="/usr/share/${PN}/man" - - [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" - [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - - emake INSTALL_PREFIX="${D}" install - - if use doc ; then - # Note: we explicitly install docs into: - # /usr/share/doc/${PF}/{doc,lib,erts-*} - # To maintain that layout we gather everything in 'html-docs'. - # See bug #684376. - mkdir html-docs || die - mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. ) - docompress -x /usr/share/doc/${PF} - else - local DOCS=("README.md") - fi - - einstalldocs - - dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl - dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc - dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript - dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call - dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp - - ## Clean up the no longer needed files - rm "${ED}/${erl_libdir}/Install" || die - - insinto "${my_manpath}" - doins -r "${WORKDIR}"/man/* - # extend MANPATH, so the normal man command can find it - # see bug 189639 - newenvd - "90erlang" <<-_EOF_ - MANPATH="${my_manpath}" - _EOF_ - - if use emacs ; then - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - fi - - newinitd "${FILESDIR}"/epmd.init-r2 epmd - newconfd "${FILESDIR}"/epmd.confd-r2 epmd - use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/erlang/erlang-24.3.3.ebuild b/dev-lang/erlang/erlang-24.3.3.ebuild index d08bb337a5c2..1d539c7aa9b4 100644 --- a/dev-lang/erlang/erlang-24.3.3.ebuild +++ b/dev-lang/erlang/erlang-24.3.3.ebuild @@ -22,7 +22,7 @@ LICENSE="Apache-2.0" # same build of ERTS that was used when compiling the code. See # http://erlang.org/doc/system_principles/misc.html for more information. SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets" RDEPEND=" diff --git a/dev-lang/erlang/erlang-24.3.2.ebuild b/dev-lang/erlang/erlang-24.3.4.ebuild index d08bb337a5c2..d08bb337a5c2 100644 --- a/dev-lang/erlang/erlang-24.3.2.ebuild +++ b/dev-lang/erlang/erlang-24.3.4.ebuild diff --git a/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch b/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch new file mode 100644 index 000000000000..32844d8dd1a8 --- /dev/null +++ b/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch @@ -0,0 +1,137 @@ +From 22a7522ef3f0f3c13618214e61f60cb01d80eef4 Mon Sep 17 00:00:00 2001 +From: Justin Davis <jrcd83@gmail.com> +Date: Tue, 26 Oct 2021 13:28:16 -0400 +Subject: [PATCH] Fix emacs erlang-mode: xref switched to CL-Lib + +Fix for GitHub issue #5314. + +Xref is a package which is also bundled with emacs: +http://elpa.gnu.org/packages/xref.html + +Xref switched its own internally defined classes from EIEIO to +CL-lib (emacs-mirror/emacs@86da812afb2572c7fead2bb07570b976bffd7c55). +erlang-mode subclasses xref-file-location in order to add a function +arity slot to xrefs. + +If xref-file-location is a class, use defclass to subclass it. Otherwise +use cl-defstruct. Avoids referencing make-instance, slot-value functions +from EIEIO. Only references constructor, accessor, and predicate +functions. Updates comments that make references to classes. + +Testing: +- cd into lib/tools/emacs. +- Run the tests included with erlang-mode from the shell: + emacs -Q -batch -L . -l erlang.el -l erlang-test.el \ + -f ert-run-tests-batch-and-exit +- Copy xref.el from the xref package (>=1.3.1) into the + lib/tools/emacs directory. +- Run the tests again. This will load xref.el automatically + and use the new interface. +--- + lib/tools/emacs/erlang.el | 48 +++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 17 deletions(-) + +diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el +index 69a5fdaeb55..40fe32689e7 100644 +--- a/lib/tools/emacs/erlang.el ++++ b/lib/tools/emacs/erlang.el +@@ -5120,8 +5120,8 @@ about Erlang modules." + ;; + ;; As mentioned this xref implementation is based on the etags xref + ;; implementation. But in the cases where arity is considered the +-;; etags information structures (class xref-etags-location) will be +-;; translated to our own structures which include arity (class ++;; etags information structures (struct xref-etags-location) will be ++;; translated to our own structures which include arity (struct + ;; erlang-xref-location). This translation is started in the function + ;; `erlang-refine-xrefs'. + +@@ -5129,6 +5129,11 @@ about Erlang modules." + ;; with xref items with xref-etags-location and some deal with xref + ;; items with erlang-xref-location. + ++;; NOTE: Around Sept 2021, the xrefs package changed all of its defined types ++;; (i.e. xref-location, xref-file-location) from EIEIO classes to CL-Lib ++;; structures. These are both supported. Older Emacsen with earlier versions of ++;; xref will continue to use defclass. Newer Emacsen will use cl-defstruct. ++ + (defun erlang-etags--xref-backend () 'erlang-etags) + + (defun erlang-soft-require (feature) +@@ -5137,6 +5142,7 @@ about Erlang modules." + + (when (and (erlang-soft-require 'xref) + (erlang-soft-require 'cl-generic) ++ (erlang-soft-require 'cl-lib) + (erlang-soft-require 'eieio) + (erlang-soft-require 'etags)) + ;; The purpose of using eval here is to avoid compilation +@@ -5165,10 +5171,20 @@ about Erlang modules." + (let ((erlang-replace-etags-tags-completion-table t)) + (tags-completion-table))) + +- (defclass erlang-xref-location (xref-file-location) +- ((arity :type fixnum :initarg :arity +- :reader erlang-xref-location-arity)) +- :documentation "An erlang location is a file location plus arity.") ++ ;; Xref 1.3.1 bundled with Emacs 28+ switched from using EIEIO classes to ++ ;; using CL-Lib structs. ++ (if (find-class 'xref-file-location) ++ (progn ++ (defclass erlang-xref-location (xref-file-location) ++ ((arity :type fixnum :initarg :arity ++ :reader erlang-xref-location-arity)) ++ :documentation "An erlang location is a file location plus arity.") ++ ;; Make a constructor with the same name that a CL structure would have. ++ (defalias 'make-erlang-xref-location 'erlang-xref-location)) ++ (cl-defstruct (erlang-xref-location ++ (:include xref-file-location)) ++ "An erlang location is a file location plus arity." ++ (arity 0 :type fixnum))) + + ;; This method definition only calls the superclass which is + ;; the default behaviour if it was not defined. It is only +@@ -5331,8 +5347,7 @@ is non-nil then TAG is a regexp." + xrefs + (when (and xrefs + (fboundp 'xref-item-location) +- (fboundp 'xref-location-group) +- (fboundp 'slot-value)) ++ (fboundp 'xref-location-group)) + (let (files) + (cl-loop for xref in xrefs + for loc = (xref-item-location xref) +@@ -5357,7 +5372,8 @@ is non-nil then TAG is a regexp." + t)))) + + (defun erlang-xrefs-in-file (file kind tag is-regexp) +- (when (fboundp 'make-instance) ++ (when (and (fboundp 'make-erlang-xref-location) ++ (fboundp 'xref-make)) + (with-current-buffer (find-file-noselect file) + (save-excursion + (goto-char (point-min)) +@@ -5369,17 +5385,15 @@ is non-nil then TAG is a regexp." + for name = (match-string-no-properties 1) + for arity = (save-excursion + (erlang-get-arity)) +- for loc = (make-instance 'erlang-xref-location +- :file file +- :line (line-number-at-pos) +- :column 0 +- :arity arity) ++ for loc = (make-erlang-xref-location ++ :file file ++ :line (line-number-at-pos) ++ :column 0 ++ :arity arity) + for sum = (erlang-xref-summary kind name arity) + when (and arity + (not (eq arity last-arity))) +- collect (make-instance 'xref-item +- :summary sum +- :location loc) ++ collect (xref-make sum loc) + do (setq last-arity arity))))))) + + (defun erlang-xref-summary (kind tag arity) |