gentoo resync : 12.05.2022

6 files changed, 29 insertions, 20 deletions

diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 5bf509858f24..2c577c2b084c 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -9,8 +9,8 @@ DIST libgcrypt-1.8.9.tar.bz2 2988243 BLAKE2B d778bc3007dfcc08f3fab0325609911aa2c
 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.1.ebuild 4975 BLAKE2B 19bf72708616e402914bd47e8f44f3240f6475e1d43d346af7bf34b28d4dd2f623a6aa95e52bc0d395fa55acd00b121c04c391e614f25672658e10801ff12afe SHA512 4fae55fac4979a6f87a8ab6c43a5679cc335f31cf60be70ecfc237f3f4f4e6d4f7d4ff2cb482a190a6b14758bd2d23fe0c6b0018fe639fddf99a23c1ff3a4a2b
-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 5021 BLAKE2B 6b299d1f1da112370b285d13bb3b5ae21f266ee1410781e776239b82553d1b5e0c70347db286f15dd9b1f5af696f6da4fe8f4d5ab98a4306dbea459f102c7588 SHA512 904493a1e5cd8a5a2c1c72e08b1654438803fbc0a4dab25124bfdfdf97fe97a4839530a7e647bf0498b492970fef04b4db96301073e045edef541505c67d344c
-MISC metadata.xml 597 BLAKE2B c16e58e302622a51420a94adf5a3f47bf16e49cf5c3e21f5c552d1f64a533aa9ad9a58ae15fb4a314bf7bc833706f0a35ca74305fe96e40a6f8a5b20a267e2c6 SHA512 0d5ea002080a6e0d656c2be39b725168a323ec9536ec85cf791d64d7f0dd8255e3dd541934866c61d61d19789860fc71b2f6fa11ffdfc9b83c8177773f451632
+EBUILD libgcrypt-1.10.1.ebuild 4995 BLAKE2B fdd0fff1d60aa2d68b8e0a78fed591533d17afa0b2b14a7d9f75a998fb1b62504328e48bf775f99e70d928a4368fa955ae42c843ffc81e2606b0f096b3c5fe50 SHA512 d1fbb464b6037763154708075e219a7336214d9397cf1dee4d8079687f13bb4c7097037fe33b4f6ce8412f63e5c1bf93f91b60bf301e62a481c6a183a18816c4
+EBUILD libgcrypt-1.8.8.ebuild 2372 BLAKE2B 21f92c71781df1c5a9aee35607d715862a7e783b3cbd0bc1d485d301561b93575eec52de5719340fd12ab70deaae597986d018ed54843b6b0ad2dcc3c688e862 SHA512 e3b54b5d8e03fd05635f743d88810df26e30b7a49f0e2b97357c9d6e817069d1dd67fea06c5ff9868fc82c4b08aa6f15c6cc0c162b4cfd6e07fe612471751b38
+EBUILD libgcrypt-1.8.9.ebuild 2988 BLAKE2B fcaf467155ca9920783968abca12c3fd38f08feac71bd2761ad20c7ccedc6bbd2ac4d135b50aa15725513fe575f23f44aa442d2cac984dfbf9c902a3c4bb836e SHA512 57b5be8ed25acf4c8e94619daaa420e44629e0e0d2edf7895ca071f587b90e9ca564845ba5d78443e317a99f1a9fd32de6e4baec3853db7f03a3d4f0f8374f3b
+EBUILD libgcrypt-1.9.4-r1.ebuild 5034 BLAKE2B 7d86db0250845980cc3a75d080d2e6c7bafc50228067d91ab79c0adae9e513fd3b62454913d496af23e8f490ef9288ac0e0f26613c3817c5c0b0dd588a33a85b SHA512 e94468aadb9da088f536e8cba8d0247e972d40c7f1bf6f644ee169bf7c8ccb9ff51f7d4ec7f2f1b7a85e5056ab2311b61ca59227b7badf848fa7b02b2a2c3182
+MISC metadata.xml 524 BLAKE2B ab417ec172246d92822cafcadf2ccb72d2b8e0c056d93f1575284afbfc30dae74086d5a3b2d0bc60ec03de0a9f02ac08dc8f961f1f38eb639d862708886141ee SHA512 52d663d33d8d76f5a4613d1fded0630a5597796b0c20ddfc5eecda92fbf28f4f3b8c976e2fdb418cebd9d743ca26b1c6329ad65e1655f6eae5c1d797df1d1f95
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
index 00b641cf2b84..a3eb80ef2918 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1.ebuild
@@ -13,8 +13,8 @@ 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"
-IUSE="+asm custom-cflags 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 static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
 # If changing this, update src_configure logic too.
@@ -92,21 +92,23 @@ multilib_src_configure() {
 		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
 		# required for sys-power/suspend[crypt], bug 751568
 		$(use_enable static-libs static)
-		$(use_enable !custom-cflags O-flag-munging)
 
 		# disabled due to various applications requiring privileges
 		# after libgcrypt drops them (bug #468616)
 		--without-capabilities
 
 		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+		# bug #832871
+		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 }
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
index 45f5a784c691..ce9198c81c91 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 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"
-IUSE="doc o-flag-munging static-libs"
+IUSE="+asm doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -51,12 +51,15 @@ multilib_src_configure() {
 
 		# required for sys-power/suspend[crypt], bug 751568
 		$(use_enable static-libs static)
-		$(use_enable o-flag-munging O-flag-munging)
 
 		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+		# bug #832871
+		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
 
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 	)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
index 98812288ba3c..b9701d819762 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.9.ebuild
@@ -14,7 +14,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"
-IUSE="doc o-flag-munging static-libs"
+IUSE="+asm doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -62,12 +62,15 @@ multilib_src_configure() {
 
 		# required for sys-power/suspend[crypt], bug 751568
 		$(use_enable static-libs static)
-		$(use_enable o-flag-munging O-flag-munging)
 
 		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+		# bug #832871
+		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
+
+		$(use asm || echo "--disable-asm")
 
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 	)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
index 8a228b0fe2c4..e7d9fb4c996d 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r1.ebuild
@@ -14,7 +14,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"
-IUSE="+asm custom-cflags 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 static-libs"
+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 static-libs"
 
 # Build system only has --disable-arm-crypto-support right now
 # If changing this, update src_configure logic too.
@@ -93,21 +93,23 @@ multilib_src_configure() {
 		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
 		# required for sys-power/suspend[crypt], bug 751568
 		$(use_enable static-libs static)
-		$(use_enable !custom-cflags O-flag-munging)
 
 		# disabled due to various applications requiring privileges
 		# after libgcrypt drops them (bug #468616)
 		--without-capabilities
 
 		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+		# bug #832871
+		$([[ ${CHOST} == hppa1.1* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 }
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index afd8e678af72..5ec9f7d1803a 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -14,6 +14,5 @@
 	</upstream>
 	<use>
 		<flag name="asm">Enable assembly for optimization</flag>
-		<flag name="o-flag-munging">Enable O-flag mangling during build</flag>
 	</use>
 </pkgmetadata>