gentoo auto-resync : 26:06:2024 - 00:12:24

3 files changed, 56 insertions, 1 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 4c542359ef29..ce5edcae9738 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -2,6 +2,7 @@ AUX libgcrypt-1.10.2-darwin.patch 566 BLAKE2B 26819835249672cb95500a7edf01864244
 AUX libgcrypt-1.10.3-hppa.patch 4077 BLAKE2B 70636355c6218261db91171b8c579ad0f4a1515cdd945ddea223a88a9dcdf32b19bff181d48b858d5fe32a50fa8fcadd0517a6e6eeefac1162f1990ddb036939 SHA512 4e84284766f673d9adb848056ae14e29ed14a727be5a152d61a350a5a83f5166b9a33484d46e53210478d0d9c1381ce07c11bbc7d0af9d3a730ac745a0abe454
 AUX libgcrypt-1.10.3-x86-refactor.patch 15984 BLAKE2B 3de41f263b512060b5f0e4aea9392666746241226b9a5b52a3229cb50f014504fbfb94b5eb1b4c1e69632f5546f37e34e04ebfc63beb8eba87bfb30bccfe72c8 SHA512 36cca10afcf1c2e4cd2f1f180601aea4a38688927ec142d93a1d4342640d69fea7ce1c43b26d8aae9c010274cb6733f475695e5fff4e513a8b276f77d9babda8
 AUX libgcrypt-1.10.3-x86.patch 3600 BLAKE2B 6daea43af8019bba84e1015c5a0e82c557e2c7098fa6fb14d3f6a46bfcb6df4dcb32d9c9b6653098c06c2cd139ce696b2a21f791934925ec35175d1cfe147fc4 SHA512 71e03f8a59388be48077723716b8c5b1ea7d4206a20fddd318b9e2d4ffebfc99ef799ac1709e3e4eeadd007357c63d3c9f337a930716fdc24c82c05e4edd4a81
+AUX libgcrypt-1.11.0-o-flag-munging.patch 1836 BLAKE2B 856f0b36074c0548f3b3c2314cb3f0b4a6e8cb9540706df5f747d1aa94fd1da0673e786d9df924d385b1a8903f5b5d9c87f5d01700d37172d8968ce8f05a7f91 SHA512 87ec07d2c5e82d618e69cb7f27b6318602d1865ab042fcee900d445fcb85a36c3670c79d4d3a72efd51f0f603fb8e72f4baaaeb531b93e7cac0d40464126c5d7
 AUX libgcrypt-1.11.0-s390x.patch 1890 BLAKE2B 5ff6456e5edecdaabde6e1d6c9a711bd0759568c446a02a41cf96d400f65204529cddd440cda7ba8e4eebf51033240bedaa3dd13f600f2990a4506febb81b396 SHA512 4d0b743f0903ae5dcbfdb56a6e30e5804b482582b17c75098cbc54aba078b7dbcfbc5572c2e0de56862fbc420d488dab86ab4d80436ea4995c19b1f0f07db60b
 AUX libgcrypt-1.9.4-no-fgrep-libgcrypt-config.patch 646 BLAKE2B a6a4b46dfa9a113446fb10e3c66ab64c08ea2cb768acfe0f5057e102c827ca6e3d676e1970f9234db5bec86ea6745b765a412c1b5cdc263bd7154b169960b136 SHA512 a49af765a1175dd8041a500d3c7213df27c00699bf8a5202b080539bf2909084214d008509039c81d6a28a0f4a3b9fe1f45f89aaa87742bce9a5dd8c8c469fbf
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
@@ -15,5 +16,5 @@ DIST libgcrypt-1.11.0.tar.bz2.sig 119 BLAKE2B e64d59dae5556e2826f6d297988a3300c3
 EBUILD libgcrypt-1.10.2.ebuild 6279 BLAKE2B fd28a7d7f44d24dd9e8e773eeb11142fe88392ad875d6f44a539b128c25522593979e0b76fc2342d5f477a9e62bef50cc4bfcf2c7f6efddf5a24c46f35661935 SHA512 32d24c6936468a549950899444bbfa2a09a380ff16051de263cea5deb289d0e4f49b45f4fd077e381b3d09db1f7f6e916a801b455e18f828d8bd8ae75553c1ef
 EBUILD libgcrypt-1.10.3-r1.ebuild 6034 BLAKE2B a71c451082e294098fe4ad4ed6c82f925adfc662ea5cc9c3e934eaca22c3f0e960f8007222624b17f98138e187d46febae179cf02cd8807ae43ad83a871b951b SHA512 3a89c7f21462b51aa5c8398233932492f74d1a98513260bf5f62bb281eadd776c903b850391b0af657226aaea575b919590fb0d2c6449366e079cbca13ce6950
 EBUILD libgcrypt-1.10.3-r2.ebuild 6164 BLAKE2B 355cb523d36087e96ff8f903a48d8f3c0d20e29c8217551f32b728c69ded94abe1e77182dfdb2b294a39f86e28faa78e658614861fd123d08137b602b01c6a8a SHA512 cc0e0ab68773ee03f17547cd2e1da953ad0fa922977d9c573c9a97a761903a59ea35290168c32d4ca136c164c618fbe33650b13f507d28b22454705a5fce6bd9
-EBUILD libgcrypt-1.11.0.ebuild 6180 BLAKE2B 98c08bf2a14d981c723181171f2326a38f6335d50cc197886a048d44b83b62d3ab4411ea7883e7c551be3dec472c371f64bbd191545b36e847e1d7586be12982 SHA512 e1a9e3cc482c9489ee07c6d50848c7b9ccb03db9b1765c1091424ce8e7778cf6b39e5026102ac4a981c0993499d116ad984975af91c1a52e19ea03fbeb403dc5
+EBUILD libgcrypt-1.11.0.ebuild 6221 BLAKE2B dc0649a5fd738b466c7bc78206b1871bd1976b671e2fa9c32f4ab0d470186469d65540c33f3a4fce8cf43a0cb81c59025c5c5c84fb3e3337a90ad3269cbb6db0 SHA512 2514a841d7f336218e422cf4eb0bac25138a46c03147b24b0523e88404d81c98b6bb1e2f59e08f1d69b2943f62b01302fe2e696f94801a1d50ba2522bca9ce80
 MISC metadata.xml 451 BLAKE2B 3be914b8449db0938d868c7cf2df7fbcf29d7f2e9b91320dfb97f0c1bf6c22326f3a1c3f3b695eaacbe4d74bb3a0b733a7afc1f88e04a37d06a9d9ed25358efb SHA512 add260d64091e3aa1de6fb802f4cfd076c1520622ebe93ddf7a0312f8d46232bd330d9bd380e2bdef6aec15563b6d27f2733b5ebe624ad9d0965ed9c6456939d
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch
new file mode 100644
index 000000000000..161e4ad5c132
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/934801
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=e96df0c
+
+From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
+From: "simit.ghane" <simit.ghane@lge.com>
+Date: Tue, 11 Jun 2024 07:22:28 +0530
+Subject: [PATCH] random:cipher: handle substitution in sed command
+
+* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed
+expression.
+* random/Makefile.am (o_flag_munging): Likewise.
+--
+
+It was there earlier and accidentally removed from
+Makefile.am of cipher and random
+
+Signed-off-by: simit.ghane <simit.ghane@lge.com>
+[jk: add changelog to commit message]
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+---
+ 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 ea9014cc..149c9f21 100644
+--- a/cipher/Makefile.am
++++ b/cipher/Makefile.am
+@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
+ 
+ 
+ if ENABLE_O_FLAG_MUNGING
+-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g'
++o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
+ else
+ o_flag_munging = cat
+ endif
+diff --git a/random/Makefile.am b/random/Makefile.am
+index c7100ef8..a42e4306 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/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g'
++o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
+ else
+ o_flag_munging = cat
+ endif
+-- 
+2.30.2
+
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
index 10b42d5ca451..9e28b00286b3 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-multilib-syspath.patch
 	"${FILESDIR}"/${PN}-powerpc-darwin.patch
 	"${FILESDIR}"/${P}-s390x.patch
+	"${FILESDIR}"/${P}-o-flag-munging.patch
 )
 
 MULTILIB_CHOST_TOOLS=(