gentoo resync : 30.09.2020

6 files changed, 13 insertions, 112 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index f5c8ff1b8b83..0ad23fc9e8da 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 61e011c4f027..06029621fbf3 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,6 +1,5 @@
 DIST gnome-keyring-3.34.0.tar.xz 1333768 BLAKE2B 0237eb7ac0b7146d096c58cac4c788a92680f1a6dd321949f295935bde206263e5ee1762c9d393dfbc10322d018e835333c823d11e8af5dc01434555886626dd SHA512 09f84bdf5ea415a55baf6a57dba2889cdf592005d273335029107ea3f83152447b3263cd190810930aae41af22dd508e765e649da3c8a9afa127db1d298bb72a
 DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
 EBUILD gnome-keyring-3.34.0.ebuild 2160 BLAKE2B 80a51431743d8dd3f81a0c63f3e4b15050ff4617f9fff822408d397a02bbe31cfe815949f2a02506d95023066011b3be98dda8818ffb34b8a0f24b81a5c18706 SHA512 274e62f0f8efd11dad00b8d9e16338e7e342b865ed14aae22548364487f2856e0ab388d00d7e20660825633457e5b5542014db5dfef7a5c884803daee5604035
-EBUILD gnome-keyring-3.36.0-r1.ebuild 2268 BLAKE2B 96a308c4b11a82b4e4efd19e5c3476beab9a55b71ade6e054e69871ae16ceb63a368a000a53054566d15c50bb9537a2003e710f423ada058da871ae9202812bd SHA512 fb444bc0a79138f381246d473919086fe767b3ee6ff7a7ac7a7481889330082c79766ff1a74e0f17856fb68b17092aea89681dad47f4d1ad9591e534b666cafa
-EBUILD gnome-keyring-3.36.0.ebuild 2163 BLAKE2B 6dffcf1cc44b37d07afeac8008e4b3939c5dd0d6aab12d0a3f0266a348b3258de8af02034b3d3321fc8545a0ef9304b78e24f2fda025a2850261d154cf8126a9 SHA512 bafa2814bae337a7cbcf8d1b3624c7c803191a071c0cd3ff24bd97f9ccaef1b48c482699e6a3e56d97fd514655d03bf1d0df0a382762ad1b7c768c626f597b44
+EBUILD gnome-keyring-3.36.0.ebuild 2264 BLAKE2B f23d07e44e3a84a4b085eccaf68c4fc6f5988888f00036a4737b97c830d1c1e885af3ba49027801b653ee3e4bf91e124370244164eb95113cc2973e89208d14e SHA512 5572f037695fea0e843268e9cf638daffcf6f55ec770c31a61741859e5067bb0efc9f2623252e617fb38b8171e58a4d7ed68de03589b76ff00d6ed9c773ab6be
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild
deleted file mode 100644
index aa54f87539b6..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit fcaps gnome2 pam python-any-r1 virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps pam selinux +ssh-agent test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
-	>=app-crypt/gcr-3.27.90:=[gtk]
-	>=dev-libs/glib-2.44:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( sys-libs/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	>=app-crypt/gnupg-2.0.28:=
-	ssh-agent? ( net-misc/openssh )
-"
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc
-}
-
-src_test() {
-	# Needs dbus-run-session to not get:
-	# ERROR: test-dbus-search process failed: -6
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
index 597152fa3d0a..1f7e6cfbd500 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -62,8 +62,10 @@ src_configure() {
 }
 
 src_test() {
+	# Needs dbus-run-session to not get:
+	# ERROR: test-dbus-search process failed: -6
 	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
 }
 
 pkg_postinst() {
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index c011cafd07d1..7f154c174b89 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,4 +1,4 @@
 AUX 3.12.0-vala-0.42-compat.patch 811 BLAKE2B 1f50e441d0483d3748db1ed7d18e581df2887160a16afe7bb8a47890e162349cd5611070ea11ceef1273c8d4865b7f5ead6bfad14a171ca5d21d32d7a8811468 SHA512 12e16ca43044ca96a4f5abdd3d982bfd705e17df2630505154ad1592dbb8ce1bad66c4624a992084a1533d58fd96c178a5d4c147c79a5074183ceaaf54dde998
 DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 2101 BLAKE2B 5563cbb91d8cf702bad279a341f79c2010eafa735b9920b4a32d03e0cea592810f7943fe43def1ed5d1cfd16cf90fa4e5c42d5ddcb89d0271da1598d64d9844f SHA512 9dd20635f7864861c5180cff31bbc6b318dd9279abb75fb70a41972870a655a0f8756774948d9984bfb35a8cf9e46f5a7d8b21eda2fc9d52469de6f9ab727aa3
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1600 BLAKE2B 1c01c314f1988c048787930d03ec216a4e22334ffc713d99315ebc5950155e1aa2de93362f53c6cab8cfad2fde53888d100105e407dbb8166daf663c7ad451e1 SHA512 4145bcbc2982433bc2507989f4709ea4bee2467674cf20d14bd3420527436190e9028d0b229d272daf08a313518b765f42dd99f9659f5c2cf8037c68b7ea2cec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index 30c0398c00e8..7a5b74562aac 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI="6"
 GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2 python-any-r1 vala multilib-minimal
+inherit gnome2 vala multilib-minimal
 
 DESCRIPTION="Compatibility library for accessing secrets"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 
 LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
-IUSE="debug +introspection test vala"
-RESTRICT="!test? ( test )"
+IUSE="debug +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 
+# tests need python2
+RESTRICT="test"
+
 RDEPEND="
 	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}]
@@ -32,25 +31,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} $(python_gen_any_dep '
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}]') )
 	vala? ( $(vala_depend) )
 "
 
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch
+	eapply "${FILESDIR}"/${PV}-vala-0.42-compat.patch
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 
@@ -62,6 +47,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ') \
 		$(multilib_native_use_enable vala)
 
 	if multilib_is_native_abi; then
@@ -72,8 +58,3 @@ multilib_src_configure() {
 multilib_src_install() {
 	gnome2_src_install
 }
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}