gentoo resync : 23.09.2020

4 files changed, 86 insertions, 4 deletions

diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 62b94b48373b..61e011c4f027 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,5 +1,6 @@
 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 2155 BLAKE2B 33f4ac2bf571ec23b33fa77706df8a077418abd1bafcbe3fb9e25dabf6d65b6db65423573bbcd801055827c70eacf8006b2835b04b8977cdf216a37539e18f1c SHA512 0a3ea6878b52ac8a5b837909b4e6874613bb8fc7cb6a52c3d86a30bf549ad88b5e494f3923cb3cddb44ba04bc12e9778076592a555285700b6d5826aee48139d
-EBUILD gnome-keyring-3.36.0.ebuild 2158 BLAKE2B 9df0fbcb8ef225e7ab7656ef7efde7f425c18a73abf7596ab415f484d4bf1cd7c0d7092ba1a9fc3d3a7da57da95b5b1cf958b1ea8d02cb1d75d7d27759273070 SHA512 e60e3f01c8dfbdc191d49c8ec1046646860f96ea4cb0166210147d31bdc36f3227bf6ae5dbf5b7e8d7f18ece1ef92a8b75a67c1163a1d492b9f0c3dd2a8dcc0f
+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
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
index 1b51ccc219c5..a06051ceaf8e 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.34.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit fcaps gnome2 pam python-any-r1 virtualx
 
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
new file mode 100644
index 000000000000..aa54f87539b6
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0-r1.ebuild
@@ -0,0 +1,81 @@
+# 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 a89b2068be78..597152fa3d0a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit fcaps gnome2 pam python-any-r1 virtualx