gentoo resync : 25.08.2020

3 files changed, 81 insertions, 3 deletions

diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index d3075bdfdeb2..e1dec9310a61 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,7 +1,9 @@
 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
-EBUILD wlroots-9999.ebuild 1868 BLAKE2B 0a3ec528911987688a69ac334fc9a4d9c50306e1bfd4df5c7a7a4df6c8bc057f2ff4454e8d3aa21b3217e9b6b8b08620cec6c69d9c7a6e8bcf12ceb46e1f14e6 SHA512 7b00c440de3dea8082e82c52975afefc209495e294bb905be8bce0ea2b42f1546fe5f837c01c456ebeb1d7d7da17c8f3eae5dd2c74ab361721b026126d966f66
+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
diff --git a/gui-libs/wlroots/wlroots-0.11.0.ebuild b/gui-libs/wlroots/wlroots-0.11.0.ebuild
new file mode 100644
index 000000000000..b8e99a306c9e
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.11.0.ebuild
@@ -0,0 +1,76 @@
+# 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/11"
+IUSE="elogind icccm systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.9.0: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
+	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
+	>=dev-util/meson-0.54.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"
+	)
+	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-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 35d3047c671d..6496ad0a75a2 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -23,7 +23,8 @@ 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
@@ -52,7 +53,6 @@ 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)