gentoo auto-resync : 11:09:2024 - 12:30:54

5 files changed, 16 insertions, 197 deletions

diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 24cf0b8a5b9d..c1eb61e38b7c 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,8 +1,6 @@
-DIST hyprland-0.41.1.gh.tar.gz 54813832 BLAKE2B 1dd17e7e1f885da91fca596bf8ce9efc76b3110640a9bc11538fabf975eb55d76180c202527e0b0eac300f027adfed815d2a9a5396a48429097ef2a5ffcc4d9e SHA512 fa63e7c429e33535fa30ca70133f6ac8617f2386bdca1e8063628a2895677c9b80965548ee21f897aea2fe6bdcc10d74d8c46989a7563b36504f4a4f43c3eaad
-DIST hyprland-0.41.2.gh.tar.gz 54821598 BLAKE2B 026559e9319690e6b48863ffdc2e059c969ab45e7bfe75578b7e41f1d10b36e720ae0655f7003107a4ff4e94c1e95aba3e8a1af8ed01bae369c571e24d966aec SHA512 5a138d9ad6de2d45d8d0a5cde8c39ba3cd4c6bac61caf5b9f8520d0adcafe6ac1dfec4c529b8a6608133ffe9409935c1414a86d98d743be6766bdbc72641179d
 DIST hyprland-0.42.0.gh.tar.gz 54225438 BLAKE2B a947289c5568408d71383034a290f114b974f442ed1f56ac3ec30e49519ee886ac83e1f2611577a7240a555480a59bc01defb79b2aca2122ef0d81ea007f5486 SHA512 839916957abc867ad9a3a32b6f74830055060b99c4c1de314f71a85f8d55ef051c5adb7c79dd7a7e10f81d1130aa032458bb65ce2454198a79faa719021f66af
-EBUILD hyprland-0.41.1.ebuild 3450 BLAKE2B 9f7660c38c7a8440d311e9586592fbd83558ae295f6391c17b9c1793c8a2ecfd54fd4d54095a493b7d525317dc967064eb10fac2f1f5e80f01695c22a1b1ab66 SHA512 5ffd43609f6b752925dc636d2e675d732307160ca703c130edc7f5a4e79eb93c18dec170c0097a45907e7fb7767d5c354b908758542f8f4b48dfc884312eaccb
-EBUILD hyprland-0.41.2.ebuild 3227 BLAKE2B 4da40fbf06cb1d9c9dac0efe98d131475906eda860d4ec69bba231a55d6d93c3a89fc31f5d165de086f4cf30f84f51a24db63d8ab5466a33f556f7b9d86bbc51 SHA512 66da766d7d68071304b4eeda1a42c9490274c41035ea9f49d78a92d7d0aca12560e4ddeae2df6a4324cb00c2636cd74cce066087d236b81f6598c8a09e720d33
-EBUILD hyprland-0.42.0-r1.ebuild 2357 BLAKE2B ef3afe64de415058d6c7c7777afc87357c2e1c2e44291ba27ab4241f6eedf3935d1ab6ea300148431a4bc7bc3760b43aa5f9d580bba7cbf75a93c390605eadb5 SHA512 62b4502b0319cbcab715949119c5ab088bb1a6bd10c057794c0940ba543b6c2f12585567f486212bb4adf1c80a99faa3131cadab90dc7334df4f18a1fef427ae
-EBUILD hyprland-9999.ebuild 2243 BLAKE2B a9255e0b44eb9aab3a9b1b2433ae801d451267ddd2924dc20d8f3f8cf58f8d800114197894f59bfe0321658751b3f316296a4cfc02aede812f4058db6f8c3332 SHA512 0d6e0c1e4d5974d80e8145eb037f2c993d765dbd6a0a07350ca2221087f43e14f77aa91b17d1f7bc9de2987c546cd04447c81de1bd54f9bd8a264b4a107ab670
+DIST hyprland-0.43.0.gh.tar.gz 54388932 BLAKE2B 610afadde6e56cb576d96c1d704327534d3ab50e69b091e9b44e9f901dbdfcd38f8a3c6a40f7fd3e843e5dda884ea1e93a24e085446861104019be9489a0a666 SHA512 521adcfb9ef55d5ad45192566856c20619942e8229f41400d2534531458dd3e54673b9dd3a0c3360280ccaaf35f5ac48393553a8549f147b701aa26522cec37b
+EBUILD hyprland-0.42.0-r1.ebuild 2356 BLAKE2B c2d0a4a9a15396bc685ce985f6371ac63625390ffd1b7c8fde772118e45763abe282e8ec21949202016b11eaf597b1ad2284417812ce38e3c0b03da217ad3324 SHA512 b9f14ea6b456f75c0b4bbefc9fb827c5a47bde06f6ec4d034c2325da8dabb488bbe369357f3b5a9e4e2a75279773cc70680d27cf1a8293d5c8d6fc4b082bae1b
+EBUILD hyprland-0.43.0.ebuild 2336 BLAKE2B 7a14a81112b3a395f55a8ed231e808a344b28b844604a0392edb7cc9fbe798447196179f9d6a7b1549b269c19b716d161447e661c3a5d2dd0a8b2f92604ade51 SHA512 a036e20ec541a5722c2a1d5eaed8441c885e13f95384c1904b7175d128273bdb1f929caa8a257515aa86c1b9b42b799808ab60140ae4400a25f2e62cfb5ac078
+EBUILD hyprland-9999.ebuild 2222 BLAKE2B c8d4973d60bfbbf5c45f1c0229f9e2c2d2ffcea1ef35d6895e4671e5d305d2a5218d8f0ef3852820412e1ee8a3a3629c0f6a8a7cd6bdb6a9bebaf286b0afcd59 SHA512 266aa50c934f0f129b450e5adb2e3e5a98d1dc9feb27ce32c2e689829a0b76c55ed8722e4a8b59cec40f75a0b2fc62df4814d4e48270aa2db6ba73e25763f766
 MISC metadata.xml 842 BLAKE2B a18d149e43389e07733358e7295c2a9c1aca796292764a7598e9fb2902c3f7ec69b8c7226e245f2bb19df18ff55522c0e1025b43a48f9f44bfa54df6b5aad938 SHA512 1d236b3417f157c2d2604465fcfd1a36a118b96a5cc938b584cb65b1b930ed658497508912680ede27a54e2ea51d87a833f34fe925d0e619e75ce120d6273bde
diff --git a/gui-wm/hyprland/hyprland-0.41.1.ebuild b/gui-wm/hyprland/hyprland-0.41.1.ebuild
deleted file mode 100644
index ded707b47007..000000000000
--- a/gui-wm/hyprland/hyprland-0.41.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
-HOMEPAGE="https://github.com/hyprwm/Hyprland"
-
-if [[ "${PV}" = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
-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"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="X legacy-renderer systemd"
-
-# hyprpm (hyprland plugin manager) requires the dependencies at runtime
-# so that it can clone, compile and install plugins.
-HYPRPM_RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	dev-build/meson
-	dev-libs/libliftoff
-	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-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/hyprcursor-0.1.9
-	media-libs/libglvnd
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	X? (
-		x11-libs/libxcb:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	${WLROOTS_DEPEND}
-	>=dev-libs/hyprland-protocols-0.3
-	>=dev-libs/hyprlang-0.3.2
-	>=dev-libs/wayland-protocols-1.36
-	>=gui-libs/hyprutils-0.1.2
-	x11-libs/xcb-util-errors
-"
-BDEPEND="
-	${WLROOTS_BDEPEND}
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
-	app-misc/jq
-	dev-build/cmake
-	>=dev-util/hyprwayland-scanner-0.3.9
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
-		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
-		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
-
-src_prepare() {
-	# skip version.h
-	sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(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
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	# First install everything except wlroots to avoid conflicts.
-	meson_src_install --skip-subprojects wlroots
-	# Then install development files (mainly wlroots) for bug #916760.
-	meson_src_install --tags devel
-}
diff --git a/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild b/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
index 0c9148aefe21..5d99847819ad 100644
--- a/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.42.0-r1.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-0.41.2.ebuild b/gui-wm/hyprland/hyprland-0.43.0.ebuild
index 9c3bfc3cf5cb..dbc6bd85587e 100644
--- a/gui-wm/hyprland/hyprland-0.41.2.ebuild
+++ b/gui-wm/hyprland/hyprland-0.43.0.ebuild
@@ -28,51 +28,16 @@ HYPRPM_RDEPEND="
 	app-alternatives/ninja
 	dev-build/cmake
 	dev-build/meson
-	dev-libs/libliftoff
 	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
@@ -80,21 +45,23 @@ RDEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
+	x11-libs/libXcursor
 	X? (
 		x11-libs/libxcb:0=
+		x11-base/xwayland
+		x11-libs/xcb-util-errors
+		x11-libs/xcb-util-wm
 	)
 "
 DEPEND="
 	${RDEPEND}
-	${WLROOTS_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.1
 "
 BDEPEND="
-	${WLROOTS_BDEPEND}
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
+	|| ( >=sys-devel/gcc-14:* >=sys-devel/clang-18:* )
 	app-misc/jq
 	dev-build/cmake
 	>=dev-util/hyprwayland-scanner-0.3.8
@@ -104,12 +71,12 @@ BDEPEND="
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
+	if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then
+		eerror "Hyprland requires >=sys-devel/gcc-14 to build"
 		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
 		die "GCC version is too old to compile Hyprland!"
-	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
+	elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then
+		eerror "Hyprland requires >=sys-devel/clang-18 to build"
 		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
 		die "Clang version is too old to compile Hyprland!"
 	fi
@@ -126,9 +93,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
 	)
 
 	meson_src_configure
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 087e0987105b..31664e318dd9 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -28,7 +28,6 @@ HYPRPM_RDEPEND="
 	app-alternatives/ninja
 	dev-build/cmake
 	dev-build/meson
-	dev-libs/libliftoff
 	dev-vcs/git
 	virtual/pkgconfig
 "