From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AADEC158041 for ; Tue, 27 Feb 2024 21:25:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B05A5E2AA1; Tue, 27 Feb 2024 21:25:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18884E2AA1 for ; Tue, 27 Feb 2024 21:25:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 200F8335C2E for ; Tue, 27 Feb 2024 21:25:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91ECF1301 for ; Tue, 27 Feb 2024 21:25:33 +0000 (UTC) From: "Gonçalo Negrier Duarte" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gonçalo Negrier Duarte" Message-ID: <1709069103.65be269d2215dd8483acc7882710794243c976bd.gonegrier.duarte@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: gui-apps/satty/ X-VCS-Repository: repo/proj/guru X-VCS-Files: gui-apps/satty/satty-0.11.0.ebuild gui-apps/satty/satty-9999.ebuild X-VCS-Directories: gui-apps/satty/ X-VCS-Committer: gonegrier.duarte X-VCS-Committer-Name: Gonçalo Negrier Duarte X-VCS-Revision: 65be269d2215dd8483acc7882710794243c976bd X-VCS-Branch: dev Date: Tue, 27 Feb 2024 21:25:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64f8f1ff-6bca-450b-b350-4baf2bff250d X-Archives-Hash: 13387b0dee7b91ff404067a44882bdca commit: 65be269d2215dd8483acc7882710794243c976bd Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Tue Feb 27 21:25:03 2024 +0000 Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Tue Feb 27 21:25:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=65be269d gui-apps/satty: fix 9999 ${S} directory Signed-off-by: Gonçalo Negrier Duarte gmail.com> 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 94ad2aa825..e3fc9bd906 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 94ad2aa825..e3fc9bd906 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