gui-wm/somewm: Prepare for GURU

diff --git a/gui-wm/somewm/Manifest b/gui-wm/somewm/Manifest
index d94e1c39a141f9e2d30c2e5828ace7b0e8a9fd2e..899416da66a0dc24ba297a4238e04849269c1864 100644 (file)
--- a/gui-wm/somewm/Manifest
+++ b/gui-wm/somewm/Manifest
@@ -1,6 +1,5 @@
-DIST somewm-1.4.0.tar.gz 3181341 BLAKE2B 022a7fd2ae0e73e728e78832597bff2e685f5a3aac168d50f90f624bbeaa79706c456033f59c168437168cd8c63926e7474a3c2f4565a5ae7fa31965b51cfd99 SHA512 a4c469e77581c2e08c9f31e54de11a537bef96783399cb9e00ae20d834c3634d11e23017d371e04d7d6bd53e37c41cbf667ab595350375369053036ebf3a7593

 DIST somewm-1.4.1.tar.gz 3191096 BLAKE2B 2308f61103a0ec19186bfde2358f89e8ddefef78443d0f1e3cf469670347cf059a25004b672e8bb2585ff2cf1de57f9bf5ce34d067c1fa9b09f811e62b376675 SHA512 05214ef62863f389c89b3e87267df094f67797115428db832f9abbffc76eeec3a8062e589e9f92297aaeb0b4c507e7f2867999dd758735b534a7a9734e33c659
 DIST somewm-1.4.1.tar.gz 3191096 BLAKE2B 2308f61103a0ec19186bfde2358f89e8ddefef78443d0f1e3cf469670347cf059a25004b672e8bb2585ff2cf1de57f9bf5ce34d067c1fa9b09f811e62b376675 SHA512 05214ef62863f389c89b3e87267df094f67797115428db832f9abbffc76eeec3a8062e589e9f92297aaeb0b4c507e7f2867999dd758735b534a7a9734e33c659

-EBUILD somewm-1.4.0.ebuild 2182 BLAKE2B 1c80db54548bdc264aa9c91f69a48fbca02a862d15579ed2acf5d9e6360ec605d5e0106ef6c2d714afd0607f4af2ed442c8d80b5506d6007b07830db3ee5ba5e SHA512 965a07095d9d26c7e2cc93a7882fc5bd2ec1f345f8c0a9a130f2fa05d14ae51ee67bbec64723833cd4cb15780b3df2e6406254125799f9c133d982a74ad23a37
-EBUILD somewm-1.4.1.ebuild 2182 BLAKE2B 1c80db54548bdc264aa9c91f69a48fbca02a862d15579ed2acf5d9e6360ec605d5e0106ef6c2d714afd0607f4af2ed442c8d80b5506d6007b07830db3ee5ba5e SHA512 965a07095d9d26c7e2cc93a7882fc5bd2ec1f345f8c0a9a130f2fa05d14ae51ee67bbec64723833cd4cb15780b3df2e6406254125799f9c133d982a74ad23a37
-EBUILD somewm-1.4.9999.ebuild 2182 BLAKE2B 1c80db54548bdc264aa9c91f69a48fbca02a862d15579ed2acf5d9e6360ec605d5e0106ef6c2d714afd0607f4af2ed442c8d80b5506d6007b07830db3ee5ba5e SHA512 965a07095d9d26c7e2cc93a7882fc5bd2ec1f345f8c0a9a130f2fa05d14ae51ee67bbec64723833cd4cb15780b3df2e6406254125799f9c133d982a74ad23a37
-EBUILD somewm-9999.ebuild 2182 BLAKE2B 1c80db54548bdc264aa9c91f69a48fbca02a862d15579ed2acf5d9e6360ec605d5e0106ef6c2d714afd0607f4af2ed442c8d80b5506d6007b07830db3ee5ba5e SHA512 965a07095d9d26c7e2cc93a7882fc5bd2ec1f345f8c0a9a130f2fa05d14ae51ee67bbec64723833cd4cb15780b3df2e6406254125799f9c133d982a74ad23a37
+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

diff --git a/gui-wm/somewm/metadata.xml b/gui-wm/somewm/metadata.xml
new file mode 100644 (file)
index 0000000..d01f65c
--- /dev/null
+++ b/gui-wm/somewm/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shuber@sthu.org</email>
+    <name>Stefan Huber</name>
+  </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.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">trip-zip/somewm</remote-id>
+    <bugs-to>https://github.com/trip-zip/somewm/issues</bugs-to>
+    <changelog>https://github.com/trip-zip/somewm/blob/main/CHANGELOG.md</changelog>
+    <doc>https://somewm.org/</doc>
+  </upstream>
+</pkgmetadata>

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

diff --git a/gui-wm/somewm/somewm-9999.ebuild b/gui-wm/somewm/somewm-9999.ebuild
index 9e938cb426de73c3875e067a0dc1c2dd28291e72..978aaaee2a7738fd90ab6b60f730da3fa5ac35a7 100644 (file)
--- a/gui-wm/somewm/somewm-9999.ebuild
+++ b/gui-wm/somewm/somewm-9999.ebuild
@@ -3,34 +3,20 @@
 
 EAPI=8
 
 
 EAPI=8
 

-LUA_COMPAT=(lua5-4 luajit)
-inherit meson desktop lua-single
+LUA_COMPAT=( lua5-4 luajit )
+
+inherit meson lua-single

 
 

-# If version ends with 9999, we want to pull from git, otherwise we pull from tarball

 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/trip-zip/${PN}.git"
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/trip-zip/${PN}.git"
 

-       # If version contains "2.0" then we fetch from branch feat/2.0-foundation
-       #    if [[ ${PV} == 2.0.* ]]; then
-       #       EGIT_BRANCH="feat/2.0-foundation"
-       #       # If version contains "2.0" then we fetch from branch feat/2.0-foundation
-       # fi
-    if [[ ${PV} == 1.4.* ]]; then
+       if [[ ${PV} == 1.4.* ]]; then

                EGIT_BRANCH="release/1.4"
        fi
 else
                EGIT_BRANCH="release/1.4"
        fi
 else

-       KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
-       if [[ ${PV} == *_p* ]]; then
-               HASH_COMMIT=
-               SRC_URI="https://github.com/awesomeWM/awesome/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-               S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-       else
-               # The 0.x releases followed a different pattern:
-               # https://github.com/trip-zip/somewm/archive/refs/tags/0.5.0.tar.gz
-               # https://github.com/trip-zip/somewm/archive/refs/tags/v1.4.0.tar.gz
-               SRC_URI="https://github.com/trip-zip/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-       fi
+       KEYWORDS="~amd64"
+       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"
 fi
 
 DESCRIPTION="An awesome-compatible dynamic floating and tiling Wayland compositor"


@@ -38,20 +24,17 @@ HOMEPAGE="https://somewm.org https://github.com/trip-zip/somewm"
 
 LICENSE="GPL-3"
 SLOT="0"
 
 LICENSE="GPL-3"
 SLOT="0"

-IUSE=""

 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 

-# Based on meson.build:
+DEPEND="${LUA_DEPS}"

 RDEPEND="
 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
        $(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

-       dev-util/wayland-scanner

        gui-libs/wlroots:0.19
        sys-apps/dbus
        x11-base/xwayland
        gui-libs/wlroots:0.19
        sys-apps/dbus
        x11-base/xwayland


@@ -62,10 +45,12 @@ RDEPEND="
        x11-libs/pango
        x11-libs/xcb-util-wm
 "
        x11-libs/pango
        x11-libs/xcb-util-wm
 "

-DEPEND="
-       ${RDEPEND}
-"

 BDEPEND="
 BDEPEND="

+       ${LUA_DEPS}
+       dev-build/meson
+       dev-build/ninja
+       dev-util/wayland-scanner
+       virtual/pkgconfig

 "
 
 pkg_setup() {
 "
 
 pkg_setup() {