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 85B0D15800F for ; Wed, 8 Feb 2023 18:05:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DDC3E077A; Wed, 8 Feb 2023 18:05:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7358FE077A for ; Wed, 8 Feb 2023 18:05:35 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93A2F335DBA for ; Wed, 8 Feb 2023 18:05:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA15689C for ; Wed, 8 Feb 2023 18:05:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1675879519.4e622e20a71438985a069d4921e6bd1d4bce6432.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/uutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/uutils/uutils-0.0.17.ebuild sys-apps/uutils/uutils-9999.ebuild X-VCS-Directories: sys-apps/uutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4e622e20a71438985a069d4921e6bd1d4bce6432 X-VCS-Branch: master Date: Wed, 8 Feb 2023 18:05:32 +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: 1e1b6492-1b00-4a68-bef8-09c8fad9a4af X-Archives-Hash: 1ddcd54e7b00d47cdf27a073378b0cbf commit: 4e622e20a71438985a069d4921e6bd1d4bce6432 Author: Sam James gentoo org> AuthorDate: Wed Feb 8 18:03:25 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 8 18:05:19 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e622e20 sys-apps/uutils: add 9999 Easier to report bugs upstream then. Signed-off-by: Sam James gentoo.org> sys-apps/uutils/uutils-0.0.17.ebuild | 27 +++++++++++++++++----- .../{uutils-0.0.17.ebuild => uutils-9999.ebuild} | 27 +++++++++++++++++----- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/sys-apps/uutils/uutils-0.0.17.ebuild b/sys-apps/uutils/uutils-0.0.17.ebuild index 1b6bc29df711..bd137947e0de 100644 --- a/sys-apps/uutils/uutils-0.0.17.ebuild +++ b/sys-apps/uutils/uutils-0.0.17.ebuild @@ -279,22 +279,37 @@ inherit cargo DESCRIPTION="GNU coreutils rewritten in Rust" HOMEPAGE="https://github.com/uutils/coreutils" -SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" - $(cargo_crate_uris) -" -S="${WORKDIR}"/coreutils-${PV} +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/uutils/coreutils" + inherit git-r3 +else + SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" + $(cargo_crate_uris) + " + S="${WORKDIR}"/coreutils-${PV} + + KEYWORDS="~amd64 ~arm64" +fi LICENSE="MIT" # Dependent crate licenses LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT Unicode-DFS-2016" SLOT="0" -KEYWORDS="~amd64 ~arm64" BDEPEND=">=virtual/rust-1.56.0" QA_FLAGS_IGNORED=".*" +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + src_compile() { emake V=1 PROFILE=release } diff --git a/sys-apps/uutils/uutils-0.0.17.ebuild b/sys-apps/uutils/uutils-9999.ebuild similarity index 92% copy from sys-apps/uutils/uutils-0.0.17.ebuild copy to sys-apps/uutils/uutils-9999.ebuild index 1b6bc29df711..bd137947e0de 100644 --- a/sys-apps/uutils/uutils-0.0.17.ebuild +++ b/sys-apps/uutils/uutils-9999.ebuild @@ -279,22 +279,37 @@ inherit cargo DESCRIPTION="GNU coreutils rewritten in Rust" HOMEPAGE="https://github.com/uutils/coreutils" -SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" - $(cargo_crate_uris) -" -S="${WORKDIR}"/coreutils-${PV} +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/uutils/coreutils" + inherit git-r3 +else + SRC_URI="https://github.com/uutils/coreutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI+=" + $(cargo_crate_uris) + " + S="${WORKDIR}"/coreutils-${PV} + + KEYWORDS="~amd64 ~arm64" +fi LICENSE="MIT" # Dependent crate licenses LICENSE+=" Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT Unicode-DFS-2016" SLOT="0" -KEYWORDS="~amd64 ~arm64" BDEPEND=">=virtual/rust-1.56.0" QA_FLAGS_IGNORED=".*" +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + src_compile() { emake V=1 PROFILE=release }