gentoo resync : 06.04.2022

3 files changed, 4 insertions, 33 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 93680bdfd90d..1dec877f1f8d 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,16 +1,15 @@
-AUX libgcrypt-1.10.0-musl-jitterentropy-includes.patch 723 BLAKE2B 8cfd1f1026e7252de843cb4ca8df68ac2735a332be956b116dd3dab3330d216bfa1e0cce8a9d93f5caf88ea4b053c2765167a7646bab3c2850ad0c469e395e50 SHA512 6cde4a5235ae5f42f2affd28acba5509825aa190beb8e2324b9efc756b61245b57ad556f9f819295b66840a00a57bd1e585ea835860c0d8dd9bdeb6a9b832513
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
 AUX libgcrypt-powerpc-darwin.patch 444 BLAKE2B 37b95d21f0df07c5c06cd7e1e1efe73d02b9ac59dfe2a31d43b7a535bed356ff24095d528662d58a0cdc9c3eb25de50b5b5a4d9feb0ddb917a42f9332b33982e SHA512 2a2e7e84222f4672a70df827955bb8592e714580fecf6b5238e131038460169f9d80fd04d63d6e232f6fc448c04e0acf214993537ef22e297ea98a4d12c6ade5
-DIST libgcrypt-1.10.0.tar.bz2 3774491 BLAKE2B 7ebeced542c19de7a23fc16b03b030f535097665d3304817219744e2e5f9d02cadaa811ab24bfa3b706776b586daf6f0266b444a1a7c4eb8756ae0d7319e05fa SHA512 785c2e14272308956bb6adcea9567c4097edf103122e18cd3907fb42a110a48a5d59c0057f05a438acd7f221c70c7f7ff87e176bd6d7ed99d16e847f9d7be087
-DIST libgcrypt-1.10.0.tar.bz2.sig 119 BLAKE2B 3d19256687993a38384934c4d9c3a4e7ac0cc11c2e9ff901d3432d7145d39a561904ca5879651a4e26ad4bfc105ee3d39f47d4eb7d0da3a5f15d605f2e33c5ac SHA512 75201612225b206faaae284297e92d1b25dcaf0665bcf1f4c5cc9a3a750a803063d0f7bd0af556dbe419f1276c953ce047554fd18a144a90085a42a7ec885168
+DIST libgcrypt-1.10.1.tar.bz2 3778457 BLAKE2B 46f30459891183b6d9ec18f1c7907fee0ad156c7dd75044f3db2b4d1c19dc6f30b2dfa6f85bc82adc9243aaba913e40fb6faf77d2226ca5a33897220d032437a SHA512 e5ca7966624fff16c3013795836a2c4377f0193dbb4ac5ad2b79654b1fa8992e17d83816569a402212dc8367a7980d4141f5d6ac282bae6b9f02186365b61f13
+DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7c978dd66a71c078df7bbb3b63f5d85180e5f909f43a49712fc16c45f7aabaa6bc30ed82a39ffc9a5d483ea6a94d162 SHA512 b156ae05079776698bc95ba5a9e48e95de8f716aa1760ef4b2e7cb8518ccec660337fc7823f865bde870461800d472fd8e458d03a7095b6bb614f6dd96f796d8
 DIST libgcrypt-1.8.8.tar.bz2 2987685 BLAKE2B 7b590c06d91403f1bbfa108379b3747271e9c83acc5547a4d43ef9ada9b0b7c78654cdc24f6cd0db012d50628ae4ec9320dcb63a901ec2dadde6a7ed56dbed7e SHA512 9861f3b5da3cb013eb79efbf2859864f8c2c11b41484b051c981c45cc0bf1569202838226da10ebddeb7a7b7f39ebd3a95f107b9bf6f908074ccc9a51ea94db8
 DIST libgcrypt-1.8.9.tar.bz2 2988243 BLAKE2B d778bc3007dfcc08f3fab0325609911aa2cde5eb46703fab11f0fdfaf4670a9fde0634b40eb408957a9942e9d3fb0a69290c0878bed59770ffe56bbe6103bcf3 SHA512 6d5a06c5bded61cc740b7883a011e65fd8d878d446160714f26cd42203a32a134ccb302e7577762ae43fec4887cdb6fb4b5413e77614c9e4cfba15ae0a093516
 DIST libgcrypt-1.8.9.tar.bz2.sig 119 BLAKE2B 147fd4701eb5c91c43e1ca21f56b36f8d999c5b1a23bb2f454a05e1ef657a4a96c06b27f2d5c867c8adb9764b9d6d80480a69160b2cd2ad1704c1ff18a37fac5 SHA512 785cb3b3950e6b7102d81cee3690b99b11aa60102ab4333370e60874ad8bbdb2f89ce1b5e0ce9215adce1cdc2a3fe84bb7a92a80830594aa3f74e4129d16ad95
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
-EBUILD libgcrypt-1.10.0.ebuild 5033 BLAKE2B b9c2315616bacd5b5f4b7791c31b2ef008795864bc0cce5de7b4c5f23f1625c3b917141776f371d4a6671ad938922816cb15a0e5c4e0f42ffb4beb2e45ca932c SHA512 09d28b60dd8eb4d9abcfbdc0dfe73dcb758332fec9b99daf1655a35aeb773e070eac21462b60b5e7112d079743b44af2a7ae34d91e308a5300e0b229fc0d3754
+EBUILD libgcrypt-1.10.1.ebuild 4977 BLAKE2B 7add0ebe773b2457ed1adaeb533ee7693452de606eda9fd678d58bf27092d17949bb466feaa44016b38572ebf26451fa679b88fcc3c79c20e79e0a73fb621d13 SHA512 8045c4cd0c9d06d904c333fda7f91ef6053c39769277d40edd0d6efd882a06ad09827d7ada770b65089ce1d2df14be85d65fa738e555a4b894d22411e251a15d
 EBUILD libgcrypt-1.8.8.ebuild 2318 BLAKE2B 335fffac9a01ebe760a019fb668ce229f22ac6bc6aea38d2fd893fdda587d76895b0bf27146a32c4817d955eab4ac5ae9aa032a3157f9dcf3ae07a98599cc60e SHA512 eea978726cb25bb0c9de94b8617cabd3e5c28b20010ccfba2f4124a4609b655d496ea376d9d72bf07c031116433f74c03d69335950ce295d922ae83801a19ada
 EBUILD libgcrypt-1.8.9.ebuild 2934 BLAKE2B b9b08095da2b6a5e42d986bac58c47ebfc2715cb15e2ac7bec4d45d35a50e164beff508aa57502e15bb5e4c15dd1578e0dd0456cb5f3820f325432b232887609 SHA512 fdfe2903216563309ca7e36d15182b31ffa7b273d70f392cfc3257839204250b3d53be5329e6c8ffabac00bf97a14109f1ead74c698336a758e7d01a2f4a485b
 EBUILD libgcrypt-1.9.4-r1.ebuild 5022 BLAKE2B da966c552e2b4dc96e7cf799246d94bc14588545bebdec3f1e6609ac3926c7b1f9cc0fac8ba1ca2b43d6499d9ae9652ec60b6ceea4b27f88cf6bf3aa535b8efc SHA512 412ca793fe764ce72614e7c3547ad40714f55d12a86d1971da0f175432d53fd5ba3b9f591a9453d4785e15f1288fd2595bb80226ee13572994517aff3639a632
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10.0-musl-jitterentropy-includes.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10.0-musl-jitterentropy-includes.patch
deleted file mode 100644
index 205944dd7a1b..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.10.0-musl-jitterentropy-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=ffaef0be613121d3ee37867d82932a7a30c2bc6d
-
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Thu, 3 Feb 2022 22:46:41 +0000
-Subject: [PATCH] jitterentropy: Include <fcntl.h> and <limits.h>
-
-* random/jitterentropy-base-user.h: Include <fcntl.h> for O_RDONLY
-* random/jitterentropy-base-user.h: Include <limits.h> for LONG_MAX
-
---
-
-Fixes the build with musl libc.
-
-Signed-off-by: Heiko Becker <heirecka@exherbo.org>
---- a/random/jitterentropy-base-user.h
-+++ b/random/jitterentropy-base-user.h
-@@ -39,6 +39,9 @@
-  * DAMAGE.
-  */
- 
-+#include <fcntl.h>
-+#include <limits.h>
-+
- #ifndef GCRYPT_JITTERENTROPY_BASE_USER_H
- #define GCRYPT_JITTERENTROPY_BASE_USER_H
- 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
index 763e29359827..fd9f8ebaf6e8 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3 cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1 doc +o-flag-munging static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
@@ -38,8 +38,6 @@ BDEPEND="doc? ( virtual/texi2dvi )
 PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
-
-	"${FILESDIR}"/${P}-musl-jitterentropy-includes.patch
 )
 
 MULTILIB_CHOST_TOOLS=(