gentoo resync : 25.10.2021

7 files changed, 8 insertions, 180 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 935876f558a4..bc4dfb294111 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 592df4bb4bae..2123ada7b6f4 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-x11-7.4-r3.ebuild 3316 BLAKE2B 9dfc306b04177c6a4f3692fa68db3402b94e9783a18411eccf155f1932742e17f6a0f02c5ae8989e49cce009fda15e7ee42c1b96663ffa6d75f3a1af867b8b49 SHA512 a82cbdefbfd488ae7907a9f1f194445a1cb78ad02930b672984b5f8d7fe3c352f458d298e68eb261f57f7dfebf83897bf1455fd33d23272e23ae9a6dade92d94
+EBUILD xorg-x11-7.4-r3.ebuild 3323 BLAKE2B b9e3e2ef46ce00539417717a1e28446c51618396f71867bef1163eeba56b5a869199f372bca69fce46c1ee8a0a026a09372611f0164796de21176047601d525d SHA512 ae8930ad3cafe31e7fbd3f66c9ecdaa1708d99a6f132cefd702ba38e4f9d877b05b520b5917a123d9d00a41577a06c3f60f048d9a77febdf9f5d5c9a4188d4c9
 MISC metadata.xml 296 BLAKE2B 876afcbb8cf5b7970f99798ce1fe33055b394597dc8a1fb12b31ab15e9ce6df73651be22c785b4506208eae8c09ac60188b872bc21d1e7253be5aab7e7886ee1 SHA512 2638dabb7a9009d534597ccefdc8073aa173238d40deaf8ce1f2ae4b10c66e25b4f18e9f4f058f676c86ae1a26d391778aa4776c5513333dccab4d1addea0ec2
diff --git a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
index a576a1656c24..348cdce0a94c 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="+fonts"
 
 # Server
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 49694db42e41..43351666ea7c 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,9 +1,6 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
-DIST xwayland-21.1.1.901.tar.xz 1258684 BLAKE2B e689f9342bc1e3ccdd0807dc3e47d04e34b9d728698848c155cb489a02002ef8120cad1322db9d6fe955d275fc6c0835bbc76d61d4a2aa26118bb267c16e7717 SHA512 60dec3875e8ea60f8fc53eea0ebcb55c948cf5eeb40b30f6d5e13d8c7b48d0aabd035884ae108fce0b03ca5da592d1b0e395a9c5198c1204e8407ec119d9bbee
-DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a85bae214f9d395450b6945ee845d28c7a8580e6aaa5f3538d06083312391d24267e6b239bfc533526a1bd7a56f0a SHA512 0cb03d796af183f9fde14c30ef45d94ef466ac4ba3d85dda34e74f91dd94bb75d0c8a867ecb7bda7ea61d98c70a4f73bc98c5a205ea5f69a0e222cd780d263d8
+DIST xwayland-21.1.2.901.tar.xz 1261656 BLAKE2B 76710f02d50506d3a41d33065b23b8bd43ef6ab6abb69f359d12174dd8a9fc2d90e1125f093701c560f6de77ad52fda6d76fdabbfe9df6028194a6ae73f82c91 SHA512 94ffb4f1d107db7c78aa01048ccc984882cd290bc67c8dc6d83ee158c65d8ad58974b71881136301b1b43077abe0aeb6b37780a5c69edf502ca714b8b8d75b1c
 DIST xwayland-21.1.2.tar.xz 1258732 BLAKE2B 1a797e4dedee4f47ada968d4a06c89da2fac64bbfa587e84f01d5b0aa7da23402b70369a274a672470e6d8df0645fd117d129d1f2049b25394d825a9eed3e451 SHA512 3bd595a563cbc44b49a00c85adabdbcddf02fd55c6500ed2711557c156f10cd273af93f7b232865141ad27392a85583e40268bcedad183ad9eeefba457cef6c6
-EBUILD xwayland-21.1.1-r2.ebuild 1794 BLAKE2B 3558e27b1006cba4b301645dc203cfc7e2f69b884b714d47eccb613e01cdd51c3e3570dcd0f9ca1de11116b507442f701a9ead1c7f694f508a3686d17e044102 SHA512 8bef4a535c5257c6be77706b7a809701adfc6b0a604efa7a1dbcc4fb333a1be20a41dbcd7a20a6f6613b400b725c96627890cb6b86287ebfaa912d57b4ac63c1
-EBUILD xwayland-21.1.1.901.ebuild 1808 BLAKE2B 05ff3178a7e0327e31f566c1822d3014028eb17db924a078f26d689d376ce684b4b65571075057331dd600d29dcc4c95a3a681a78dd818766e5fd302e5a03fe4 SHA512 75e1a6dac3d1486bcb3680c6e414ac11abdd59b0c4be57ecbe6f93e572192726c8f3f25258ff2d76157532a345b7e7a6679b6eaa2bb83aac939592b73e70eca0
 EBUILD xwayland-21.1.2-r2.ebuild 1928 BLAKE2B fa337518f1cf0d1da110b0cbe890a63f8ccf7b1f6abb005c5e7948b2d6d4eda17a1135c97d5ace033b68f0af7975a61fb4ef8710c6b564eef39d681c2fc1a4ad SHA512 640e0895fc066f6fb713a88a83f67329f202acec89c12cfe9d39fe03832ef8d682b1ef901650ca64e8f7e81bbbccc03c9e3523328e0e06669ac1b21bf31c428a
-EBUILD xwayland-21.1.2.ebuild 1918 BLAKE2B 55c67dbdb3a7221f4694bd4b9b5a0c574640067ec15b14eb8a2bf6e2dfdc8601ff1db3fab6fb1aa03a0bfbaafccdbbf22d567df849b771d345bb25da1ce86768 SHA512 bf8c1c16d346227c0a54e116faae4824cad188dab8c9caea0018835edb447c8beb1df15dc7f54ec0ded4bf70250c2ba22824e5e9020142e2777ad618efeb073d
+EBUILD xwayland-21.1.2.901.ebuild 1934 BLAKE2B 6d620ee6fad745f9833df0a8d2b0633066aa11aa8571a772dfecff19f99122947bdf6bde1a769083f98ae0b82da9b230ecb6ebed518b6e14a634332f38d1221a SHA512 b4ed120b7323dbf989aa14b0c4c1b34f11496af9de73bdf7a59e547a38c05440d6934783493e552f3162dd487f9e516c2a73fa184072225be8a43ac0d428166d
 MISC metadata.xml 493 BLAKE2B 9761735ff751b1c66db647d8427c32997113ca4106b6d447a3542b0e70b848bf3486fab64a9a47d9c4222d2184dd582036c91c02118cddd43458e69075eebfdd SHA512 eef562fc6bcbfaa6916e7ee3ee813eebea57e56049dd4617f6c9a22118de836e681c14a77a7187deee5d003d0fd4f9a509b24535b54ba42df791ffa644b6be3a
diff --git a/x11-base/xwayland/xwayland-21.1.1-r2.ebuild b/x11-base/xwayland/xwayland-21.1.1-r2.ebuild
deleted file mode 100644
index 06ad6c677a3d..000000000000
--- a/x11-base/xwayland/xwayland-21.1.1-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-
-IUSE="rpc unwind ipv6 xcsecurity selinux"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=x11-libs/pixman-0.27.2
-	dev-libs/libbsd
-	>=x11-libs/libXfont2-2.0.1
-	dev-libs/openssl:=
-	dev-libs/wayland
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libdrm-2.4.89
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	>=media-libs/mesa-18[X(+),egl,gbm]
-	>=x11-libs/libxshmfence-1.1
-	rpc? ( net-libs/libtirpc )
-	>=x11-libs/libXau-1.0.4
-	media-libs/libglvnd[X]
-	unwind? ( sys-libs/libunwind )
-	>=dev-libs/wayland-protocols-1.18
-	media-fonts/font-util
-	x11-libs/libxkbfile
-	>=x11-libs/xtrans-1.3.5
-	x11-base/xorg-proto
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-"
-
-RDEPEND="
-	${DEPEND}
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use rpc secure-rpc)
-		$(meson_use unwind libunwind)
-		$(meson_use ipv6)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		-Dsha1=libcrypto
-		-Ddpms=true
-		-Ddri3=true
-		-Dglamor=true
-		-Dglx=true
-		-Dscreensaver=true
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxv=true
-		-Dxvfb=true
-		-Dxwayland-path="${EPREFIX}"/usr/libexec
-		-Ddtrace=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../libexec/Xwayland /usr/bin/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-21.1.1.901.ebuild b/x11-base/xwayland/xwayland-21.1.1.901.ebuild
deleted file mode 100644
index ad2989c660eb..000000000000
--- a/x11-base/xwayland/xwayland-21.1.1.901.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-
-IUSE="rpc unwind ipv6 xcsecurity selinux video_cards_nvidia"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-DEPEND="
-	>=x11-libs/pixman-0.27.2
-	dev-libs/libbsd
-	>=x11-libs/libXfont2-2.0.1
-	dev-libs/openssl:=
-	dev-libs/wayland
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libdrm-2.4.89
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	>=media-libs/mesa-18[X(+),egl,gbm]
-	>=x11-libs/libxshmfence-1.1
-	rpc? ( net-libs/libtirpc )
-	>=x11-libs/libXau-1.0.4
-	media-libs/libglvnd[X]
-	unwind? ( sys-libs/libunwind )
-	>=dev-libs/wayland-protocols-1.18
-	media-fonts/font-util
-	x11-libs/libxkbfile
-	>=x11-libs/xtrans-1.3.5
-	x11-base/xorg-proto
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-"
-
-RDEPEND="
-	${DEPEND}
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use rpc secure-rpc)
-		$(meson_use unwind libunwind)
-		$(meson_use ipv6)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Dsha1=libcrypto
-		-Ddpms=true
-		-Ddri3=true
-		-Dglamor=true
-		-Dglx=true
-		-Dscreensaver=true
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxv=true
-		-Dxvfb=true
-		-Dxwayland-path="${EPREFIX}"/usr/libexec
-		-Ddtrace=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../libexec/Xwayland /usr/bin/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-21.1.2.ebuild b/x11-base/xwayland/xwayland-21.1.2.901.ebuild
index 327122b433d5..f95f884f71bf 100644
--- a/x11-base/xwayland/xwayland-21.1.2.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.2.901.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libdrm-2.4.89
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
 	>=x11-libs/libxshmfence-1.1
 	rpc? ( net-libs/libtirpc )
 	>=x11-libs/libXau-1.0.4
@@ -41,6 +41,7 @@ DEPEND="
 
 RDEPEND="
 	${DEPEND}
+	x11-apps/xkbcomp
 	!<=x11-base/xorg-server-1.20.11
 	selinux? ( sec-policy/selinux-xserver )
 "
@@ -72,7 +73,7 @@ src_configure() {
 		-Dxinerama=true
 		-Dxv=true
 		-Dxvfb=true
-		-Dxwayland-path="${EPREFIX}"/usr/libexec
+		-Dxwayland-path="${EPREFIX}"/usr/bin
 		-Ddtrace=false
 	)
 
@@ -80,7 +81,7 @@ src_configure() {
 }
 
 src_install() {
-	dosym ../libexec/Xwayland /usr/bin/Xwayland
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
 
 	meson_src_install
 }