gentoo auto-resync : 04:01:2023 - 12:06:28

6 files changed, 46 insertions, 60 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d5b1f2bb2102..9f8d35deeb5c 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index dd130161a1df..e44ffda871e4 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -4,5 +4,4 @@ AUX 1.9.2-Makefile.patch 4250 BLAKE2B f71ed4b638a21d90249ec7e045ff15fa49f315c8ac
 AUX 1.9.2-clang16.patch 2098 BLAKE2B 1d6c58a5908a498d47244e24eb2518d992a8f1de09da32baad510d7db010a548006b00b8a3c21a7517fc433f5a1a75abbc9ee4831759421a93beff3bfbc25c97 SHA512 c74625f804a5cb892047b2fcb0fdf759224680eafb6e6392a9098d19af786b0b7392eeb6cceee0c57684403cd97c350f8880655eb487dbb8f57841086efb5d01
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
 EBUILD efitools-1.9.2-r1.ebuild 1119 BLAKE2B bd4c8cabbc7cacea06e50b761f1c928db1f33c79510203a64aa5648c0f502580b310b1b18fc10021be68f57d6a9cc3cf8942bf6b984d804a89908d91026a875f SHA512 ada67ec73648e9f4700491469eef5d25a0ce22b1fad42031284491921d62e7ec30f524e314b6b6d0436794e78570390ade383beda50304855522d25478d3a53e
-EBUILD efitools-1.9.2.ebuild 1371 BLAKE2B 3b6365e47baea942517f9a607ada4b332ad1a305bda1a6e160e2a9a86b04b1f622f060ec34a0f296138c9b312bc984155c6103eb9f953389d0021c0ed742a78e SHA512 b5509e5b8bc324d493d47d62685be8079ed940da0ed27ced73644351a57d4ec17df0b6247dffea03dd675a9c1202f89104c8625f0de8a126fcadae5972faaf23
 MISC metadata.xml 218 BLAKE2B e650ab1b6c50b385efc18a924f5382ef66cd5669e4c138270215328e5b595a45b519dc48925a76e824ba834e159865adbb131c0b7e166c2ffaf91d3c63b76163 SHA512 79219cfff4bf8680335548005e5f1f64270e1dcbabb2700b033e355fa65f0a5aefb0eaec20fbe231fc4525a7511693b84c0d957452fc9aa39e4ab31a1e1e56eb
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
deleted file mode 100644
index ac731ef3bd03..000000000000
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="static"
-
-LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
-
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	sys-apps/util-linux"
-
-DEPEND="${RDEPEND}
-	app-crypt/sbsigntools
-	dev-perl/File-Slurp
-	static? ( ${LIB_DEPEND} )
-	sys-apps/help2man
-	sys-boot/gnu-efi
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/1.7.0-Make.rules.patch"
-	"${FILESDIR}/1.8.1-respect-ar.patch"
-)
-
-src_prepare() {
-	if use static; then
-		append-ldflags -static
-		sed -i "s/-lcrypto\b/$($(tc-getPKG_CONFIG) --static --libs libcrypto)/g" \
-			Makefile || die
-	fi
-
-	# Let it build with clang.
-	if tc-is-clang; then
-		sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
-	fi
-
-	# Respect users CFLAGS
-	sed -i -e 's/CFLAGS.*= -O2 -g/CFLAGS += /' Make.rules || die
-
-	# Respect users LDFLAGS
-	sed -i -e 's/LDFLAGS/LIBS/g' Make.rules || die
-	sed -i -e 's/\$(CC)/& $(LDFLAGS)/g' Makefile || die
-
-	# Run 'default', to apply user patches
-	default
-}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 4dfeacba3386..558827ef7160 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,5 +1,6 @@
+AUX p11-kit-0.24.1-configure-clang16.patch 1071 BLAKE2B d12b500a4f38060ec9845cf6b0a348af11b8a1f02fb7d9c4cb2a74825305808d710ab6f69efc0b36f304f0e74a269a81b89b5651e2261c2109b6f942d80749d3 SHA512 5a6dc630d23607910faa1923e2389817f356df33a90e973612f92ef0617a53650cb316e1f2d009ddc658e4599721ad76b5a31ea2150928702c1b6937ab07023d
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
 EBUILD p11-kit-0.23.22.ebuild 2010 BLAKE2B 0a5fd2558221b3bf49b43550b55db0844f743a71362998c5fef7edf7e6e997388bbf2b39df1cca795df74aa47753757396a7290306ed69ba0bfbd36fbed6664e SHA512 2093e6b8b09fc075161d9db832f6436f4f44501370ea5dd5f1d5a19765e88853d1dc6ac75f1c42cc99d4f5947243f8889c0acea05c6dcd22df6c8509e10c3c0d
-EBUILD p11-kit-0.24.1.ebuild 2025 BLAKE2B 4bc37118a60aee8333efcfb54faa09e2c0a7a1c5821d42d02c0208ef602591d317ed9d896b69678252c645f8bbf5b492d87fb3e5398f2e9e22478dd718a27ce6 SHA512 9da02113a73c74ba8e1192e93dc3ba22d3bc5505c28999a409d15302b8529a90cc95c8f2441fac4f6667e323209230e4a6c34f0c2186ea7f63d6ae2987689d85
+EBUILD p11-kit-0.24.1-r1.ebuild 2201 BLAKE2B 65f24f8d400f9c7a014db35c5949ecdf236a16b4a10fb5d636178d35f35fd78cbeb369af0330f62aa39fa0bc0cc747c0a119ebd02768defb1c4b5bbdfcf9778b SHA512 280de89b3040e1ff0ddbb4222584d0a09bc036ac5950dddab7e2e0d4fff2dc53a05103260e1c294e077663009ce6672e6cda9dcc946d80d9277d3c33f75df7c3
 MISC metadata.xml 462 BLAKE2B fa827cf8466907f22be017b9e86f15dff3107e681db7d799c09c75ce4ba5a3f2bde34e925945646b13c8a20973ab85884075810201720629f3868066832a8bab SHA512 e142dce54418ca0be110b2a1826c2234cada11110c5c0f8c6699f34405640cd8334638e9c35e1ff765cb2a68d40207cea01d4ba041fac3d8ba183ec1c18f062f
diff --git a/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch b/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch
new file mode 100644
index 000000000000..3af5da6c68ac
--- /dev/null
+++ b/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch
@@ -0,0 +1,35 @@
+https://github.com/p11-glue/p11-kit/commit/d39043f7c6e44247b5b1a237888e80b2a4d9c2b2
+
+From d39043f7c6e44247b5b1a237888e80b2a4d9c2b2 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 12 Dec 2022 19:40:25 +0100
+Subject: [PATCH] Fix meson/configure _Thread_local checks for C99
+ compatibility
+
+The type was missing from the definition, which happens to work
+in current compilers for historic reasons.  Implicit ints were
+actually removed from C in 1999.
+--- a/configure.ac
++++ b/configure.ac
+@@ -148,7 +148,7 @@ if test "$os_unix" = "yes"; then
+ 		[ac_cv_tls_keyword=
+ 		for keyword in _Thread_local __thread; do
+ 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>]],
+-			[[static ]$keyword[ foo;]])],
++			[[static ]$keyword[ int foo;]])],
+ 			[ac_cv_tls_keyword=$keyword])
+ 		done])
+ 	if test -n "$ac_cv_tls_keyword"; then
+--- a/meson.build
++++ b/meson.build
+@@ -200,7 +200,7 @@ if host_system != 'windows'
+   tls_test_code_template = '''
+ #include <stdlib.h>
+ int main (void) {
+-static @0@ foo;
++static @0@ int foo;
+ return 0;
+ }
+ '''
+
+
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
index 91ee0171c43a..e5ecd181f2ff 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
 HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
@@ -22,6 +22,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-configure-clang16.patch
+)
+
 pkg_setup() {
 	# disable unsafe tests, bug#502088
 	export FAKED_MODE=1
@@ -38,7 +42,10 @@ src_prepare() {
 		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
 			p11-kit/server.c || die
 	fi
+
 	default
+	# TODO: drop in next release (after 0.24.1), p11-kit-0.24.1-configure-clang16.patch is emrged
+	eautoreconf
 }
 
 multilib_src_configure() {