4 files changed, 59 insertions, 56 deletions
diff --git a/net-misc/hargo/Manifest b/net-misc/hargo/Manifest
deleted file mode 100644
index 4f1a461..0000000
--- a/net-misc/hargo/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST github.com-blang-semver-v3.5.1.tar.gz 14831 BLAKE2B e0c6d3f33add029913f6235667993f50901050482667121a362f6e56cfd2d9cbef585056d5a031162b162fd458d78380d48e8bb1be575c051206e064aef7c15b SHA512 836a218f54e20c5ca322fee39d6757f45ab34341d1eca639d584774b0aefe0136441ef36bf91b4695346e769c35402f3083c17878839c428291dddc5130ae0ca
-DIST github.com-golang-net-ba9fcec4b297.tar.gz 1100219 BLAKE2B 763e2e4b38adf4f7abed20974aaeadbd22356f7224957b6f8d99146d07355ba6924727e93ef71f0e3b0416a7f5269539321223c56c9b3b4667160ff947a544b5 SHA512 8ad57611de7fcc6766da4ff1c29adf2e9d21eb888dcf0c1160b31b310f1f94d4c3bd45a1a3627d9f2ab9fcc8f4c0960beceae3771083b8a2cddc2568f5c4f1a2
-DIST github.com-golang-sys-953cdadca894.tar.gz 1355032 BLAKE2B 117c73ebb46b736c5747d4e7e4fd6a67bb33724724259766217743e363d4359f8ddb44ec50707394d2b3f9842df50fba8abc48a7021a15d35a89cc9d524bcb7a SHA512 2be9fe83c5cb252ae915c77dc6e905b5057a70aebd6a9f38cc3fbc85996c486e6ea108ad554c8354be28e5da21932fc1037ea86969322b0d99d2cd40adb53f6f
-DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
-DIST github.com-influxdata-influxdb1-client-fc22c7df067e.tar.gz 58365 BLAKE2B e47caf550688580386e192af4a934949ebc1c91bda9ac32c78b19af21b2f94e4bd01e1a629bc9c9bfeaafe22cd0f2ab15ac06d90ff8644c1abb3dc6d20324abf SHA512 120bf09267f6719a952c0ad4727079bf31432b0b020ae7c8637f13df169df677c20730cf2861b40481030c4686e4123dc84370a5f20f52f35ea5bb9a1eadfc81
-DIST github.com-sirupsen-logrus-v1.4.2.tar.gz 41373 BLAKE2B 3675dd82fd9c174fddf93eea87f3ca2c2671d9719ba148b03136c35ce6a3ce95866c57cb706a641a14522a522606dc9ea9ec9f0a6c7da6f8cf18f46b9f4bd3ee SHA512 c29689e5ea0ff919afc6fe1c492898d8b898e6831c442d3fc45c29508bdfda08604b1ea09d3b17db401bddca69fd5f8f744610075ee3c0577df6a537e0980a13
-DIST github.com-urfave-cli-v1.21.0.tar.gz 68419 BLAKE2B 4fe7091cfe3dd58d1c73d7ade84c70efbfeda354f8dfeb1cf7572b8792ed15c14432b4815107aae900a7d45e08a81dd261c97edac1a94a2e9557c3e595824e20 SHA512 8bd1dc64220eb5388da99a9d98971097b7e64dc054cdaff54c86fd427667962aa8add7edaeb045d17515bb15df885c369f939a5d374e8bcc010c7f0fdd554763
-DIST hargo-0.1.2.tar.gz 51331 BLAKE2B adf51fa4442c6586deeb29e43f0bff547e64871b40783fcef5f38de89b0f846f74468711ecbf5569ad64988634720b7effe916dba3ee25ba83f093bdf42f6cda SHA512 9dc03622d99672e3c6f4077c2f2cb5bf4e26ab05b3d098afb7e91d9d930bff2d7d943b5acff873708bfe9ebc98870bdaa6db15e1e3c90096ae43d936d9d50d08
diff --git a/net-misc/hargo/hargo-0.1.2-r1.ebuild b/net-misc/hargo/hargo-0.1.2-r1.ebuild
new file mode 120000
index 0000000..ff01121
--- /dev/null
+++ b/net-misc/hargo/hargo-0.1.2-r1.ebuild
@@ -0,0 +1 @@
+hargo-9999.ebuild
+\ No newline at end of file
diff --git a/net-misc/hargo/hargo-0.1.2.ebuild b/net-misc/hargo/hargo-0.1.2.ebuild
deleted file mode 100644
index 4b046d9..0000000
--- a/net-misc/hargo/hargo-0.1.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/mrichman/${PN}"
-EGO_VENDOR=(
-	"github.com/blang/semver v3.5.1"
-	"github.com/influxdata/influxdb1-client fc22c7df067e"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/urfave/cli v1.21.0"
-	"golang.org/x/net ba9fcec4b297 github.com/golang/net"
-	"golang.org/x/sys 953cdadca894 github.com/golang/sys"
-	"golang.org/x/text v0.3.0 github.com/golang/text"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="A command line utility that parses HAR files, written in GoLang"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-SRC_URI="${ARCHIVE_URI}"
-RESTRICT="mirror"
-
-LICENSE="MIT"
-SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="+pie"
-
-src_compile() {
-	# -buildmode=pie forces external linking mode, even CGO_ENABLED=0
-	# https://github.com/golang/go/issues/18968
-	use pie && local build_pie="-buildmode=pie"
-
-	local build_flags="$( echo ${EGO_BUILD_FLAGS} ) $( echo ${build_pie} )"
-
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		GOCACHE="${T}/go-cache" \
-		CGO_ENABLED=0 \
-		GO111MODULE=off \
-		go install -v -work -x ${build_flags} ${EGO_PN}/cmd/hargo
-	echo "$@"
-	"$@" || die
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/net-misc/hargo/hargo-9999.ebuild b/net-misc/hargo/hargo-9999.ebuild
new file mode 100644
index 0000000..efebab5
--- /dev/null
+++ b/net-misc/hargo/hargo-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGO_PN="github.com/mrichman/${PN}"
+
+inherit go-module
+
+if [[ ${PV} == *9999* ]]; then
+    inherit git-r3
+    EGIT_REPO_URI="https://${EGO_PN}.git"
+    EGO_VER="devel"
+
+    src_unpack() {
+        git-r3_src_unpack
+        go-module_live_vendor
+    }
+else
+    EGO_VER="v${PV}"
+    #SRC_URI="https://${EGO_PN}/archive/${EGO_VER}.tar.gz -> ${P}.tar.gz"
+    inherit git-r3
+    EGIT_REPO_URI="https://${EGO_PN}.git"
+    EGIT_COMMIT="${EGO_VER}"
+
+    src_unpack() {
+        git-r3_src_unpack
+        go-module_live_vendor
+    }
+
+    KEYWORDS="~amd64 ~x86 ~arm64 ~arm"
+fi
+
+DESCRIPTION="A command line utility that parses HAR files, written in GoLang"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+RESTRICT="mirror"
+IUSE="+pie"
+
+src_compile() {
+    # -buildmode=pie forces external linking mode, even CGO_ENABLED=0
+    # https://github.com/golang/go/issues/18968
+    use pie && local build_pie="-buildmode=pie"
+
+    local build_flags="$( echo ${EGO_BUILD_FLAGS} ) $( echo ${build_pie} )"
+    local ld_flags="$( echo "-s -w -X 'main.Version=${EGO_VER}' -X 'main.CommitHash=${EGIT_VERSION}' -X 'main.CompileDate=$(date --iso-8601=seconds)'" )"
+
+    set -- env \
+        CGO_ENABLED=0 \
+        go build -o "bin/${PN}" -mod=vendor -v -work -x "${build_flags}" -ldflags "${ld_flags}" \
+            ./cmd/${PN}
+    echo "$@"
+    "$@" || die
+}
+
+src_install() {
+    dobin bin/*
+}