gentoo resync : 01.10.2021

5 files changed, 83 insertions, 2 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 7b71b5ebb782..5a62292cc875 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 94f8b431d53b..92a4b8afe1a2 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,4 @@
 DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e
+EBUILD gnome-keyring-40.0-r1.ebuild 2162 BLAKE2B 422663d6cdcf7eab1bcea2318af0f4d854542494448b7ec855b4133853c574c5fe371e88da04e93d9ecc4d964efb6b409e2579a222e3c5b8b6aa18aa959ce9c5 SHA512 e83fd59c871e579358843ee9f1f320e5eae63ff0fd3057f46ab8173bc8b9856d6486a55a638606ba614667abaf085657671f017210eda5360481d9b1a239582d
 EBUILD gnome-keyring-40.0.ebuild 2240 BLAKE2B c79a2de4457666987941707a1fe784b504d2fe820661650039e22cf420597d239f8f6939233d7fb2198e5e537d7eb79cf298fb2448439acd6d4375271c9177e9 SHA512 3994d2754c8738f0630a88dad84a7ac62d0ded284c098173324361bb7224f387c1973e9f724b86875bb3cb6fcc1dab1379f228553d58f5256c6af0d3ef896d43
 MISC metadata.xml 884 BLAKE2B 7453133f82b652fce07202db1a10c488a32355dd9398847e3d2f7d1cc62ad466c25febb6713318ba6d77d006e3f87b15c593c5020d1f187e2d7704a4c676dade SHA512 d5419c6a5b09fc57cb877210e59f82717374ea5ca7914fe305b2f3625e190c4438f76b24503698dffd00633ba17bcd70a0068765284ccfab730c5b7e8c1b768d
diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
new file mode 100644
index 000000000000..a6174f16178a
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit 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="pam selinux +ssh-agent test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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]
+	>=app-crypt/gnupg-2.0.28:=
+	>=app-eselect/eselect-pinentry-0.5
+	app-misc/ca-certificates
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	pam? ( sys-libs/pam )
+	selinux? ( sec-policy/selinux-gnome )
+	ssh-agent? ( net-misc/openssh )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=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} )
+"
+
+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 \
+		--without-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
+	"${BROOT}${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, but that breaks with glib-2.70
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	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/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 90e6e3d53668..b868a496484b 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,5 +1,5 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
-EBUILD nautilus-40.2.ebuild 2893 BLAKE2B 58ce39cd1d585f6c280aa96dad4a210556c71607087c73f70ba756e35b704c067207989d070bf90279869e233cbd2ed290aa4e993a07c8966ae3d79395ebbf0e SHA512 d409795bab3a1c0bedf214adb11a08f417bebb711b1fb166d577077d23fa924ce7c3fe693bebef7fab2e2cbb87ccca7652007b3ac5869e0cd260f4d30f9c5e17
+EBUILD nautilus-40.2.ebuild 3065 BLAKE2B 9e69ced68e66e213977e927dc86865eb71211388aed72f190377c0af5c45fc7e3993ae53e98f5123305b42bf6d3167749fb0593e9df7307832f2169be520994a SHA512 66a918c5ae9fbf231684fc76d19b817dbbfaf4e887f52eb7870cdf9a0ad1bd6ed075d31db5b7b678dcd5217986708542d7c84781506ed2b5b4a79375a7a0fe85
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/nautilus-40.2.ebuild b/gnome-base/nautilus/nautilus-40.2.ebuild
index 60b6475d5030..0ed580949d00 100644
--- a/gnome-base/nautilus/nautilus-40.2.ebuild
+++ b/gnome-base/nautilus/nautilus-40.2.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
 		$(meson_use gstreamer) # gstreamer audio-video-properties extension
 		$(meson_use introspection)
-		-Dlibportal=false
+		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
 		-Dpackagekit=false
 		$(meson_use selinux)
 		-Dprofiling=false
@@ -87,6 +87,7 @@ src_install() {
 }
 
 src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
 	virtx meson_src_test
 }