gentoo resync : 29.12.2022

3 files changed, 3 insertions, 91 deletions

diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 76267eba5027..29179655f33a 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,3 @@
 DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
-EBUILD libsecret-0.20.5-r3.ebuild 3719 BLAKE2B c89de8dc1e1255fafa208606ed0e9fe46601262112feeaa8aa2c220bb13433ccfe76c6b456cb6ca9351f94626a5d4aad53c75aca31480859e0e322b542ceb89d SHA512 1415cdeb327f6887f85871db2d4ed158d4200df06ea37b7ae50eb43c1568b02554366dc7b0d2fbf586e6044d93245451e44d12838940872d1cd9edda0387c437
-EBUILD libsecret-0.20.5.ebuild 2225 BLAKE2B 8b5730b19340eeffad72c3b055ff26cecf2d0b0859358969ce5e7588dad9e134119021377c7db0d7c289135dde411eee2f5863b59339e1035d719fa26d0f555b SHA512 5f860e90a98696369febf9d4833da8110cfff203b54f36229f7e498c05ad32a1302305c45d3bfa3b6536bc1151f54d9b5970e5b2a4f006e55366fde0d423bb07
+EBUILD libsecret-0.20.5-r3.ebuild 3714 BLAKE2B 47abd028419ab7e1006740e343f01b634ebd358edb59f231f38bb504108ec36d268230027284ab092d6dfbd090d905b845f7b9b30f3de09750010f7ef41feca9 SHA512 e28093adb9b27d778c31fb059699aae9d03f80b615dba6b2ad45571243d4650207e74a265c8ab7c448a77b8ce7e45f0db550546a42c4ff7df3c860bbd76e16d0
 MISC metadata.xml 368 BLAKE2B b1730ea71fc0ee02e7971533562f7bbf0e0479304c22dbeb13a4620dde8083031cffa63077ac5dc725de4f17c4a826df2cd6091d378682d04e9cab2f3072c97f SHA512 b5a3db4438a1a98846c2e24b269966b7d9fdbe7419f7a169557a16544ba1846b470e0835720d039bdea56d8cf02667cc6435169029f9ef40365cb4642a9a3b04
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
index c16fe9ac3396..bddb8f0cc181 100644
--- a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	gtk-doc? ( crypt )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
@@ -72,7 +72,7 @@ dbus_run() {
 
 tpm2_run_with_emulator() {
 	export XDG_CONFIG_HOME=${T}/.config/swtpm
-	${BROOT}/usr/share/swtpm/swtpm-create-user-config-files || die
+	"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
 
 	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
 	swtpm_setup_args=(
diff --git a/app-crypt/libsecret/libsecret-0.20.5.ebuild b/app-crypt/libsecret/libsecret-0.20.5.ebuild
deleted file mode 100644
index 91d31f827b4d..000000000000
--- a/app-crypt/libsecret/libsecret-0.20.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 )
-	)
-	vala? ( $(vala_depend) )
-"
-
-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() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}