gentoo auto-resync : 03:04:2023 - 17:20:42

3 files changed, 55 insertions, 2 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 9e464c7318b8..23a033584cc6 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,3 +1,4 @@
+AUX libgcrypt-1.10-build-Allow-build-with-Oz.patch 1548 BLAKE2B 251e530bf2256492d95a91f2f4236344d0fced1e33ca419bd5c9ed2a7ad9f066f536f1a83c7fcaffa8c2a451611b28e2006218f091da67297bc2061bbdeea18c SHA512 124d5e3c74fd00af97219838233c3088f8d37a72ed2e086252696ab1a80e7a009414902aab49026dfd464347ef5ee979670ce65d2ea12b173328b1af83ac7a3b
 AUX libgcrypt-1.10.1-configure-clang16.patch 5972 BLAKE2B d0b45199e11cdfea1b26e8efd85b978e2d903712e10f4d5f8e9edcad91f3adc6314f4afe7ece897cb190bbfe59e8713ead45b857b8fdeb485428e3a41f73520e SHA512 b7e4565a58356859f4cb37b51cbdd859280c55c8797af893e622b75c4748b0509d2ea33c946a4c9bc3c9a1479b9edaa6e8884d2f221f7410f7bb8639aefc9cc7
 AUX libgcrypt-1.10.1-fix-no-asm-hppa.patch 1166 BLAKE2B 17b27fd88b0e9ccf97c3f46780f16495d6df84e3d58ed9073af6f200908422273a6cbaa18a7285b87db2203c12a9f45f6d2853caf05d667be94a95979b5a0c47 SHA512 02e0c174844fd56da7212518f41b582894e72714e9cbc013448a5eea748cedc7d6ee5719af4049ee6695b83b5f44eb63e6c95972096ba0fc180c2cfe2482ad6e
 AUX libgcrypt-1.9.4-arm-neon-compile-fix.patch 1389 BLAKE2B 548fc764050f322786f3c0ec8f806a6a897987115db0cfd8a2a4f1ffc134a31e9069dca4e334a7a5288f5176ce8e2e8450dc2003c56915d5fdd4dc3c11012c0a SHA512 0b83ab2585502d65d1ccf36440f4a73aa9a9d3a8cb40375ca6a4e81fcc962040fb233df9a345c823281605c061b8ea0e509e0e16a5c3a32581a279e5904bbfd0
@@ -9,6 +10,6 @@ DIST libgcrypt-1.10.1.tar.bz2.sig 119 BLAKE2B 5261d7dbfd5d82b2d3fa2ebf864a9ef0c7
 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.1-r2.ebuild 6237 BLAKE2B 0246702c6936eeb86f380b1e1757d7e98b25a88f0e287a68286d141fd085372b4b2b89a512be141db66edfc8117a918fb18d0e8958f91b7528a56e3db5487f45 SHA512 251f1389ffe471a63674bcc9329d6291dcf4cca5a0771a5b7748082efebd76f0247b433a460dae74630acb140a122708fc222e140c3d82e1d906ea5efb0849ea
-EBUILD libgcrypt-1.10.1-r3.ebuild 6293 BLAKE2B 9f47b68103120114845947d408e5a9d0cbdc88c05963f93f94c8540a579dd5a31d4c7365de4a3b1629bbe24e31962442653341a992ca31c50b48f4484bca96a7 SHA512 394638a47263c787fbf25cce9e256cab047b5d00ed8f0bf1cb7868e775a3f85f509043fa990cae3f8ac6b8a9d25b6a45999cdc29f3c5e14d2f30d666fb869e39
+EBUILD libgcrypt-1.10.1-r3.ebuild 6357 BLAKE2B d2e7264aa7e6037096828475b20568b1dd584c5f5e0d6a323a3661518c894156f88a11401ee01933054e50b6354c80a4fe86d54164b254430f18e7816f91b626 SHA512 11a2ee473792911678d13b1f506888f4045fd6196647e3a3202da4892b2d3e9d3f6681a829bf3ca0cd4ddc3481354a1cfe198ef65490c8d71107e54db9b7409e
 EBUILD libgcrypt-1.9.4-r2.ebuild 5282 BLAKE2B f86b756b1497055d15abbb53c603d144b368c18294d7fa48f18a26eba7edd3544f4c35484f9c9acacd63f1912536f64bb7071eb4bc52f919ef161ba3da003f1a SHA512 21fddd979d7529486278d9fa0b0b076dce1aa3219cfcf9af95e4ee1b6730546437ab83aca869b74a8e61413b421eddaa38495bb3e3a8aefad336a76ac5b72a15
 MISC metadata.xml 510 BLAKE2B 1c3a524d74fb388a17465acdeb777872600347779635e33b8f235b59a464690cfd2ecd690b8fc0080600f1180e98255fe367dbb0dab70d04bf546ad7839de72a SHA512 2d1f11194b5ee566ed7a787fa7e40ee2e14511e9f94467ea84b4b3a8395a908c0f95044bda0714dc7426f47d81b0ff977d15654bd06316cfd4a00424242ae900
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10-build-Allow-build-with-Oz.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10-build-Allow-build-with-Oz.patch
new file mode 100644
index 000000000000..c54499e15dba
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.10-build-Allow-build-with-Oz.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/902765
+https://dev.gnupg.org/T6432
+https://dev.gnupg.org/rC7edf1abb9a0d892a80cbf7ab42f64b2720671ee9
+
+From 7edf1abb9a0d892a80cbf7ab42f64b2720671ee9 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 3 Apr 2023 14:00:15 +0900
+Subject: [PATCH] build: Allow build with -Oz.
+
+* cipher/Makefile.am [ENABLE_O_FLAG_MUNGING]: Support -Oz.
+* random/Makefile.am [ENABLE_O_FLAG_MUNGING]: Support -Oz.
+
+--
+
+GnuPG-bug-id: 6432
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ cipher/Makefile.am | 2 +-
+ random/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cipher/Makefile.am b/cipher/Makefile.am
+index cf1fbe85..e67b1ee2 100644
+--- a/cipher/Makefile.am
++++ b/cipher/Makefile.am
+@@ -165,7 +165,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
+ 
+ 
+ if ENABLE_O_FLAG_MUNGING
+-o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g'
++o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
+ else
+ o_flag_munging = cat
+ endif
+diff --git a/random/Makefile.am b/random/Makefile.am
+index af978570..0c935a05 100644
+--- a/random/Makefile.am
++++ b/random/Makefile.am
+@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
+ 
+ # The rndjent module needs to be compiled without optimization.  */
+ if ENABLE_O_FLAG_MUNGING
+-o_flag_munging = sed -e 's/-O\([1-9sg][1-9sg]*\)/-O0/g' -e 's/-Ofast/-O0/g'
++o_flag_munging = sed -e 's/-O\([1-9sgz][1-9sgz]*\)/-O0/g' -e 's/-Ofast/-O0/g'
+ else
+ o_flag_munging = cat
+ endif
+-- 
+2.40.0
+
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
index 2d2497903a5b..f813838f223c 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch
 	"${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch
 	"${FILESDIR}"/${PN}-1.10.1-configure-clang16.patch
+	"${FILESDIR}"/libgcrypt-1.10-build-Allow-build-with-Oz.patch
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -102,7 +103,8 @@ multilib_src_configure() {
 	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
 	# https://dev.gnupg.org/T5581
 	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
-	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) &&
+		(($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
 		append-flags -fno-tree-loop-vectorize
 	fi