gentoo resync : 16.04.2022

3 files changed, 20 insertions, 7 deletions

diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 7b10870abd2b..90af7a9260e6 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -1,4 +1,4 @@
-AUX difftastic-0.24.0-regex-dep.patch 483 BLAKE2B ecc1d6a712c285192abfc63d80fa44cec7e318f2aeb7618b1eff60b5c09b68b60844be68d072c6d21542583be5c89504ded95befed0ddca0897f1545f8371d4d SHA512 55ddeb8b9ebd6d2067ad189821e3ea31fbd9f99a68bc20de85f8ba4aa848e840487c3baeb72811efd43e538a14e04d2dfd1d75aabf3f2386380d737b285779ef
+AUX difftastic-0.26.3-regex-dep.patch 771 BLAKE2B ca4d4b2d360491f4f2b7277aff19788a3702798198fa7ae1034eae8fa4473b20f7a54c96668dc7185b1f4dc824b0cfd5f54c7ea525d9bb6aa6b82247d98819e3 SHA512 474ee6e7674b3280d45e989e78e7195cf72491ea9f6fd26f79cd00579ae738b2c325df51fd185230ba439d82f8fbd758182c8212b06fd902bf534cb04f26f050
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST archery-0.4.0.crate 21265 BLAKE2B d5e98cd65b7ae426affc3cd905d7cc4b4296c059a305ae5bb3cfcb206f0bffb6dc4aaf24c820d855ca8acd1be1bd80e2bd8c2e172af5824bcd9b300224d8159b SHA512 4726598957f2fda480fe4fb28b518307030dc032b1b79a9ce83a5e58872e57517a632e205cb83870f48937c3090956045faa066171248d615cb6b029127ee693
@@ -16,7 +16,7 @@ DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ce
 DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
 DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST difftastic-0.25.0.tar.gz 8645342 BLAKE2B 2e7b72881849c655b838e20a64c477f0c2763e345b54979a052b14ff35c1adee0edd9b9ee03a6109416397c3eed9bbd1d49f9a2ad4b32b8c05f9066b68a15032 SHA512 b421a591cbd896cacff832ce0e39cb9fc952690f2e334969bdd2722ff17b43f5c6fd81a4223490e38e0a9c5b639a558c6c3682123d5280ba5f29950072626473
+DIST difftastic-0.26.3.tar.gz 10100584 BLAKE2B 9121a9747f761f13830028d8ae01655d6d15ceb846f966b92d905224f54280a354873afb19419fb3a496e67ebca12df1cf15369e69588a1066d7682bea0fee93 SHA512 91ef6c359e709f0f63d3627621ed6a03627248cb31ef90ce1a617294425d5ca8803f3f7608d1b2c1326fd1247ee89a8fc200f1188c659028d9af43bc69fa9467
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
@@ -64,5 +64,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wu-diff-0.1.2.crate 33439 BLAKE2B 78b90ed8a42b3a7a1697f92227edb9f0cb8e74583edf8079b8f85110f6fc049eb68370e93ead3940ae222d108c2f18b7f301e9285968e046d362669a79bbb3ca SHA512 6d93c8854dba66f48f736db3f9e997d11d07a0fef3e13219716e553c0f5936f1d00468b88d9164329cfd195271aa242ec7dfd58560074f1a41e8558719ba5af0
-EBUILD difftastic-0.25.0.ebuild 2158 BLAKE2B 50f13dae2d74fe6235d617c24b41c8f6ce9503d9d38f716c5e3742b9dd36661455acf61d124b533f44a70fde95b5b100692a62837beb9fed81d675283d3b37d2 SHA512 91a7071317ef0314bfaf2ec1909854789d2e4de70b7237a70fa6f09ed104411ba0b77f739dadeab03347ced6c2838fbcc2a24bb76db2fc3d37e263e14cd8e774
+EBUILD difftastic-0.26.3.ebuild 2145 BLAKE2B 34dcf62c98c13b89a971a0e1a33ce2e8bdfc0363dfed90bef5dc1e392cf1bdaeaecf6f2cbff7e1f8963ec48239b77093df342c6f3d626eaa0b03a7b4b1f14b43 SHA512 a02890feab24a41b10f2acc9a79775f3a80bfb1b764991ef7e3984a336ddf13210531a7ac05f0b9f91d5f40e0c8c4ae95ea57ef1999aa43d29d5dc26979f741d
 MISC metadata.xml 333 BLAKE2B 3ba43124273c8969651c7ff68c86718cf0484850e98b2e5de2b4aaacea67e95609b286c6156dc74cb1fa1201e198f0cb685b9cb1f80a6c81cfb8b712dec96a05 SHA512 0726b7ca030ff47d0a304f30f97671e7274905c9c5187edd61eba9224207430ad1cd98d76ecb4120f8b9d722e628834f7bc3d0a3734ef22f0df48fcb44c6c2b3
diff --git a/dev-util/difftastic/difftastic-0.25.0.ebuild b/dev-util/difftastic/difftastic-0.26.3.ebuild
index e1b4ece14a37..cfca879d4a2f 100644
--- a/dev-util/difftastic/difftastic-0.25.0.ebuild
+++ b/dev-util/difftastic/difftastic-0.26.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2017-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Auto-Generated by cargo-ebuild 0.3.2-alpha.0
+# Auto-Generated by cargo-ebuild 0.5.1
 
 EAPI=8
 
@@ -93,7 +93,7 @@ RESTRICT="mirror"
 QA_FLAGS_IGNORED="usr/bin/difft"
 
 PATCHES=(
-	"${FILESDIR}/difftastic-0.24.0-regex-dep.patch"
+	"${FILESDIR}/difftastic-0.26.3-regex-dep.patch"
 )
 
 DOCS=(
diff --git a/dev-util/difftastic/files/difftastic-0.24.0-regex-dep.patch b/dev-util/difftastic/files/difftastic-0.26.3-regex-dep.patch
index 20a8c60e273c..e5f25935074b 100644
--- a/dev-util/difftastic/files/difftastic-0.24.0-regex-dep.patch
+++ b/dev-util/difftastic/files/difftastic-0.26.3-regex-dep.patch
@@ -1,5 +1,5 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index d1c2f2d11..7a80ce5f8 100644
+index b31dab30f..a3e7795aa 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
 @@ -418,9 +418,9 @@ dependencies = [
@@ -14,3 +14,16 @@ index d1c2f2d11..7a80ce5f8 100644
  dependencies = [
   "aho-corasick",
   "memchr",
+diff --git a/Cargo.toml b/Cargo.toml
+index f5916fa44..8d7cf3ea2 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -21,7 +21,7 @@ include = [
+ ]
+ 
+ [dependencies]
+-regex = "1.5.4"
++regex = "1.5.5"
+ clap = { version = "3.0.13", features = ["cargo"] }
+ itertools = "0.10.1"
+ typed-arena = "2.0.1"