gentoo resync : 25.04.2020

3 files changed, 37 insertions, 1 deletions

diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index b0a99a370eca..d7fc8b472a0c 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,8 +1,9 @@
+AUX elixir-1.10.2-test-regex-fix.patch 1092 BLAKE2B 132d75468b1128dc20a51d39cd7ea53640a89e037c10781aa368e965a303d4411ab176e92ff57c5109d28ae02f0e51f621f3816eaef9a65be6f93eb7c0e43bfb SHA512 98e0a19f5e911cfd930c15615c6a651b8510bdd01bd34994f3edaa475665fe4e1d284368ad685fe6acf461dd7ff4648c140fa949b93bcb62d645920c642d75d1
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
 DIST elixir-1.10.1.tar.gz 2322975 BLAKE2B 875948d233a726bdf88db4d64d21d227dd5e90f762f10dcc82103e088a2ed633898489a2f0a870a6c4e09ce22e509d117f05b3b3f8b8be6c742f628d612e3baf SHA512 823a685d62b6181be9f3314c1a86b69606dd3d3528a2053060f83802a561d8e136fb32099d51cb90542ea155a0a5768d7e6fc7aa1ae18d2c9f5fd5a5a2ac9cdc
 DIST elixir-1.10.2.tar.gz 2323450 BLAKE2B 2d0897af98864966dabc8760d3551caeae39baddc892239c398f3aecf6b72db0ee9d3c8e03fbc8b7a7da0b0dcb08f200fa145d704b8306190eb47a9ccb862bb4 SHA512 a1d1c7847fc8135865d063c6e014bee970066ba07f979f308bec456a732f5366a9343631239965d1caeeaea5cdb644f35185fdfb23f18fcc8c6735a7e3256c0f
 DIST elixir-1.9.4.tar.gz 2250611 BLAKE2B adc363627dc3997684482ac022927aaa4d315afdb8fbc8981e1b88371eb13be80e01084b67288fc88fc51f0015085743d11289e932093d5608e5ac4dfa0823a8 SHA512 c97b93c7438efd7215408525a3b9f2935a1591cce3da3eb31717282d06aff94e8e3d22c405bac40c671bcfe8e73f3dd1ada315f53dee73ceef0bfe2a7c27e86d
 EBUILD elixir-1.10.1.ebuild 759 BLAKE2B 93e0cad090218f2e3af71225afbc654d68afee5b9612e3f03561e4c3d149079dbdcd0fdf8631182511a13e2aaa414f98b18b0619a9be96f02c507a339e5a68ce SHA512 1272bfbb83fa3c47cf5fadfff4e2d3806e4db4ba0bbc666c0ae67dad87c2cff316fa4f83b1b0e2e2847021a12c9db0986466444e40bfa84c3a2485dacfd7a9c7
-EBUILD elixir-1.10.2.ebuild 829 BLAKE2B 9805b802c6273181c809a499a12cd49a0994c83aa7cdc1b76ad71359df347512c457e0e479a58a760df9580737374eca1d8e77a14b8fde73fcdae019f6554b5c SHA512 c2c262ae9cae43be82b4e996ba8ce25ad0cf5211ad287ea85a00572a0763662ef38fbe05cf4f74854648a06069a9a8391d59f661a7a4fff5cd485e86a87d67dd
+EBUILD elixir-1.10.2.ebuild 881 BLAKE2B d49f7d705ccc444e4a9b7ed1821f4184c640115d20a0e0670d9daf40a56085106e256b877c4212571970675b38989967c21bd4ec872dba0fb46cc8a544cc302d SHA512 d159ef309974512e113bac24381a70827b55008c4ea4f9350a461e8d7d983b7f8792bd42c9e5797c649ab555ada6584311fbf861f54ceb42190f66230bef0f9c
 EBUILD elixir-1.9.4.ebuild 756 BLAKE2B 45337b098daa503ea61e9f8f5d8e4ccb6bbd09babb2457dc85a8e96cb79f76ec31d1ef393d015d8fb878b6c4e0d9c4380f39252d8e67b6da5b5e99dc79b77c5b SHA512 97ee97a4b7aece89c3308aa9efc050562e688e491fc313afd31a6400048c1551f734e5222963b187cc7ae4006d112ace23bee093645acfa96d88839136437e8b
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.10.2.ebuild b/dev-lang/elixir/elixir-1.10.2.ebuild
index 12dc7c530fe1..6db35bebc3c2 100644
--- a/dev-lang/elixir/elixir-1.10.2.ebuild
+++ b/dev-lang/elixir/elixir-1.10.2.ebuild
@@ -27,6 +27,7 @@ DEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${P}-test-regex-fix.patch # backport
 )
 
 src_compile() {
diff --git a/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch b/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch
new file mode 100644
index 000000000000..01b27a050276
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch
@@ -0,0 +1,34 @@
+From 8491f0dc74f8bc89bb926b8130b45eaa5ba92c4b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@dashbit.co>
+Date: Sat, 28 Mar 2020 10:49:16 +0100
+Subject: [PATCH] Fix improper regex use, closes #9914
+
+---
+ lib/elixir/test/elixir/regex_test.exs | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/lib/elixir/test/elixir/regex_test.exs
++++ b/lib/elixir/test/elixir/regex_test.exs
+@@ -91,8 +91,10 @@ defmodule RegexTest do
+     assert <<0xA0::utf8>> =~ ~r/[[:space:]]/u
+     assert <<0xA0::utf8>> =~ ~r/\s/u
+ 
++    # Erlang/OTP 23 raises badarg on invalid UTF-8.
++    # Earlier versions simply would not match.
++    assert catch_error(if <<?<, 255, ?>>> =~ ~r/<.>/u, do: flunk("failed"), else: raise("failed"))
+     assert <<?<, 255, ?>>> =~ ~r/<.>/
+-    refute <<?<, 255, ?>>> =~ ~r/<.>/u
+   end
+ 
+   test "ungreedy" do
+@@ -349,6 +351,6 @@ defmodule RegexTest do
+   end
+ 
+   defp matches_escaped?(string, match) do
+-    Regex.match?(~r/#{Regex.escape(string)}/simxu, match)
++    Regex.match?(~r/#{Regex.escape(string)}/simx, match)
+   end
+ end
+-- 
+2.26.1
+