gentoo resync : 22.12.2021

4 files changed, 11 insertions, 102 deletions

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 74d2ce99009a..a6c13fb39770 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,6 +1,4 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
-DIST xwayland-21.1.2.tar.xz 1258732 BLAKE2B 1a797e4dedee4f47ada968d4a06c89da2fac64bbfa587e84f01d5b0aa7da23402b70369a274a672470e6d8df0645fd117d129d1f2049b25394d825a9eed3e451 SHA512 3bd595a563cbc44b49a00c85adabdbcddf02fd55c6500ed2711557c156f10cd273af93f7b232865141ad27392a85583e40268bcedad183ad9eeefba457cef6c6
-DIST xwayland-21.1.3.tar.xz 1261776 BLAKE2B bccecc3386ceb7e612929139b5b73e038df684bc43d9554c1196c4c3e66f200b346ea8615ec9224ae999400f34881d5f29365f06d4487bf4dda381c03b83e05b SHA512 24147ef788cce3fa16cd5604d293ffbe7ef4c6dc5fc2b1a1018d78ca4c0f10ade7b99c1ad6a8cdca5c581ff40f5834d7e34b2a314acca665a527eed700993594
-EBUILD xwayland-21.1.2-r2.ebuild 1928 BLAKE2B fa337518f1cf0d1da110b0cbe890a63f8ccf7b1f6abb005c5e7948b2d6d4eda17a1135c97d5ace033b68f0af7975a61fb4ef8710c6b564eef39d681c2fc1a4ad SHA512 640e0895fc066f6fb713a88a83f67329f202acec89c12cfe9d39fe03832ef8d682b1ef901650ca64e8f7e81bbbccc03c9e3523328e0e06669ac1b21bf31c428a
-EBUILD xwayland-21.1.3.ebuild 1923 BLAKE2B 679e27aecfe108bf0d36d720d87e8cb2a100efcd46c8ee15b30ba453534090abff3bcdffab188d1b0558218a8acf3922cf4e1ae726d9a1bae7141c358983cf8c SHA512 08e61b75a110439c985def27e2af5ebb140d61917b7010a0b9ed4bce738a62da4c9ecdf5d1460abd884435883bd2cb7f5a7632f86cf5148234fa0887027594ed
-MISC metadata.xml 493 BLAKE2B 9761735ff751b1c66db647d8427c32997113ca4106b6d447a3542b0e70b848bf3486fab64a9a47d9c4222d2184dd582036c91c02118cddd43458e69075eebfdd SHA512 eef562fc6bcbfaa6916e7ee3ee813eebea57e56049dd4617f6c9a22118de836e681c14a77a7187deee5d003d0fd4f9a509b24535b54ba42df791ffa644b6be3a
+DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
+EBUILD xwayland-21.1.4.ebuild 1878 BLAKE2B 03b8494809927b8e98760c0588d7029aa55aad807f81da816b07789b85deb43e35ae0f04ca9fb4b9cbe214d7310120223aae1b34da88255e4d287d522d47510b SHA512 9d6741060cea96f26506ed62afad2c5eae472f05cfb589afe5b981b7142be7f43b8558075a076062f3800b88aad346c6cb05e313f941281f506e9f62b8c970d1
+MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/metadata.xml b/x11-base/xwayland/metadata.xml
index 882bad551a98..b3e3a39a9a3a 100644
--- a/x11-base/xwayland/metadata.xml
+++ b/x11-base/xwayland/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
 	<flag name="xcsecurity">Build Security extension</flag>
-	<flag name="rpc">Enable secure rpc</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
diff --git a/x11-base/xwayland/xwayland-21.1.3.ebuild b/x11-base/xwayland/xwayland-21.1.3.ebuild
deleted file mode 100644
index 8700d08f40f9..000000000000
--- a/x11-base/xwayland/xwayland-21.1.3.ebuild
+++ /dev/null
@@ -1,87 +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 xcsecurity selinux video_cards_nvidia"
-
-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
-	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-21.1[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-apps/xkbcomp
-	!<=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 selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-21.1.2-r2.ebuild b/x11-base/xwayland/xwayland-21.1.4.ebuild
index e9a245353e11..1aa97eee00d1 100644
--- a/x11-base/xwayland/xwayland-21.1.2-r2.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.4.ebuild
@@ -9,7 +9,7 @@ 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"
+IUSE="selinux video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
@@ -25,9 +25,8 @@ 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
 	media-libs/libglvnd[X]
 	unwind? ( sys-libs/libunwind )
@@ -56,25 +55,25 @@ PATCHES=(
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use rpc secure-rpc)
+		$(meson_use selinux xselinux)
 		$(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
+		-Ddtrace=false
 		-Dglamor=true
 		-Dglx=true
+		-Dipv6=true
+		-Dsecure-rpc=false
 		-Dscreensaver=true
+		-Dsha1=libcrypto
 		-Dxace=true
 		-Dxdmcp=true
 		-Dxinerama=true
-		-Dxv=true
 		-Dxvfb=true
+		-Dxv=true
 		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddtrace=false
 	)
 
 	meson_src_configure