gentoo resync : 04.01.2022

3 files changed, 8 insertions, 94 deletions

diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index f603f918861f..b4bb6fa7580b 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,4 @@
 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 2247 BLAKE2B 327929f73f312ba31672cfbdddc65a5dd0a005db64ddfc2b20277ec49b1eb7da50d4d7130a03ea9f549adcd4849a2882394c066640cb87c358af8221e7a42672 SHA512 368278b8b2e315ec30baedddca0849ab38532257827af1fdafaee3e3eb5d188da47b0d8557c2572c2e4cb0c79b283a1e14f40735aa70059abd1bdc4ddf791e7d
-EBUILD libsecret-0.20.4.ebuild 2363 BLAKE2B b4682220dfa37898f0473580c554a547ab56b914287aea325f7ba2c7c96dfeff340be2173466706a9f6468d1dedf6d71e056567d8ce00f90b318447df99e6570 SHA512 c54fa657adae23150022ec1d8c117425eac1114656d76dd7201236f6ef4468d53008e8d7b04c06ff5ddcac6cda93ebfbecd1955ecaf7c5750f98ceccef053181
+EBUILD libsecret-0.20.4-r1.ebuild 2345 BLAKE2B a13c06bda6cb753656b66276fcacddae29131cd3111e4ca0df4b94e8228216b48eaa16b3136b32236cdf16922c678320e35e8cac76250576a20fa4ad70becf66 SHA512 edd63da2e3b3d0d6c1b219896b2cc6e43f072814159725d4dfc6aa63beebd2c6af6b4b01141ecc75f24739f92effd38e283e771cdd57a28641515af3cbb8056c
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
index 2ed9a2f37a66..37666f544f15 100644
--- a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 VALA_USE_DEPEND=vapigen
 
 inherit gnome2 meson-multilib python-any-r1 vala virtualx
@@ -25,16 +25,21 @@ 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}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+	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/gtk-doc
+	)
 	test? (
 		$(python_gen_any_dep '
 			dev-python/mock[${PYTHON_USEDEP}]
diff --git a/app-crypt/libsecret/libsecret-0.20.4.ebuild b/app-crypt/libsecret/libsecret-0.20.4.ebuild
deleted file mode 100644
index 5db7cd230147..000000000000
--- a/app-crypt/libsecret/libsecret-0.20.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND=vapigen
-
-inherit 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 +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}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-RDEPEND="${DEPEND}"
-# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
-PDEPEND=">=gnome-base/gnome-keyring-3" # to avoid circular dep (bug #547456)
-BDEPEND="
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	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) )
-"
-
-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
-	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
-
-	# 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_native_use_bool gtk-doc gtk_doc)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}