[gentoo-commits] repo/proj/guru:master commit in: dev-lang/hare/

[Andrew Ammerlaan]

commit:     2fecd79959dbc36a6616b643a690bf84a3d7a184
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Mon Aug  8 20:22:40 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 20:23:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2fecd799

dev-lang/hare: Fix snapshot

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 dev-lang/hare/Manifest                     |  2 +-
 dev-lang/hare/hare-0_pre20220624-r1.ebuild | 33 ------------------------
 dev-lang/hare/hare-0_pre20220730.ebuild    | 40 ++++++++++++++++++++++++++++++
 dev-lang/hare/hare-9999.ebuild             | 32 +++++++++++++++---------
 4 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/dev-lang/hare/Manifest b/dev-lang/hare/Manifest
index 628dcaace..8ca8dae2d 100644
--- a/dev-lang/hare/Manifest
+++ b/dev-lang/hare/Manifest
@@ -1 +1 @@
-DIST hare-0_pre20220624.tar.gz 671399 BLAKE2B 4ef1d2724219367ce6ffdcf69b5c9f5bd573ddf19a12c0aafa695483c05ef2032961ea714058af9bcfecfcbb45f0ca9bfd3056dc0b388f001f4ddb8a96873233 SHA512 9e8b4b17e293f0bc23cc3913860055d62dae0d0fc700080b2bde76a65c5344bf09e5a51c92f799e9c000bd18550fe10b9a5cd6e38c52ffe7c3faca8a670188ee
+DIST hare-0_pre20220730.tar.gz 681268 BLAKE2B e91bb4e0d87adb8271a1f9a30b744e3874482f38d0d370c6abd446456c960e088d1ff717793c4fa5876461397792c7ec66478bc327e11ba22b372f0ee714a5c4 SHA512 d7c07188e0416e68c5314f40d1dbffa27cd03644784aecb14a29a88d4ad6bc37e310cc8df95dbf93a96eebf2e262638d0ed0c0d98bce22d7c9630984418ce437

diff --git a/dev-lang/hare/hare-0_pre20220624-r1.ebuild b/dev-lang/hare/hare-0_pre20220624-r1.ebuild
deleted file mode 100644
index a9096c3d7..000000000
--- a/dev-lang/hare/hare-0_pre20220624-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The Hare systems programming language"
-HOMEPAGE="https://harelang.org/"
-EGIT_COMMIT="65449ddbbbf39659bfaf84a2cb78510409a4ab7a"
-SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-LICENSE="MPL-2.0 GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-DEPEND="
-	sys-devel/qbe
-	dev-lang/harec
-"
-BDEPEND="
-	app-text/scdoc
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	default
-	git-r3_src_unpack
-	mkdir "${WORKDIR}/${P}/build" || die
-}
-
-src_configure() {
-	cp config.example.mk config.mk || die
-	sed -i -e 's;^PREFIX=.*;PREFIX=/usr;' config.mk || die
-}

diff --git a/dev-lang/hare/hare-0_pre20220730.ebuild b/dev-lang/hare/hare-0_pre20220730.ebuild
new file mode 100644
index 000000000..df2b5c234
--- /dev/null
+++ b/dev-lang/hare/hare-0_pre20220730.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
+	SLOT="0"
+else
+	EGIT_COMMIT="296925c91d79362d6b8ac94e0336a38e9af0f1c9"
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+DESCRIPTION="The Hare systems programming language"
+HOMEPAGE="https://harelang.org/"
+LICENSE="MPL-2.0 GPL-3"
+
+DEPEND="
+	sys-devel/qbe
+	>=dev-lang/harec-0_pre20220702
+"
+BDEPEND="
+	app-text/scdoc
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	cp config.example.mk config.mk || die
+	sed -i \
+		-e 's;^PREFIX=.*;PREFIX=/usr;' \
+		-e 's;^AS =;AS ?=;' \
+		-e 's;^LD =;LD ?=;' \
+		-e 's;^AR =;AR ?=;' \
+		config.mk || die
+}

diff --git a/dev-lang/hare/hare-9999.ebuild b/dev-lang/hare/hare-9999.ebuild
index 7b5abe0c2..df2b5c234 100644
--- a/dev-lang/hare/hare-9999.ebuild
+++ b/dev-lang/hare/hare-9999.ebuild
@@ -1,32 +1,40 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3
+if [[ "${PV}" = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
+	SLOT="0"
+else
+	EGIT_COMMIT="296925c91d79362d6b8ac94e0336a38e9af0f1c9"
+	SRC_URI="https://git.sr.ht/~sircmpwn/hare/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+	SLOT="0/${PV}"
+
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
 
 DESCRIPTION="The Hare systems programming language"
 HOMEPAGE="https://harelang.org/"
-EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hare"
 LICENSE="MPL-2.0 GPL-3"
-SLOT="0"
 
 DEPEND="
 	sys-devel/qbe
-	dev-lang/harec
+	>=dev-lang/harec-0_pre20220702
 "
 BDEPEND="
 	app-text/scdoc
 "
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	default
-	git-r3_src_unpack
-	mkdir "${WORKDIR}/${P}/build" || die
-}
-
 src_configure() {
 	cp config.example.mk config.mk || die
-	sed -i -e 's;^PREFIX=.*;PREFIX=/usr;' config.mk || die
+	sed -i \
+		-e 's;^PREFIX=.*;PREFIX=/usr;' \
+		-e 's;^AS =;AS ?=;' \
+		-e 's;^LD =;LD ?=;' \
+		-e 's;^AR =;AR ?=;' \
+		config.mk || die
 }