commit: 13e0c3c3489b3b33ae9dc9f468f4723c30df8204 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Sep 10 09:49:29 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Sep 10 09:49:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e0c3c3
app-crypt/p11-kit: drop 0.24.1-r1 Signed-off-by: David Seifert <soap <AT> gentoo.org> app-crypt/p11-kit/Manifest | 1 - .../files/p11-kit-0.24.1-configure-clang16.patch | 35 ------------- app-crypt/p11-kit/metadata.xml | 4 -- app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild | 59 ---------------------- 4 files changed, 99 deletions(-) diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest index 19269a7fd9f1..b9ce676ba163 100644 --- a/app-crypt/p11-kit/Manifest +++ b/app-crypt/p11-kit/Manifest @@ -1,2 +1 @@ -DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81 DIST p11-kit-0.25.0.tar.xz 958940 BLAKE2B 6ffce977f86c516a327afe50f4cc5a36e86ba7f43c6cb555db419d9e4ba7543a9f1847ba83da348cd6d7bbebe55dfa26cfe3a3aaa3e1d5420a4b8dc6cbbff088 SHA512 e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe 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 deleted file mode 100644 index 3af5da6c68ac..000000000000 --- a/app-crypt/p11-kit/files/p11-kit-0.24.1-configure-clang16.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/p11-glue/p11-kit/commit/d39043f7c6e44247b5b1a237888e80b2a4d9c2b2 - -From d39043f7c6e44247b5b1a237888e80b2a4d9c2b2 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <[email protected]> -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/metadata.xml b/app-crypt/p11-kit/metadata.xml index 206d0fae5a6e..91df1af79aaa 100644 --- a/app-crypt/p11-kit/metadata.xml +++ b/app-crypt/p11-kit/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <!-- maintainer-needed --> - <use> - <flag name="asn1">Enable ASN.1 certificate support</flag> - <flag name="trust">Build the trust policy module</flag> - </use> <upstream> <remote-id type="github">p11-glue/p11-kit</remote-id> </upstream> diff --git a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild deleted file mode 100644 index b7d9c1025d7f..000000000000 --- a/app-crypt/p11-kit/p11-kit-0.24.1-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: port to meson on next release -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"; -SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"; - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+asn1 debug +libffi systemd +trust" -REQUIRED_USE="trust? ( asn1 )" - -RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) - libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:= ) - trust? ( app-misc/ca-certificates )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-configure-clang16.patch -) - -pkg_setup() { - # disable unsafe tests, bug#502088 - export FAKED_MODE=1 -} - -src_prepare() { - default - # TODO: drop in next release (after 0.24.1), p11-kit-0.24.1-configure-clang16.patch is emrged - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable trust trust-module) \ - $(use_with trust trust-paths "${EPREFIX}"/etc/ssl/certs/ca-certificates.crt) \ - $(use_enable debug) \ - $(use_with libffi) \ - $(use_with asn1 libtasn1) \ - $(multilib_native_use_with systemd) - - if multilib_is_native_abi; then - # re-use provided documentation - ln -s "${S}"/doc/manual/html doc/manual/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -}
