gui-wm/somewm: Bump to 1.4.2

diff --git a/gui-wm/somewm/Manifest b/gui-wm/somewm/Manifest
index 899416da66a0dc24ba297a4238e04849269c1864..b2e0c94943859850d69490c9c744e8180e13427f 100644 (file)
--- a/gui-wm/somewm/Manifest
+++ b/gui-wm/somewm/Manifest
@@ -1,5 +1,7 @@
 DIST somewm-1.4.1.tar.gz 3191096 BLAKE2B 2308f61103a0ec19186bfde2358f89e8ddefef78443d0f1e3cf469670347cf059a25004b672e8bb2585ff2cf1de57f9bf5ce34d067c1fa9b09f811e62b376675 SHA512 05214ef62863f389c89b3e87267df094f67797115428db832f9abbffc76eeec3a8062e589e9f92297aaeb0b4c507e7f2867999dd758735b534a7a9734e33c659
-EBUILD somewm-1.4.1.ebuild 1465 BLAKE2B 2ead1d133afa31c5f4be4b5f6b0a4e5cdb49df9b56da526aa9b9eeda3bf0043cb1ed903ed6178940ca5eb19ccd32df1fba6c3591a26bf7e7ef3a6ef551621d80 SHA512 d851dd1318899ae95ed1e9ed356e8f3f2fa4a3e59127bfdd95224864e0985e131debe3782bb0c1709989b768a292ea55add33acc287276cbafdbd21f2a876e78
-EBUILD somewm-1.4.9999.ebuild 1465 BLAKE2B 2ead1d133afa31c5f4be4b5f6b0a4e5cdb49df9b56da526aa9b9eeda3bf0043cb1ed903ed6178940ca5eb19ccd32df1fba6c3591a26bf7e7ef3a6ef551621d80 SHA512 d851dd1318899ae95ed1e9ed356e8f3f2fa4a3e59127bfdd95224864e0985e131debe3782bb0c1709989b768a292ea55add33acc287276cbafdbd21f2a876e78
-EBUILD somewm-9999.ebuild 1465 BLAKE2B 2ead1d133afa31c5f4be4b5f6b0a4e5cdb49df9b56da526aa9b9eeda3bf0043cb1ed903ed6178940ca5eb19ccd32df1fba6c3591a26bf7e7ef3a6ef551621d80 SHA512 d851dd1318899ae95ed1e9ed356e8f3f2fa4a3e59127bfdd95224864e0985e131debe3782bb0c1709989b768a292ea55add33acc287276cbafdbd21f2a876e78
-MISC metadata.xml 912 BLAKE2B 15a6c6df9ca1cedd67ae5a24ee785a34c63648f2609b2fae66c8a9b20b79758cf56941412313ab28a776a3cae68f80811272a0b4beee95331345ae235b85c7a7 SHA512 eded069424a94b324ccc5f6b8b932792b756620db1bee0bcabc277445d0ba3c4137a08c3af601286955254661c5af742f8bbbc0bcc4f2852cfa162add2a330f3
+DIST somewm-1.4.2.tar.gz 3238485 BLAKE2B 52f92a28537b204b0868c8d58f9ca10f63c92b0f6adf0df8af37deb7f81e363b78eaa83a9bd95b5d5d17586e2ca62e4a5e8ea629c20bf1ba1658eedd6206c691 SHA512 a994119ac0223a34c9fa260c467ab6b4a230fc2a3edc1991bf0fc1105145b8326889104391bd9a3b6f07f1428313d24fc0bbdd031d9967a1c574f67d733c615c
+EBUILD somewm-1.4.1.ebuild 1482 BLAKE2B 5e31bfb7f9f33d48f971349e3ccdf6035e596c1db61924ddd1a91a2254e34e56f0a5bc89503d28b7d608b0159d7ae5e982ddb84c3f37ea7a0baac27e5bebb0a3 SHA512 85ce61545d5f6004ff5b136089de8cd9e1766a92bb2339a0e2996ac128968bfd751a16d8df7a203b0bfdcc1b20d7681a2dda190f362413cdbb17fd19da5816ff
+EBUILD somewm-1.4.2.ebuild 1482 BLAKE2B 5e31bfb7f9f33d48f971349e3ccdf6035e596c1db61924ddd1a91a2254e34e56f0a5bc89503d28b7d608b0159d7ae5e982ddb84c3f37ea7a0baac27e5bebb0a3 SHA512 85ce61545d5f6004ff5b136089de8cd9e1766a92bb2339a0e2996ac128968bfd751a16d8df7a203b0bfdcc1b20d7681a2dda190f362413cdbb17fd19da5816ff
+EBUILD somewm-1.4.9999.ebuild 1487 BLAKE2B 989287e5d6cc7ac0b90f3dc54272edb820cef39a3fe83e26c71f698a281e2189166d22d392923f916bf08398e485884577045a0a6374f3ab712271dd6a79037d SHA512 c70aa36e04d00bba73c387fb0143b70368bcbb1b0724444bde58b9bda957fa7b0408d5d4e9769f92603bd4a84cb1fd38954cca9582cea6955adbe890af3e9e6d
+EBUILD somewm-9999.ebuild 1482 BLAKE2B 5e31bfb7f9f33d48f971349e3ccdf6035e596c1db61924ddd1a91a2254e34e56f0a5bc89503d28b7d608b0159d7ae5e982ddb84c3f37ea7a0baac27e5bebb0a3 SHA512 85ce61545d5f6004ff5b136089de8cd9e1766a92bb2339a0e2996ac128968bfd751a16d8df7a203b0bfdcc1b20d7681a2dda190f362413cdbb17fd19da5816ff
+MISC metadata.xml 918 BLAKE2B ab259828a8119dc7020de27798fb2efb1ec9d13794db2c2c033871ac61110488369097ed01f4f4f6b095d9b9573e26bb0526903c603c0208ff71720a478e7ce0 SHA512 56d2436f248a9f512a6f605cf8a4cb76d2effd9fe8edc00b2dd0da4c8d7035430346dcf3a2730f588e57a5d9837d7cfb69162d3db1e59b8a449ba2063e4ee194

diff --git a/gui-wm/somewm/metadata.xml b/gui-wm/somewm/metadata.xml
index d01f65c41e698fedb28f96ba9fd92f03e96001f4..007076ee90f0cb20592aac731e433f9f81d59902 100644 (file)
--- a/gui-wm/somewm/metadata.xml
+++ b/gui-wm/somewm/metadata.xml
@@ -7,10 +7,10 @@
   </maintainer>
   <longdescription>
     SomeWM is a Lua-scriptable Wayland compositor and designed as a modern,
-    compatible alternative to AwesomeWM. It is compatible to AwesomeWM's Lua API
-    such that existing configs, widgets and themes carry over. While 1.4 version
-    give 100% AwesomeWM 4.4 compatibility, later versions will add new features
-    and may break compatibility.
+    compatible alternative to AwesomeWM. It is compatible with AwesomeWM's Lua
+    API such that existing configs, widgets and themes carry over. While the 1.4
+    version give 100% AwesomeWM 4.4 compatibility, later versions will add new
+    features and may break compatibility.
   </longdescription>
   <upstream>
     <remote-id type="github">trip-zip/somewm</remote-id>

diff --git a/gui-wm/somewm/somewm-1.4.1.ebuild b/gui-wm/somewm/somewm-1.4.1.ebuild
deleted file mode 120000 (symlink)
index 94adbcdf8f9f8023d9de40907b0b9ab1d38806e6..0000000000000000000000000000000000000000
--- a/gui-wm/somewm/somewm-1.4.1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-somewm-9999.ebuild
\ No newline at end of file

diff --git a/gui-wm/somewm/somewm-1.4.1.ebuild b/gui-wm/somewm/somewm-1.4.1.ebuild
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6754ef8084f785bf0285f052352df96b77758
--- /dev/null
+++ b/gui-wm/somewm/somewm-1.4.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 luajit )
+
+inherit meson lua-single
+
+if [[ ${PV} == *9999* ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/trip-zip/${PN}.git"
+
+       if [[ ${PV} == 1.4.* ]]; then
+               EGIT_BRANCH="release/1.4"
+       fi
+else
+       KEYWORDS="~amd64"
+       SRC_URI="https://github.com/trip-zip/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An AwesomeWM-compatible dynamic floating and tiling Wayland compositor"
+HOMEPAGE="https://somewm.org https://github.com/trip-zip/somewm"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+       ${LUA_DEPS}
+       $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]')
+       dev-libs/glib:2
+       dev-libs/libffi
+       dev-libs/libinput
+       dev-libs/wayland
+       dev-libs/wayland-protocols
+       gui-libs/wlroots:0.19
+       sys-apps/dbus
+       x11-base/xwayland
+       x11-libs/cairo[X]
+       x11-libs/gdk-pixbuf:2
+       x11-libs/libdrm
+       x11-libs/libxkbcommon
+       x11-libs/pango
+       x11-libs/xcb-util-wm
+"
+DEPEND="
+       ${RDEPEND}
+"
+BDEPEND="
+       ${LUA_DEPS}
+       dev-build/meson
+       dev-build/ninja
+       dev-util/wayland-scanner
+       virtual/pkgconfig
+"
+
+pkg_setup() {
+       lua-single_pkg_setup
+}
+
+src_configure() {
+       meson_src_configure
+}
+
+pkg_postinst() {
+       einfo "Migration check from AwesomeWM:"
+       einfo "  somewm --check ~/.config/awesome/rc.lua"
+       einfo ""
+       einfo "Launching somewm from a TTY:"
+       einfo "  somewm-session"
+       einfo ""
+       einfo "Further details at: https://somewm.org/docs/intro"
+}

diff --git a/gui-wm/somewm/somewm-1.4.9999.ebuild b/gui-wm/somewm/somewm-1.4.9999.ebuild
deleted file mode 120000 (symlink)
index 94adbcdf8f9f8023d9de40907b0b9ab1d38806e6..0000000000000000000000000000000000000000
--- a/gui-wm/somewm/somewm-1.4.9999.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-somewm-9999.ebuild
\ No newline at end of file

diff --git a/gui-wm/somewm/somewm-1.4.9999.ebuild b/gui-wm/somewm/somewm-1.4.9999.ebuild
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..b1cdc2b97269072c15fc440d32e7c60750d4dc30
--- /dev/null
+++ b/gui-wm/somewm/somewm-1.4.9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{4..5} luajit )
+
+inherit meson lua-single
+
+if [[ ${PV} == *9999* ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/trip-zip/${PN}.git"
+
+       if [[ ${PV} == 1.4.* ]]; then
+               EGIT_BRANCH="release/1.4"
+       fi
+else
+       KEYWORDS="~amd64"
+       SRC_URI="https://github.com/trip-zip/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An AwesomeWM-compatible dynamic floating and tiling Wayland compositor"
+HOMEPAGE="https://somewm.org https://github.com/trip-zip/somewm"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+       ${LUA_DEPS}
+       $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]')
+       dev-libs/glib:2
+       dev-libs/libffi
+       dev-libs/libinput
+       dev-libs/wayland
+       dev-libs/wayland-protocols
+       gui-libs/wlroots:0.19
+       sys-apps/dbus
+       x11-base/xwayland
+       x11-libs/cairo[X]
+       x11-libs/gdk-pixbuf:2
+       x11-libs/libdrm
+       x11-libs/libxkbcommon
+       x11-libs/pango
+       x11-libs/xcb-util-wm
+"
+DEPEND="
+       ${RDEPEND}
+"
+BDEPEND="
+       ${LUA_DEPS}
+       dev-build/meson
+       dev-build/ninja
+       dev-util/wayland-scanner
+       virtual/pkgconfig
+"
+
+pkg_setup() {
+       lua-single_pkg_setup
+}
+
+src_configure() {
+       meson_src_configure
+}
+
+pkg_postinst() {
+       einfo "Migration check from AwesomeWM:"
+       einfo "  somewm --check ~/.config/awesome/rc.lua"
+       einfo ""
+       einfo "Launching somewm from a TTY:"
+       einfo "  somewm-session"
+       einfo ""
+       einfo "Further details at: https://somewm.org/docs/intro"
+}

diff --git a/gui-wm/somewm/somewm-9999.ebuild b/gui-wm/somewm/somewm-9999.ebuild
index 978aaaee2a7738fd90ab6b60f730da3fa5ac35a7..51d6754ef8084f785bf0285f052352df96b77758 100644 (file)
--- a/gui-wm/somewm/somewm-9999.ebuild
+++ b/gui-wm/somewm/somewm-9999.ebuild
@@ -19,7 +19,7 @@ else
        SRC_URI="https://github.com/trip-zip/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-DESCRIPTION="An awesome-compatible dynamic floating and tiling Wayland compositor"
+DESCRIPTION="An AwesomeWM-compatible dynamic floating and tiling Wayland compositor"
 HOMEPAGE="https://somewm.org https://github.com/trip-zip/somewm"
 
 LICENSE="GPL-3"
@@ -27,8 +27,8 @@ SLOT="0"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-DEPEND="${LUA_DEPS}"
 RDEPEND="
+       ${LUA_DEPS}
        $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]')
        dev-libs/glib:2
        dev-libs/libffi
@@ -45,6 +45,9 @@ RDEPEND="
        x11-libs/pango
        x11-libs/xcb-util-wm
 "
+DEPEND="
+       ${RDEPEND}
+"
 BDEPEND="
        ${LUA_DEPS}
        dev-build/meson