gentoo resync : 28.04.2021

4 files changed, 6 insertions, 84 deletions

diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 13c53dab1bec..4eb0e913625a 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,8 +1,6 @@
 AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
-DIST gnome-desktop-3.36.8.tar.xz 739236 BLAKE2B 378cf551787863543e30b0e69dd7447a5a9fd1026c3c85f32f140874658f803e6e8d2a82c79a1a9c4aadd08043905f1b0486e900596e855c2650248ac9478d01 SHA512 d9a447ec1c34e98d19ed6f5ef7e48f19d89009bd20368e2d731ff0cea30adc2dea6c0293df9b07f39e4573035edd25815ccd7d740f09ba421ebee74b7c8c90a2
-DIST gnome-desktop-3.38.3.tar.xz 745372 BLAKE2B d5df6d8bead6f65f655c7fbb65ea07937250318ee1fdc3e15c7d74a6e5933389640a06d162079dfce0137db11ceb67b4d86dcff787ecee9dbbbdf750e7aaa252 SHA512 023121316d308d8d69a26bd595657f2d7471da82395c7208cdd642a5e58927d2af05b27b6a0e52eaa10f9fa5a27c1146d5496c042ae3a9cf7e134875d3b2c84f
 DIST gnome-desktop-3.38.4.tar.xz 745168 BLAKE2B 1d85b176acb6721fb21bc56eef552629a06b059117cc53a5dde9c2c74ae23f624701efed3849e8e7daf21c1fd7622b747b394b6c63ab974371daec14bfb8d9ce SHA512 546fd2bd25d7582ae6cc6aa2beab4221fd246d16640e7d3f0cf9b700732f67a95c4bcb3211b5cb131f151b25923d59aa1ffa114183b6fcb683ad88cb94790e1e
-EBUILD gnome-desktop-3.36.8.ebuild 2022 BLAKE2B f3dd6dca7559c79967f73859b72c5ec3f9edcd8ab4d527e8d9503fd93ff2e117637223261a59e3937d5d074ebb064c36d7294adb62b5686435cce88fcbb0c7f5 SHA512 7280f4ae4748c982826f10248a3b6edf8e963a982facc182c98895ad1e6c695d076a62d4f56830c6fbf96dc0a9cdb3c9d533f1ceb16757f4f3475c8942579fcf
-EBUILD gnome-desktop-3.38.3.ebuild 1926 BLAKE2B 4cceae3627dff7279fa09bc258e484e5548d2b4f92d91215d89333602c2506c6fec5d0f3a43149881c9d01413e5777433217ba0548fb9c7abeee75fa87a9bcde SHA512 acdb1be15fa0b82f037c96bf502b92c144bf7f3cfad579f833a23512b20fe48450418797706d65400dce9dfb9beb35a88d8080fd51b36421e625e1e3a84b8e5a
-EBUILD gnome-desktop-3.38.4.ebuild 1927 BLAKE2B 4df2c7f4106735ba0b75111cb9573db0849c6e34e910e17eed037eb6ee3e79e62a783c1890ed5ffe86a6a5d7407fa1e5613aa55ef43a99ebca3f9bedf9f51a6e SHA512 ce16a220725338c8ede87ed48b29dbc06482b7f25073838721853d999e93e8d858d4fed4b90876544a4f26dedc9557b3497065aba0bb4272b56ba3d4a176fe19
+DIST gnome-desktop-40.0.tar.xz 721628 BLAKE2B ff89b8f4a284f63ee4c8b87f5b26542dabec13a4dcd75424f91acb21877699a5077d27bf4c618ea5e2c4cbd97570003c048296e24a8684021fb589238c09dfdf SHA512 faf6fd2a0c5db47a49319c03ca9a348d77092050cdd8d79a74979b2878d0e35ffa85bbe5e87449f9285ceb28a884439de6eb73d6b9fcaa02236eb48f4a7ac49c
+EBUILD gnome-desktop-3.38.4.ebuild 1924 BLAKE2B 126f3efd5c9f0b87e60ddfbd1e13667c38411e29ac17895a0ced69b16ddaf57de2a3bb995992b493e3e668806dc3f462e7277f0326246db88c2bdbfaa5b9dd3a SHA512 6d220eed8b4061734bb2ca1bf2470b8669368fe45071a05c8103d33d5dbfb6636b4337694b18993bac77e149458c237f39d8e84e8f3a46e1a03e55f31b13b73c
+EBUILD gnome-desktop-40.0.ebuild 1950 BLAKE2B 8fe295cc9783c308c77d371d374cce48596c6582d64afe5a49a98c19fbb342fde1d9110b472c02ade8126334684be1029d0ac2e913a65d5a2bab70b1a41c1e99 SHA512 961cbd1337b0b36f881f5500ccb03712ebcf70d284b11ceeba3fafbb6a6d0737f9514a4017fe06c31623e4a40aa101f5990c60f7f4188d911ba0b43325957dd3
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
deleted file mode 100644
index bcd26befee5f..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.36.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx 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 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-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
-	app-text/iso-codes
-	x11-libs/libX11
-	systemd? ( sys-apps/systemd:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=[X]
-	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
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
index 6ec27d919253..706a013f6ea9 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.4.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.38.4.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.38.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.0.ebuild
index df14c0b77b34..b42b6b81c1b1 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.38.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.0.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
@@ -18,6 +18,7 @@ COMMON_DEPEND="
 	>=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? (