gentoo auto-resync : 12:12:2024 - 02:01:23

5 files changed, 2 insertions, 194 deletions

diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index c98c39dc1d1b..ab10b0699d9c 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,14 +1,9 @@
 AUX swtpm-0.10.0-build-sys-Remove-WError.patch 458 BLAKE2B 70ac46cde8c995a8569749c2878d2ca0f4d6edf66a4668c7943d5e46f193767b9ff13a93284c255296351a08038c1444b2ad829d7389665aae2f2cdf5d866c99 SHA512 d2766c1c78f3b0fd45e574b963b6b49c53ffcf03788962bdf4ed992574bad9ccdf9eaaa7fa5ec70236daca8a4f4edade63267990df1b93dae8ffae345bda3506
 AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aab6b8f7cd3de53509716d48fd2f30d136279bb2a52a6a942f43a2c87e6f66db9f3470f0486255db8056da8c49b2b788048af62aa3ba SHA512 981a1fe5bf25c7a820dc5913b0384bc48b0bc50cd84e04921f0f64a4be6dd6b2a815d4cba39370b2e62c4473f2edbdc6bba7b09ce74b9e441f1b8df3166eb959
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
-AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
 AUX swtpm-0.8.2-slibtool.patch 779 BLAKE2B 4403ddecb4d1b2f0f40c3f4511ccc51eb0345d8570a5b36ef125c8c8781d8bceee6741b08f77057ca9eb222cfe31045748e722d837c011a393512cd539c1f7e7 SHA512 37bdaf16950b3b94af4ea8d8f042919a550fae1c9a8519eac36acc1fa289daa5677ba227b5e5a224a98b4f6859335a3f4e10de293c8283ac87474a84cef49f9a
 DIST swtpm-0.10.0.tar.gz 414698 BLAKE2B 62ebc5638e7c0b6c2be42d8da5369dfce708339882b582b154aa46d5ae6ed4a59f4e6cc31a05b062190b98a461caed82281bf64b05e8941d3923d200cfde501c SHA512 6f1848b0514799417582c1a5bedf9b7110e3627ab14f02ea193ad76ce8a188eba596494f410405c5f7226e2daf7d9ee889983a2265285839e72de12e6368180d
-DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
-DIST swtpm-0.8.2.tar.gz 364432 BLAKE2B 1ffa6feed88a67a2eeea1fca1c034f6513347173d59ae0c0654696faa1e791529e7fa044c478e5fb7e016117ce5f3151b875014d85eac528e4b6d92d5cf9017b SHA512 3b63116b1ed56087e05b0b697462720a10fe384ea2b8ec7115b549df8f557f6a9cf4de8e7d65b8061a1c85e54e015e0249bfbb613d35c1b64453a98d23ce334f
 DIST swtpm-0.9.0.tar.gz 370942 BLAKE2B bed63851dfdb94f463bbac962044114f75abd36f6558f173fd67be608f50c8954c6038d33bb6e3d2e88427238c7c06048beae23b84b2a1e186c0de98a9bd5ad8 SHA512 4f1723679b85218e80ea6aacdffa687e541ee309ddab9bcb8d8e5aa0b461ee431c880f2e300f1dcae112646f3636593005a342ee0cb762ec115aa599369e111c
-EBUILD swtpm-0.10.0.ebuild 1616 BLAKE2B a11fe1855918ccfcb97c1234b0ed46ea0058a03c3418ad55468424d05e475df20b731dc1b6bf65a8e65e0ca077b2512eac65ed681c16282cb98e75b8114e8724 SHA512 06ce80f839576120aa7d46a760e5ff0bd5373cefadeae459b621308aec93c188c2a7f842a63bfd3335d64be27784f652e9b5dfc73539383688072db57d3baf1a
-EBUILD swtpm-0.8.1-r2.ebuild 1602 BLAKE2B b51ae100307f16be7042c8215121b12a2724c0d370b4261ca9cb2fa3ee1533901b40f7839916fca557f91c0c048154184b9012bd59b2d3997d1c288ce5b0986c SHA512 6c1ee351c2d46a7dcfc368efead75ead25471aa1fdd214827df0fa156259d1b12b348846aee6e87ec1f0c8015eb279967760eedb10f27b7ad1cf43c341043d64
-EBUILD swtpm-0.8.2.ebuild 1584 BLAKE2B 56ef23842f8f8db53af77801012e0774cdd9b491d5253c4c763247ea219bd2b9c3888be484b1d8d96b0e6b1f1a43c076e25da61721896be278f57f7433714089 SHA512 dd7e4b1940abe4eb2f0e327b92f9405be5bc38701e3fbb757dc535b12c537d7d6542d772a7b30c517ec3c212971501704d19a93f92f07d59ba94521f95f8bf27
+EBUILD swtpm-0.10.0.ebuild 1666 BLAKE2B 7c6700343d532e012586f11a23e90f553063970431b7e6f6644f56351efbbc4058c8d952d7c14f37bd53b11d686a1a542984cd2e4c10de53084ffd9da8d40409 SHA512 1bc9e84a84fbd7c9fd9a1575ace864c3e012375ee53d18b86570217e8b16cbbb1e00062ba34e800cb77d3c90006ee80edbae85a57dde40fa38d6e296f180bdab
 EBUILD swtpm-0.9.0.ebuild 1602 BLAKE2B 2370b7d3776c44a308fe6b15a87c4632b800a233974e951f7a6e254784c73921d141ac90cbfd84b925ab5f43ca13e0feceb113f7186585b52b5f9d24270c4108 SHA512 5dcf477bf01109b2086628ec4beb030eb37cf046051cdd31052708b9ef62ebfc124a3e5828c9ce2bb6cac9617106e6bcf0b7c55b7744b0cbfc826da0c294be61
 MISC metadata.xml 717 BLAKE2B 70de08f9ed69084e7ed07c72ae96ab76cdb8bf489c3d3664edab24d2a904f44a6483bb9685f0e97f4520420dab1b6796e58cff00ba82190459af12398aa4b6d1 SHA512 a4f2977c84e03e215f6455def44ead6f767d6a4803061942b799b38bedaada373b51bbd47bd87c4339df32138a339b5f595a5ea19c5706b5e424329cc8aec0a5
diff --git a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
deleted file mode 100644
index b17e1c2470fc..000000000000
--- a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-configure.ac: Conditionalize test dependencies
-
-Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
---- a/configure.ac
-+++ b/configure.ac
-@@ -369,20 +369,25 @@ else
- fi
- AC_SUBST([DEFAULT_PCR_BANKS])
- 
--AC_PATH_PROG([EXPECT], expect)
--if test "x$EXPECT" = "x"; then
--	AC_MSG_ERROR([expect is required: expect package])
--fi
-+AC_ARG_ENABLE([test],
-+	[AS_HELP_STRING([--enable-test],
-+			[enable tests (default is yes)])],
-+	[enable_test=$enableval],
-+	[enable_test=yes])
-+
-+AS_IF([test "x$enable_test" != xno],
-+	[AC_PATH_PROG([EXPECT], expect)
-+	AS_IF([test "x$EXPECT" = "x"],
-+		AC_MSG_ERROR([expect is required: expect package]))
-+	AC_PATH_PROG([SOCAT], socat)
-+	AS_IF([test "x$SOCAT" = "x"],
-+		AC_MSG_ERROR([socat is required: socat package]))])
- 
- AC_PATH_PROG([GAWK], gawk)
- if test "x$GAWK" = "x"; then
- 	AC_MSG_ERROR([gawk is required: gawk package])
- fi
- 
--AC_PATH_PROG([SOCAT], socat)
--if test "x$SOCAT" = "x"; then
--	AC_MSG_ERROR([socat is required: socat package])
--fi
- 
- AC_PATH_PROG([BASE64], base64)
- if test "x$BASE64" = "x"; then
--- 
-2.34.1
-
diff --git a/app-crypt/swtpm/swtpm-0.10.0.ebuild b/app-crypt/swtpm/swtpm-0.10.0.ebuild
index eeeaaf2f76aa..10f6f19f8ed2 100644
--- a/app-crypt/swtpm/swtpm-0.10.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.10.0.ebuild
@@ -67,6 +67,7 @@ src_configure() {
 
 src_install() {
 	default
+	rm -fr "${ED}/usr/libexec/installed-tests/swtpm"
 	fowners -R tss:root /var/lib/swtpm-localca
 	fperms 750 /var/lib/swtpm-localca
 	keepdir /var/lib/swtpm-localca
diff --git a/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild b/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild
deleted file mode 100644
index 650e54402d13..000000000000
--- a/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-IUSE="fuse seccomp test"
-RESTRICT="!test? ( test )"
-
-# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
-# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
-# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	seccomp? ( sys-libs/libseccomp )
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms
-	dev-libs/libtasn1:=
-	net-libs/gnutls[pkcs11,tools]
-"
-
-DEPEND="${RDEPEND}
-	test?	(
-		net-misc/socat
-		dev-tcltk/expect
-		)"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.7.2-Conditionalize-test-dependencies.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl \
-		--with-gnutls \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with seccomp) \
-		$(use_enable test)
-}
-
-src_install() {
-	default
-	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
-}
diff --git a/app-crypt/swtpm/swtpm-0.8.2.ebuild b/app-crypt/swtpm/swtpm-0.8.2.ebuild
deleted file mode 100644
index 786d1888290a..000000000000
--- a/app-crypt/swtpm/swtpm-0.8.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-IUSE="fuse seccomp test"
-RESTRICT="!test? ( test )"
-
-# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
-# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
-# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	seccomp? ( sys-libs/libseccomp )
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms
-	dev-libs/libtasn1:=
-	net-libs/gnutls[pkcs11,tools]
-"
-
-DEPEND="${RDEPEND}
-	test?	(
-		net-misc/socat
-		dev-tcltk/expect
-		)"
-
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-	"${FILESDIR}/${PN}-0.8.2-slibtool.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-openssl \
-		--with-gnutls \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with seccomp) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	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
-}