From 65be269d2215dd8483acc7882710794243c976bd Mon Sep 17 00:00:00 2001 From: Gonçalo Negrier Duarte Date: Tue, 27 Feb 2024 21:25:03 +0000 Subject: gui-apps/satty: fix 9999 ${S} directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gonçalo Negrier Duarte --- gui-apps/satty/satty-0.11.0.ebuild | 16 ++++++++++++---- gui-apps/satty/satty-9999.ebuild | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/gui-apps/satty/satty-0.11.0.ebuild b/gui-apps/satty/satty-0.11.0.ebuild index 94ad2aa82..e3fc9bd90 100644 --- a/gui-apps/satty/satty-0.11.0.ebuild +++ b/gui-apps/satty/satty-0.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -243,15 +243,14 @@ else https://github.com/gabm/Satty/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " + M_PN=Satty + S="${WORKDIR}/${M_PN}-${PV}" KEYWORDS="~amd64" fi LICENSE="MPL-2.0" SLOT="0" -M_PN=Satty -S="${WORKDIR}/${M_PN}-${PV}" - RDEPEND="virtual/rust dev-libs/glib:2 media-libs/libepoxy @@ -263,6 +262,15 @@ RDEPEND="virtual/rust QA_FLAGS_IGNORED="usr/bin/${PN}" +src_unpack() { + if [[ "${PV}" == 9999 ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + src_install() { dodoc README.md diff --git a/gui-apps/satty/satty-9999.ebuild b/gui-apps/satty/satty-9999.ebuild index 94ad2aa82..e3fc9bd90 100644 --- a/gui-apps/satty/satty-9999.ebuild +++ b/gui-apps/satty/satty-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -243,15 +243,14 @@ else https://github.com/gabm/Satty/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " + M_PN=Satty + S="${WORKDIR}/${M_PN}-${PV}" KEYWORDS="~amd64" fi LICENSE="MPL-2.0" SLOT="0" -M_PN=Satty -S="${WORKDIR}/${M_PN}-${PV}" - RDEPEND="virtual/rust dev-libs/glib:2 media-libs/libepoxy @@ -263,6 +262,15 @@ RDEPEND="virtual/rust QA_FLAGS_IGNORED="usr/bin/${PN}" +src_unpack() { + if [[ "${PV}" == 9999 ]]; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + src_install() { dodoc README.md -- cgit v1.2.3-65-gdbad