gentoo resync : 15.01.2020

3 files changed, 66 insertions, 4 deletions

diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 8e1d6c70d1e1..ebe8d474370f 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,6 +1,8 @@
 AUX p11-kit-0.23.12-mktime.patch 683 BLAKE2B 16d25f2634dea248659ee9790555afaf0e3af14a05d7f186a23f321044f319f9302ef893d5f196855de7e4c04283bceb482c6e4986bd8ac10c0ec43c56bdf748 SHA512 d4f381e27271583a8a4fbf44e4b10eb9a5a3a700e8b1c820182c87dbc5bbfe963e4bd2ff0389b58e765a8810018bae5f18dfa2ed3b967dc5275087609a95e366
 DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
 DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7
+DIST p11-kit-0.23.18.1.tar.gz 1305755 BLAKE2B 6d453fad0f4b42e3ae583e76bd206377fd30dd32d98dda94ba3b2fe505cde4c3e05410e685ebe9e8e2f6cae7da3cbd2b78203cae64b8c000b1a2f2ec2a902c4c SHA512 941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd
 EBUILD p11-kit-0.23.12-r1.ebuild 1990 BLAKE2B dfdc292cd95b2d304d5dca5c151ad0db84e3b619523d864017809b729da4c62055aa921dc2a33ffedf2e91dacb53ca786f2ccdeb8e29aa9feec0db8fcb9f11a6 SHA512 5bfcbbd8d47494d8e27321181604972fff4e15f0124ff71e3a747e0e32594a05fe6638d1c76a5a332115f83ca37bd7e8f32aeb0c1a1d02f8fb7fea06a0cd2b5f
 EBUILD p11-kit-0.23.16.1-r1.ebuild 2010 BLAKE2B bd2f0d0bffe1b804c4db57e20eb58ea010b03b300ec98d98a8b2a6a49e5e0cfe5b397ce7dc5a14a47176a07384b7562ba603bad532c9db414531e6baef1fd992 SHA512 35607daf3a38f4432df4792e24b6b26fa54977ff00962c6367821ddcb75f1f4527930395fe92b1658ad39d948fb2530fd009b8fcc1cb343e198e43d902b8a5fe
-MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
+EBUILD p11-kit-0.23.18.1.ebuild 1955 BLAKE2B d49489e85d05b6c4f4be571032a7203a7142a31a0378ab6d67c04d003dbffccb25e15fc71fbb1a71c081117d9aee9859c30d1ecf7608a4536e00ccc483c864e5 SHA512 f3b0fd9f48e8989f6ab8cdafd44790356a2793bbd562bb10f11d6961baec1f078bcee4807b679fd9a8c727b80eb9cc1b75eeb64f108c232f45baddbee6915c16
+MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index 911ed2493e78..21a9f711d2ff 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
 		<flag name="asn1">Enable ASN.1 certificate support</flag>
diff --git a/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
new file mode 100644
index 000000000000..3a5ba72d93a0
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+		# drop to XPG6 to make feature_tests.h happy
+		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+		# paths.h isn't available, oddly enough also not used albeit included
+		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+		# we don't have SUN_LEN here
+		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+			p11-kit/server.c || die
+	fi
+	default
+}
+
+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)
+
+	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
+}