gentoo resync : 12.07.2021

8 files changed, 12 insertions, 12 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index d44ab47839a7..8623f36352f3 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index bd72d22f3171..d25f65ca44b9 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -3,6 +3,6 @@ DIST icewm-2.3.4.tar.lz 1708239 BLAKE2B d19a7864642795b93a8d30a63c6ba0dcac4ee9b9
 DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97d8e5eeb93942908481f68614cfe55afd4041b5d60e58e732fef1694f67c5918a130bc55b252ebae67a51482a SHA512 1f59b4dbe90ca47031e5abf999cdb23a8e9ea956d5a76a0dde9b3489dec4530bf0ce72e10b337615d0bcadf04007b00a7db6f43082504bef65b109f9115d9f52
 DIST icewm-2.6.0.tar.lz 1722772 BLAKE2B 4d7055b77d88d0731517b668f525161a97b571f68cf0b2944e9b364653cb022f0b29d664ccc9539d1807005ab8954aa3ce31244911c2fafaa673ef5afeb447f1 SHA512 fe491c8c59aa530d48a20134857c787eccfeda5bd9529e063d865bd3c5f243ef41fbecba40aa06e7fa8037af89839958095debebc5d9b1acc9b5670bd0e12eb6
 EBUILD icewm-2.3.4.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
-EBUILD icewm-2.5.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+EBUILD icewm-2.5.0.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
 EBUILD icewm-2.6.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-2.5.0.ebuild b/x11-wm/icewm/icewm-2.5.0.ebuild
index 7b0d626e90a0..6215cdd777d4 100644
--- a/x11-wm/icewm/icewm-2.5.0.ebuild
+++ b/x11-wm/icewm/icewm-2.5.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype uclibc xinerama"
 
 # Tests broken in all versions, patches welcome, bug #323907, #389533
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 6e936613a899..9101a466b6ab 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -7,8 +7,8 @@ DIST mutter-40.1.tar.xz 2680816 BLAKE2B 924fd977e1c6669abd5adea1855c3a0a4027ae7e
 DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73 SHA512 f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
 DIST mutter-40.2.tar.xz 2681840 BLAKE2B 7785086a9aff9f273735e0a0716a8535a7e69b35c5b4312d8a363b4058e84e499a15c1d9b085c40d1303e69e661fd74c286da89a83a27d86e1a56c537f7e2e18 SHA512 9582004efde7a4b2ad21c390f4a4558c99709e21bdcac3f161f185612de9aaeb60cbfcf5dd1684726ae18244540aa4b6bcd2b9f362b92eb8c74304c43c9e1113
 EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125c91bc878f715a1430d90996bf4183c2281c88b935ca44b8940ddf4f7850f5a42d7550f138ddead7eb6ddd62a4a8e SHA512 c2a5b423e410bb6a8a9304acea03fbefba0ce3385d3dabb8adc46baa63d9daef02a59b051a371b62acdc6acfed3c443a8cc229928a2305a11766005ded637c2a
-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 4850 BLAKE2B 144dca2b78def91b819e33966680a8276ab821eea88c04ef295c7d5147df6cf41c4c4a22465606b6ab2a5caa48a12259cc42f7774ac76a1934c26d4d252aa836 SHA512 bfe0c51adfbb7786ecd95ccf9131c6f447eaf215f6a8946230254e301e48fe0ee8a5787694abb3ed331ace8616332ba878cb24445213d2f8c36843c17a61c84e
+EBUILD mutter-40.1-r2.ebuild 4698 BLAKE2B 2e596db628643d0ea02b06c1f0a4c1fa3a59cd4f179edadacaf903b238af01e200745977570db0a9d70e3f27655bc685ca734977284f0be6ffa3029d92d85b77 SHA512 c95097736269f708215ee70990be54feadf580898911d859d3d63b4f3991646016625be586c58f718e3904dc80d3b118d4824ea528675894252ac46a0d81b8bf
+EBUILD mutter-40.1-r4.ebuild 4795 BLAKE2B 81cdf5e0012ab9145a9e131f2701dc1335833f177c336b8880d89b23cdbb7afcdd45baaa70232a81424116fd4840e140f0a59a2e74a08e852b6d399a32ad496d SHA512 4d7b383a6185c169a0b2ee6e5139fc614b3c9ff4f19094c9da6783174d0fcd255c191170c31786dd5ffc78531fb014c7253ee5d0f90f36a377f356c885bd5915
+EBUILD mutter-40.2-r1.ebuild 4701 BLAKE2B 1785d0505f6182894f187c84d2d9b04eb7d7914d0182a35ce78f0ba9984aa2fc22df955e092d1583d1e3965fa6437d3815cb081620a3d4ead6a893f0154fa9aa SHA512 42423c360756ec6d3ba7bb3e4d1da26df9c15d4b1e7f3ae139382a24c1e0b85afd77c2fe4f28ff364c794e611b68b15195a5b07ad3cfa1c59422acfb2d689a1a
+EBUILD mutter-40.2.1.ebuild 4857 BLAKE2B 7d7c1edaf536ead824e60131fa5e92e8c1a0fa612f0f2548d4669648dd0453c4325bd05f89163cb6fe9893619d1cdaf32038b0a3154c6fd4452c579cc0e72276 SHA512 43d5d57b0d96cb0a98a8b687672c7398cc23dd99990179d7a9031e669996f9a8ee73e2d83f31d36379844536c23463468db7f21743098478015ffb4789eec777
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-40.1-r2.ebuild b/x11-wm/mutter/mutter-40.1-r2.ebuild
index 1e805c5eb326..3373ba421a31 100644
--- a/x11-wm/mutter/mutter-40.1-r2.ebuild
+++ b/x11-wm/mutter/mutter-40.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit gnome.org gnome2-utils meson udev virtualx xdg
 
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+DESCRIPTION="GNOME compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/mutter/mutter-40.1-r4.ebuild b/x11-wm/mutter/mutter-40.1-r4.ebuild
index e4a6acbe99d6..8b6349daebf3 100644
--- a/x11-wm/mutter/mutter-40.1-r4.ebuild
+++ b/x11-wm/mutter/mutter-40.1-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit gnome.org gnome2-utils meson udev virtualx xdg
 
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+DESCRIPTION="GNOME compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"
 
diff --git a/x11-wm/mutter/mutter-40.2-r1.ebuild b/x11-wm/mutter/mutter-40.2-r1.ebuild
index 36f6f75bc571..42eb8d088172 100644
--- a/x11-wm/mutter/mutter-40.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-40.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit gnome.org gnome2-utils meson udev virtualx xdg
 
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+DESCRIPTION="GNOME compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild
index e981a487b659..8429f5326103 100644
--- a/x11-wm/mutter/mutter-40.2.1.ebuild
+++ b/x11-wm/mutter/mutter-40.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 inherit gnome.org gnome2-utils meson udev virtualx xdg
 
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+DESCRIPTION="GNOME compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
@@ -94,7 +94,7 @@ BDEPEND="
 		>=sys-kernel/linux-headers-4.4
 		|| (
 			x11-libs/libxcvt
-			x11-base/xorg-server[xorg,-minimal]
+			<x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
 		)
 	)
 "