diff options
Diffstat (limited to 'dev-lang/elixir')
| -rw-r--r-- | dev-lang/elixir/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/elixir/elixir-1.14.5-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-lang/elixir/elixir-1.14.5-r2.ebuild | 41 | ||||
| -rw-r--r-- | dev-lang/elixir/files/elixir-1.14.5-otp26-tests.patch | 107 |
4 files changed, 153 insertions, 3 deletions
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest index 4a8964a42092..aeee8c7cf968 100644 --- a/dev-lang/elixir/Manifest +++ b/dev-lang/elixir/Manifest @@ -1,6 +1,7 @@ AUX elixir-1.10.3-epmd-daemon.patch 512 BLAKE2B c767cf4336214396d953efe568f0302d6852ec5332575202c167f38553deb9878b69d0744ed8a4062bbcb996df840f759f390ddc0c5e467aeab99250dee5a72e SHA512 dfe12ca0b47529a29d87871c9b31728099f816a0bd416512dd2409686fe6ceeb0e80e9da322ff38df27600da3235d174b365c80b8cae0e55eaee328b1260bc0d AUX elixir-1.10.3-no-Q.patch 355 BLAKE2B 903e5a7149f6e7f7030a533ae437b0e40b97c82c6baa7f90c1dff37fedf96c2e821e98529007e2300a92b8b3e9284428d91d6ee45888da7d79b18d35dfd89e58 SHA512 21d28b63fee2877337c0df095cfa200ae11ec2f0c76556e971957bb92e2b8e9d811c939b1efa458c633b61d3525f47a8b04d1b6f23df04e50ffb3ed5225f7c18 AUX elixir-1.14.1-make44-parallel-build.patch 1026 BLAKE2B d5ba9c3721b34df0e8c707d285f0e06804ef11ea20327637846d8542b0ddd0093bffc36e09a6c4f4ef528a44996fb68f4d0f6b25f016b8317bc3d0c91b3443a2 SHA512 06fb8a0729f1507d9faaed69e87ff39930b1893dc77f6dbc75c6f15c5cf6cb153f4db5283da3028e6248960f23a76c9248ee5169a3e3cdc4d052db25393c05b5 +AUX elixir-1.14.5-otp26-tests.patch 3908 BLAKE2B 7c21440ee45af54859ca8c60dccef0dc3c8f6f0e6e05becc18cfd1a91767926b6f0da0f8e4c3afcfe2b599407e848b9ba5a2f5bfa6b27ff79530155d875243c8 SHA512 a2d84084882e9f11e9c1df1e0bb9190b038f12762e5c4084f9ccd5c961a0901ba30462f968bce49ada57268e47502ea5e3107e25a6d13ea1925eadd19c593728 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc DIST elixir-1.13.4.tar.gz 2912984 BLAKE2B 3849e7be7d1ba54ac3f96690f158b60a3b7da720e85a6c2ef38b078da795c1debaff319133eae6d5e77a7159f452b2ee6a7ad9ebbf7339391e4ee9ae8838d848 SHA512 cd3a28cd227bf60f09500563b7ad4700b2688e0361f975268d5fa81b530aee80ed4f8640335bf08a8c544a2f5d79dbf96c97f281bd3bf4582466a73a9d2edbec DIST elixir-1.14.3.tar.gz 3086297 BLAKE2B b162ea35a762bc1e151c7844237f3167c97da9aae44bca9fe022d09cde6f6909103b383e67b2133b68e76c061c4ed05cdd081070bdbb48be85bbc0ed067fadfd SHA512 eec1e161364f823e26d79596d18b0ff7e6ade1c2c1f6f9ca84eb34d20fd90f434bbd29ef74cd41096e8f25e71d9cd1da0ec6f0a4f24c485124f9525b1ae2c4e0 @@ -10,7 +11,8 @@ DIST elixir-1.15.7.tar.gz 3151775 BLAKE2B 62dc5e390f7b704fdab2be91b36faabc62aed0 DIST elixir-1.16.1.tar.gz 3353282 BLAKE2B 795c8778fb5d5d29e2c1b85d1ad2d9c0c96418010c69e692dc0bcb44ffb4a22e4a67489d991717c548eb3f9ea7173ff71d73a055543f477cf1460b1282259f58 SHA512 2663c04ab3abe577884535e681989610131be0f4f0e55997956b9d4cb87c1a3c0cfd3bf453cf61dbc66f3aa20cdf46bc683df1bfe9292771b5445c164e5197ce EBUILD elixir-1.13.4-r1.ebuild 1075 BLAKE2B 4c180f7c602d5be7ab0f7902b69c2b06a3d92b1a85114ea9ff3dde5e1cf2d092c3b5447207fc0d460c159a97ae404521463b6739ec6ed9fca42e0bc3ba40c0c5 SHA512 31098830265c9deef4b600c13ee1bc5510a69239e07d9dee6012d8db30abe691c00b49dc03f336fbd415a9f2ec16dcacd3b040fe61f628df4e480c66e24a12f7 EBUILD elixir-1.14.3-r1.ebuild 1075 BLAKE2B f04a8d220a207098a8f529a26522984c0188d776bd9225c29570583dc7bff5a0ed30c1122b3218189ca44591ecc70cf4912a2f470bcc40307404df37481b701c SHA512 c903f901958468f0cbc14a6b55e88276196c998d83950f5dff94fe699e2cf8414c6dcf47df9d9b3668b3ff34dc49ee98e2d8351c88f9bdb9510aca365b8694e8 -EBUILD elixir-1.14.5-r1.ebuild 1078 BLAKE2B c365e4c645eb4763475578e60292033a543a1a70b0445ec6e9013a9e2fc751132264ae73ce470ff25e4c3bc965755a6b0486ee89e1c7a6df73c95cf57476f830 SHA512 efd8f6bc799760893748f838552bded59876c327831b6acc4ce90525f4b2594950240753e3a39d55e2e581c9a6f318c7c351bfe318b70227fa56897e75b2ba59 +EBUILD elixir-1.14.5-r1.ebuild 1080 BLAKE2B f2ec7a8c04fc85938f0681e7b6d797f1a6fa35b05b3d950689dcb295248e4ff41062a603a057a9b411eda7af461b8ac4b0dd6405194b3f7e81011c634199b5f9 SHA512 c34c112ba9fcea7b5f24dad4f3575fc58495fca55a5f3a123abb12926cdeee439c1b2f2ac47b2dfdc1f74bb4081704065ae75286912107f1f9d30eac2ebff92b +EBUILD elixir-1.14.5-r2.ebuild 1124 BLAKE2B 9e2db53b75ba926cd48a945155b0688774f344a68237010eeb712d5884504b7156600e97e6ef68ff930a7068de34bc974374cffc5ed857ca3e1e5acbc31be77a SHA512 c26275434d77a2004ab24b0e989f2cf1ffded9e5718b54eeb57e7314b5109c6b5ee50b10f84013157a71867ecab7e60f6a55dfa65dff8ff51c3c32d94b471412 EBUILD elixir-1.15.6.ebuild 1024 BLAKE2B 23f476a6d1a6b863b5d051844ff42742140c47d7d219e6f8ed6cc1a797a4bd8748cb6e4249c48466128a71d755397b0ed890fb4fabdb3b4472b8f3fd67757935 SHA512 5bcb5ee8f9e4a83f3eaf0db84dfef44eb45a9117f3dfb07d42128f7f2864cac49343c699ee3ce39d41340ecd4d1b534bf2e41d6233f3b1f4a33427629ae790f6 EBUILD elixir-1.15.7.ebuild 1022 BLAKE2B 39dcca698a60d83057297aeee72f45fce2751851de8c46fdf8d1b3b6a807204dabce74ec15953575b1a98d6c7221c63ad9e1a2079d888baca716ac8f120d7abd SHA512 10bebf96befc825277ed193fc4a4c5e331f385bbeb51d31790b3d1b326b22b45978d0daa60776f12ae95fdf6fddcbd339789190aefd9b650651bd2ebb3ec3e15 EBUILD elixir-1.16.1.ebuild 1008 BLAKE2B 8fd43a3908bd041ff4eac297e9b0483af41485186ec01ae7284bff9eee428c87b60d48b14dd22e7a4a61436fed74f456cb598639859359cca06479dc52838e7e SHA512 a3d6f6fae136a2a6abdbd52dc158d865c85ce4eabc229b9cfb199059a9bd05123314691db088c39c44d9a733317cfae0f679eaead5a03b862483327e6394b1fd diff --git a/dev-lang/elixir/elixir-1.14.5-r1.ebuild b/dev-lang/elixir/elixir-1.14.5-r1.ebuild index 9bba653e0598..359bc83d8d81 100644 --- a/dev-lang/elixir/elixir-1.14.5-r1.ebuild +++ b/dev-lang/elixir/elixir-1.14.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" # https://hexdocs.pm/elixir/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp DEPEND=" >=dev-lang/erlang-23:0=[ssl] - <dev-lang/erlang-26 + <dev-lang/erlang-26.1 " # 'mix' tool collides with sci-biology/phylip, bug #537514 RDEPEND="${DEPEND} diff --git a/dev-lang/elixir/elixir-1.14.5-r2.ebuild b/dev-lang/elixir/elixir-1.14.5-r2.ebuild new file mode 100644 index 000000000000..77baef256235 --- /dev/null +++ b/dev-lang/elixir/elixir-1.14.5-r2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Elixir programming language" +HOMEPAGE="https://elixir-lang.org" +SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 ErlPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +# https://hexdocs.pm/elixir/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp +DEPEND=" + >=dev-lang/erlang-23:0=[ssl] + <dev-lang/erlang-27 +" +# 'mix' tool collides with sci-biology/phylip, bug #537514 +RDEPEND="${DEPEND} + !!sci-biology/phylip +" +DEPEND+=" + test? ( dev-vcs/git ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch + "${FILESDIR}"/${PN}-1.10.3-no-Q.patch + "${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch + "${FILESDIR}"/${PN}-1.14.1-make44-parallel-build.patch + "${FILESDIR}"/${PN}-1.14.5-otp26-tests.patch +) + +src_install() { + emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install + dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md +} diff --git a/dev-lang/elixir/files/elixir-1.14.5-otp26-tests.patch b/dev-lang/elixir/files/elixir-1.14.5-otp26-tests.patch new file mode 100644 index 000000000000..4e554cda252a --- /dev/null +++ b/dev-lang/elixir/files/elixir-1.14.5-otp26-tests.patch @@ -0,0 +1,107 @@ +Grabbed as-is from https://github.com/elixir-lang/elixir/commit/54516c5684daa3af7f15477c77fae39e8d0c6482 which was done for 1.15.x + +From 54516c5684daa3af7f15477c77fae39e8d0c6482 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co> +Date: Sun, 1 Oct 2023 15:46:17 +0200 +Subject: [PATCH] Address tests on Erlang/OTP 26.1, closes #12975 + +--- + lib/ex_unit/lib/ex_unit/callbacks.ex | 9 +----- + lib/ex_unit/test/ex_unit/formatter_test.exs | 31 +++++++++----------- + lib/ex_unit/test/ex_unit/supervised_test.exs | 11 ++----- + 3 files changed, 18 insertions(+), 33 deletions(-) + +diff --git a/lib/ex_unit/lib/ex_unit/callbacks.ex b/lib/ex_unit/lib/ex_unit/callbacks.ex +index 060d207516a..2dbe9bd0e4a 100644 +--- a/lib/ex_unit/lib/ex_unit/callbacks.ex ++++ b/lib/ex_unit/lib/ex_unit/callbacks.ex +@@ -549,14 +549,7 @@ defmodule ExUnit.Callbacks do + end + + child_spec = Supervisor.child_spec(child_spec_or_module, opts) +- +- case Supervisor.start_child(sup, child_spec) do +- {:error, {:already_started, _pid}} -> +- {:error, {:duplicate_child_name, child_spec.id}} +- +- other -> +- other +- end ++ Supervisor.start_child(sup, child_spec) + end + + @doc """ +diff --git a/lib/ex_unit/test/ex_unit/formatter_test.exs b/lib/ex_unit/test/ex_unit/formatter_test.exs +index afb66a52436..bb9642fbcc4 100644 +--- a/lib/ex_unit/test/ex_unit/formatter_test.exs ++++ b/lib/ex_unit/test/ex_unit/formatter_test.exs +@@ -491,28 +491,25 @@ defmodule ExUnit.FormatterTest do + test "inspect failure" do + failure = [{:error, catch_assertion(assert :will_fail == %BadInspect{}), []}] + +- message = ~S''' +- got FunctionClauseError with message: +- +- """ +- no function clause matching in Inspect.ExUnit.FormatterTest.BadInspect.inspect/2 +- """ +- +- while inspecting: +- +- %{__struct__: ExUnit.FormatterTest.BadInspect, key: 0} +- +- Stacktrace: +- ''' +- +- assert format_test_failure(test(), failure, 1, 80, &formatter/2) =~ """ ++ assert format_test_failure(test(), failure, 1, 80, &formatter/2) =~ ~s''' + 1) world (Hello) + test/ex_unit/formatter_test.exs:1 + Assertion with == failed + code: assert :will_fail == %BadInspect{} + left: :will_fail +- right: #Inspect.Error<\n#{message}\ +- """ ++ right: #Inspect.Error< ++ got FunctionClauseError with message: ++ ++ """ ++ no function clause matching in Inspect.ExUnit.FormatterTest.BadInspect.inspect/2 ++ """ ++ ++ while inspecting: ++ ++ #{inspect(%BadInspect{}, structs: false)} ++ ++ Stacktrace: ++ ''' + end + + defmodule BadMessage do +diff --git a/lib/ex_unit/test/ex_unit/supervised_test.exs b/lib/ex_unit/test/ex_unit/supervised_test.exs +index 577ae6b9676..a02dfe3c0c5 100644 +--- a/lib/ex_unit/test/ex_unit/supervised_test.exs ++++ b/lib/ex_unit/test/ex_unit/supervised_test.exs +@@ -73,19 +73,14 @@ defmodule ExUnit.SupervisedTest do + + test "starts a supervised process with ID checks" do + {:ok, pid} = start_supervised({MyAgent, 0}) ++ assert is_pid(pid) + +- assert {:error, {:duplicate_child_name, ExUnit.SupervisedTest.MyAgent}} = +- start_supervised({MyAgent, 0}) +- +- assert {:error, {{:already_started, ^pid}, _}} = start_supervised({MyAgent, 0}, id: :another) ++ assert {:error, _} = start_supervised({MyAgent, 0}) ++ assert {:error, _} = start_supervised({MyAgent, 0}, id: :another) + + assert_raise RuntimeError, ~r"Reason: bad child specification", fn -> + start_supervised!(%{id: 1, start: :oops}) + end +- +- assert_raise RuntimeError, ~r"Reason: already started", fn -> +- start_supervised!({MyAgent, 0}, id: :another) +- end + end + + test "stops a supervised process" do |