gentoo resync : 01.10.2021

3 files changed, 19 insertions, 35 deletions

diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 5f8fd8cf5da6..a7b7c18c0a89 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,4 +1,3 @@
-AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
-DIST tpm2-pkcs11-1.6.0.tar.gz 1370370 BLAKE2B 5dd8c587688a26958e8406366ce14cdadc9d2279f01276037df3895f49f835bd021b96da2c7399881e23527c79c45d25417b57acfb961f934f29d785dacf87f7 SHA512 db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea
-EBUILD tpm2-pkcs11-1.6.0.ebuild 1559 BLAKE2B 91679bcf8eec8fe09d12601bbfa0bf0ad120d6eb60b0025044d31f814506bfeda522948dd150fbe9331c382f6079e35776dc85717879c4f0abfc99e61c1ad3b0 SHA512 9eba3fe01a307f46680bbd7e9880c71a6368d56711c67fdd10bc9f5d67bf934400621946df67e9528a8d93fbd60a140e9af4f5da3743ba50663ae6b83edc0c87
+DIST tpm2-pkcs11-1.7.0.tar.gz 1386693 BLAKE2B bf53a76be712bda374a8d107910440bab087fdb6c34fee3c748128d471a7a84b08f887ff97c8cdfef632679dd4343cf020e9459b96553cd5feecf76e65d6e290 SHA512 eb2736a7ef00fefa91bb70cc96d94d1c7b6ce3701ab12301658b7b076d8fca93bc590c7cdba5a84934b6bd09dad252b13670804c686e76a65b03c7ef6d96427d
+EBUILD tpm2-pkcs11-1.7.0.ebuild 1436 BLAKE2B 9bbf63d22a2f29bcc0fe5860563a7f445e19ec5ac293eae4c547a90e7fd1c99eebf9d5820469095d6d2a6dc5dc272e7a4b10b039950521153c7fe7009d5bf835 SHA512 ab607f6dc726f8afc9e0a6c71c0d8a7007bbe09d5f4b3d3bdcd8d8d9b994356c07d2a1f03d695ec543daeb4a2de975fa53d06b9825e40af3a49167335df759e2
 MISC metadata.xml 473 BLAKE2B 66d9a37ccc8a1dc4e94798394a6e33090a42922d40ca87b55b687207da072ed50a12b985e9261863a4208bced5a76c856e1d05eeed78b27a766dc56234a40ff1 SHA512 e15ae6f4fa11fe7719ba7692b04f7b81563f6c1ea7caa1984c0e0957c18a53abb87ea70c27f0972fec6f6b8608f94142e7791cbd9c2025d7ad0d17889968a549
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
deleted file mode 100644
index 7aae19c7c71f..000000000000
--- a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3088817..d789ce9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [
- 
-   add_hardened_c_flag([-Wall])
-   add_hardened_c_flag([-Wextra])
--  add_hardened_c_flag([-Werror])
- 
-   add_hardened_c_flag([-Wformat])
-   add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
index fc4bbfa9a2f1..407c9604607b 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-inherit autotools distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
 HOMEPAGE="https://tpm2-software.github.io/"
@@ -17,11 +16,10 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE="fapi"
+IUSE="fapi test"
 
-# python-pkcs11 is required but not in Portage. python-pkcs11 in turn requires
-# aenum which is ALSO not in portage. Futhermore, aenum has a dead homepage.
-RESTRICT="test"
+# Units tests only for now
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-crypt/p11-kit
 	app-crypt/tpm2-abrmd
@@ -29,28 +27,23 @@ RDEPEND="app-crypt/p11-kit
 	!fapi? ( app-crypt/tpm2-tss )
 	fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
 	dev-db/sqlite:3
+	dev-libs/libyaml
 	dev-libs/openssl:=
+	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}] "
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
 
-DEPEND="${RDEPEND}"
+DEPEND="test? ( dev-util/cmocka )
+	${RDEPEND}"
 BDEPEND="sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.2-Remove-WError.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	econf \
-		$(use_enable fapi)
+		$(use_enable fapi) \
+		$(use_enable test unit)
 }
 
 src_compile() {
@@ -66,3 +59,7 @@ src_install() {
 	dobin "${S}/tools/tpm2_ptool"
 	find "${ED}" -name '*.la' -delete || die
 }
+
+src_test() {
+	default
+}