gentoo resync : 03.07.2021

6 files changed, 98 insertions, 18 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 316017a2c6ac..4ca33a326918 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 8cdc31e65cc5..048f999761ae 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,5 +4,5 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d
 DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
 EBUILD xorg-server-1.20.11-r1.ebuild 5219 BLAKE2B 80008ff4771eae117886ce2e10c04fd0aca05d7f8daf77bfe5f1cf3ddfb51ea9021ef31e078003746412ccfa13af941f44281172fe8dfc740c18ee0f416b5d17 SHA512 e19a024e55847a973edb77ebe064a1862405472c7eb50f231ddf3900c0e5ae258dad77ef6150be102d2e059079be75b939f2cd4a7563e445ee8c426ec3e89f96
 EBUILD xorg-server-1.20.11.ebuild 5574 BLAKE2B 9e1a53aab7fc913898e01728057bb121f68e41d3f50ad022328474e6b2fcea48502d5d64c2116faa8417db174259146420171cb77f1d10328a9951bb67de6b4b SHA512 b209f1dbbcdb8cacac4b638b2ad9db0527b535c5111535a99f6965124dba0e77fec890c292b07e5cdfef8f3a5f8e5a5f4e53464061b9936c8b391dbd0a23e635
-EBUILD xorg-server-9999.ebuild 5578 BLAKE2B 3fa7a83ed1cdada0ce2d7ae5fb43bbaf8b130c3a9b30b7db37508b0460045244361c989b26d3801d923fe06a83f03c0b29a0bf01270534dc66d83170b65e72e7 SHA512 a3829df86bf7446e277c165b703da4f930a9f0af014d7258df71fca055b61f917ddc6600fb69d8a94b4113badfd7d3a6aa2688b7ea3f8b95bf31d49372e57679
+EBUILD xorg-server-9999.ebuild 5242 BLAKE2B 0febe3e6105875cc0bc3ae0ff0953f99c962df7d89407de92a9f9edd9db38ed4baaba1ff39d30cbf97ef15a4ec51e65927990fe254fd1398c6645bba22014066 SHA512 2d97ede7604284d01232a4ec5bfb4d4fda4195418080b67334536390a9d3f98fbc22680ae6091d893dc4a9af6e6b71737bd49507e0c3126deefdbfeef3846231
 MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 1b2a33ee9084..70fb5f6bd29f 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -68,11 +68,6 @@ CDEPEND="
 	)
 	udev? ( virtual/libudev:= )
 	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		>=media-libs/libepoxy-1.5.4[egl(+)]
-		>=dev-libs/wayland-protocols-1.18
-	)
 	>=x11-apps/xinit-1.3.3-r1
 	systemd? (
 		sys-apps/dbus
@@ -97,6 +92,7 @@ DEPEND="${CDEPEND}
 			)
 		)
 	)
+	wayland? ( x11-base/xwayland )
 "
 RDEPEND="${CDEPEND}
 	!systemd? ( gui-libs/display-manager-init )
@@ -104,7 +100,6 @@ RDEPEND="${CDEPEND}
 "
 BDEPEND="
 	sys-devel/flex
-	wayland? ( dev-util/wayland-scanner )
 "
 PDEPEND="
 	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
@@ -127,14 +122,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
 )
 
-pkg_setup() {
-	if use wayland && use minimal; then
-		ewarn "glamor is necessary for acceleration under Xwayland."
-		ewarn "Performance may be unacceptable without it."
-		ewarn "Build with USE=-minimal to enable glamor."
-	fi
-}
-
 src_configure() {
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
@@ -148,7 +135,6 @@ src_configure() {
 		$(use_enable kdrive)
 		$(use_enable test unit-tests)
 		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
 		$(use_enable !minimal dri)
@@ -165,6 +151,7 @@ src_configure() {
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
 		$(use_with systemd systemd-daemon)
+		--disable-xwayland
 		--enable-libdrm
 		--sysconfdir="${EPREFIX}"/etc/X11
 		--localstatedir="${EPREFIX}"/var
@@ -174,6 +161,7 @@ src_configure() {
 		--disable-linux-acpi
 		--without-dtrace
 		--without-fop
+		--with-os-vendor=Gentoo
 		--with-sha1=libcrypto
 		CPP="$(tc-getPROG CPP cpp)"
 	)
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index a416a95aa825..7f62e98359a0 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,4 +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
-EBUILD xwayland-21.1.1-r1.ebuild 1749 BLAKE2B 9a01d67d5979f11c653febfa1b1f29de088bc3cd499db9fe367f99358d818201a038c6bd8fb4e6b577dad29a1402bdff7701b98d6b02e1e5cd1fd0cf17f006e3 SHA512 2b72fb2244ad0df39b36135691d3668d6124b88959bc20a9922db4c4b447b76c5053ae304c461c7b23bf80d944588b5d61a46687ecd9c1cc3faed54c42ea85c2
+EBUILD xwayland-21.1.1-r1.ebuild 1781 BLAKE2B e79e59ff8777b74ca154997673973b7527b7a805f354e08d0741f720fa1c81d3c25c3ab6608610da1b7e4c00c0c1fc9475d148cec7e08bd61f9b5ea6bfb5090c SHA512 1da30c7a5d6350238e971bf69a0a0465ac4cc3c1992fa3e7fd53dc979cd1053b499f4b4f453972b176fd5ed4ea411b2dd61e8afd7bb5edb8188de9419537531f
+EBUILD xwayland-21.1.1.901.ebuild 1795 BLAKE2B 1d5afaaf69693d1de91996c81feb782a01a3fc3d732a0cf735f8b75a495a739033d316826c28b959dd376eb5b044987b8bb30d0691f6d84d1d544bab27a2698b SHA512 4f8cf17bb0c97f58993cce1ccfaf40f3026247da8bdeeb59cb0f2cd210df1ef9a90cb40f99808731f34ceeb4879bcae829ce8a13173c9e183e4d6c4487038d33
 MISC metadata.xml 492 BLAKE2B df9bce6c0bf8fc88dc1386143ceffe54b16e9e024281d6839496827ba1e645b01126ed2937e152b9cd06ee232c8149c5a789bc4ce6d380b5b6cec722b7c65c13 SHA512 987198d7347e1849f7974873d8140d9dfa921b3afff3a6864c47b59baa29de92bdc90a83b03f3765c7a4e15553f2afaa1ae164aac2d9e3b52d9839444bee6255
diff --git a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
index b5ace4e02aee..f9966135b1cf 100644
--- a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
+++ b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
@@ -19,6 +19,7 @@ CDEPEND="
 	>=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
@@ -72,7 +73,7 @@ src_configure() {
 		-Dxinerama=true
 		-Dxv=true
 		-Dxvfb=true
-		-Dxwayland-path=/usr/libexec
+		-Dxwayland-path="${EPREFIX}"/usr/libexec
 		-Ddtrace=false
 	)
 
diff --git a/x11-base/xwayland/xwayland-21.1.1.901.ebuild b/x11-base/xwayland/xwayland-21.1.1.901.ebuild
new file mode 100644
index 000000000000..2814cbf9058c
--- /dev/null
+++ b/x11-base/xwayland/xwayland-21.1.1.901.ebuild
@@ -0,0 +1,89 @@
+# 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=""
+
+CDEPEND="
+	>=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
+"
+
+DEPEND="
+	${CDEPEND}
+	!<=x11-base/xorg-server-1.20.11
+"
+
+RDEPEND="
+	${DEPEND}
+	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
+}