gentoo resync : 24.06.2021

4 files changed, 133 insertions, 0 deletions

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
new file mode 100644
index 000000000000..a416a95aa825
--- /dev/null
+++ b/x11-base/xwayland/Manifest
@@ -0,0 +1,4 @@
+AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
+DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a85bae214f9d395450b6945ee845d28c7a8580e6aaa5f3538d06083312391d24267e6b239bfc533526a1bd7a56f0a SHA512 0cb03d796af183f9fde14c30ef45d94ef466ac4ba3d85dda34e74f91dd94bb75d0c8a867ecb7bda7ea61d98c70a4f73bc98c5a205ea5f69a0e222cd780d263d8
+EBUILD xwayland-21.1.1-r1.ebuild 1749 BLAKE2B 9a01d67d5979f11c653febfa1b1f29de088bc3cd499db9fe367f99358d818201a038c6bd8fb4e6b577dad29a1402bdff7701b98d6b02e1e5cd1fd0cf17f006e3 SHA512 2b72fb2244ad0df39b36135691d3668d6124b88959bc20a9922db4c4b447b76c5053ae304c461c7b23bf80d944588b5d61a46687ecd9c1cc3faed54c42ea85c2
+MISC metadata.xml 492 BLAKE2B df9bce6c0bf8fc88dc1386143ceffe54b16e9e024281d6839496827ba1e645b01126ed2937e152b9cd06ee232c8149c5a789bc4ce6d380b5b6cec722b7c65c13 SHA512 987198d7347e1849f7974873d8140d9dfa921b3afff3a6864c47b59baa29de92bdc90a83b03f3765c7a4e15553f2afaa1ae164aac2d9e3b52d9839444bee6255
diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
new file mode 100644
index 000000000000..39e0548eaaa3
--- /dev/null
+++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch
@@ -0,0 +1,27 @@
+diff --git a/dix/meson.build b/dix/meson.build
+index ddc5cc3..bf5bfa3 100644
+--- a/dix/meson.build
++++ b/dix/meson.build
+@@ -56,8 +56,3 @@ libxserver_main = static_library('libxserver_main',
+     include_directories: inc,
+     dependencies: common_dep,
+ )
+-
+-install_data(
+-    'protocol.txt',
+-    install_dir: serverconfigdir,
+-)
+diff --git a/meson.build b/meson.build
+index 4af03ef..791465d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -520,9 +520,3 @@ subdir('hw')
+ if host_machine.system() != 'windows'
+     subdir('test')
+ endif
+-
+-install_man(configure_file(
+-    input: 'man/Xserver.man',
+-    output: 'Xserver.1',
+-    configuration: manpage_config,
+-))
diff --git a/x11-base/xwayland/metadata.xml b/x11-base/xwayland/metadata.xml
new file mode 100644
index 000000000000..db66c9cee4da
--- /dev/null
+++ b/x11-base/xwayland/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<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>
+</upstream>
+</pkgmetadata>
diff --git a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
new file mode 100644
index 000000000000..b5ace4e02aee
--- /dev/null
+++ b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild
@@ -0,0 +1,86 @@
+# 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"
+
+CDEPEND="
+	>=x11-libs/pixman-0.27.2
+	dev-libs/libbsd
+	>=x11-libs/libXfont2-2.0.1
+	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
+"
+
+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)
+		-Dsha1=libcrypto
+		-Ddpms=true
+		-Ddri3=true
+		-Dglamor=true
+		-Dglx=true
+		-Dscreensaver=true
+		-Dxace=true
+		-Dxdmcp=true
+		-Dxinerama=true
+		-Dxv=true
+		-Dxvfb=true
+		-Dxwayland-path=/usr/libexec
+		-Ddtrace=false
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	dosym ../libexec/Xwayland /usr/bin/Xwayland
+
+	meson_src_install
+}