gentoo resync : 03.11.2021

7 files changed, 16 insertions, 162 deletions

diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 1dad93538243..5f41a8a884e0 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,9 +1,6 @@
-DIST wlroots-0.13.0.tar.gz 503575 BLAKE2B bfcd40ea5cf9f85157b9a44a4a49f0fef1c82c2199ee428316b578e8d53cc39276b42d0a2c4b6b94d1a1f49df5d312539cdf4d053ea2472e0de93254e39dc015 SHA512 1c942a6b8a628383e2b68cd9096d3525021347c5c363a8239a3b4fb0d5736ffcd3e2c1333fdd7d95ecf214dd04bf01062b4f1b4fbbcd88d1d086a55261ca0c82
 DIST wlroots-0.14.0.tar.gz 505461 BLAKE2B d2fa28f64014ef9d840838cb5938af23f6f6b211b62dc352d0d5bb824ccaa7d7a85531e1eca14feeb06d31d59955ff9a913e40a73cad21ed1ebfe76ada39d558 SHA512 83f001133cb4b11a72bb9532b7321655428826662848f67de8e3220a33d9dff4d37c859602bdc319929949d387d014a257b0347039a6649944d7b084c76bb611
 DIST wlroots-0.14.1.tar.gz 505840 BLAKE2B fca4d259cdde62da0c196344ce1d0f5dd679d012ff33e3ceb5385b9374667e16d91059a2ba6a318153e79ac2f0a6464e3066e614a13398f8c433f442560d84d2 SHA512 4f557c827f9673eccf208a3644954de80e7355b95cc374cc5e851a47087b227f196e0936c0913d21a6c776c29b74de2d028a100931264e41934c747568d8ebe0
-EBUILD wlroots-0.13.0.ebuild 1950 BLAKE2B 680b6a39783806291c950dae086800ead41f337ed611b6d86655bf342bb80e13b63f97a32f11f58c8875e4ee14b7f53e1d122fe69fbb67c91f998baab57da70a SHA512 8497307be27fe7884384986cea09a5cead3fa25a205ec13eec37026ebf5bbbf89aab1d9384970b4a1b4798589c3c30205567979d0accd50b5b61efd17a4f5e82
-EBUILD wlroots-0.14.0-r1.ebuild 1494 BLAKE2B a6279c9bc36a7569a63ca4b4a74c72f8bb223923bf5e7aab6b58136a7dbfe87c0bb17c1ca72518e39a3aaf4b7dbbea20aaba3680ff0e30d1c101a36a0ecb89cc SHA512 cc06ee5e250be6cd332bd2829f86766597006e7769aee64afa6ae4fe5ed78c875f47def60ab3d40c4ce4f84b9406686beb86a8f7c2061aa97c2ce596fe6355ad
-EBUILD wlroots-0.14.0.ebuild 1506 BLAKE2B d67c5855d2fb9ea65a419177f1963153385e681f5ea0912018685782f4106d59fe2fcd9d17699bc291616ec05c1c4fa8d74f55067847ba8d4dab7b920b552d83 SHA512 db4304a09f07cb28fc3ac723e5b4147f0226697b3168ed90e92c32a0d50abeddede51a5ed6f715ec0c6d0eed3b0198def3106bc20529125aa6f69ad7294a8e5d
-EBUILD wlroots-0.14.1.ebuild 1497 BLAKE2B 32863ba14c6cd9ebddaacda70d96d07c4843b4ae61f4c03bbdcf272bbf68c6262567bbcf6db48387f0a537fde62d4c0f2006b2efc9ef67b474c3f44957c7c4c1 SHA512 f46165d4cb9defbc53f2b3f7b607618d3323e7b03e7440864e36a5c24f5f3ee601ebe5b29dc0a22042e555236d367ab85673af814d7fc5df9631f3d271775f30
-EBUILD wlroots-9999.ebuild 1442 BLAKE2B 596cc38dfb8d31b1a52f63873610a7e391e70763c40b1d87a226ad8a640ef23e49d6498a7924d97fb1ab88655f2c131e104773f0e03598e6f8abdff9e1f55420 SHA512 5a45a11ffd8ba92abf66b64ad0d6cf675c2fa30157b1b49422dbd5b6f9d83695a48b89735b10ecc9452e0736145d4c705775bd6ee145a4daa0794c616dc62949
-MISC metadata.xml 1720 BLAKE2B df45f5bc064958bceb955275e58182747f5a20adad765ea5b517c500159ee1c3827e6d781265a93b54697128f5939581adba8f1f8ecf7a666c4b30452c3a7768 SHA512 8f75b1efd2d7f53624bba068b6c153b2964963a264120b0ad02af1d735dd1ae31f4a800a7e99cd8278e252c95c438607a42cdfa91c5e868eef64f7e77a136b2f
+EBUILD wlroots-0.14.0-r2.ebuild 1500 BLAKE2B 766fa524353658f542c648281b05e9871140ee5272f160fbcbc36a28a48246d83494c6bd3e02ebbd16e1527c61139ea00ec00085d68a2a0b87b2b06347b2fa12 SHA512 22fc3dd03ec1c1a719bba7990b264dbb789445ba56afbff0c8e6aec6765b9a0a30ad4a27469f7d5a5ffa95848e861615aaa75a418ad6c771caec5b2179feeb21
+EBUILD wlroots-0.14.1-r1.ebuild 1503 BLAKE2B 12a12358ec5b012bb94a58d2aa20bbff7ddbf3fb34f06c1b6380429cec6fe9952ec53c85ea6607d1b0261a9c00060bdae71a23a40bc4f217c4fb8e0d28ee2853 SHA512 2a555ab4b3dc620394a4a9a975cbad6075757f27c85ee120448e6e0eb28c92ead7bbdd51ef935a104efafe8f5cb2f163f95f8fba6668258d8be996328027402f
+EBUILD wlroots-9999.ebuild 1633 BLAKE2B e5883f9795ec3415794210d5b876014e29139d1a6ebda107cf986a1e54c5020959d98b0222bc524484816b4a5e65b1538b4b1e02307c783e5938e48cedfb71a2 SHA512 0e4158e402c96d7d39d3dd4a5cb9b5766e86f5265cc4ecdbf86555b7bdfd01b1c7e181bc5bf0640d7af29fdcf8d17cc90125e51ca517124a9cf07b844f0d4c77
+MISC metadata.xml 1494 BLAKE2B d13e5a08805383dfbde283878cd3374ed442e1013661f3894384e1096c2adf1f687d460e6dff78b97af3088c7dbc50901e0e3e01d294728b8e285dc46978237f SHA512 c6e6fcffd0b266afc0b292b45cf096c42b680cf1f55653d017f63777bdff41645665268739692a0978585b0ca0b9925509ec8a1e8b9385442a89e7fdfc2900cf
diff --git a/gui-libs/wlroots/metadata.xml b/gui-libs/wlroots/metadata.xml
index 853453f8a323..1c86adb5d1fc 100644
--- a/gui-libs/wlroots/metadata.xml
+++ b/gui-libs/wlroots/metadata.xml
@@ -21,9 +21,7 @@
 		wlroots is developed under the direction of the <pkg>gui-wm/sway</pkg> project.
 	</longdescription>
 	<use>
-		<flag name="elogind">Enable support for rootless session via elogind</flag>
-		<flag name="icccm">Use xcb-icccm (from <pkg>x11-libs/xcb-util-wm</pkg>) util library for improved Xwayland introspection</flag>
-		<flag name="seatd">Enable support for rootless session via <pkg>sys-auth/seatd</pkg></flag>
+		<flag name="vulkan">Enable support for the vulkan backend renderer</flag>
 		<flag name="x11-backend">Enable support for handling input/output devices through <pkg>x11-libs/libxcb</pkg></flag>
 		<flag name="X">Enable support for X11 applications (XWayland)</flag>
 	</use>
diff --git a/gui-libs/wlroots/wlroots-0.13.0.ebuild b/gui-libs/wlroots/wlroots-0.13.0.ebuild
deleted file mode 100644
index ff9bf315dd99..000000000000
--- a/gui-libs/wlroots/wlroots-0.13.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps 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 x86"
-	SLOT="0/13"
-fi
-
-LICENSE="MIT"
-IUSE="elogind icccm seatd systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
-
-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]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-237 )
-	icccm? ( x11-libs/xcb-util-wm )
-	seatd? ( sys-auth/seatd:= )
-	systemd? ( >=sys-apps/systemd-237 )
-	x11-backend? ( x11-libs/libxcb:0= )
-	X? (
-		x11-base/xorg-server[wayland]
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-	)
-"
-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"
-		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
-		"-Dexamples=false"
-		"-Dwerror=false"
-		-Dlibseat=$(usex seatd enabled disabled)
-	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
-
-	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-r1.ebuild b/gui-libs/wlroots/wlroots-0.14.0-r2.ebuild
index 2d6a794bbe7a..17b92696cdc7 100644
--- a/gui-libs/wlroots/wlroots-0.14.0-r1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.14.0-r2.ebuild
@@ -25,7 +25,7 @@ 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]
+	media-libs/mesa[egl(+),gles2,gbm(+)]
 	sys-auth/seatd:=
 	virtual/libudev
 	x11-libs/libdrm
diff --git a/gui-libs/wlroots/wlroots-0.14.0.ebuild b/gui-libs/wlroots/wlroots-0.14.0.ebuild
deleted file mode 100644
index 0a2009a3fbb1..000000000000
--- a/gui-libs/wlroots/wlroots-0.14.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/xorg-server[wayland]
-		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.1.ebuild b/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild
index 07ce77c9d01a..cfe8c9ee911f 100644
--- a/gui-libs/wlroots/wlroots-0.14.1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild
@@ -25,7 +25,7 @@ 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]
+	media-libs/mesa[egl(+),gles2,gbm(+)]
 	sys-auth/seatd:=
 	virtual/libudev
 	x11-libs/libdrm
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 468d72e78ead..53e54f07ae88 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -19,15 +19,20 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="x11-backend X"
+IUSE="vulkan x11-backend X"
 
 DEPEND="
 	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.19.0
 	>=dev-libs/wayland-protocols-1.23
-	media-libs/mesa[egl,gles2,gbm]
+	media-libs/mesa[egl(+),gles2,gbm(+)]
 	sys-auth/seatd:=
 	virtual/libudev
+	vulkan? (
+		dev-util/glslang:0=
+		dev-util/vulkan-headers:0=
+		media-libs/vulkan-loader:0=
+	)
 	x11-libs/libdrm
 	x11-libs/libxkbcommon
 	x11-libs/pixman
@@ -54,8 +59,9 @@ src_configure() {
 		"-Dxcb-errors=disabled"
 		"-Dexamples=false"
 		"-Dwerror=false"
-		"-Drenderers=gles2"
+		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
 		-Dxwayland=$(usex X enabled disabled)
+		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
 	)
 
 	meson_src_configure