From a44ea5658264033cd220844f839e0f36634f0778 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Thu, 14 Dec 2017 17:50:55 -0200
Subject: [PATCH] erlang: update to 20.2.

---
 srcpkgs/erlang/patches/ERL-490.patch | 100 ---------------------------
 srcpkgs/erlang/template              |   8 +--
 2 files changed, 4 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/erlang/patches/ERL-490.patch

diff --git a/srcpkgs/erlang/patches/ERL-490.patch b/srcpkgs/erlang/patches/ERL-490.patch
deleted file mode 100644
index 70d6eb7a22c..00000000000
--- a/srcpkgs/erlang/patches/ERL-490.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 7715f437ab9a789e0500873b6002a49bfe69009c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
-Date: Fri, 29 Sep 2017 07:17:01 +0200
-Subject: [PATCH] Fix incorrect internal consistency failure for binary
- matching code
-
-4c31fd0b9665 made the merging of match contexts stricter;
-in fact, a little bit too strict.
-
-Two match contexts with different number of slots would
-be downgraded to the 'term' type. The correct way is to
-keep the match context but set the number of slots to the
-lowest number of slots of the two match contexts.
-
-https://bugs.erlang.org/browse/ERL-490
----
- lib/compiler/src/beam_validator.erl  |  6 +++---
- lib/compiler/test/bs_match_SUITE.erl | 38 ++++++++++++++++++++++++++++++++++--
- 2 files changed, 39 insertions(+), 5 deletions(-)
-
---- otp_src_20.1/lib/compiler/src/beam_validator.erl
-+++ otp_src_20.1/lib/compiler/src/beam_validator.erl
-@@ -1430,13 +1430,13 @@ merge_types(bool, {atom,A}) ->
-     merge_bool(A);
- merge_types({atom,A}, bool) ->
-     merge_bool(A);
--merge_types(#ms{id=Id1,valid=B0,slots=Slots},
--	    #ms{id=Id2,valid=B1,slots=Slots}) ->
-+merge_types(#ms{id=Id1,valid=B1,slots=Slots1},
-+	    #ms{id=Id2,valid=B2,slots=Slots2}) ->
-     Id = if
-              Id1 =:= Id2 -> Id1;
-              true -> make_ref()
-          end,
--    #ms{id=Id,valid=B0 band B1,slots=Slots};
-+    #ms{id=Id,valid=B1 band B2,slots=min(Slots1, Slots2)};
- merge_types(T1, T2) when T1 =/= T2 ->
-     %% Too different. All we know is that the type is a 'term'.
-     term.
---- otp_src_20.1/lib/compiler/test/bs_match_SUITE.erl
-+++ otp_src_20.1/lib/compiler/test/bs_match_SUITE.erl
-@@ -39,7 +39,7 @@
- 	 match_string_opt/1,select_on_integer/1,
- 	 map_and_binary/1,unsafe_branch_caching/1,
- 	 bad_literals/1,good_literals/1,constant_propagation/1,
--	 parse_xml/1,get_payload/1]).
-+	 parse_xml/1,get_payload/1,num_slots_different/1]).
- 
- -export([coverage_id/1,coverage_external_ignore/2]).
- 
-@@ -71,7 +71,7 @@ groups() ->
-        match_string_opt,select_on_integer,
-        map_and_binary,unsafe_branch_caching,
-        bad_literals,good_literals,constant_propagation,parse_xml,
--       get_payload]}].
-+       get_payload,num_slots_different]}].
- 
- 
- init_per_suite(Config) ->
-@@ -1524,6 +1524,40 @@ do_get_payload(ExtHdr) ->
-     <<_:13,_:35>> = ExtHdr#ext_header.ext_hdr_opts,
-     ExtHdrOptions.
- 
-+%% ERL-490
-+num_slots_different(_Config) ->
-+    Ts = [{<<"de">>, <<"default">>, <<"Remove">>, <<"a">>},
-+          {<<"de">>, <<"default">>, <<"Remove from list">>, <<"a">>},
-+          {<<"de">>, <<"default">>, <<"Remove from the list">>, <<"a">>},
-+          {<<"de">>, <<"default">>, <<"Results">>, <<"Ergebnisse">>},
-+          {<<"de">>, <<"default">>, <<"Reservatio">>, <<"a">>},
-+          {<<"de">>, <<"navigation">>, <<"Results">>, <<"Ergebnisse">>},
-+          {<<"de">>, <<"navigation">>, <<"Resources">>, <<"Ressourcen">>}],
-+    _ = [{ok,Res} = lgettext(A, B, C) || {A,B,C,Res} <- Ts],
-+
-+    {'EXIT',_} = (catch lgettext(<<"d">>, <<"default">>, <<"Remove">>)),
-+    {'EXIT',_} = (catch lgettext("", <<"default">>, <<"Remove">>)),
-+    {'EXIT',_} = (catch lgettext(<<"de">>, <<"def">>, <<"Remove">>)),
-+    {'EXIT',_} = (catch lgettext(<<"de">>, <<"default">>, <<"Res">>)),
-+    ok.
-+
-+
-+lgettext(<<"de">>, <<"default">>, <<"Remove">>) ->
-+    {ok, <<"a">>};
-+lgettext(<<"de">>, <<"default">>, <<"Remove from list">>) ->
-+    {ok, <<"a">>};
-+lgettext(<<"de">>, <<"default">>, <<"Remove from the list">>) ->
-+    {ok, <<"a">>};
-+lgettext(<<"de">>, <<"default">>, <<"Results">>) ->
-+    {ok, <<"Ergebnisse">>};
-+lgettext(<<"de">>, <<"default">>, <<"Reservatio">>) ->
-+    {ok, <<"a">>};
-+lgettext(<<"de">>, <<"navigation">>, <<"Results">>) ->
-+    {ok, <<"Ergebnisse">>};
-+lgettext(<<"de">>, <<"navigation">>, <<"Resources">>) ->
-+    {ok, <<"Ressourcen">>}.
-+
-+
- check(F, R) ->
-     R = F().
- 
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index bbd2ae66456..b7736de3ecc 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,7 +1,7 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=20.1
-revision=4
+version=20.2
+revision=1
 create_wrksrc=yes
 build_wrksrc=otp_src_${version}
 build_style=gnu-configure
@@ -15,8 +15,8 @@ license="Apache-2.0"
 homepage="http://www.erlang.org/"
 distfiles="http://www.erlang.org/download/otp_src_${version}.tar.gz
  http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"
-checksum="900d35eb563607785a8e27f4b4c03cf6c98b4596028c5d6958569ddde5d4ddbf
- 05ccf82ff85316e2eb1bebf1a1741dfac1ee450ed49cf0be365f9d4fec6d7b46"
+checksum="24d9895e84b800bf0145d6b3042c2f2087eb31780a4a45565206844b41eb8f23
+ 950e088f9e47fc10a98e3f67d6420a990650836c648686a2f5dafe331747cbdf"
 
 build_options="x11"