gentoo resync : 28.07.2021

4 files changed, 74 insertions, 5 deletions

diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 943ab93c4fb6..caf36940f151 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,6 +1,7 @@
 DIST wlroots-0.13.0.tar.gz 503575 BLAKE2B bfcd40ea5cf9f85157b9a44a4a49f0fef1c82c2199ee428316b578e8d53cc39276b42d0a2c4b6b94d1a1f49df5d312539cdf4d053ea2472e0de93254e39dc015 SHA512 1c942a6b8a628383e2b68cd9096d3525021347c5c363a8239a3b4fb0d5736ffcd3e2c1333fdd7d95ecf214dd04bf01062b4f1b4fbbcd88d1d086a55261ca0c82
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 EBUILD wlroots-0.13.0.ebuild 1950 BLAKE2B 680b6a39783806291c950dae086800ead41f337ed611b6d86655bf342bb80e13b63f97a32f11f58c8875e4ee14b7f53e1d122fe69fbb67c91f998baab57da70a SHA512 8497307be27fe7884384986cea09a5cead3fa25a205ec13eec37026ebf5bbbf89aab1d9384970b4a1b4798589c3c30205567979d0accd50b5b61efd17a4f5e82
-EBUILD wlroots-0.14.0.ebuild 1509 BLAKE2B e4bbc42e2260f3804bd2f0118b2bd2663c3615cb103a3a87dc1e858fce0d62a5e587c3717fb1a68b79197196ee17fe86a168fcb95f7e1ea0a6f971257f2c56ba SHA512 3857996c0ea44b645d53ddf86f164e5bf863b1f6876adf1bccd9ea599b4dd018816204432c6820914419316daf6ceb1ea88ff62827deb65cffe9ccbf5a5d1cbd
-EBUILD wlroots-9999.ebuild 1502 BLAKE2B 5d51d77f6c908a0d12d322e420ee4e259d8907ab70468dc33d501285650b9869ffc5689c83e5c42540671d93becfbf581eafb23af7bcf24c7f0e1aa363ff321c SHA512 1f5f2ddf111d0cd85760613b8bd386e5cce9fbd55a56de97d76ac2d19e5331453f73d6d66b416afc7d723a04dff7904d9cbfcc393b7192ae052fd8fd61432285
+EBUILD wlroots-0.14.0-r1.ebuild 1497 BLAKE2B 96b1095a7d8de84f515d7fab901e33f45e58d6e0c7f40ed5fce265e191ce00ab210dede3372205b6c8484410a43381a2fa8f966aa55a0e25164dca9d129819a3 SHA512 4c345c69e4b549883e8165876d77f538e83b203060070bde44d83d536f66649f5dfdb39d308276bdc9ad923c82db7de996313a020ffbcb0ad1b65e47c4b2adf6
+EBUILD wlroots-0.14.0.ebuild 1506 BLAKE2B d67c5855d2fb9ea65a419177f1963153385e681f5ea0912018685782f4106d59fe2fcd9d17699bc291616ec05c1c4fa8d74f55067847ba8d4dab7b920b552d83 SHA512 db4304a09f07cb28fc3ac723e5b4147f0226697b3168ed90e92c32a0d50abeddede51a5ed6f715ec0c6d0eed3b0198def3106bc20529125aa6f69ad7294a8e5d
+EBUILD wlroots-9999.ebuild 1497 BLAKE2B 4320242063f128e1984aafef1e611400a88f754da68c4c90c5160be7ccd502514f60cfd76127820a7b61460f67f22ef8523caaf228d3eeebfb02c36b011e0f3b SHA512 f0c4b0178dc66593d6ebbf149c8beb051123a793f384292aeff1f6697183e37b4ab45247961d4cfb966b516067cfccde4a550a90c33174ac963dfb666fc47f23
 MISC metadata.xml 1719 BLAKE2B 363f75063f67b87b9447f4aafa37c528a6b418f8bf8039453c79a9d8a7e4c9bfb60c36b181f311f21dc26c854b51d98b060fd3367d0f45787420c61cec426577 SHA512 a75cb0f8f9b3ce1576c4e688b0abff4f2c68e57a4661b1ffb46a1d3b0d6edd3cea2a8bcf69558ff9210d654daba38c7fe5d8b1ad2c1cacaa78387f6623089633
diff --git a/gui-libs/wlroots/wlroots-0.14.0-r1.ebuild b/gui-libs/wlroots/wlroots-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..f87521b20da6
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.14.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	SLOT="0/14"
+fi
+
+LICENSE="MIT"
+IUSE="x11-backend X"
+
+DEPEND="
+	>=dev-libs/libinput-1.14.0:0=
+	>=dev-libs/wayland-1.19.0
+	>=dev-libs/wayland-protocols-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	sys-auth/seatd:=
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	>=dev-util/meson-0.56.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		"-Dexamples=false"
+		"-Dwerror=false"
+		"-Drenderers=gles2"
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-0.14.0.ebuild b/gui-libs/wlroots/wlroots-0.14.0.ebuild
index 34a1612b0eda..0a2009a3fbb1 100644
--- a/gui-libs/wlroots/wlroots-0.14.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.14.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 	SLOT="0/14"
 fi
 
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 37d74dc38438..eb52e3661f46 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	SLOT="0/14"
 fi
 
@@ -33,7 +33,7 @@ DEPEND="
 	x11-libs/pixman
 	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
-		x11-base/xorg-server[wayland]
+		x11-base/xwayland
 		x11-libs/libxcb:0=
 		x11-libs/xcb-util-image
 		x11-libs/xcb-util-wm