gentoo resync : 22.12.2021

6 files changed, 9 insertions, 205 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 315a4e5d6c25..a648f7103c4c 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,14 +1,11 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
 AUX 40.0-optional-bluetooth.patch 2034 BLAKE2B 9df252dbef229d372bae87ab017d49086090a4194644fc0f7f3dc78226f78fa58cb99d67d4aac2b156894721658c6094aa6609c0da8c707cf0a8dac5a9a404ee SHA512 ec82f1ef7a9123134af2617526c22fa4258413edb6d68acdcd074911b98ed27d2e761904ccd88a364d9064d79bdefd402988bc53e1139f0e54f993c84242f19f
-DIST gnome-shell-40.3.tar.xz 1869724 BLAKE2B b6a663c97f5ad9239e608e16805074f9695f90b110514d202cc799818321d258417ce4e7841fa3256ae664e2bcba12201ac035737720a37f4eb3e84a26418ad9 SHA512 05d47e1b0f8ec27f0ae7564476012f21dcb2ec8e6da61a589b7fe17df1a23035cb6e261805250a410737502b9bdbb25f56432a618de88881d7e15b6432e52770
 DIST gnome-shell-40.4.tar.xz 1870468 BLAKE2B 78b0a749850e5df18beabd25cc35214b2d1f9a254dd095b9e783b2acdc9bac30edd7ffae3e6b15dd14d5b0877e8453c17548298e29b57642353e80ed505e556d SHA512 305d12cc7273f23e4a0c294f532cbf951816fd2de81959bef769048f4d5717e9e1886b64fe17b2f5ef6ee216ea67a6b913293a8903ec5dc5214bd29fbb1d3b32
 DIST gnome-shell-40.5.tar.xz 1871284 BLAKE2B 39c7392541af8a043627fb7aa19b723ee3b36e3d8001a64f34b14a6f23d68d3b160a0abe0f90659c55b99bf898cfdf30d88f62b8e113fc47814a55ef37c58725 SHA512 98bb0321aa9bc9da10ff6262cac802f575e2958600f429d446f3f87ec1ea40c837dd6e2fecae9dab0c2e224d2bf8b434a188ade84d4f480260102dcc80fdc5c9
-DIST gnome-shell-41.0-r1-patchset.tar.xz 46860 BLAKE2B 7c2204855ceb41a455cf4e92af81cb7f8d1eff027c1f70b5171218a6ec880332902f34bc96fcdaefba48daf4dc2e9f8a2486abfefba574aba408dc45ff73d228 SHA512 72c91ba7913f0e64f9babcbea7f438260ae3795b5f82ef9a5158de50d3c54d31d47492df8539663d611dfa3dc4ead640164f5f26d671a18b3946472688926920
-DIST gnome-shell-41.0.tar.xz 1893676 BLAKE2B 500c22a2eafb86a5717794f8da9de49c633c568e917b7116a8ecae0e62a3769a21e0b591d1147d6bed59b8350394e8ff157c184486c4f97e59e0f9dc202492b8 SHA512 2d2a2dd4ecf315776c10949b00f10dbbd77f495542bb7ca8cdb95047998942433c5c4cad818fe729681f888f74038d51c3d5903f1a0861a66147dbf668231824
 DIST gnome-shell-41.1.tar.xz 1897144 BLAKE2B b129fc9d7082956c3d0b0521126f569753f9137d1d61a42ce148bf94a8ec154a24a3bcf48807f6b0568a90763eba9c6166d7eac7c5495f3f72ffd318b38d3d0b SHA512 b9a5064c6d66d34c86b2fcd1ac2748072b094eb149e5ba3deb5b271e6ada2b6793c5422c4a80ce407f5a6cf52160d2d76fcf0ab752ee7cb27d9f246e8e024827
-EBUILD gnome-shell-40.3.ebuild 6359 BLAKE2B d4f2d72dacd2c4a67eb6ce37ff199ac890e097e807f3a2c921b664f8d76c22c55ae4dc73b9b7461ac38ae818fe034941de3e208fac15a95210b0254dcde95aff SHA512 aba29d2394572b63f55c9e9e694483de3c8a413114ee8d6bd2c1080e9086fea4297f268e572bbccf84c07896ec242397520414c58a67175cd73c0517d8379dc1
-EBUILD gnome-shell-40.4.ebuild 7082 BLAKE2B 826537818dfcc45ff5f7a1014edeb87ff6802abc1394140200094862f07c9f07db143b0e63d9404e037d5c8003126d252ee2ace0b05cad41370ccf64813ad391 SHA512 948d9e179d2a68d872449c47cb4442a1cc4f929a38d1e9980d4c9ee0a6d59471cb6f54e3ac9c04f1c33ff6415a23ce87534d09a383a9d7296c279c75e56e47f5
-EBUILD gnome-shell-40.5.ebuild 7085 BLAKE2B a6fabc3b6a1e5c97342faf2127c59ca3a9e0bd0c9bfe1f40532caae186ec7db1470b95b92b55340ac15b45a48da244f720a5224e87fb981582c564d21db5bbd8 SHA512 b3176278331c66b1f076c3654ebad9696dad03b2ecd21293aa993840b9beb1bb471c9bd6562658aad4ed0d4989ce2e9aea7fe719f14a5a1882d7096a3e99743f
-EBUILD gnome-shell-41.0-r1.ebuild 7403 BLAKE2B 8c878baddb8d6d3205182a86f1216c961d2d73fb0aafcb1d94a9709fc3c72e649a76f6c7e9b48f5a58d72c466d9dc0ef521abbe051b1a70e0b5ee9c206123ccc SHA512 9ce135c81b4b804a967a5fff54a7d90cd5d04c818196a1b4582bc544b322fc093a3ae6e5e50572679e9a404a110a878f967f4dedc714e5fc90bddb39c146427a
-EBUILD gnome-shell-41.1.ebuild 7307 BLAKE2B d02f84fcae29a9f26d9d31de7cf7d5aff407316293aef2a1de7352d5fccfc07a8d63f7b9124f083117c227b2e193962709083a0e4771ce22557b6a25aef7d44d SHA512 99b6d987e71bd5a1838f1fc637040664888b6f7db68d50157c339284076e7ab3645eb4ea9d6921f2a014a91333aba175143c427ae7af053d8ba372cc1b27e7ce
+DIST gnome-shell-41.2.tar.xz 1896672 BLAKE2B 634cc8e4b77a94899af123fa9ce2a11271b913467007084bde90cfe2f4dbddd65bb1ed115c42ba21a697cb591e48387a19c5b0c3764e13950b9034c9fbc493d9 SHA512 4ec29881030933f8c15ea1d11a431ca07ea84566cd7c1ab69afbf25c1b588b2d75ade17b623b5bf644b42bf5b82e375b67a833169b5b0b6c7c0dd8dbd3e56835
+EBUILD gnome-shell-40.4-r1.ebuild 7078 BLAKE2B 0e2c32170f0cd386b9ac6585545082360c5907a55eb547367a8cbe7a698d10a9ef290d8b1199b5d8c24eaa74f264100501ebfd2e34aa252762eed9460bd8a351 SHA512 9a88e9178458f7503bc28184161b87fe78a8cbc6c940eb718f2573ae5e846929b72f1a179107145bbce4ab7981d101f37e7c73579b892a90250194d17f9d9da9
+EBUILD gnome-shell-40.5-r1.ebuild 7081 BLAKE2B 0c727a7c25e2be75a02634078b7841a523540f37b3a56c2f5d40b311ac2b4b2320db600935eee9583d45e94b471069cfa170a734d5487259f90c4a48451dc0d8 SHA512 34ad2fa9f44135c6ef6e0c78667b930c33c2fd7dba77a26b7d71a53f8e02c66cf7629e7aa85d770d8e8111975eff4db3c59302c143512ccbe568601a68a8d8af
+EBUILD gnome-shell-41.1-r1.ebuild 7303 BLAKE2B b97b21fd5669ad6cb3da3d106f252010a1579a395d4e8284a4252bab333e28efbfab2f30240a0c76f11f7c31967cc59e10dcf75afb4fa97d5832c6ee01328f3f SHA512 1c0bfb9268ec20d59245a5e7ad6f796e548d54ba3d33f129c70659102618091e17680e0dd49bcc7558f946be90c7327076dacf1f1b6fa4d8cda97a5f1a4a654d
+EBUILD gnome-shell-41.2-r1.ebuild 7303 BLAKE2B b97b21fd5669ad6cb3da3d106f252010a1579a395d4e8284a4252bab333e28efbfab2f30240a0c76f11f7c31967cc59e10dcf75afb4fa97d5832c6ee01328f3f SHA512 1c0bfb9268ec20d59245a5e7ad6f796e548d54ba3d33f129c70659102618091e17680e0dd49bcc7558f946be90c7327076dacf1f1b6fa4d8cda97a5f1a4a654d
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild b/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
deleted file mode 100644
index dfb141f86a4f..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer/pipewire support is currently automagic
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.57.2:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.65.1
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-40.0:0/8[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.33.1
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.2
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4:=[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-242
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-	media-fonts/cantarell
-
-	sys-apps/xdg-desktop-portal-gtk
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
-	dev-lang/sassc
-	dev-libs/libxslt
-	app-text/asciidoc
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/40.0-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild b/gnome-base/gnome-shell/gnome-shell-40.4-r1.ebuild
index f873b46053e3..b1f920349a61 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.4-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
 	>=media-libs/gstreamer-0.11.92:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
diff --git a/gnome-base/gnome-shell/gnome-shell-40.5.ebuild b/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
index 9273794623bc..308122265769 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.5.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-40.5-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
 	>=media-libs/gstreamer-0.11.92:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
diff --git a/gnome-base/gnome-shell/gnome-shell-41.1.ebuild b/gnome-base/gnome-shell/gnome-shell-41.1-r1.ebuild
index 535631da257e..950ce4355d5c 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.1-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
 	>=media-libs/gstreamer-0.11.92:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
diff --git a/gnome-base/gnome-shell/gnome-shell-41.0-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-41.2-r1.ebuild
index 23f7b697c685..950ce4355d5c 100644
--- a/gnome-base/gnome-shell/gnome-shell-41.0-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-41.2-r1.ebuild
@@ -8,7 +8,6 @@ inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 
 DESCRIPTION="Provides core UI functions for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
@@ -37,7 +36,7 @@ DEPEND="
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
 	>=media-libs/gstreamer-0.11.92:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:0/0.3
+	>=media-video/pipewire-0.3.0:=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4:=[introspection]
 		net-libs/libnma[introspection]
@@ -136,7 +135,6 @@ BDEPEND="
 # app-text/asciidoc
 
 PATCHES=(
-	"${WORKDIR}"/patches/
 	# Fix automagic gnome-bluetooth dep, bug #398145
 	"${FILESDIR}"/40.0-optional-bluetooth.patch
 	# Change favorites defaults, bug #479918