gentoo resync : 20.03.2022

4 files changed, 173 insertions, 22 deletions

diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index b4bb6fa7580b..fef6c624303a 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,5 @@
 AUX libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch 1316 BLAKE2B 0c0fb8c10d869ff98d0644067336e54f907904ed8c4899e58e5d65aa84406442a550a6d4d6939cc34d5f6a80ec5d1d96dc7dcc91e44e955a8eef9b272f2fef6f SHA512 e2e4474a2af3e6f8a5bde2eff58417991b3d85f3042fe77776815f86567094168ca01c25f101cbc82a5f66573b1bc4592e6dee6b1be082fb8ec612c1394a7ce9
-DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
-EBUILD libsecret-0.20.4-r1.ebuild 2345 BLAKE2B a13c06bda6cb753656b66276fcacddae29131cd3111e4ca0df4b94e8228216b48eaa16b3136b32236cdf16922c678320e35e8cac76250576a20fa4ad70becf66 SHA512 edd63da2e3b3d0d6c1b219896b2cc6e43f072814159725d4dfc6aa63beebd2c6af6b4b01141ecc75f24739f92effd38e283e771cdd57a28641515af3cbb8056c
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
+EBUILD libsecret-0.20.5-r1.ebuild 3699 BLAKE2B 1e2ae8299297444340851ee7fb648317d8848760c867cfb990f111e1db869a619c922018770c1f5f37e788ac94241b243cdcec46d843d90988c7e7c4de1c5137 SHA512 e169f9db924f86444af0e69aaf6a8562ce3ee6e2e0d9b027b2a80d57bb9aedd90a793b37988a905fb513d879e83cdc67d7136740184bdfd1f66e94d4c5e06a35
+EBUILD libsecret-0.20.5.ebuild 2225 BLAKE2B 8b5730b19340eeffad72c3b055ff26cecf2d0b0859358969ce5e7588dad9e134119021377c7db0d7c289135dde411eee2f5863b59339e1035d719fa26d0f555b SHA512 5f860e90a98696369febf9d4833da8110cfff203b54f36229f7e498c05ad32a1302305c45d3bfa3b6536bc1151f54d9b5970e5b2a4f006e55366fde0d423bb07
+MISC metadata.xml 368 BLAKE2B b1730ea71fc0ee02e7971533562f7bbf0e0479304c22dbeb13a4620dde8083031cffa63077ac5dc725de4f17c4a826df2cd6091d378682d04e9cab2f3072c97f SHA512 b5a3db4438a1a98846c2e24b269966b7d9fdbe7419f7a169557a16544ba1846b470e0835720d039bdea56d8cf02667cc6435169029f9ef40365cb4642a9a3b04
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r1.ebuild
new file mode 100644
index 000000000000..da95f0a7ad31
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.20.5-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND=vapigen
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test tpm +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	${BROOT}/usr/share/swtpm/swtpm-create-user-config-files || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_use crypt gcrypt)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	fi
+}
diff --git a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.5.ebuild
index 37666f544f15..91d31f827b4d 100644
--- a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 VALA_USE_DEPEND=vapigen
 
-inherit gnome2 meson-multilib python-any-r1 vala virtualx
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
 
 DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
 LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 
-IUSE="+crypt gtk-doc +introspection test +vala"
+IUSE="+crypt gtk-doc +introspection test tpm +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	vala? ( introspection )
@@ -25,6 +25,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 DEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
 	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -38,7 +39,7 @@ BDEPEND="
 	virtual/pkgconfig
 	gtk-doc? (
 		app-text/docbook-xml-dtd:4.1.2
-		dev-util/gtk-doc
+		>=dev-util/gi-docgen-2021.7
 	)
 	test? (
 		$(python_gen_any_dep '
@@ -50,10 +51,6 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
-)
-
 python_check_deps() {
 	if use introspection; then
 		has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
@@ -69,27 +66,22 @@ pkg_setup() {
 src_prepare() {
 	use vala && vala_src_prepare
 	default
-
-	# Remove @filename@ from the header template that would otherwise cause
-	# differences dependent on the ABI
-	sed -e '/enumerations from "@filename@"/d' \
-		-i libsecret/secret-enum-types.h.template || die
 }
 
 multilib_src_configure() {
 	local emesonargs=(
-		$(meson_use crypt gcrypt)
-
-		# Don't build docs multiple times
 		$(meson_native_true manpage)
+		$(meson_use crypt gcrypt)
+		$(meson_native_use_bool vala vapi)
 		$(meson_native_use_bool gtk-doc gtk_doc)
-
 		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
 	)
 	meson_src_configure
 }
 
 multilib_src_test() {
-	virtx meson_src_test
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
 }
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index f453528b934f..7318f81748ab 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<use>
+		<flag name="tpm">Enable Trusted Platform Module support via <pkg>app-crypt/tpm2-tss</pkg></flag>
+	</use>
 </pkgmetadata>