gentoo auto-resync : 07:08:2024 - 12:37:20

8 files changed, 61 insertions, 114 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 8e3baeb3cc4d..b5e018bf74ad 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest
index a8360c9ce599..80805be2361a 100644
--- a/gui-wm/dwl/Manifest
+++ b/gui-wm/dwl/Manifest
@@ -1,6 +1,8 @@
 DIST dwl-v0.5.tar.gz 57363 BLAKE2B 6dce89cbfa1aa1946983897bed5ac16619ac237e0f7092b588847315b849392b83643839dc5386c5bd73a36e5da55a281696a6ef13dcaec8345cb4e495c5e3b7 SHA512 7bd292559b0ecafc54bf1c1ba0c3b6b0417e8bd03bb0058f492b87295c92b50932e25621cc5f804c38ad06ffadad7bb8017872fade4a04bf617b1d4f1993aae8
+DIST dwl-v0.6.tar.gz 62677 BLAKE2B 01d010c7e5054c9a8ed0b2b03093e8eee8ff11555296819f2b42a54dd5f07507d9129e6eaf34521d5743bf172309472b52d9a0106b7badd545c75e922a115ef0 SHA512 5e5d7599438d4cdf632e7afaddb1d345c8131c9925e9e4d1b632ad52c4418b1db2c0ff6a2da4b5686607c79cf2598e26e8c7f4c8385be82b2c2355fa28c2e8fb
+DIST dwl-v0.7-rc1.tar.gz 63167 BLAKE2B e581909decd5859702903c01e91af19dbcf394337dc6d1813835b883396eb075a91dcef1bfe0c92b1c0d61fd9303d1263a3ddbac1323c594ce84d628d9f31b66 SHA512 a3214539e3b8f1df3a3fef4dd51506db1ec1c730e793fbd30e2be44a2913b47b0f87d170a4466d61bb05a0822e6c4cab12916ff667db2c8b7e8fcc0beab0a2a1
 EBUILD dwl-0.5-r1.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f
-EBUILD dwl-0.5.ebuild 1465 BLAKE2B eca80af80978fe2d80de59f39daec8a923b6ec5d9bce6e19b08e453885e80c3852b3de3ab4f2612b8a8cd2d453adf4a312fb69a00c19414ff40690617d148f81 SHA512 efe1d7a11f10b4779aa87167f2422ef4c878c8546b1ed3557f0bc9ce61f0b1d6e56d784bbe6f646e6a885fdf85ddf7d959b4b37e7820e112af27f53f00211c89
-EBUILD dwl-9999-r1.ebuild 1595 BLAKE2B f3236da4e40f84d3bd772cfbcbfab966653b8b918b14e0fbd5e953d0dfcd28c2a36119579456946b92d513d210db7125ac1a14f73f940d7a79977628aba5ad6b SHA512 a07c5c101b8470c2a27c822aab001fd0670e25c3557c48c1af4fd7ac553641c26dd6967da9b584b8d52c202df27535ca00fb7a176317c24ca4f4e7e53ba6b833
-EBUILD dwl-9999.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f
+EBUILD dwl-0.6.ebuild 1468 BLAKE2B 9087b017a96ac34f437fc1abc7b3aeb7601e85afe715cc2b292d0f418ed560a9aee50159c699f493246c1c129180621e49466a516818a91b38178cd954199581 SHA512 292d747137180be2e598c6fbab1d1b3bfd9ce378c3302f6564a9c1b586de5b8bd6266d637b05e94b67722069bd919d07af39f605f317e0d2d86b2ad9bb156cd1
+EBUILD dwl-0.7_rc1.ebuild 1475 BLAKE2B 323ede1091cb06ca717a2770544bbea5da2098c3055033cc067bc37a24e829399437946ee1925a8c5d5ae7a0c3172858630a0ed85489e4ea85160a65c94bfa6b SHA512 eb312a24b339d19c12ebb54b549f0cb965337650aeb9954a2ab6b5868ed18581e2a96d0e04cc199b8e79fdaf9bf103dbb2535fbcd9709dbb747791d66fc3d7af
+EBUILD dwl-9999.ebuild 1475 BLAKE2B 3a5444db4ae0ba53f6ca4f2bbc7bd4fa9b6088e40c6c4ee60f1d2b19b815e8ba7924828c990c9ad43c781bb91d25ec77f52ee9c2444e943e44d7fd7878aec261 SHA512 2be4d1959cf1db84d4301806d15ce931efccb902762bdf5cf47589c2c599fb4cc651715dc630c69d55679f92ae4c8d79ae539657a298f1576c0e676159a8eda4
 MISC metadata.xml 607 BLAKE2B 05185e10615acd19020f558e6d05305ea1df831ddb9703516bf8789108c2d5bc5d90ca75fd261674aa15f41be6518b49d45898866faa10848dafb0a28fada899 SHA512 c70b7a100380b1771385a7e398f256be391a2650df620499e43ead3acec46765c646c55671885a6bbfef7f3a87c488c135ec5f34c87bb4f2dfdb8f6c7a8f2ed8
diff --git a/gui-wm/dwl/dwl-0.5.ebuild b/gui-wm/dwl/dwl-0.6.ebuild
index d96014e0f6ec..823944d46d13 100644
--- a/gui-wm/dwl/dwl-0.5.ebuild
+++ b/gui-wm/dwl/dwl-0.6.ebuild
@@ -5,25 +5,13 @@ EAPI=8
 
 inherit savedconfig toolchain-funcs
 
-MY_P="${PN}-v${PV}"
-WLROOTS_SLOT="0/17"
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
 	inherit git-r3
-
-	# 9999-r0: main (latest stable wlroots release)
-	# 9999-r1: wlroots-next (wlroots-9999)
-	case ${PVR} in
-		9999)
-			EGIT_BRANCH=main
-			;;
-		9999-r1)
-			EGIT_BRANCH=wlroots-next
-			WLROOTS_SLOT="0/9999"
-			;;
-	esac
 else
-	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-v${MY_PV}"
+	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
@@ -35,20 +23,32 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
 SLOT="0"
 IUSE="X"
 
-RDEPEND="
+if [[ ${PV} == 9999 ]]; then
+	COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]"
+else
+	COMMON_DEPEND="
+		>=gui-libs/wlroots-0.17:=[libinput,session,X?]
+		<gui-libs/wlroots-0.18:="
+fi
+
+COMMON_DEPEND+="
 	dev-libs/libinput:=
 	dev-libs/wayland
-	gui-libs/wlroots:${WLROOTS_SLOT}[libinput,session,X?]
 	x11-libs/libxkbcommon
 	X? (
 		x11-libs/libxcb:=
 		x11-libs/xcb-util-wm
 	)
 "
-
+RDEPEND="
+	${COMMON_DEPEND}
+	X? (
+		x11-base/xwayland
+	)
+"
 # uses <linux/input-event-codes.h>
 DEPEND="
-	${RDEPEND}
+	${COMMON_DEPEND}
 	sys-kernel/linux-headers
 "
 BDEPEND="
diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-0.7_rc1.ebuild
index 631ff290e732..673657f8b653 100644
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ b/gui-wm/dwl/dwl-0.7_rc1.ebuild
@@ -5,30 +5,13 @@ EAPI=8
 
 inherit savedconfig toolchain-funcs
 
-MY_P="${PN}-v${PV}"
-
-WLROOTS_DEP="
-	>=gui-libs/wlroots-0.18:=[libinput,session,X?]
-	<gui-libs/wlroots-0.19:=
-"
-
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
 	inherit git-r3
-
-	# 9999-r0: main (latest stable wlroots release)
-	# 9999-r1: wlroots-next (wlroots-9999)
-	case ${PVR} in
-		9999)
-			EGIT_BRANCH=main
-			;;
-		9999-r1)
-			EGIT_BRANCH=wlroots-next
-			WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]"
-			;;
-	esac
 else
-	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-v${MY_PV}"
+	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
@@ -40,8 +23,15 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
 SLOT="0"
 IUSE="X"
 
-CDEPEND="
-	${WLROOTS_DEP}
+if [[ ${PV} == 9999 ]]; then
+	COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]"
+else
+	COMMON_DEPEND="
+		>=gui-libs/wlroots-0.18:=[libinput,session,X?]
+		<gui-libs/wlroots-0.19:="
+fi
+
+COMMON_DEPEND+="
 	dev-libs/libinput:=
 	dev-libs/wayland
 	x11-libs/libxkbcommon
@@ -51,14 +41,14 @@ CDEPEND="
 	)
 "
 RDEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	X? (
 		x11-base/xwayland
 	)
 "
 # uses <linux/input-event-codes.h>
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	sys-kernel/linux-headers
 "
 BDEPEND="
diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild
index f94a2aa83609..55db23917d62 100644
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -5,30 +5,13 @@ EAPI=8
 
 inherit savedconfig toolchain-funcs
 
-MY_P="${PN}-v${PV}"
-
-WLROOTS_DEP="
-	>=gui-libs/wlroots-0.17:=[libinput,session,X?]
-	<gui-libs/wlroots-0.18:=
-"
-
-if [[ ${PV} == *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git"
 	inherit git-r3
-
-	# 9999-r0: main (latest stable wlroots release)
-	# 9999-r1: wlroots-next (wlroots-9999)
-	case ${PVR} in
-		9999)
-			EGIT_BRANCH=main
-			;;
-		9999-r1)
-			EGIT_BRANCH=wlroots-next
-			WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]"
-			;;
-	esac
 else
-	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+	MY_PV="${PV/_rc/-rc}"
+	MY_P="${PN}-v${MY_PV}"
+	SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
@@ -40,8 +23,15 @@ LICENSE="CC0-1.0 GPL-3+ MIT"
 SLOT="0"
 IUSE="X"
 
-CDEPEND="
-	${WLROOTS_DEP}
+if [[ ${PV} == 9999 ]]; then
+	COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]"
+else
+	COMMON_DEPEND="
+		>=gui-libs/wlroots-0.19:=[libinput,session,X?]
+		<gui-libs/wlroots-0.20:="
+fi
+
+COMMON_DEPEND+="
 	dev-libs/libinput:=
 	dev-libs/wayland
 	x11-libs/libxkbcommon
@@ -51,19 +41,19 @@ CDEPEND="
 	)
 "
 RDEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	X? (
 		x11-base/xwayland
 	)
 "
 # uses <linux/input-event-codes.h>
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	sys-kernel/linux-headers
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.32
-	dev-util/wayland-scanner
+	>=dev-util/wayland-scanner-1.23
 	virtual/pkgconfig
 "
 
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 65caf41b14fa..dd983fd4908e 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -8,7 +8,7 @@ DIST hyprland-0.41.2.gh.tar.gz 54821598 BLAKE2B 026559e9319690e6b48863ffdc2e059c
 EBUILD hyprland-0.37.1-r1.ebuild 3776 BLAKE2B 695ad287b51c217d6b6cf340e9737de64d43a21bb03265d5dc8ac738c91aac37af020950b81d928d6b182b49388855b68a752e614a6b96db11045d9b37afec4d SHA512 663d4f5a8e8ed20c6a80ca7fc9d3b86605a48651c0900f173d98110b494200b1832a7ca195c79e72a08b38c1e64eb6de54aa16e38ce606c81aa4007c354c95f1
 EBUILD hyprland-0.39.1-r3.ebuild 3967 BLAKE2B 2d469c0a319227b1ce83fd1ab8be9cc04cfeb43737ee717ec0f163afb0c3f162332760c5c5cedea089303e6d913a20ac91719cb37ff1f36aa3c290085527af9c SHA512 038d6297db31571f67cf3b4181012ab29625d13d2a3952bb4214539dede9dfdafc7ea4429523fb47e2fb407cb6c7bc5f8c4ecd6d3328e01aa5e5f75184464830
 EBUILD hyprland-0.40.0-r1.ebuild 4009 BLAKE2B 129b4d55aa26fbc9f282a1b2de230a1431770aaec9c088a28874dfb08de81871774df26f3571494dfa62c3ed9631aa0af739e169e95269ba416edae2344ee01a SHA512 2be06355e9fb98a187e9aa3754cae800eab0fa91ffaac7ce69f0f8cf955a67bf3affc6a73b7c3d78af5ed8da1b2ba0150f323dbea5940c855c7398eb20799224
-EBUILD hyprland-0.41.1.ebuild 3451 BLAKE2B 21286db4b04d32cbb340069a44f022c3fb8ae65fa83fe5d7bd8891980bedc7cf7984bf6c8a9be91b57853818d96a7e151b0b40afec1bc65d8f8c5bef7d37ea91 SHA512 b9c860711a669f7c80472485effb254d841735043911255b72ac5d8b6af14b7f1df4dfcb708e6b137c73131b86ab498e6822fa9de5686b799e8f6217bacfa381
+EBUILD hyprland-0.41.1.ebuild 3450 BLAKE2B 9f7660c38c7a8440d311e9586592fbd83558ae295f6391c17b9c1793c8a2ecfd54fd4d54095a493b7d525317dc967064eb10fac2f1f5e80f01695c22a1b1ab66 SHA512 5ffd43609f6b752925dc636d2e675d732307160ca703c130edc7f5a4e79eb93c18dec170c0097a45907e7fb7767d5c354b908758542f8f4b48dfc884312eaccb
 EBUILD hyprland-0.41.2.ebuild 3227 BLAKE2B 4da40fbf06cb1d9c9dac0efe98d131475906eda860d4ec69bba231a55d6d93c3a89fc31f5d165de086f4cf30f84f51a24db63d8ab5466a33f556f7b9d86bbc51 SHA512 66da766d7d68071304b4eeda1a42c9490274c41035ea9f49d78a92d7d0aca12560e4ddeae2df6a4324cb00c2636cd74cce066087d236b81f6598c8a09e720d33
-EBUILD hyprland-9999.ebuild 3113 BLAKE2B 0b4fc852279010e7e4a74f69cbade4bf94b806eb6ae881783a3ab6e79da5c1767c3d6f5f6ff6c1407745d58dd662cca17276729c40b5dc4817311c5ee907d465 SHA512 643ee5c75ea794f607e648fc64a493de89f30f0879bb915f770297aa5bb55201acedca66d3b940408372100963fa16c86e46d3a346017055fb688d9b90ea95f7
+EBUILD hyprland-9999.ebuild 2273 BLAKE2B fa21d85a1de38732795dbaca8e542b869e0506d39c391406360fd3599f286ff37c5c0d3cdb7718a1512cdd3107d029de408880a9f678386fdcd92bb0516580a2 SHA512 bfcec09a7cce6056d1261d2fbadd1b870b4f9cc99c271cd3100c79fcb90c766d54a0677fa3fdab4a6a262d9678ec833d4f49f5eb0e291e1b3d98a9f3008ad857
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/hyprland-0.41.1.ebuild b/gui-wm/hyprland/hyprland-0.41.1.ebuild
index 0e41b9d2b446..ded707b47007 100644
--- a/gui-wm/hyprland/hyprland-0.41.1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.41.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}-source"
 
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="BSD"
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index f7df6d445341..820237251659 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -32,47 +32,13 @@ HYPRPM_RDEPEND="
 	dev-vcs/git
 	virtual/pkgconfig
 "
-# bundled wlroots has the following dependency string according to included headers.
-# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
-# enable x11-backend with X and vice versa
-WLROOTS_DEPEND="
-	>=dev-libs/wayland-1.22
-	media-libs/libglvnd
-	|| (
-		>=media-libs/mesa-24.1.0_rc1[opengl]
-		<media-libs/mesa-24.1.0_rc1[egl(+),gles2]
-	)
-	>=x11-libs/libdrm-2.4.114
-	x11-libs/libxkbcommon
-	>=x11-libs/pixman-0.42.0
-	media-libs/libdisplay-info:=
-	sys-apps/hwdata
-	>=dev-libs/libinput-1.14.0:=
-	sys-auth/seatd:=
-	virtual/libudev:=
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-errors
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-		x11-base/xwayland
-	)
-"
-WLROOTS_RDEPEND="
-	${WLROOTS_DEPEND}
-"
-WLROOTS_BDEPEND="
-	>=dev-libs/wayland-protocols-1.32
-	dev-util/hyprwayland-scanner
-	virtual/pkgconfig
-"
 RDEPEND="
 	${HYPRPM_RDEPEND}
-	${WLROOTS_RDEPEND}
 	dev-cpp/tomlplusplus
 	dev-libs/glib:2
 	dev-libs/libinput
 	>=dev-libs/wayland-1.20.0
+	gui-libs/aquamarine
 	>=gui-libs/hyprcursor-0.1.9
 	media-libs/libglvnd
 	x11-libs/cairo
@@ -90,7 +56,7 @@ DEPEND="
 	>=dev-libs/hyprland-protocols-0.3
 	>=dev-libs/hyprlang-0.3.2
 	>=dev-libs/wayland-protocols-1.36
-	>=gui-libs/hyprutils-0.1.5
+	>=gui-libs/hyprutils-0.2.0
 "
 BDEPEND="
 	${WLROOTS_BDEPEND}
@@ -120,7 +86,6 @@ src_configure() {
 		$(meson_feature legacy-renderer legacy_renderer)
 		$(meson_feature systemd)
 		$(meson_feature X xwayland)
-		$(meson_feature X wlroots:xwayland)
 		-Dwlroots:backends=drm,libinput$(usev X ',x11')
 		-Dwlroots:xcb-errors=disabled
 	)