gentoo resync : 23.09.2020

10 files changed, 89 insertions, 114 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index e8b77a29ec8e..a2d222216779 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 7a7bae1af070..f8f2ac07a1a2 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -6,5 +6,5 @@ AUX gconf-3.2.6-python3.patch 6699 BLAKE2B 20e24d3f55ccc3455a62fd72fcb054c6fd333
 AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602
 DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58
 EBUILD gconf-3.2.6-r4.ebuild 3617 BLAKE2B bb8a10f13cd7598daa7418e3f8324a6ba0c2fac9dd9aa292e0a3723bde5ae33aa368013924589fff534e0a15f079a7c2fff43854c17880d20b7d5929fa0c511c SHA512 7a572f25580c947e4d7a7e114c2c1b21b1a937d44e498ffea1ce42c110a5a38ff6aedd373f88ee9e711d9e56f3b4b0d361c2af264c25bd39a65d1fb4aa28652f
-EBUILD gconf-3.2.6-r5.ebuild 3841 BLAKE2B da4e07d79a3c644bb41d1c4696cf3b29be12179350303cacf7f92e8878e3d224fc75deb5b366baa93e21c7155a847265a97819aac4de37b0ea589767be506a38 SHA512 3fb906136252cbbcd8fa6d36c6fbe3d2397ecc2fd0b7bfcda2a46b2c169cbc331bcb847909d22cdf9d686afb35c298a62891f898f6c01cb40548a6493eddd875
+EBUILD gconf-3.2.6-r5.ebuild 3837 BLAKE2B 601ae42230226915bccd98f66481bdd7daca8cdc76f08e4790f837481947c2c984a03e4a4f4cd37e1c193fa9734adb040c135ed553ac1232e7a851d31fb55155 SHA512 8ee216f14709d8c6639e95d9762e4472b05d3e725b76cb1f43c684f38e12b596ab8df52d3121aa11ea70eef1634364e875f82db22978e97c5cb5d7d466b8b31a
 MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4
diff --git a/gnome-base/gconf/gconf-3.2.6-r5.ebuild b/gnome-base/gconf/gconf-3.2.6-r5.ebuild
index 5459cfbdca64..11bd6e578463 100644
--- a/gnome-base/gconf/gconf-3.2.6-r5.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-linux"
 IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
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
 
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 1de6b989e727..8f1db6da788b 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,6 +3,5 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf
 AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
-EBUILD libglade-2.6.4-r2.ebuild 2833 BLAKE2B 9a427b6a95d8d9387b20b27cf327d57c81a668871cf0853193f499b980144caacad0ee6bcd3e0cf48655d5d4c668f8cdc43674243495d62f200925789dca4145 SHA512 3ba8b42f9a076a5bbfc103be2864494345e4095a1b4274a185af2dd00dcf92a57abbd23e7bc6bbfbaaeaf083ec36a75b88c652ebd39980c3f624f70aa5bd0fec
 EBUILD libglade-2.6.4-r3.ebuild 2488 BLAKE2B 588a99f621abb8c59661867b66fc9dec1b3209b52b6f615010b822805b343a100f6278f935a6ad2b57762197a5782c94e136902aabad89861263caacef9834ea SHA512 2ed21ab6dca7653e829fc7dd26fbef32aa66d354ada006ee798f0483a5c9907a9264fbd367320cd12f55e728a880c5da1b105cee73b2df6a4a6642e317e0ac7d
-MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
deleted file mode 100644
index 5e004a473cb6..000000000000
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml(+)'
-
-inherit autotools eutils gnome2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library to construct graphical interfaces at runtime"
-HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs test tools"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.10.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	tools? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use tools && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# patch to stop make install installing the xml catalog
-	# because we do it ourselves in postinst()
-	epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
-
-	# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
-	epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
-
-	# Fails with gold due to recent changes in glib-2.32's pkg-config files
-	epatch "${FILESDIR}/${P}-gold-glib-2.32.patch"
-
-	# Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h
-	epatch "${FILESDIR}/${P}-enable-extensions.patch"
-
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		glade/Makefile.am glade/Makefile.in || die
-
-	if ! use test; then
-		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
-	fi
-
-	gnome2_src_prepare
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-multilib_src_configure() {
-	if ! multilib_is_native_abi || ! use tools; then
-		export am_cv_pathless_PYTHON=none
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable static-libs static)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_test() {
-	Xemake check || die "make check failed"
-}
-
-multilib_src_install() {
-	dodir /etc/xml
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	local DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_postinst() {
-	echo ">>> Updating XML catalog"
-	"${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \
-		"https://glade.gnome.org/glade-2.0.dtd" \
-		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	echo ">>> removing entries from the XML catalog"
-	"${EPREFIX}"/usr/bin/xmlcatalog --noout --del \
-		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-}
diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml
index be1a70fa45d5..996e7cacd217 100644
--- a/gnome-base/libglade/metadata.xml
+++ b/gnome-base/libglade/metadata.xml
@@ -5,7 +5,4 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="tools">Install libglade-convert Python script.</flag>
-	</use>
 </pkgmetadata>