gentoo resync : 24.09.2020

3 files changed, 2 insertions, 144 deletions

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index f8f2ac07a1a2..c526289d35fa 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -5,6 +5,5 @@ AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d3
 AUX gconf-3.2.6-python3.patch 6699 BLAKE2B 20e24d3f55ccc3455a62fd72fcb054c6fd33308bda419f21426417dd4f9a79581cc5cd03449bad9063e4e927875ed020a99254609517b3c86ebb1b65f268d3d2 SHA512 def5cd74ec7b9d06dc1ccd05364bfa500f8d9685ea3016f219c53df925b09f68dfaf547277dd0dfb9eed266be4de650875611a09a84bc0db3d0a7b907c7beb73
 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 3837 BLAKE2B 601ae42230226915bccd98f66481bdd7daca8cdc76f08e4790f837481947c2c984a03e4a4f4cd37e1c193fa9734adb040c135ed553ac1232e7a851d31fb55155 SHA512 8ee216f14709d8c6639e95d9762e4472b05d3e725b76cb1f43c684f38e12b596ab8df52d3121aa11ea70eef1634364e875f82db22978e97c5cb5d7d466b8b31a
+EBUILD gconf-3.2.6-r5.ebuild 3834 BLAKE2B e0d363c1d43da1eb34683f0679e008e633847b44ea0a1332f6149316c891fbe611c3a2bc08692a206f5cb2d9a82069ee497773860415c098fc58559d55ae44f9 SHA512 51f7e8445633f13db488724675f4b3d2781ee56296601f5c02f38fa9765935ac98c2a52a5a3aea4e6c8c71f2937399cc114703bc03dff5a95b63eb18e92dc1cd
 MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
deleted file mode 100644
index 5712c7277f6e..000000000000
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 multilib-minimal python-r1
-
-DESCRIPTION="GNOME configuration system and daemon"
-HOMEPAGE="https://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux"
-IUSE="debug +introspection ldap policykit"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100.2:=[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.6.18-r1:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	ldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-	policykit? ( sys-auth/polkit:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	kill_gconf
-}
-
-src_prepare() {
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
-	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
-	# From 'master'
-	# mconvert: enable recursive scheme lookup and fix a crasher
-	epatch "${FILESDIR}/${P}-mconvert-crasher.patch"
-
-	# dbus: Don't spew to console when unable to connect to dbus daemon
-	epatch "${FILESDIR}/${P}-spew-console-error.patch"
-
-	# gsettings-data-convert: Warn (and fix) invalid schema paths
-	epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gsettings-backend \
-		--with-gtk=3.0 \
-		--disable-orbit \
-		$(multilib_native_use_enable introspection) \
-		$(use_with ldap openldap) \
-		$(multilib_native_use_enable policykit defaults-service)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/gconf/html doc/gconf/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-	gnome2_pkg_preinst
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
-	then
-		"${EPREFIX}"/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/gconf-3.2.6-r5.ebuild b/gnome-base/gconf/gconf-3.2.6-r5.ebuild
index 11bd6e578463..9345785514a9 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="