gentoo resync : 06.04.2022

7 files changed, 120 insertions, 4 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index dc2be7f4d9aa..0d80c655c6ff 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest
index c1f52a4319be..7ed6a1fe8d66 100644
--- a/x11-base/xorg-sgml-doctools/Manifest
+++ b/x11-base/xorg-sgml-doctools/Manifest
@@ -1,3 +1,5 @@
 DIST xorg-sgml-doctools-1.11.tar.bz2 120356 BLAKE2B 55a6e89675dff17bb873e187325255a3da0a431a49950dfb3aea353efa6335a01118512edc0a24b0690f2d2d8b2ddda49bd84e71064574048e06c0a4923cf0ba SHA512 64bf561bc7a6855f96d9df8b062860deb3b9967203339ae2fc02404ad29c05272f7ead3aa792b149811ecfc7af786567e0b8a66a2bf112d33ec7385dd1398e7e
+DIST xorg-sgml-doctools-1.12.tar.bz2 131356 BLAKE2B 555faf50f2e83b689566c7033669bd6e2e93294b9b6895d07110497392387f60b821fe570063e34d8089dc1a9f273eefb5ea0d0556d5965bf893756279e8688f SHA512 5c4f8506992abcc3d98b99d33b60ac770f039c3ffa11ad49005942bc9b7497367842a57967cee51b0e8e9095a660879af9a243abddf6b1af88741dbb882b3a4a
 EBUILD xorg-sgml-doctools-1.11.ebuild 406 BLAKE2B df22ff8918a192ac1044b55d63a031271a896b7c2edaa31bfbb305aeb21e7b1f1c25e03c581871128b19c8de07939fea102fda2da8ee0acd50da98349144dbe2 SHA512 9e992185a735469e4baf7d7def7a46d5399ccf564b5ad0fe33abdf9fea7d82a8cdf4ea7c0802e07bc949f3104e7892f1a9b66733e4f4b064c4b46f21c7ddca68
+EBUILD xorg-sgml-doctools-1.12.ebuild 411 BLAKE2B 64bc330961fc85110336ae852aefc9dbf55def2f60e3ebaa59e7d21241ff098826ab9a22a70b13548fa7f55bd5c6ad6ab1ad292809c09b5685327f335f4c1ca0 SHA512 bc88ec4fdc74fef2329a17462f2ba665fc5832bf502b1991311421ebf61847e01a0137a0e4cc397f776ba02e9ddb9326f737660f3106c83b02a3bbf4d3559748
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.ebuild
new file mode 100644
index 000000000000..824ecd0720a9
--- /dev/null
+++ b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_MODULE=doc/
+
+inherit xorg-3
+
+DESCRIPTION="SGML entities and XML/CSS stylesheets used in X.Org docs"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="x11-misc/util-macros"
+RDEPEND=""
+BDEPEND=""
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 2b6c4d500b99..5a893505e3db 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,6 +1,8 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
 DIST xwayland-22.1.0.tar.xz 1271896 BLAKE2B bd090032a31a2872d3e1095ca2f73d8945eb9f29801ea5164b867132c98e4195eb84adc404048b294e148181b38b9172453e276f78a1a9575889fbc77c31d740 SHA512 01306d2127e9d02e457d86208d6fb285379ed8fab2837febe56aaee4b236bc052ad65ca8ec35555b983d15f0d8dd01d20526a17b40225d2a4b91c53202ec10b5
-EBUILD xwayland-21.1.4.ebuild 1882 BLAKE2B e80be42c3262df906848da3db9965a797e6fdb6d493e2441890c63a38bf2674aa2ec97e9baaa1949d3be2aa10512e6962cf7eb03ed457aa00b932dab72200a51 SHA512 88b60dfd55a8c6a14380a4b18a7ee137d59e024366dc760f46945ee51050d08bf6bf6ded3ae71c87c4f600e5f314731647426e40e7e19aeb28532c1189efe334
-EBUILD xwayland-22.1.0.ebuild 2024 BLAKE2B 4a5551dcf5db869b39cbeb046c5f35a8a0ad0c86965a4d1197ebe3e20b11612672e61a327748e8432d4597602115c395666e9dba997bd392c4c709c8a8cff9a2 SHA512 c59271431fe50565c73af573e2f69431f1a0cde04dedc5682a3fd6fa224c6d3ca77a9e02115619a1f6318d4a0c44660d373d4d96a282f643b8a3a9afdde9e7d5
+DIST xwayland-22.1.1.tar.xz 1272176 BLAKE2B 5dabf9d6cf6ed217cdf5694dba9c63059bcc43e2bb413c1edcd5d8775a906270b28e9dddb90bedacdefe27bd792339c346782511102b42250e2a940aa664e9cb SHA512 435cdf59f2be1ff7cb3dbb04e7a8920d9c48471fbeffca96c9dab2be400b168bfdb73b9e818829c555ab5d6fd83345eb693b3ba785d4ef701bdb27c8344077b5
+EBUILD xwayland-21.1.4.ebuild 1889 BLAKE2B 084f95eb85009e95da761a339a84cd0645ba0d0fa0c298722e3bcf56a8adc2f4433816be8bb2d9c8f6dce67d2cfc6ace08538d1111bbf5671e842fe2cd5ff451 SHA512 7612a13407450e6655ff958bcc316f40a5c180a9f3dbae8550a65abae12f341748471868592e26b01ca078bc894735cc80b9d1c59628509308a28cdf2c120405
+EBUILD xwayland-22.1.0.ebuild 2023 BLAKE2B 7d13e6cfd08c2f70907a69a540adebb3a110ff944467a8521d4bd827b9543fa207fe052cd193967a205801f8bd6bf4ce9ea60062efba311a5c198321b8636fb1 SHA512 ac69ec3176db6bc3b04d194fe7f661c7aadbe310801ad49ded1614a887ed8250a71b7e1251e9115ccec95a0d95e116d6dd31b856744116ecce71c54738721705
+EBUILD xwayland-22.1.1.ebuild 2023 BLAKE2B 7d13e6cfd08c2f70907a69a540adebb3a110ff944467a8521d4bd827b9543fa207fe052cd193967a205801f8bd6bf4ce9ea60062efba311a5c198321b8636fb1 SHA512 ac69ec3176db6bc3b04d194fe7f661c7aadbe310801ad49ded1614a887ed8250a71b7e1251e9115ccec95a0d95e116d6dd31b856744116ecce71c54738721705
 MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/xwayland-21.1.4.ebuild b/x11-base/xwayland/xwayland-21.1.4.ebuild
index 1a68db1c9a96..3f95543af791 100644
--- a/x11-base/xwayland/xwayland-21.1.4.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.4.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	dev-libs/libbsd
 	>=x11-libs/libXfont2-2.0.1
 	dev-libs/openssl:=
-	dev-libs/wayland
+	>=dev-libs/wayland-1.20
 	video_cards_nvidia? ( gui-libs/egl-wayland )
 	>=x11-libs/libXdmcp-1.0.2
 	>=x11-libs/libdrm-2.4.89
diff --git a/x11-base/xwayland/xwayland-22.1.0.ebuild b/x11-base/xwayland/xwayland-22.1.0.ebuild
index 54ef1745e2ba..242b2daef28f 100644
--- a/x11-base/xwayland/xwayland-22.1.0.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 COMMON_DEPEND="
 	dev-libs/libbsd
 	dev-libs/openssl:=
-	>=dev-libs/wayland-1.5.0
+	>=dev-libs/wayland-1.20
 	>=dev-libs/wayland-protocols-1.22
 	media-fonts/font-util
 	>=media-libs/libepoxy-1.5.4[X,egl(+)]
diff --git a/x11-base/xwayland/xwayland-22.1.1.ebuild b/x11-base/xwayland/xwayland-22.1.1.ebuild
new file mode 100644
index 000000000000..242b2daef28f
--- /dev/null
+++ b/x11-base/xwayland/xwayland-22.1.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2021-2022 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="selinux video_cards_nvidia unwind xcsecurity"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	dev-libs/libbsd
+	dev-libs/openssl:=
+	>=dev-libs/wayland-1.20
+	>=dev-libs/wayland-protocols-1.22
+	media-fonts/font-util
+	>=media-libs/libepoxy-1.5.4[X,egl(+)]
+	media-libs/libglvnd[X]
+	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
+	>=x11-libs/libdrm-2.4.89
+	>=x11-libs/libXau-1.0.4
+	x11-libs/libxcvt
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont2-2.0.1
+	x11-libs/libxkbfile
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+
+	unwind? ( sys-libs/libunwind )
+	video_cards_nvidia? ( gui-libs/egl-wayland )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+	>=x11-libs/xtrans-1.3.5
+"
+RDEPEND="
+	${COMMON_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 selinux xselinux)
+		$(meson_use unwind libunwind)
+		$(meson_use xcsecurity)
+		$(meson_use video_cards_nvidia xwayland_eglstream)
+		-Ddpms=true
+		-Ddri3=true
+		-Ddrm=true
+		-Ddtrace=false
+		-Dglamor=true
+		-Dglx=true
+		-Dipv6=true
+		-Dsecure-rpc=false
+		-Dscreensaver=true
+		-Dsha1=libcrypto
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxvfb=true
+		-Dxv=true
+		-Dxwayland-path="${EPREFIX}"/usr/bin
+		-Ddocs=false
+		-Ddevel-docs=false
+		-Ddocs-pdf=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../bin/Xwayland /usr/libexec/Xwayland
+
+	meson_src_install
+}