gentoo resync : 03.07.2021

9 files changed, 30 insertions, 93 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 6ef7939fa349..aadcf5c55fa6 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index bbf1abcd66c5..4ccfe820ee4c 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,6 +1,5 @@
-DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
 DIST marco-1.24.1.tar.xz 1860008 BLAKE2B b147e6ce8aad9382b2e8d96eec2da0356cce91977f4387776359ffb1f26903d7f0b9d9a1d43a436d1a64033f545600e7f810a29e3ae6ecdfb0d73ef8073b782c SHA512 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
-EBUILD marco-1.24.0-r2.ebuild 1504 BLAKE2B 58da594bf9ce3e1930ccfd1f43b64cdddd5c74ce54d9fb4199aa5c99fa96961640c40bd1b67cabb306a5c72a4780d77d9eea078e488d8d133d7fef657a9ef98b SHA512 506253ae98268e699848c937f826b1072f13e41868a4057f30b6090f9ae2cea30ad319183a3ec2ff709a9bf5767d25a3f503eed281242b836e8c83095b5ae5b6
-EBUILD marco-1.24.1-r1.ebuild 1483 BLAKE2B e03106fde2cd93d6f26c25a58ed3984d38b4968cef4e4c52c076622586e16053575227b06cb78d00f71af25ca7cef06094b51fe5b239fe2a330f5f49570290fe SHA512 d5a15bdd165f326ad3782a2e77f5fcf3020b16c54aa1a9f6fe2fc029cf7ee38c9efd951e6a9f5e454827abf7c9824bc21cc94840d803ec7e5ebecb3655460eea
-EBUILD marco-1.24.1.ebuild 1506 BLAKE2B 23a2e5ed1605eb0457fe6ec558374aaea77775b9cc0aa9321209da72b4ac509ef896efed15b9665e7c50490b9f0b84f1f24a7e2f271a46e18f0282861f8e466d SHA512 aa40eae15416b859fc2c9c23b16c46b97763908325709743c14ef24596bae37a35e407f28ff7b876481df8586f8bc320c518a08df638ef734ff55916afd4dbfd
+DIST marco-1.24.2.tar.xz 1845356 BLAKE2B 9308e07fec5319f741f7d78007e68e916c407c515fc2076c0e26a760830d3c79edf39888f265f7edc1baf0c8dc29661fb6598be16352103455cc441bc2a1daf5 SHA512 2e699935fb72ddc34aa1f98f5771f252141245ad8fd0983aafe5ea55aeeb3f90b5d68a61c27704adf0b929565180367aae46486d45e789d7de101ec9a7bc9f96
+EBUILD marco-1.24.1-r1.ebuild 1481 BLAKE2B 51998a385ac740af4e5f8be0a1c11e003aa2616196f6feba41e46c237ed473d0c7e38d137eef9158cff77f9381a36ff06244fdbae55517797515e9bc40f4a2c5 SHA512 aa21ffea9dd30126fd29fca608c2bba4a6186b52769d84505d16ef5c414ebacbead9dcd19bd1d5a6e0f1dbc81d164c3e7f729a688a36c2e6d84a935a4546d371
+EBUILD marco-1.24.2.ebuild 1483 BLAKE2B 9ded09675ad592b0953122a1a317cd3a86ebf6b1aac3fff4b050be453a6109da8b7264b0a01e16e0511b4660851ebfb79f6e522d85ee822ac2862aadcd4a30b6 SHA512 d227cd02844441d3f1e2c0c6053957911023b876ac7ecc082815c333ba1e55bd90333d7cf0c230d9a60b66dd7f490d80b7109554cd64ba2886d1cc78d07eed64
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.24.0-r2.ebuild b/x11-wm/marco/marco-1.24.0-r2.ebuild
deleted file mode 100644
index 3a7cf634c890..000000000000
--- a/x11-wm/marco/marco-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0/2"
-
-IUSE="startup-notification test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.58:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra[gtk3]
-	x11-libs/cairo
-	>=x11-libs/pango-1.2[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpresent
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/startup-notification-0.7
-	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity
-	>=mate-base/mate-desktop-1.20.0
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
-	>=sys-devel/libtool-2.0.0
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc doc/*.txt
-}
diff --git a/x11-wm/marco/marco-1.24.1-r1.ebuild b/x11-wm/marco/marco-1.24.1-r1.ebuild
index cd92c1853eea..2664b2b46315 100644
--- a/x11-wm/marco/marco-1.24.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.24.1-r1.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=6
@@ -8,7 +8,7 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE default window manager"
diff --git a/x11-wm/marco/marco-1.24.1.ebuild b/x11-wm/marco/marco-1.24.2.ebuild
index 02b3042b4bbc..e36ea8196cc3 100644
--- a/x11-wm/marco/marco-1.24.1.ebuild
+++ b/x11-wm/marco/marco-1.24.2.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=6
@@ -40,7 +40,8 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	>=x11-libs/startup-notification-0.7
 	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
+	!!x11-wm/mate-window-manager
+"
 
 RDEPEND="${COMMON_DEPEND}
 	gnome-extra/zenity
@@ -50,16 +51,16 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/gettext-0.19.8
 	>=sys-devel/libtool-2.0.0
-	virtual/pkgconfig:*
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
+	xinerama? ( x11-base/xorg-proto )
+"
 
 src_configure() {
 	mate_src_configure \
-		--disable-static \
 		--enable-compositor \
 		--enable-render \
 		--enable-shape \
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 071eed93a226..54a4a256316d 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -10,5 +10,5 @@ EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125
 EBUILD mutter-40.1-r2.ebuild 4700 BLAKE2B 0840633959f8e6e064a80a419c1bd5f160ca753b6f87294a07339c3402af285fe381cf5f7e4f235a84b5987382eda8303c2a9981e5c9a0685c2b6b71c9369d63 SHA512 db91adf7292964945e1149abc46b5d6d965e986d05a853865f21cb232eea2a62ecc6381f74dddfbbf718360c2832a950809e2da0652841373b2d0e7705b82983
 EBUILD mutter-40.1-r4.ebuild 4797 BLAKE2B 90eb1c17eb99023d2fce023d5202bdc798cb43f28ccb7aee708a7c0e6575687058510274858f015ea2c41c1cc0ae5f6dec2d3bef3022493295a7dfbf079030a8 SHA512 b1942ad4a4fdf14ce1e6e64f0df7fbb7b7d7d71b97be3b78ffc66f2bd4e7232a9ef99984fad2ecf912265f354a490d22875fcc813e835ddad23fa068b5152caf
 EBUILD mutter-40.2-r1.ebuild 4703 BLAKE2B 2f64ebb4b184934c359f840110fe653845faf325dd84c34b6c1f1ebc265113d5211bebb8f9e3236df76e3e7e8b37ed340efa9448f03265156de02681154b64f2 SHA512 cda41d5512f32843338c52d5ca82e19d4a7d11cd1e6761243ca6dfa0e038db03dd181d95f5dfeaf5668a5dfc643a32f036df775ee37b31f0167a3d1a1a36dadd
-EBUILD mutter-40.2.1.ebuild 4703 BLAKE2B 2f64ebb4b184934c359f840110fe653845faf325dd84c34b6c1f1ebc265113d5211bebb8f9e3236df76e3e7e8b37ed340efa9448f03265156de02681154b64f2 SHA512 cda41d5512f32843338c52d5ca82e19d4a7d11cd1e6761243ca6dfa0e038db03dd181d95f5dfeaf5668a5dfc643a32f036df775ee37b31f0167a3d1a1a36dadd
+EBUILD mutter-40.2.1.ebuild 4760 BLAKE2B 77a50e5539c2bbd7f34a66e87cb59dd996380430b822c7d25416be130c620658ea5045909b94bea08adb3164d36fa64dff12aad252e1bc3a8a2b288a9c388e35 SHA512 e0a0c671457103d5cb308cb19513833382075bcb48cd37a301bdbfacce6d0a6ba02f5dc26f6186017bced21145c7d04c762045e7ad5d48f0a592866e7ef63094
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild
index 36f6f75bc571..62bbdb155ee3 100644
--- a/x11-wm/mutter/mutter-40.2.1.ebuild
+++ b/x11-wm/mutter/mutter-40.2.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 LICENSE="GPL-2+"
 SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland"
+IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) udev )
@@ -65,6 +65,7 @@ DEPEND="
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
 		x11-base/xorg-server[wayland]
+		video_cards_nvidia? ( gui-libs/egl-wayland )
 	)
 	udev? ( >=dev-libs/libgudev-232:=
 		>=virtual/libudev-232-r1:= )
@@ -109,8 +110,6 @@ src_configure() {
 		$(meson_use wayland)
 		$(meson_use wayland native_backend)
 		$(meson_use screencast remote_desktop)
-		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
-		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
 		$(meson_use udev)
 		-Dudev_dir=$(get_udevdir)
 		$(meson_use input_devices_wacom libwacom)
@@ -130,6 +129,19 @@ src_configure() {
 		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
 		#xwayland_grab_default_access_rules
 	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emsonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
 	meson_src_configure
 }
 
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 809fc9ab3fda..f17fffcca502 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -2,5 +2,5 @@ AUX 50sawfish-gentoo.el 366 BLAKE2B 5d068cfae8fd522037656d009a2007188ab272d4ea0c
 AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807cd7712be992bdfe7d20bfc5fe6bfcf8a1c0407f8a1394ad2bfed8fe5663745edd761a7d41c0ced226f400c414a7d1 SHA512 ab96ea42c01e1fb2bde192f55273fc647a6fd9904c6bcd05303eea03dc306dde90c152ab7dfea003a50441dcd344f37478e184d9a9c1124961b96556e3aab40d
 AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022585712af26153ba87187da629ffb662f89eeee9529322ab810809fa352bba0eaca314e1cfef507d8735086075b9c29bd SHA512 89d2f547b6fe100815763c4b1ab9fcb2cb67613c35bdda6de7d6be297c2871909c70c6d352debea04fa4627aca6e195ea44a1d402a4cd01137d80ff96b5040be
 DIST sawfish_1.12.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d
-EBUILD sawfish-1.12.90-r2.ebuild 2332 BLAKE2B 9d25104045ca942117465d061344e4fa8e448cefd76708743f10f128601fd18a2a40559763e1e760b930ede4d653a50ca9ed26f2832f4201c47983cbf2f59a80 SHA512 3eb3a49d6a6552ee0e32e3a6e6109d7e7a7faa8ac48b70dbd20a5fdf926a479d71a94652ae7d6e545dcacd6719b10a4c1c7b42a72fb3a8abaaad08db7a9e36b0
+EBUILD sawfish-1.12.90-r2.ebuild 2341 BLAKE2B 26b6e4d9169546dce31bbf861da787cec330943efeee57216ba1387cbf90b8cb7b14e0b34fd4e7e1dd9febda820f9f7dcfa25eecc5b04c6ea883bd329f9d1b39 SHA512 78d893f585ab4753c579fcdd0300d2705c0a4d5cc60bbcaa887a2a30e57fd0dbda3b716e12cd254427ed42982842e366a49abb0f9846e69455e61d49969e9f2d
 MISC metadata.xml 435 BLAKE2B de60328aaf226209271f875971dc4061e350c1bb882980522aa5335addcb0cd8721624bdd8a378927212db79056307795368becbafa6024486e95a87fb267b9f SHA512 ecc1b031b97b12870bd327a10d2b1247e2d3a739cc93e23ce7833d88ebaf0c287de650eb903a2133bd3c9bf0520388216635e551303eb68909ca26827f478044
diff --git a/x11-wm/sawfish/sawfish-1.12.90-r2.ebuild b/x11-wm/sawfish/sawfish-1.12.90-r2.ebuild
index bf4276d85148..b07f61899569 100644
--- a/x11-wm/sawfish/sawfish-1.12.90-r2.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.90-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 MY_P="${P/-/_}"
-inherit autotools elisp-common l10n xdg-utils
+inherit autotools elisp-common strip-linguas xdg-utils
 
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="https://sawfish.fandom.com/wiki/Main_Page"