gentoo resync : 25.11.2020

6 files changed, 15 insertions, 118 deletions

diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index e1dec9310a61..3947f7fe9d93 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,9 +1,6 @@
-AUX wlroots-gcc-10.patch 1020 BLAKE2B a3548355bd2374e590c83b873d1381f76857891aca5372190cf11e5e58bbd5d6909ea204674537bd3c5955cd2ef19d6cc3589dad5520a989dcdcf3ea4a694d07 SHA512 e09695602898104e03a6fa4d05fde2b617ef536460ae0ea1c9a5d35f704fe4d114bc405652f499570593a1b8cc61c5d0bd219bab5529d254f519e73ee23852a1
-DIST wlroots-0.10.0.tar.gz 454540 BLAKE2B 0d2326a62267019001be5f0d79c7b5c937ed20b952c92f0dd8cb04c3a0c06f3ef58723f552b1da1b947ea50ad91df46a543ec9705dad588db800bfa944743d11 SHA512 0e8e0c37f1afb1d99f0ecb3c2282992ffd06381aaa396c7234ead9f3ff2d5c599e766b677680ebaecf68e792054c3e42657d24f32d08bc8bcf35f9eb4bdaa876
-DIST wlroots-0.10.1.tar.gz 455232 BLAKE2B 0f4def61d8501b7746ccc589d59586b3641340fb7633b0c4a7b518f1b1b5285c1ee71fb629aa0a0e649c15a4ae69b5cfbc7a034c96e545765a96ddda35f10609 SHA512 e1af5a5b6484b5f4060090e13d22d699d5aaa6926e1a6b1043d2b900f88a002ed67dacf8498f23ed3008bf8a35500f415f95b3dbcf50de5da354f309f9161d58
 DIST wlroots-0.11.0.tar.gz 481126 BLAKE2B d2262298f24948293643b02c823851b4643289f776bc087d7b67240f4c9c76a7aca03c7dc7e13a65b3d0d3a7c8a5f5246a0e282d2cb3b88bbae0ef94b906f18a SHA512 a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575
-EBUILD wlroots-0.10.0.ebuild 1882 BLAKE2B c438d4d1e895ad8c539ccfd69f32a80ceb609b139e2b14929f6e5d173184e01026978531919805b3602530813ecbbc5abe5393933b1fe34bf374b86f830129f5 SHA512 269a1ec002a5e80bc5384833025135eadba865e106009d214fa24271066344d1a8876d7b1832483a78ffdd59f1b2e2d009c26eeee1370027132ddc16bd12ba7b
-EBUILD wlroots-0.10.1.ebuild 1949 BLAKE2B 3e7e878846b1d2911b3fe2f34483757e48c918fe33ecf7b84cd664992b070bbb96a2e1495a85c7e58631231708384116b251ebf4f5c41f1f1820c6090732ae05 SHA512 28a91c1e0c5ed36e4b6f4c47d8f8609b8762936172b5ad22dd464e76041690930b80dbee5af01d4680ad6215af8ef55aa69cea3fc9e2d98b2e2fbbc58859c29e
+DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415
 EBUILD wlroots-0.11.0.ebuild 1855 BLAKE2B cdf38296782645752facdb54febb5a75ae7a4577809ce14ec24fb31109193810fecfbaaba16536b7633e86799d480da7426203e61309a02063b0497c0178e3e9 SHA512 5447e589bfa0057b55a2ff918a900357b59ec8ef6f33b5ed81175a32b3305fb9e803d0ba75c307179b86c289cab75d5df057ed89548f89587fcef24be6cee897
-EBUILD wlroots-9999.ebuild 1860 BLAKE2B 620db003337167d00ef9126e5e12b9f391280008d7e1c508d24e5cc46452a68b15d324e2d45e37c9114f41dfa46a86ca2d53fe2932e82352e7aec6f69e4f0288 SHA512 a635e1eb74699bee9827f5cecce4b51a7dec44a4910f001396beea531041ca918c72af92ba28f9ed6ad8fbb100186dcb67d589c695b70a8d930c9c980b08bcae
-MISC metadata.xml 1611 BLAKE2B a52787db83324cc424c28255d7a6db05fa6ea7f92f2d5d7cd6ac4121e89f77b9e642be4ecccdb5b75be2f4ac9b1434f98d40743ae86be8044165f70cc59add65 SHA512 b04fbd1afea30e057f0feea17d05195fb76bf872aa80b5d5d6f20ac47a99c08c3703bee65b2352587a6ac588974a7da375228b439c82f861bdefa41537278a99
+EBUILD wlroots-0.12.0.ebuild 1936 BLAKE2B e9d94f67b1d3301e351fcd731c155d41217cf3dc6135dd7c1eec919c10c83846f171ba7f1c2468b57dae2d12cc1567c8d4c4b4cdc8ad387191df0262bde96794 SHA512 155fa6170109a9e499907e79e1d7b38cf450eae4d617b26998da7fa950f78ffdc4b73043f66fc22ef2ae45645b10b3a4ec84e72a29dd77063e6feb7d0dc9e29b
+EBUILD wlroots-9999.ebuild 1938 BLAKE2B 4987f033eaf34d0b46366e63126f23c581162ad6b3d6a44d08207148076d33973ac01ee514dbbebb60b938cd8088fae30be9abd89b8b9624db4057b0b3a0f200 SHA512 f4f2efd3f7ebc7cadc5e4335348663b7e93aa813e30162de2927d2cc9119b2c5fe9278ff1f706035eafe1a9a792ccaee04285969082432cb9cdb078a251765e3
+MISC metadata.xml 1705 BLAKE2B 91b9e709f0d0c19f0bebf9db073241e2fb0e355c00d582479839ef16438f16b1a13ad8e38614d6d8863b74371369199d623fd17541890ce268efb70773b27393 SHA512 d06d9948237e0b051a919dd977adfbfea04b5c7d3cc2dc6f2b72fd50316cfcc7acc234f8a99ae143eab070a497267859acdd6646845284ecfbab800ad215e9be
diff --git a/gui-libs/wlroots/files/wlroots-gcc-10.patch b/gui-libs/wlroots/files/wlroots-gcc-10.patch
deleted file mode 100644
index 44e1cb7d89b0..000000000000
--- a/gui-libs/wlroots/files/wlroots-gcc-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/707496
-
-From f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jstanek@redhat.com>
-Date: Tue, 28 Jan 2020 15:27:24 +0100
-Subject: [PATCH] Declare wlr_seat globals as extern
-
----
- include/types/wlr_seat.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/include/types/wlr_seat.h
-+++ b/include/types/wlr_seat.h
-@@ -4,9 +4,9 @@
- #include <wayland-server-core.h>
- #include <wlr/types/wlr_seat.h>
- 
--const struct wlr_pointer_grab_interface default_pointer_grab_impl;
--const struct wlr_keyboard_grab_interface default_keyboard_grab_impl;
--const struct wlr_touch_grab_interface default_touch_grab_impl;
-+extern const struct wlr_pointer_grab_interface default_pointer_grab_impl;
-+extern const struct wlr_keyboard_grab_interface default_keyboard_grab_impl;
-+extern const struct wlr_touch_grab_interface default_touch_grab_impl;
- 
- void seat_client_create_pointer(struct wlr_seat_client *seat_client,
- 	uint32_t version, uint32_t id);
diff --git a/gui-libs/wlroots/metadata.xml b/gui-libs/wlroots/metadata.xml
index 25975bbdb159..07149597df5d 100644
--- a/gui-libs/wlroots/metadata.xml
+++ b/gui-libs/wlroots/metadata.xml
@@ -23,6 +23,7 @@
 	<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="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.10.0.ebuild b/gui-libs/wlroots/wlroots-0.10.0.ebuild
deleted file mode 100644
index 00bde310ba80..000000000000
--- a/gui-libs/wlroots/wlroots-0.10.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 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
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/10"
-IUSE="elogind icccm systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/libinput-1.9.0:0=
-	>=dev-libs/wayland-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 )
-	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
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
-
-src_configure() {
-	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
-	local emesonargs=(
-		"-Dxcb-errors=disabled"
-		-Dlibcap=$(usex filecaps enabled disabled)
-		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
-		"-Dexamples=false"
-		"-Dwerror=false"
-	)
-	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.10.1.ebuild b/gui-libs/wlroots/wlroots-0.12.0.ebuild
index 49ac9be701a4..fe45e5af7e13 100644
--- a/gui-libs/wlroots/wlroots-0.10.1.ebuild
+++ b/gui-libs/wlroots/wlroots-0.12.0.ebuild
@@ -17,13 +17,14 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0/10"
-IUSE="elogind icccm systemd x11-backend X"
+SLOT="0/12"
+IUSE="elogind icccm seatd systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=dev-libs/libinput-1.9.0:0=
-	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.17.0
 	media-libs/mesa[egl,gles2,gbm]
 	virtual/libudev
 	x11-libs/libdrm
@@ -31,6 +32,7 @@ DEPEND="
 	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? (
@@ -44,22 +46,20 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.17
+	>=dev-util/meson-0.54.0
 	virtual/pkgconfig
 "
 
-# Patch is in upstream master. Probably drop on 0.10.2 or 0.11.
-PATCHES=("${FILESDIR}"/${PN}-gcc-10.patch)
-
 src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
 		"-Dxcb-errors=disabled"
-		-Dlibcap=$(usex filecaps enabled 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")
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 6496ad0a75a2..72a4c104e4a6 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/9999"
-IUSE="elogind icccm systemd x11-backend X"
+IUSE="elogind icccm seatd systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -32,6 +32,7 @@ DEPEND="
 	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? (
@@ -58,6 +59,7 @@ src_configure() {
 		-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")