gentoo resync : 28.04.2021

3 files changed, 92 insertions, 21 deletions

diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index e5e12c8e330c..27a5f8e09d4a 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,6 +1,8 @@
 DIST wlroots-0.11.0.tar.gz 481126 BLAKE2B d2262298f24948293643b02c823851b4643289f776bc087d7b67240f4c9c76a7aca03c7dc7e13a65b3d0d3a7c8a5f5246a0e282d2cb3b88bbae0ef94b906f18a SHA512 a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575
 DIST wlroots-0.12.0.tar.gz 476936 BLAKE2B 4129c87a148085f95f4cee6973308d79ab3f8b024247287a68dadd6729da8a5f8cc1e4ada63c15477a2c8e8258032440afe4a21a26f947143d17c87b0ca8a1a4 SHA512 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415
+DIST wlroots-0.13.0.tar.gz 503575 BLAKE2B bfcd40ea5cf9f85157b9a44a4a49f0fef1c82c2199ee428316b578e8d53cc39276b42d0a2c4b6b94d1a1f49df5d312539cdf4d053ea2472e0de93254e39dc015 SHA512 1c942a6b8a628383e2b68cd9096d3525021347c5c363a8239a3b4fb0d5736ffcd3e2c1333fdd7d95ecf214dd04bf01062b4f1b4fbbcd88d1d086a55261ca0c82
 EBUILD wlroots-0.11.0.ebuild 1855 BLAKE2B cdf38296782645752facdb54febb5a75ae7a4577809ce14ec24fb31109193810fecfbaaba16536b7633e86799d480da7426203e61309a02063b0497c0178e3e9 SHA512 5447e589bfa0057b55a2ff918a900357b59ec8ef6f33b5ed81175a32b3305fb9e803d0ba75c307179b86c289cab75d5df057ed89548f89587fcef24be6cee897
 EBUILD wlroots-0.12.0.ebuild 1933 BLAKE2B 716d5177e922e17cf03249e3be4e9277bc04e5b42b9878addad282462f1f815e2cb1d9f8a7d0da74d066926e9225e6874516e6259120d7c76352eea559bd3120 SHA512 081c33aebe7a0326563f3143411cadbec78cb499db231b37c0ba8dbec19a817fb3f79b1199093b564a99282745c95cc6212e5bfd8757e05b857890dec4c20e6b
-EBUILD wlroots-9999.ebuild 1938 BLAKE2B 090142ff895880bd3ca362bcaa7151fa84f41a32f1e594184e2fed3e9e52937e7e1c4313d9e407f7b28d1610a34b1e58297e95a33c363959896e67b01ad52934 SHA512 9382966698c381ff23d2dce9d22b7a244110944b41db08ab6d9ded7f05c6d9afd7b556a4f0baeef19c613612d9cc65612e0186fc4292bf19e2527c630ada2552
+EBUILD wlroots-0.13.0.ebuild 1953 BLAKE2B b50e4871bb53bae03abf0de816bf94082149ecf6e383b9ba5c87b1f9da6417537d43d6598b68b847c0795b63b352ccbde383a437b81db642f744e18b7d355ad2 SHA512 8c6ac6e38484e9470e9ae59aaa7d00da0d9adce5dda30eb1afffd7411112d264d20229ebfeb58a2e8859ccf15e4cd59613270a7f1c1019aa1c9db82ded970369
+EBUILD wlroots-9999.ebuild 1502 BLAKE2B cc3fe493692c7063ceb2d505603b3d508cc88807e4608d653afbc19e94d80261b7279ca1d44fda8ad41afcb4f29ac20f7a13607b5d5aa1a6d3685e76e8536745 SHA512 577162e7a4f5181b196f7cf8cd209fa0099b45ef8b6bcfdb32841f17ae4748ebd139107d5667de1c2799876d522a7f31a681cfca85af9dd79e7ccd2cf6c11e05
 MISC metadata.xml 1719 BLAKE2B 363f75063f67b87b9447f4aafa37c528a6b418f8bf8039453c79a9d8a7e4c9bfb60c36b181f311f21dc26c854b51d98b060fd3367d0f45787420c61cec426577 SHA512 a75cb0f8f9b3ce1576c4e688b0abff4f2c68e57a4661b1ffb46a1d3b0d6edd3cea2a8bcf69558ff9210d654daba38c7fe5d8b1ad2c1cacaa78387f6623089633
diff --git a/gui-libs/wlroots/wlroots-0.13.0.ebuild b/gui-libs/wlroots/wlroots-0.13.0.ebuild
new file mode 100644
index 000000000000..da2f898bd72a
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.13.0.ebuild
@@ -0,0 +1,79 @@
+# 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-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index c37237839e1e..cb80b4e42fd5 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit fcaps meson
+inherit meson
 
 DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
 HOMEPAGE="https://github.com/swaywm/wlroots"
@@ -11,34 +11,32 @@ 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/14"
 fi
 
 LICENSE="MIT"
-SLOT="0/9999"
-IUSE="elogind icccm seatd systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="x11-backend X"
 
 DEPEND="
-	>=dev-libs/libinput-1.9.0:0=
+	>=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
-	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
+		x11-libs/xcb-util-wm
 	)
 "
 RDEPEND="
@@ -54,20 +52,12 @@ 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)
+		"-Drenderers=gles2"
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend 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
 }