[gentoo-commits] repo/gentoo:master commit in: gui-wm/dwl/

[Sam James]

commit:     6ce7c841bd1b7fa3e53e805f9200210fc548d29c
Author:     Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Mon Sep 25 01:31:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 01:59:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce7c841

gui-wm/dwl: fix nonexistent ${S}

and install desktop file (only for 0.4)

Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
Closes: https://github.com/gentoo/gentoo/pull/33043
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gui-wm/dwl/dwl-0.4.ebuild     | 7 ++++++-
 gui-wm/dwl/dwl-9999-r1.ebuild | 4 +++-
 gui-wm/dwl/dwl-9999.ebuild    | 4 +++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gui-wm/dwl/dwl-0.4.ebuild b/gui-wm/dwl/dwl-0.4.ebuild
index a80953766ba4..8a5fd16b0c32 100644
--- a/gui-wm/dwl/dwl-0.4.ebuild
+++ b/gui-wm/dwl/dwl-0.4.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 inherit savedconfig toolchain-funcs
 
+MY_P="${PN}-v${PV}"
 WLROOTS_SLOT="0/16"
 if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/djpohly/dwl";
@@ -22,7 +23,8 @@ if [[ ${PV} == *9999* ]]; then
                        ;;
        esac
 else
-       
SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz
 -> ${P}.tar.gz"
+       
SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz
 -> ${P}.tar.gz"
+       S="${WORKDIR}/${MY_P}"
        KEYWORDS="~amd64 ~x86"
 fi
 
@@ -70,5 +72,8 @@ src_install() {
        emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
        dodoc README.md
 
+       insinto /usr/share/wayland-session
+       doins "${FILESDIR}/dwl.desktop"
+
        save_config config.h
 }

diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-9999-r1.ebuild
index 9e7a7bdcfaf3..f093811e7e8a 100644
--- a/gui-wm/dwl/dwl-9999-r1.ebuild
+++ b/gui-wm/dwl/dwl-9999-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 inherit savedconfig toolchain-funcs
 
+MY_P="${PN}-v${PV}"
 WLROOTS_SLOT="0/16"
 if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/djpohly/dwl";
@@ -22,7 +23,8 @@ if [[ ${PV} == *9999* ]]; then
                        ;;
        esac
 else
-       
SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz
 -> ${P}.tar.gz"
+       
SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz
 -> ${P}.tar.gz"
+       S="${WORKDIR}/${MY_P}"
        KEYWORDS="~amd64 ~x86"
 fi
 

diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild
index a80953766ba4..6bb47768ea96 100644
--- a/gui-wm/dwl/dwl-9999.ebuild
+++ b/gui-wm/dwl/dwl-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 inherit savedconfig toolchain-funcs
 
+MY_P="${PN}-v${PV}"
 WLROOTS_SLOT="0/16"
 if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/djpohly/dwl";
@@ -22,7 +23,8 @@ if [[ ${PV} == *9999* ]]; then
                        ;;
        esac
 else
-       
SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz
 -> ${P}.tar.gz"
+       
SRC_URI="https://github.com/djpohly/${PN}/releases/download/v${PV}/${MY_P}.tar.gz
 -> ${P}.tar.gz"
+       S="${WORKDIR}/${MY_P}"
        KEYWORDS="~amd64 ~x86"
 fi