gentoo auto-resync : 22:05:2023 - 02:55:39

6 files changed, 125 insertions, 26 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 284b52ace894..fc6c0fe93335 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 370970156ea1..abb7e6f072f6 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -7,6 +7,7 @@ EBUILD wlroots-0.14.0-r2.ebuild 1481 BLAKE2B f350d6bbaf05a349cb9ee5ac67cea0c29b1
 EBUILD wlroots-0.14.1-r1.ebuild 1484 BLAKE2B 9de2dec4bbb573b4288a9c994047de1547ed6c7be66af4e8f7b5c3d459a4e2cccc97f3883bbb633942ade7f81ba2a883a14a40ac25f8033a57b24a6556d579b1 SHA512 c59c653561420f563e34584f48c646ea38a0622f65ed054d8895508f66fe4ef10e6b77d07b7bcb555fdf5c2077b7bd8f43df495a742b31075739630a666d4859
 EBUILD wlroots-0.15.1-r1.ebuild 1903 BLAKE2B db14251e37bb2448556a7a8f98fadfea64c4c6047b3c8736932ca08ea586a8cc0db0c8d54335f0dad5d36a52c7a10f87f6d60425c35d5bf361334ab0e3ad0f5a SHA512 6bd49fad40df4267c4490e928fe750677fadf9dd1f08856fab8777000af8a3769f0710be0741ce98cfbbe2cb4cb1cfc6020937078211abf5aa5a224b702b4135
 EBUILD wlroots-0.15.1.ebuild 1694 BLAKE2B 6612ccfa47cb13280a788b766b8c986c37f8ed256808e54068709e84e629e7618ecda9624faea2ac63878f232996c47a8f36a4ae760d7747cd7c918ed0667d90 SHA512 fbb4123948bc0d9f69bfd8d9c3990aa21e648b5e1a7018aa6c4bcc6bf6aa0982bf8ff5aea6df9ea460f29ba48646687747457ec3d146808a3f0ac2b8b667f374
-EBUILD wlroots-0.16.2.ebuild 1921 BLAKE2B a0cdb4b25d4311bef06d043dfb8060fd72353b4e45021a3dbcbba661283ef5d55e4b3f7b3d81c467e4400693701e74daff21f2741331fde1d0599081783c915a SHA512 94c09b56883945ad2a3c9f082bec53e21d24743c70a7d666d3b24f0ac7501b1a5b5907f03c6a7e1e224772db2302f5374c3482169ca03e55ebe8a6d978ba2b63
-EBUILD wlroots-9999.ebuild 2220 BLAKE2B 9c441634b1e032555458e6edaee683dc3b703ce7a68a8f8d2aaced2c02f20ceb9eee19da49b4c9671ac23c72e35143f306aeb51ac8cbf6be093729884f33740e SHA512 4bd8dc5df78b80cc9446ba46a6452eada1719cd80cfa66adb033d0e4e7676636d4201096c60a7215e8498cb310eac67c0de68bdccedf58b04dce8d20b8166874
-MISC metadata.xml 1939 BLAKE2B 8c7ffebb2ec8ec5fafdae90a49fb3a43cd984457c3278a7211e80931fac4441b7f220ed62724b53a6d643c6e13541861684e5aa2d7380c751ab5b4086a1c5463 SHA512 194d7fc4374bf60462a89708877fa87717d341d9667c109cc46552d28809a76e11d0f3237616da01f1913e86f82ed5d4d58cdc29a1028f083733becc6ccbab9a
+EBUILD wlroots-0.16.2-r1.ebuild 2083 BLAKE2B 06a2545af02f7efee221244ffc6d7edda6d3c7a40b1e40568497fed4dc19340f6f2b60e2d7c2c2f983d57c6d9f141aa1f60389832ecc27077abc009943d3e3b0 SHA512 21e28c01f30b77cca6af0665059be44adfb706f94c802cd9c480bcf99616c2a095982e9f450a9e17083e606d990dd6e7c6eb23a6ce630210e4e4e82fc0d43363
+EBUILD wlroots-0.16.2.ebuild 1867 BLAKE2B 92acbbdf1ea682a26c2db9cec4b912da340b38bb46934c421aa70d85252532f803d3d43825f893e6b3c1d62512d42566562d3438c6a40ff59904c2d362410380 SHA512 d21c7af4bba4dbfed53c29e8b59338eb4aa4c8a8348ba46c758ab2f179ad79fa3cc481f5f18c547c35be1f311938db3dae0c590e4afdebd8ad9e517cba1562b7
+EBUILD wlroots-9999.ebuild 2323 BLAKE2B 9522808721afea836626f0b848446d34e1b2e4a10cee2eac63a8425ee23f9ce5354b91b606fc48be95f102705e0fe82efb1a20cab3a3c0b86db21bdffa8be65d SHA512 52d6ac37ede3270d10b7c9594146763d1070e8f432fb2bc43d39c666d9552d41a86b0a0b559b7f44532e9e64af0e700d8aa0e3705f8a3e12c543a07ac43b87cf
+MISC metadata.xml 2078 BLAKE2B 2a3a7a60686d98b9a72c38b5dc86ebaabde993b781b91a18c6f74b3381fcfa70c6172cb739a9b7f95f2b8803b8225068601d800dd18bb78cf4880c7b4703272d SHA512 2af2bab0d210378f11e68269b772dccb9c1ea03812a8cec6c39bc93e2c200f0a2dee7ba10d813209f519792c9a6b8b572d22ea72ceccfac8fbe6ebd3e0b72bae
diff --git a/gui-libs/wlroots/metadata.xml b/gui-libs/wlroots/metadata.xml
index 69cb7d4fc088..10ac1444ba24 100644
--- a/gui-libs/wlroots/metadata.xml
+++ b/gui-libs/wlroots/metadata.xml
@@ -21,9 +21,10 @@
 		wlroots is developed under the direction of the <pkg>gui-wm/sway</pkg> project.
 	</longdescription>
 	<use>
-		<flag name="hwdata">Use system hwdata</flag>
-		<flag name="liftoff">Enable support for libliftoff kms plane backend</flag>
-		<flag name="seatd">Enable libseatd session support</flag>
+		<flag name="drm">Enable Direct Rendering Management</flag>
+		<flag name="liftoff">Enable support for libliftoff KMS plane backend</flag>
+		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
+		<flag name="session">Enable session support (is required for DRM and libinput)</flag>
 		<flag name="tinywl">Install the minimal wayland client, tinywl</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>
diff --git a/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild b/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
new file mode 100644
index 000000000000..a82f1b899992
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
+	inherit git-r3
+	SLOT="0/9999"
+else
+	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	SLOT="0/$(ver_cut 2)"
+fi
+
+LICENSE="MIT"
+IUSE="+drm +libinput tinywl vulkan x11-backend X"
+
+DEPEND="
+	>=dev-libs/wayland-1.21.0
+	>=dev-libs/wayland-protocols-1.28
+	drm? ( sys-apps/hwdata:= )
+	libinput? ( >=dev-libs/libinput-1.14.0:0= )
+	media-libs/mesa[egl(+),gles2]
+	sys-auth/seatd:=
+	virtual/libudev
+	vulkan? (
+		dev-util/glslang:0=
+		dev-util/vulkan-headers:0=
+		media-libs/vulkan-loader:0=
+	)
+	>=x11-libs/libdrm-2.4.114:0=
+	x11-libs/libxkbcommon
+	>=x11-libs/pixman-0.42.0:0=
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xwayland
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.24
+	>=dev-util/meson-0.60.0
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local backends=(
+		$(usev drm)
+		$(usev libinput)
+		$(usev x11-backend 'x11')
+	)
+	# Separate values with a comma with this evil floating point bit hack
+	local meson_backends=$(IFS=','; echo "${backends[*]}")
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		$(meson_use tinywl examples)
+		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
+		$(meson_feature X xwayland)
+		-Dbackends=${meson_backends}
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use tinywl; then
+		dobin "${BUILD_DIR}"/tinywl/tinywl
+	fi
+}
+
+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.16.2.ebuild b/gui-libs/wlroots/wlroots-0.16.2.ebuild
index c6aa61b39f4b..0e57c5f6342e 100644
--- a/gui-libs/wlroots/wlroots-0.16.2.ebuild
+++ b/gui-libs/wlroots/wlroots-0.16.2.ebuild
@@ -19,16 +19,16 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="+hwdata +seatd tinywl +udev vulkan x11-backend X"
+IUSE="tinywl vulkan x11-backend X"
 
 DEPEND="
 	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.21.0
 	>=dev-libs/wayland-protocols-1.28
 	media-libs/mesa[egl(+),gles2]
-	hwdata? ( sys-apps/hwdata:= )
-	seatd? ( sys-auth/seatd:= )
-	udev? ( virtual/libudev )
+	sys-apps/hwdata:=
+	sys-auth/seatd:=
+	virtual/libudev
 	vulkan? (
 		dev-util/glslang:0=
 		dev-util/vulkan-headers:0=
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index ec3331b0dc80..882576390063 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -19,18 +19,23 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="+hwdata liftoff +seatd tinywl +udev vulkan x11-backend xcb-errors X"
+IUSE="liftoff +libinput +drm +session tinywl vulkan x11-backend xcb-errors X"
+REQUIRED_USE="drm? ( session ) libinput? ( session )"
 
 DEPEND="
-	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.22.0
 	>=dev-libs/wayland-protocols-1.28
+	drm? (
+		liftoff? ( dev-libs/libliftoff )
+		media-libs/libdisplay-info
+		sys-apps/hwdata:=
+	)
+	libinput? ( >=dev-libs/libinput-1.14.0:0= )
 	media-libs/mesa[egl(+),gles2]
-	media-libs/libdisplay-info
-	hwdata? ( sys-apps/hwdata:= )
-	liftoff? ( dev-libs/libliftoff )
-	seatd? ( sys-auth/seatd:= )
-	udev? ( virtual/libudev )
+	session? (
+		sys-auth/seatd:=
+		virtual/libudev
+	)
 	vulkan? (
 		dev-util/glslang:0=
 		dev-util/vulkan-headers:0=
@@ -60,20 +65,22 @@ BDEPEND="
 "
 
 src_configure() {
+	local backends=(
+		$(usev drm)
+		$(usev libinput)
+		$(usev x11-backend 'x11')
+	)
+	# Separate values with a comma with this evil floating point bit hack
+	local meson_backends=$(IFS=','; echo "${backends[*]}")
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
-		"-Dxcb-errors=disabled"
-		-Dxcb-errors=$(usex xcb-errors enabled disabled)
+		$(meson_feature xcb-errors)
 		$(meson_use tinywl examples)
 		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
+		$(meson_feature X xwayland)
+		-Dbackends=${meson_backends}
+		$(meson_feature session)
 	)
-	if use udev; then
-		emesonargs+=(-Dsession=$(usex seatd enabled disabled))
-	else
-		emesonargs+=(-Dsession=disabled)
-	fi
 
 	meson_src_configure
 }