[gentoo-commits] repo/proj/guru:dev commit in: gui-wm/cage/

["Daichi Yamamoto" <dev@dyama.net>]

commit:     bb2cba461910e7ea138b971624ba688aed45b99e
Author:     Daichi Yamamoto <dev <AT> dyama <DOT> net>
AuthorDate: Sat Oct  5 06:36:11 2024 +0000
Commit:     Daichi Yamamoto <dev <AT> dyama <DOT> net>
CommitDate: Sat Oct  5 06:36:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bb2cba46

gui-wm/cage: add 0.1.5_p20241002, drop 0.1.5_p20240227

Closes: https://bugs.gentoo.org/940628
Signed-off-by: Daichi Yamamoto <dev <AT> dyama.net>

 gui-wm/cage/Manifest                                      |  2 +-
 ...0.1.5_p20240227.ebuild => cage-0.1.5_p20241002.ebuild} | 11 ++++-------
 gui-wm/cage/cage-9999.ebuild                              | 15 ++++++---------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/gui-wm/cage/Manifest b/gui-wm/cage/Manifest
index 93d5a91a9..2deb12531 100644
--- a/gui-wm/cage/Manifest
+++ b/gui-wm/cage/Manifest
@@ -1 +1 @@
-DIST cage-0.1.5_p20240227.tar.gz 23891 BLAKE2B a0127a1ea4b3a2719bf8a5e0e461bf055826b6194fb844c714dc8d28807530c9541a759c90edc1029dfc2832dc06d41691a62f26196c1db9f0d1db472df04685 SHA512 8e203aabb06946ed6467f93e37e806775956fcc25575b22be6a5b1c8ce7c1397981b645dbd50af44d3b6bc340ea7349ab55c207f005f6d48a8abaa02a178c859
+DIST cage-0.1.5_p20241002.tar.gz 24118 BLAKE2B fdf2d8fdabd5974d15e2785f48b919dd9cdab609949adacfe319e9dbc8f687f8c469d0cf19dcaf140f4794f12180b717dc4f072deba3db1af558e938afc99e39 SHA512 37998c81f36aeb2040c65899414ac4df5e8e9bde4e8551d4d88f299d523dd62600db8a87012717ffb015563e144aaf63d0797404342d879d020f5a7cfc8ae023

diff --git a/gui-wm/cage/cage-0.1.5_p20240227.ebuild b/gui-wm/cage/cage-0.1.5_p20241002.ebuild
similarity index 74%
rename from gui-wm/cage/cage-0.1.5_p20240227.ebuild
rename to gui-wm/cage/cage-0.1.5_p20241002.ebuild
index 096be5c1c..e07020da1 100644
--- a/gui-wm/cage/cage-0.1.5_p20240227.ebuild
+++ b/gui-wm/cage/cage-0.1.5_p20241002.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit meson
 DESCRIPTION="A Wayland kiosk"
 HOMEPAGE="https://www.hjdskes.nl/projects/cage/ https://github.com/Hjdskes/cage"
 
-COMMIT="e7d8780f46277af87881e0be91cb2092541bb1d5"
+COMMIT="34de3f7bac48aae64bbbb09a4c10900e0150e968"
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 if [[ "${PV}" == 9999 ]]; then
@@ -26,11 +26,8 @@ IUSE="X"
 
 RDEPEND="
 	dev-libs/wayland
-	>=gui-libs/wlroots-0.17.0:0[X?]
 	x11-libs/libxkbcommon[X?]
+	X? ( gui-libs/wlroots:0.18[X,x11-backend] )
+	!X? ( gui-libs/wlroots:0.18 )
 "
 DEPEND="${RDEPEND}"
-
-src_configure() {
-	meson_src_configure $(meson_feature X xwayland)
-}

diff --git a/gui-wm/cage/cage-9999.ebuild b/gui-wm/cage/cage-9999.ebuild
index 00123e337..c1026f034 100644
--- a/gui-wm/cage/cage-9999.ebuild
+++ b/gui-wm/cage/cage-9999.ebuild
@@ -5,8 +5,10 @@ EAPI=8
 
 inherit meson
 
-if [[ "${PV}" == 9999 ]]
-then
+DESCRIPTION="A Wayland kiosk"
+HOMEPAGE="https://www.hjdskes.nl/projects/cage/ https://github.com/Hjdskes/cage"
+
+if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Hjdskes/cage"
 else
@@ -14,8 +16,6 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A Wayland kiosk"
-HOMEPAGE="https://www.hjdskes.nl/projects/cage/ https://github.com/Hjdskes/cage"
 LICENSE="MIT"
 SLOT="0"
 
@@ -23,11 +23,8 @@ IUSE="X"
 
 RDEPEND="
 	dev-libs/wayland
-	>=gui-libs/wlroots-0.17.0:0[X?]
 	x11-libs/libxkbcommon[X?]
+	X? ( gui-libs/wlroots:0.18[X,x11-backend] )
+	!X? ( gui-libs/wlroots:0.18 )
 "
 DEPEND="${RDEPEND}"
-
-src_configure() {
-	meson_src_configure
-}