4 files changed, 3 insertions, 124 deletions
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index e1b3bd03da75..322aac94e0cb 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,11 +1,8 @@
 AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
-AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664
 AUX 0.40.0-bash-completion-dir.patch 3029 BLAKE2B 6695d75088c96060b0b0a34f928d8db9b06528d97ff3fe44b5911ef1c04b1a68aa807eea507213e316283db8b1d73218255e12c378aafb3fc920ab39d3f092b4 SHA512 4fead302c92327787f26b0001ced07dcd176abbc5142119a19be0b48893d777f1cfc4559f37a37a5c589221cb2c81f1627626371d8a3ad58bb8c542806ac7b87
-DIST dconf-0.34.0.tar.xz 112876 BLAKE2B 6890cd82a3ba81eac8c72dda93ebf1b82f3002b735bf2e059ba07a2f0f3817978a9e4f5dd37a9efab728fc2a4e20c34c519f9eeb3915d705ff8a3c4a65f9ab41 SHA512 8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743
 DIST dconf-0.36.0.tar.xz 114828 BLAKE2B 033cb2e095d9dac72bd07c5fa8280a3e1012aac6c1b0657d5455c2a519617be9112acca702ec4078554a814f36d12ee8e25201cc5b8aed2d33a32ef14e2f6fa5 SHA512 fed0b4ac13dfeff3bbe428a5c25408a0f13610219e561841a3af75cf18f9c630c385989b700c081b79ab53c00bdecf43c7c94979312c047faefbda4b2653d40d
 DIST dconf-0.40.0.tar.xz 117764 BLAKE2B bdbc48b71e46fdc4353358cd08fb96933d07af587300a6f91bc45826aeafb3f34f482fe6e09041dd839e507b863a8e33d09bad88a91c1c868983f8afb52c5c85 SHA512 71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a
-EBUILD dconf-0.34.0.ebuild 2192 BLAKE2B 74e61c5af928ef2effa2d23593105fa50e0487b3d842b39a66c210a1b06b194d34b95d03cfa536764971b29e5cc139776641f77accb85f8f3be5ccad478c59a1 SHA512 d474a1b2ec9f6d30579c853bdf9a7e53ee19913553a4c0d62adf586de5633552966e9567439f2769f7c671b87286c5eef613241d64d0d4caff624344b19d9902
-EBUILD dconf-0.36.0.ebuild 2104 BLAKE2B 6989287b32971b02a72e5c14da091555707dc3b3e35d87eef39a7be6981e4d90b221b8f73d029f4624815a40532a12c11ea381d69ca4f79c56303e05d2c02f2d SHA512 3d192e4cbf500f42e51d0c938581a3cded0aa883eac39b98c058c6573552a1aac0e8b0c4b7a1f92842b69e77407447352c8a204168e7b7d2bbc8765a3c7d006f
+EBUILD dconf-0.36.0.ebuild 2105 BLAKE2B e37e0693baa534e3b680939a0bd7f372ece3aae28b968fd79c8be76716da92768a0877fd99a8f0d9a5e70ab2727d45502aaac3d8fede0cec89721c1a5dec162a SHA512 eabe8cb200cef20d2c481541a7b29a8996f1d4370a8147a5ade2083f0c17e6af76b7777aefa8a5c253231435c0b85632e1c7338cc0e0f73bb8488dad36429a28
 EBUILD dconf-0.40.0.ebuild 2170 BLAKE2B 268f0db3b8cb8124bb2b5c9e9d66a5bf26807b3dd9dcd0221d1a4196049a514b9d53f10af1608bb5628a9ff99bb23a4fb8f009d8ff1393e8104c8acd436b879d SHA512 6798b88f00a2cfcc1b098d1f401a579a32131224663e6f235677a81810750914ec1b1695ee72f5d248681064999b888e1e75590a54bdff6b753145708cbaae84
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.34.0.ebuild b/gnome-base/dconf/dconf-0.34.0.ebuild
deleted file mode 100644
index f8c053be7442..000000000000
--- a/gnome-base/dconf/dconf-0.34.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
-IUSE="gtk-doc"
-RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	sys-apps/dbus
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.30.1-bash-completion-dir.patch
-	"${FILESDIR}"/0.32.0-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep
-	"${FILESDIR}"/0.32.0-meson-0.52-compat.patch # https://gitlab.gnome.org/GNOME/dconf/issues/59
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-Dman=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dvapi=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# GSettings backend may be one of: memory, gconf, dconf
-	# Only dconf is really considered functional by upstream
-	# must have it enabled over gconf if both are installed
-	# This snippet can't be removed until gconf package is
-	# ensured to not install a /etc/env.d/50gconf and then
-	# still consider the CONFIG_PROTECT_MASK bit.
-	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
-	doenvd 51dconf
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_giomodule_cache_update
-
-	# Kill existing dconf-service processes as recommended by upstream due to
-	# possible changes in the dconf private dbus API.
-	# dconf-service will be dbus-activated on next use.
-	pids=$(pgrep -x dconf-service)
-	if [[ $? == 0 ]]; then
-		ebegin "Stopping dconf-service; it will automatically restart on demand"
-		kill ${pids}
-		eend $?
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_giomodule_cache_update
-}
diff --git a/gnome-base/dconf/dconf-0.36.0.ebuild b/gnome-base/dconf/dconf-0.36.0.ebuild
index c861d09ab81b..aa94127feb70 100644
--- a/gnome-base/dconf/dconf-0.36.0.ebuild
+++ b/gnome-base/dconf/dconf-0.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="gtk-doc"
 RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
 
diff --git a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
deleted file mode 100644
index 7b5d8c5aefc0..000000000000
--- a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <diegoe@gnome.org>
-Date: Thu, 31 Oct 2019 05:51:22 -0500
-Subject: [PATCH] build: Update use of link_whole for meson-0.52
-
-A regression in meson-0.52 caused uses of link_whole to expose scenarios
-where duplicate symbols issues could appear. In particular
-libdconf_client_dep was being link_whole'd to itself, which recursively
-already included libdconf_common which was also a link_whole.
-
-This change does not modify the available symbols in libdconf.so, and is
-compatible with meson-0.52 and 0.51.
-
-See: https://github.com/mesonbuild/meson/pull/6030
-Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
----
- client/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/client/meson.build b/client/meson.build
-index f3b7122..de6387e 100644
---- a/client/meson.build
-+++ b/client/meson.build
-@@ -28,7 +28,7 @@ libdconf_client = static_library(
- 
- libdconf_client_dep = declare_dependency(
-   dependencies: gio_dep,
--  link_whole: libdconf_client,
-+  link_with: libdconf_client,
- )
- 
- libdconf = shared_library(
--- 
-2.20.1
-