gentoo resync : 28.07.2021

5 files changed, 91 insertions, 3 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index a83365e33b0c..b3598c162808 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 0b49fcc7d771..4d424824935d 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,2 +1,2 @@
-EBUILD xorg-x11-7.4-r3.ebuild 3317 BLAKE2B 0519b780d9f14acb55e739167522460d36a9083be2f272f51b94c4815163e68161ca884fd53a687b1f7c00bc40b3dd48238245e3e06efbf1c0dc0294adba4443 SHA512 4e73a7020dbdc28e917f451c1d53e94600e0816688ed24f7900a080be15a0cded3f6bbdd44b13e377a40616a70109a5d17345d787272dddf436c8412b37b3bb6
+EBUILD xorg-x11-7.4-r3.ebuild 3316 BLAKE2B 9dfc306b04177c6a4f3692fa68db3402b94e9783a18411eccf155f1932742e17f6a0f02c5ae8989e49cce009fda15e7ee42c1b96663ffa6d75f3a1af867b8b49 SHA512 a82cbdefbfd488ae7907a9f1f194445a1cb78ad02930b672984b5f8d7fe3c352f458d298e68eb261f57f7dfebf83897bf1455fd33d23272e23ae9a6dade92d94
 MISC metadata.xml 295 BLAKE2B bf8cdcd84763dacb5bc31355ca5050d30c6808e4aff370c709f07269cf4c3e62a1e107350cf5e6a9cbf0d0ca1ad2e3b57393674595e44dc023b0320dd6f32e47 SHA512 66ad6bd339be8ab149a01cf9039eea3ef06058de715c700ba5e1f511c957ef71ffded1209dab1594f7c899db0d77876bcfec48ba0d43a296704fb8dc33946be7
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 b35879117473..a576a1656c24 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 sparc x86"
 IUSE="+fonts"
 
 # Server
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 93cde6d69b9f..b7408381cd69 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.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.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.ebuild 1912 BLAKE2B d5a8ab21b6fd6622f2f3df295f47112ff74143b45c579e46f42fd6bb0a03cff51052e002f3bc9293ee0acd5243b62b4599863d8115bfe46060f02d43049b6996 SHA512 14977c1d9cb9b4e7508019b0e365e7e499e5ca3b2f74cff6bc2c059cbc0dc06cdef697d3b4c48c7fbfa8ad0a93ac0323f865f0e2c83b15caee847c2cf4862331
 MISC metadata.xml 492 BLAKE2B df9bce6c0bf8fc88dc1386143ceffe54b16e9e024281d6839496827ba1e645b01126ed2937e152b9cd06ee232c8149c5a789bc4ce6d380b5b6cec722b7c65c13 SHA512 987198d7347e1849f7974873d8140d9dfa921b3afff3a6864c47b59baa29de92bdc90a83b03f3765c7a4e15553f2afaa1ae164aac2d9e3b52d9839444bee6255
diff --git a/x11-base/xwayland/xwayland-21.1.2.ebuild b/x11-base/xwayland/xwayland-21.1.2.ebuild
new file mode 100644
index 000000000000..b4eed7a433eb
--- /dev/null
+++ b/x11-base/xwayland/xwayland-21.1.2.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 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-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
+}