gentoo resync : 15.06.2021

3 files changed, 55 insertions, 10 deletions

diff --git a/dev-erlang/idna/Manifest b/dev-erlang/idna/Manifest
index a13597edbe1f..a7d8d931db65 100644
--- a/dev-erlang/idna/Manifest
+++ b/dev-erlang/idna/Manifest
@@ -1,4 +1,4 @@
-AUX idna-remove-unicode_util_compat.diff 3444 BLAKE2B 7b45729159ff91beb386208c02eb726d32f760cd63537cd80521be56803c5bfcc12299093ff4c8a3fea27b46b016063a73b050c0ece6617ae3709101dc5ad9bb SHA512 25a2f9333711184ddf192fb0d7ca98d50bbb74628572c0e7a144078489561fcc2d2a3a9a7424d84cac74f87a7b370f0fc4947ab1ff01fc079577be272d94631e
+AUX 0001-Remove-dependency-on-unicode_util_compat.patch 4911 BLAKE2B 6705a63cb6d68e8fa49e9491237d756d17a46b3ae698dea1bc533f185299911b2347be9388272e603c3cd2f8b65c886cc1c859d6ffa9bed0047bf8ac594f2e69 SHA512 9d4484d91092d6add18eb7b16c7abd717e0a9e2145ac09e25259c7621b122a5ef183ccc6aa605002f496e1d0b16818aabfc22258182bcc08559f23d2d6bb8321
 DIST idna-6.0.0.tar.gz 740802 BLAKE2B 91bc6ee4031450b00659415125e8cec3f034f988bb7d307d323b0a7ca53450d42f0e84a044ccb6c198107c253b70e54466e77b2b0b4e9dd7f7051da49872be33 SHA512 59f8996199f7e3391b1da1b8fb1ebb70e442838eab1f26af9a8a8545f3e1b9f72f0afd65108272a51d846b34e0e8abe9623f10c89156ebca3d87b6b3eb63a066
-EBUILD idna-6.0.0.ebuild 656 BLAKE2B 5bf53827ccefd89f1df77a1ee174ebcccedff78fba74caf9496ab0651c15509652348e2c1f391985f71e2fc831f888d224ba3665b6c7278fbae376141d6356f7 SHA512 2937093a77e55cd05abd39df7cda279ad6519397fdd2498f460a8b8ae9713fbe0ffe7d5c4f2a64fd3a73e84ea5fc4866fce425a7e6b66a9942524458a39defe8
+EBUILD idna-6.0.0-r1.ebuild 675 BLAKE2B 73bc316599521fd9dd760ec6e39da9cf4e91a30209b9fa844235f84d5c9f53207f6bb1bfc2b60196de9db359df6e32c249ee24e3762673381ef02761c39633f9 SHA512 f2ffecc74d764cb2699d74edc82f80872aeca44a3ba27529e012f894e2da6e2ceb27e5ddc9815aa5178b689fe322901acd38b3e63bc1268eb3fdb9f9e8200399
 MISC metadata.xml 304 BLAKE2B 2b2842ba00aebaf921f5681602aecd852190006dc8ae7e6fec8b947b70f201bc4a0828940e2ee7608ba92489b73331092dfed1b5349f89acef84c7980fb3127c SHA512 bd74f4f66daaf228c6e94fedeaf31151c2fc1c28d003b62e54dae6aa5ab8949512585ef5cd90f9a42e0023d50073b80edd4dcfdec46442bc37353c2b8e6b2532
diff --git a/dev-erlang/idna/files/idna-remove-unicode_util_compat.diff b/dev-erlang/idna/files/0001-Remove-dependency-on-unicode_util_compat.patch
index d369cefbf2a6..0737b1842360 100644
--- a/dev-erlang/idna/files/idna-remove-unicode_util_compat.diff
+++ b/dev-erlang/idna/files/0001-Remove-dependency-on-unicode_util_compat.patch
@@ -1,5 +1,34 @@
+From 9c91cd33265f4706e5e614349b879c059ffaeaf9 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Thu, 8 Apr 2021 19:43:43 +0200
+Subject: [PATCH] Remove dependency on unicode_util_compat
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Newer erlang versions, and this includes all dev-lang/erlang version
+currently in ::gentoo, do not require unicode_util_compat.
+
+This is based on
+https://github.com/benoitc/erlang-idna/pull/31/. Holger Weiß suggested
+to additionaly patch unicode_util_compat out of
+src/idna.app.src. Thanks Holger. :)
+
+Signed-off-by: Florian Schmaus <flo@geekplace.eu>
+Suggested-by: Holger Weiß <holger@zedat.fu-berlin.de>
+---
+ rebar.config         |  2 +-
+ rebar.config.script  | 11 -----------
+ rebar.lock           |  6 ------
+ src/idna.app.src     |  2 +-
+ src/idna.erl         | 10 +++++-----
+ src/idna_context.erl |  4 ++--
+ 6 files changed, 9 insertions(+), 26 deletions(-)
+ delete mode 100644 rebar.config.script
+ delete mode 100644 rebar.lock
+
 diff --git a/rebar.config b/rebar.config
-index 84fd954..cd02013 100644
+index 84fd954aea01..cd0201386367 100644
 --- a/rebar.config
 +++ b/rebar.config
 @@ -1,3 +1,3 @@
@@ -9,7 +38,7 @@ index 84fd954..cd02013 100644
 +{deps, []}.
 diff --git a/rebar.config.script b/rebar.config.script
 deleted file mode 100644
-index d2bce94..0000000
+index d2bce945b8b2..000000000000
 --- a/rebar.config.script
 +++ /dev/null
 @@ -1,11 +0,0 @@
@@ -26,7 +55,7 @@ index d2bce94..0000000
 -end.
 diff --git a/rebar.lock b/rebar.lock
 deleted file mode 100644
-index 15fc8a1..0000000
+index 15fc8a117070..000000000000
 --- a/rebar.lock
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -36,8 +65,21 @@ index 15fc8a1..0000000
 -{pkg_hash,[
 - {<<"unicode_util_compat">>, <<"D869E4C68901DD9531385BB0C8C40444EBF624E60B6962D95952775CAC5E90CD">>}]}
 -].
+diff --git a/src/idna.app.src b/src/idna.app.src
+index a6a75374351b..d6475067c2ad 100644
+--- a/src/idna.app.src
++++ b/src/idna.app.src
+@@ -3,7 +3,7 @@
+   {vsn, "6.0.0"},
+   {modules, []},
+   {registered, []},
+-  {applications, [kernel, stdlib, unicode_util_compat]},
++  {applications, [kernel, stdlib]},
+ 
+   {maintainers, ["Benoit Chesneau"]},
+   {licenses, ["BSD"]},
 diff --git a/src/idna.erl b/src/idna.erl
-index 5f010b3..32b1745 100644
+index 3436dd995477..24d96b810ceb 100644
 --- a/src/idna.erl
 +++ b/src/idna.erl
 @@ -333,7 +333,7 @@ lowercase_list([], true) ->
@@ -80,7 +122,7 @@ index 5f010b3..32b1745 100644
      [CP|Str] -> [CP|characters_to_nfc_list(Str)];
      [] -> []
 diff --git a/src/idna_context.erl b/src/idna_context.erl
-index afcb814..a09ff1f 100644
+index afcb814956e3..a09ff1f92992 100644
 --- a/src/idna_context.erl
 +++ b/src/idna_context.erl
 @@ -28,7 +28,7 @@ valid_contextj(Label, Pos) ->
@@ -101,3 +143,6 @@ index afcb814..a09ff1f 100644
      #{ ccc := ?virama_combining_class } -> true;
      _ -> false
    end;
+-- 
+2.30.2
+
diff --git a/dev-erlang/idna/idna-6.0.0.ebuild b/dev-erlang/idna/idna-6.0.0-r1.ebuild
index 597fc28fad44..853b273e7c8a 100644
--- a/dev-erlang/idna/idna-6.0.0.ebuild
+++ b/dev-erlang/idna/idna-6.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,5 +21,5 @@ DOCS=( CHANGELOG README.md )
 S="${WORKDIR}/erlang-idna-${PV}"
 
 # Removes dependency to workaround for older erlang versions.
-# Patch from https://github.com/benoitc/erlang-idna/pull/31
-PATCHES=( "${FILESDIR}/idna-remove-unicode_util_compat.diff" )
+# Patch based on https://github.com/benoitc/erlang-idna/pull/31
+PATCHES=( "${FILESDIR}/0001-Remove-dependency-on-unicode_util_compat.patch" )