gentoo resync : 29.06.2021

4 files changed, 23 insertions, 36 deletions

diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index f1d94d0d0d69..64bea5864e70 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,6 +1,6 @@
 AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aab6b8f7cd3de53509716d48fd2f30d136279bb2a52a6a942f43a2c87e6f66db9f3470f0486255db8056da8c49b2b788048af62aa3ba SHA512 981a1fe5bf25c7a820dc5913b0384bc48b0bc50cd84e04921f0f64a4be6dd6b2a815d4cba39370b2e62c4473f2edbdc6bba7b09ce74b9e441f1b8df3166eb959
 AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
-AUX swtpm-0.5.0-fix-localca-path.patch 1318 BLAKE2B 1d8c7367cdc92232d13b4169e387afcd7247ffbdc785cad0d4e40ca9ee7710036f4a7debc1c6112afe255b19422a32b76f72efba04840136f28a72d241aa091e SHA512 e327b581dd1cf9bf92d400fc2574a585ea8708ba6b7e2c89fe368cfc990e464773900488736944b0f97cfd6e65b6aebf39e55ef22428fcc2510c8205ef77d738
-DIST swtpm-0.5.2.tar.gz 309436 BLAKE2B 0518e59b052c9224d5db1c2720f74ff15717468f73b1665e67c017581dd2b52d7a4cf28f94a932eb6068de3bc50f2e5710b8c447e4a08e6b4a31019db542d910 SHA512 4554f1b7a534829f9fbef4a09e190f1d5e91692d270f4f668bd6ef79799a4186a38db172e37a18be9f203466e2d7c9cdf3a350c0020d25ff6126128085ebe3a3
-EBUILD swtpm-0.5.2.ebuild 1671 BLAKE2B 77939c42e9a89167ed20027d27d13aa3b200d53b4d71d98fa67d8b2c10eb40e33ac90c060d83a27681ca4d289eadab7000ce125d02fd37f5f6c4acee821e7504 SHA512 6c1a9763855f4ac13233199e14e473ad941e88770541a925f05ce60707c4ab2c7a56f6b29390c4fb760a41516d8baac7575674d713d3893d1078c165c3d9a01b
-MISC metadata.xml 490 BLAKE2B efa6dc113d2c387e4fdf3b35a694c8edc3505129fdbf732f6441a68ce3195f9b45db52881a06ff3660a8309986a6298706d6aac22ec918d4c45ae45e6a401efe SHA512 cb8186df9ed31b7fb526bcca4eaeb97335385143bf303f9e42b3005d9f37e24838e9e3b874cbaa7663d0777513b52fbe1738c7c52b208c9c8dde5d5260f738e8
+AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
+DIST swtpm-0.6.0.tar.gz 326049 BLAKE2B 52b310e4da1f256f440d9e0022cb6d5f5987b10aa85c8bf2837f5a5c61bc076f7d24d0a027987ef28ba0e7983a2fb04476103b88c33e3312536777366bf9b0cd SHA512 b12bb9cc486c50d0689a5655799c0d52f85d320a1d849fd56ee5c4b497472102c61b5d368f46a81e0b9feacc63b25b434bd6229f492951097af1e9c74a37cc96
+EBUILD swtpm-0.6.0-r1.ebuild 1402 BLAKE2B 19d14d73da27d541313ec6f5890b13c50c63682d994fbe29ac173c59dc965fb178ef91713af29758b03ca649c5f1a387360ad4cbe0c247c07973d4b2ff00f801 SHA512 d90177c53ace986ad29fc8f765fcd0c6bf85da4b74b8b032a7ff2e2fc7f5030f68add33b49b0e236862293dfbe9d001d2495255c3233091c9f63287c9dcabb5a
+MISC metadata.xml 622 BLAKE2B fac6d084af4763e20d7bf965bc66f31cc8485d11b0a79169395e253730ab8cd9754ce6edc9f72f1289347497a1562bfdba083ef49bf4e13e5e99f01cb5ea7735 SHA512 c89423fcbfb975edbe115075aece42f43b833d8ebecfe86630f74e8b7de1cdc279fb3fc580fbf77d19529e8d52c657d0abbfcf95b30683df860d0b341ce3d17d
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch
index 27d29fc55aed..ae47bd5a793f 100644
--- a/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch
+++ b/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch
@@ -1,9 +1,9 @@
 diff --git a/samples/Makefile.am b/samples/Makefile.am
-index 7d69bf8..9fb8338 100644
+index dcbc9b6..68c8adb 100644
 --- a/samples/Makefile.am
 +++ b/samples/Makefile.am
-@@ -56,10 +56,10 @@ endif
- 
+@@ -48,10 +48,10 @@ swtpm_localca_CFLAGS = \
+ 	$(GLIB_CFLAGS)
  
  install-data-local:
 -	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
@@ -15,7 +15,7 @@ index 7d69bf8..9fb8338 100644
 +		chmod 0750 $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
  	fi
  
- # for out-of-tree builds we need to clean up
+ EXTRA_DIST= \
 diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
 index 1f0b48d..63f1fed 100644
 --- a/samples/swtpm-localca.conf.in
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index fd9c4b51cbd0..e89388a5e44a 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="fuse">Support sys-fs/fuse based /dev/tpm interface</flag>
 	</use>
diff --git a/app-crypt/swtpm/swtpm-0.5.2.ebuild b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
index 0042a1df1f80..33fa7b5bc313 100644
--- a/app-crypt/swtpm/swtpm-0.5.2.ebuild
+++ b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools distutils-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Libtpms-based TPM emulator"
 HOMEPAGE="https://github.com/stefanberger/swtpm"
@@ -14,44 +14,38 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="fuse gnutls seccomp test"
+IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
-	fuse? (
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="fuse? (
 		dev-libs/glib:2
 		sys-fs/fuse:0
 	)
 	gnutls? (
 		dev-libs/libtasn1:=
-		>=net-libs/gnutls-3.1.0[tools]
+		>=net-libs/gnutls-3.1.0[tools,pkcs11]
 	)
-	dev-libs/openssl:0=
-	dev-libs/libtpms
 	seccomp? ( sys-libs/libseccomp )
-"
-
-DEPEND="${COMMON_DEPEND}
 	test? (
 		net-misc/socat
 		dev-tcltk/expect
 	)
-"
-
-RDEPEND="${COMMON_DEPEND}
 	acct-group/tss
 	acct-user/tss
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
+	dev-libs/openssl:0=
+	dev-libs/json-glib
+	dev-libs/libtpms
+	${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.5.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
 	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
 )
 
 src_prepare() {
 	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
-	python_setup
 	default
 	eautoreconf
 }
@@ -66,21 +60,10 @@ src_configure() {
 		$(use_with seccomp)
 }
 
-src_compile() {
-	# We want the default src_compile, not the version distutils-r1 exports
-	default
-}
-
 src_install() {
 	default
-	python_foreach_impl python_optimize
 	fowners -R tss:root /var/lib/swtpm-localca
 	fperms 750 /var/lib/swtpm-localca
 	keepdir /var/lib/swtpm-localca
 	find "${D}" -name '*.la' -delete || die
 }
-
-src_test() {
-	# We want the default src_test, not the version distutils-r1 exports
-	default
-}