gentoo resync : 20.03.2022

3 files changed, 2 insertions, 74 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index aa20fbc8f4e0..5430c9a15292 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,6 +1,4 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-40.7.tar.xz 721452 BLAKE2B d9979be0131bbaafdc4ae808a5367ce1ac39ade3595f96999cfc7e2876c9cf380a6a6039c74db34a40f1747fec05081384ea1dbf487e849f32a1da67fe22e8a0 SHA512 b687c8b7de968544b14bc8801ba3762e0cc2f4d08a41b718813302fdbdcedc3b67ead19bea14050db6312bd807f28bf5e56eeec53c3e2d9005466c9e73e62d14
 DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
-EBUILD gnome-desktop-40.7.ebuild 1935 BLAKE2B 2996ef29e201abe721ea0b5611e52eb121e9da28fa858f2a3deb11ea084951f7ddc0ce6aa655177e6a5b3e0edd8e5079f226fd6c79c5154f50b69faf156621f6 SHA512 34435b92fcdae005a9855cf3f10c99e5e9dde499116737bdabb6d3a6765765fe3a474925da67e98b909b9350af581bf06623d19e4730878696f1b85a1fee642a
-EBUILD gnome-desktop-41.3.ebuild 1925 BLAKE2B 68d86b4ef86b039777fb210cc7dc68213b48a86f1667dc95eb9943fd70ba72dee8602032f1235849c875740b37cc3c49ca5e537dc00f62bb49340959252585c3 SHA512 922a601ad2e11ed2665fbcc97c16a0b063f328534c743a9777109fc7f8b9d7ab47c5b3282570ed4a6ed56ccfb804bbdaf47d07c40c398fddc7f9a86e1a6d34fc
+EBUILD gnome-desktop-41.3.ebuild 1922 BLAKE2B d2d6613309b0adba0b3afba8d8966e368a8ea7fd5c1676ee2f3aaa37a3518af6f861a5aa98ba0611c3ee023901ba5c7838f59eddd1ef43cdee27054dfc94bb7f SHA512 722b7d3f3c6e43c84c7bf37f202263a21021ed0fc3b8275ea1cd207b0d19cb3e7807bbc8eb539a54210a4296468994d677ebdbd1b82023e11514f00ca82c73e4
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild
deleted file mode 100644
index 6acc99df16e8..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-40.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? ( virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
-	"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
index 17f8768e560d..7aeb9c59632c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]