gentoo auto-resync : 21:04:2024 - 12:05:28

6 files changed, 30 insertions, 119 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index b96b24c679ec..fcde8d1393d2 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 2a4fbec1a413..41d855e92316 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,8 +1,9 @@
+AUX bash-completion-fix-0.39.1.patch 1428 BLAKE2B 5fac61964fc255357e73f7d3cc7120818336849a049b83a7b728b5775995ce4b90b3496620962a596ca74f45a7933950568300e193e2e8d13f130bbdf06c756d SHA512 4101bb40509eec8a1649315d8fdb54d683347a576564f80b5a9e2d958fe75cc7e5ff3b669ed24cf8d897929e1eba4ab3c92b7287cc6ac9a90f2b7c01c93ab1f6
 DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B 92bd78168909510ffb21b46f7d66e139e7b86f7655c7a8126eaf90b6ef6d7d5affaf0bc55ca1647a2f80b6d767afc00e1efe5f2241b2bc88d20357acee611b92 SHA512 f09316e210805b833a27524894222edc7a048b77f9f5d9cc8faa5b4e37040485ad3b9638f60a346da8d4d4aff24bbd6382b7fde64d07528990e9a521b2f46454
 DIST hyprland-0.38.1.gh.tar.gz 54701702 BLAKE2B 56f16d938099856be9aea0a089154e58a1d2226f42fc2a81a560e3f3883caed6eb76faa674340a3a4a1632df5a8c1a28d084c64c6749c3452c23ca192bef967b SHA512 addd4cea3f83e17907180288021718a66973c247b261e306accb7b32bbbbd2f0b3f4fcf4c22189614f561c361bfb99ea0645f4698e7af9491379d424d1d1142b
 DIST hyprland-0.39.1.gh.tar.gz 54681029 BLAKE2B 5a78c5e7cef3369fd72abc05941f88f0391fb87e79afaa13c128acd9f8d2aa79d6af4d0dc82a90c09689993fe914ac48bc5ba4a32173eed31ecc20204f5a4edc SHA512 da8ee577aa823c9fb7b45bfd07503656561c1cd4cac42a9bf8f582f653c93b20824b3bce7bbcbd47b7f7f8e83fb1b630d6d5c983fe345c971322369f193c2c8f
 EBUILD hyprland-0.37.1.ebuild 3715 BLAKE2B 9ad1db0bcb9e2c63fa3a23abe14c26c4a3fae60a46985731fbea497a9fa86165f1f7c942ad744cd84a5f8a7d2b711f93493ad04faf23317c89bee3adb631c499 SHA512 3de2a9ed87567edf2707e2997ebc2cef0ac3f914aed184ae4121515298f1c566075fcb3e4b1ca2dc19b333676dcc259dfea110b5deb177629ed6d46396938e35
 EBUILD hyprland-0.38.1.ebuild 3735 BLAKE2B 867a6609496a33ebb6863c7d0405136e83eea51b5967527a71027b61259a3887395f8c623bf81372db92845d0497e40ac987eec06c47ee57156f4145d5f09939 SHA512 8bd315cb5cecec8c3aab4c2d9c768cb4c18e07b286b1828072f5897ab567861b28a128f6adfd94606653610e551fc845c710c58bd5525a5ddb9cacd48985fd85
-EBUILD hyprland-0.39.1.ebuild 3743 BLAKE2B 508e3971e81c7a1f8aea75c449a8f546764abe0c4e9f2f675d6a7d9390958fa2f5c9b715c3a0d8755997932c51acfa5088345ee6c4abc1b729d7378bd888ece7 SHA512 297331f1318c6560c610cdc7996fe887c34515a8abd53a84bf292c99b63d24ade55b81706b8a1b725e9ef96a4f11584d31f949bc79a32ce44be238d19836e68e
+EBUILD hyprland-0.39.1-r1.ebuild 3886 BLAKE2B 3271531c5d2606c7791323913557f5376d3e7afefbddde708f216601bada1cf2efcb209c6473c834054666dc4f12ac38a545059294325daa3bfa786a21d5a9bf SHA512 f371f7a82bea139d725a71028bce7a513ed0fca3239998469c2edd34e1444edac19eeaedd3e94297fb7dcba0d5df828b7c55f36b8254b98c6cdcfb062e6a8d2c
 EBUILD hyprland-9999.ebuild 3735 BLAKE2B 867a6609496a33ebb6863c7d0405136e83eea51b5967527a71027b61259a3887395f8c623bf81372db92845d0497e40ac987eec06c47ee57156f4145d5f09939 SHA512 8bd315cb5cecec8c3aab4c2d9c768cb4c18e07b286b1828072f5897ab567861b28a128f6adfd94606653610e551fc845c710c58bd5525a5ddb9cacd48985fd85
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch b/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
new file mode 100644
index 000000000000..fe48ce45dd3a
--- /dev/null
+++ b/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
@@ -0,0 +1,22 @@
+https://github.com/hyprwm/Hyprland/pull/5653
+
+--- a/hyprctl/meson.build
++++ b/hyprctl/meson.build
+@@ -2,6 +2,6 @@ executable('hyprctl', 'main.cpp',
+   install: true
+ )
+
+-install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprctl')
++install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprctl')
+ install_data('hyprctl.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
+ install_data('hyprctl.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprctl')
+--- a/hyprpm/src/meson.build
++++ b/hyprpm/src/meson.build
+@@ -9,6 +9,6 @@ executable('hyprpm', src,
+   install : true
+ )
+
+-install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprpm')
++install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprpm')
+ install_data('../hyprpm.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
+ install_data('../hyprpm.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprpm')
diff --git a/gui-wm/hyprland/hyprland-0.39.1.ebuild b/gui-wm/hyprland/hyprland-0.39.1-r1.ebuild
index 3368e4aa15c2..6b1a6eff78b2 100644
--- a/gui-wm/hyprland/hyprland-0.39.1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.39.1-r1.ebuild
@@ -95,6 +95,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://bugs.gentoo.org/930132
+	# https://github.com/hyprwm/Hyprland/pull/5653
+	"${FILESDIR}/bash-completion-fix-0.39.1.patch"
+)
+
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 04f77f29be45..abe0d6d223bd 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -2,7 +2,6 @@ AUX sway-portals.conf 216 BLAKE2B d30b62bb142802e5067c2829d69faba87b07c8a36661f4
 DIST sway-1.8.1.tar.gz 5577483 BLAKE2B 0e21c3a113b6bbb4a535ef77e347304ead98a424b65c176299f3d86fd52c35abf88d4e88fff0a8ecdb48494e8275110c79ea35fafd2902653db03fd938ee0323 SHA512 1f9909cb0402a99926d0ff1cefb98c40930e61678067413b6f195b036e6018a4f85bb3a6649d8bb743c93f0476b103791617a94d7c8c11a2c021f40131b65563
 DIST sway-1.9.tar.gz 5581281 BLAKE2B 11d90866e3d12a76880f41e006be5ae7f3a3b1e6cbeb2412d30b673be91be7f60523dcce2892579e1da76de1d0498e0669138aa953bf1f595b97123720812e06 SHA512 7ec0a29078eb7e0fb1b6af97613c263adec78ddb03a63cb75fb5e44c7241ed144687fd094ee2eb70f4397832ca9bdffc88bc32dee7683bf0e515417c7a05d4c4
 EBUILD sway-1.8.1-r2.ebuild 2777 BLAKE2B d3eca9d01c78701eb34d24f0b17bccb6749c82b7cc51ceb90dbeccb3f8a9e72f01c53bb61bd7d18707b729597cb1e254215a42fba73b0bf6ee0fce70bd6dd06c SHA512 508c773652ca63d6ba5c018d0fea2d7c626f68711e60d3cbd5053ee197245fa22bd32a8ae7af8e7b4d94be8d1704e32dd478d13b1ff2f6a759cd5074f9b156cf
-EBUILD sway-1.8.1.ebuild 2698 BLAKE2B df1f17e70b9424c8553efcd353b206c89e4e5d08a895e2346ece8e1f6766ac41b322451e0afe6a584cebc65d8466e7f4879154f6e1326fae6c04db66514d9a92 SHA512 247e84b485036f0cfb37da95f587cba2733740769b33c4e3bf456d52d01ada64cad70e061a95029a8a1c5dd056c63212f6e796e2b217ac3669c2c7df107f1bfe
 EBUILD sway-1.9.ebuild 2690 BLAKE2B 525da24f7b6a2cef34e8e9fdc88bf0d659a8cbe81938f57923fd830f42165e3f77db6f5ce01f4b40e59925cf71455ace91b544cdd00af6f0adb986c871a9c59b SHA512 504a560698dcdbb7402624bb9478d86f4082b16d72ab7d8c6093985129b16477078981a97aab2162462a35262d6f03cc005d419594afaa2490529417c2b44e0f
 EBUILD sway-9999.ebuild 2693 BLAKE2B 9f8bb9be70b0e00432fb1d36a2d281c780658c34f8775191860798091ad89fe088301b16c59b06fbfd8789658f967cc2e26cde7cd8681b001287f676cb62c4df SHA512 f0555473ae327b5694b9fd6b6da8eb7b2841d6eee824d63d54c4620937f6b914485d0d3dc685dda3537cd54dd9318d736f9d37437b45c976771ab959202e86ba
 MISC metadata.xml 1802 BLAKE2B 2851be5d36dd2965a8ae2e55617615990f5e936208c05aacad49825099866c47f550d74f066905cb09029ec90e53d20a4487a7ba1af039ef1d2d445ebd1bd041 SHA512 c47f54f6997e10461c5ff337eb9ad441b03f6dcc83f1ae63cb92bb3df07bbb78d78c7b9718eb50e0d808a7ea73e13d3f4f809931af34d5b557e8a7ac9903d228
diff --git a/gui-wm/sway/sway-1.8.1.ebuild b/gui-wm/sway/sway-1.8.1.ebuild
deleted file mode 100644
index c60250eff3b8..000000000000
--- a/gui-wm/sway/sway-1.8.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="grimshot +man +swaybar +swaynag tray wallpapers X"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.21.0:0=
-	sys-auth/seatd:=
-	dev-libs/libpcre2
-	>=dev-libs/wayland-1.20.0
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	media-libs/mesa[gles2,libglvnd(+)]
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	tray? ( || (
-		sys-apps/systemd
-		sys-auth/elogind
-		sys-libs/basu
-	) )
-	wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
-	X? (
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-wm
-	)
-"
-# x11-libs/xcb-util-wm needed for xcb-iccm
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999:=[X?]"
-else
-	DEPEND+="
-		>=gui-libs/wlroots-0.16:=[X?]
-		<gui-libs/wlroots-0.17:=[X?]
-	"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	grimshot? (
-		app-misc/jq
-		gui-apps/grim
-		gui-apps/slurp
-		gui-apps/wl-clipboard
-		x11-libs/libnotify
-	)
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.24
-	>=dev-build/meson-0.60.0
-	virtual/pkgconfig
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-REQUIRED_USE="tray? ( swaybar )"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature man man-pages)
-		$(meson_feature tray)
-		$(meson_feature X xwayland)
-		$(meson_feature swaybar gdk-pixbuf)
-		$(meson_use swaynag)
-		$(meson_use swaybar)
-		$(meson_use wallpapers default-wallpaper)
-		-Dfish-completions=true
-		-Dzsh-completions=true
-		-Dbash-completions=true
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use grimshot; then
-		doman contrib/grimshot.1
-		dobin contrib/grimshot
-	fi
-}
-
-pkg_postinst() {
-	optfeature_header "There are several packages that may be useful with sway:"
-	optfeature "wallpaper utility" gui-apps/swaybg
-	optfeature "idle management utility" gui-apps/swayidle
-	optfeature "simple screen locker" gui-apps/swaylock
-	optfeature "lightweight notification daemon" gui-apps/mako
-	echo
-	einfo "For a list of additional addons and tools usable with sway please"
-	einfo "visit the offical wiki at:"
-	einfo "https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway"
-	einfo "Please note that some of them might not (yet) available on gentoo"
-}