[net-misc/BaiduPCS-Go] upgrade from upstream

Signed-off-by: Chen, Chih-Chia <pigfoot@gmail.com>

7 files changed, 66 insertions, 100 deletions

diff --git a/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.6.2-r1.ebuild b/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.6.2-r1.ebuild
deleted file mode 100644
index 48fb29d..0000000
--- a/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_PN="github.com/felixonmars/${PN}"
-
-DESCRIPTION="BaiDu PCS client, written in GoLang"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+="${EGO_SUM_SRC_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 \
-		GOCACHE="${T}/go-cache" \
-		CGO_ENABLED=0 \
-		go build -mod=vendor -v -work -x ${build_flags} -o "bin/${PN}" .
-	echo "$@"
-	"$@" || die
-}
-
-src_install() {
-	newbin bin/${PN} baidu-pcs
-}
diff --git a/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.6.2.ebuild b/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.6.2.ebuild
deleted file mode 100644
index 7ff3760..0000000
--- a/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.6.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/iikira/${PN}"
-EGO_VENDOR=(
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="BaiDu PCS client, 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}
-	echo "$@"
-	"$@" || die
-}
-
-src_install() {
-	newbin bin/${PN} baidu-pcs
-}
diff --git a/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.8.7.ebuild b/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.8.7.ebuild
new file mode 120000
index 0000000..1926410
--- /dev/null
+++ b/net-misc/BaiduPCS-Go/BaiduPCS-Go-3.8.7.ebuild
@@ -0,0 +1 @@
+BaiduPCS-Go-9999.ebuild
\ No newline at end of file
diff --git a/net-misc/BaiduPCS-Go/BaiduPCS-Go-9999.ebuild b/net-misc/BaiduPCS-Go/BaiduPCS-Go-9999.ebuild
new file mode 100644
index 0000000..54d5e7c
--- /dev/null
+++ b/net-misc/BaiduPCS-Go/BaiduPCS-Go-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/qjfoidnh/${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="BaiDu PCS client, written in GoLang"
+LICENSE="Apache-2.0"
+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} )"
+
+    set -- env \
+        CGO_ENABLED=0 \
+        go build -o "bin/baidu-pcs" -mod=vendor -v -work -x ${build_flags} \
+            -ldflags '-s -w -X main.Version='${EGO_VER} \
+            .
+    echo "$@"
+    "$@" || die
+}
+
+src_install() {
+    dobin bin/*
+}
diff --git a/net-misc/BaiduPCS-Go/Manifest b/net-misc/BaiduPCS-Go/Manifest
deleted file mode 100644
index a559da8..0000000
--- a/net-misc/BaiduPCS-Go/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST BaiduPCS-Go-3.6.2.tar.gz 919325 BLAKE2B 108ad38e3cf19d7b21a44d0b93b96cfb349f0dbdce48a4a75efddaed5ffae18658729d5e5fbce1fa7f9bf7cd4ec2a4a6aa1062dc497d76f3a983837d830ccbbd SHA512 e7248521cade634aa41224c88b8dd07cac3a84d0f262c369447c4c4872e52c9431dcee38b42cf6360c13a64cc1b6bce1cc4199de54602b4e8bac95b37a68688c
diff --git a/net-misc/curlie/Manifest b/net-misc/curlie/Manifest
deleted file mode 100644
index da72765..0000000
--- a/net-misc/curlie/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST curlie-1.6.0.tar.gz 440484 BLAKE2B 9cd6c916bdd1f86b23e3082c630edcc863308123e6543558e18e27de7fb38e6ef4cbb4da2fdac0827d5b1985faad016057569a014adece11aa4d49868657659f SHA512 653e586960300556c92716fba2d8abb9a0b413a8be1d2ba249c8dc4dd51aa253bd67d6024526f753720a37edd3f80002bd0db7da10af71974efa73a8f11d364d
-DIST github.com%2Fakamensky%2Fargparse%2F@v%2Fv0.0.0-20180518035907-99676ba18cd5.mod 37 BLAKE2B 5ad6fc4f42d61ac68c70b1dd5344c5f9cc36badf9ffd11f0f782dcc339044b87408565dd4c3edf812c8b03b86050359e7378ba61d1699f8760316b65398e73fe SHA512 696862f6dc4807c5a55eceb2d19a3b12ca800f5d5908fa51520431902b8767f9b0e48114d1d169725988b6c94743a5523a5f8383e3acf069a3daf3bfc305a40f
-DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
-DIST github.com-akamensky-argparse-99676ba18cd5.tar.gz 16835 BLAKE2B 5d7afa821683e370d541aaa2c6d5bd2d3e9127baeb2971898f3aff20c4ec4117140103ff589ca5c30f97add33308e744d4354f91ba974fe0b8f19661b720d8fc SHA512 1c28ebda54a461a7b992a1ad1f6fbfa58ccb99f19cc306180b959a7abd42651c360f826bb776838eb120fb18b08433cda0e4a8b175572bfe4d04afb55f95a3c4
-DIST github.com-golang-crypto-159ae71589f3.tar.gz 1610335 BLAKE2B d2413c64c4c475e4ea89ba7165dd41fe0dea35ecb5b64cda5fe19ba14c1fc275f427d33f391313675185c8ac92aa160cd605420c1aa0d079f992bfe6938246f8 SHA512 4e10a3eab52330f7ddfd90eaabb3e8fef50c549997aba1231f093626d717d5d8d6ecd1ccd280519f71fe4111a40651618fa590df1a8d313a1b3f7d99138b16c3
-DIST github.com-golang-sys-33540a1f6037.tar.gz 1500062 BLAKE2B 055c4eb37817dc15feffd6f42c1850cdfdd771f7512cb6b83d1917756ff0188c4155d78992d07d4183b165da81966bfce59d9e9e8a1c429594ebc0b82f9c6407 SHA512 6682c2a7ccfd7bdbc373c5ca9678a0b9a1a60c588e4758a82de8d295914392560d0eca00b8e4e5521af9a68e12c8ec216211a93bd98f76cdc860a5c573c7b2e1
-DIST github.com-jessevdk-go-flags-v1.4.0.tar.gz 55452 BLAKE2B bbaf7dc6284e316e6c1eada1dbea6324fc8cebdfea93a240fcc7376c0aa65aae29006312830706a3cc434247d54bc45a1ed0e9427f714d2789607315b5f505c8 SHA512 e90d9771c6455abf6e6e98094379e87259c065d612b9ee38cbd834a5418adb56465f6fed7dab67120c30c61b66dd24d09b19d80c58808bb03d1624d4ed29c5c4
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180524125353-159ae71589f3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180524125353-159ae71589f3.zip 1726140 BLAKE2B 96939507e4d37bac54daf2cb34a89ba382356b35b65d095ecf30ab7b996043b76c5988bf01e880c5e67ba7cb6a0cad515283550f932867a5c4b51962ba85e260 SHA512 51dff0cd1ee5f6479508f7dda7a4b7afce87a37a532077d0fe8d18951c0806e69814b975104457950cc87af89d17738d5b6d712201c662267f35dc5f42424ad2
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180525062015-31355384c89b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927 BLAKE2B bd890b16f2adb601f5655ca3f4815bbb335fe48c961b06f316ec579ff6efa2fc8f360d7c0bf272dc2d35e9a0470235c36cee331399ed01d8c455172f39921194 SHA512 59a4db96e438a1f03af9b00070f4d3772f1eeeff72334e6bc8ad1774bf202d39f7129572cd75fb9e1ecdfc7a532c5cd91bfdbfab3ebd10228bc6733e9556f70c
diff --git a/net-misc/curlie/curlie-9999.ebuild b/net-misc/curlie/curlie-9999.ebuild
index 259bc40..8f1b6c4 100644
--- a/net-misc/curlie/curlie-9999.ebuild
+++ b/net-misc/curlie/curlie-9999.ebuild
@@ -10,6 +10,7 @@ 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
@@ -18,17 +19,14 @@ if [[ ${PV} == *9999* ]]; then
 else
     EGO_VER="v${PV}"
     #SRC_URI="https://${EGO_PN}/archive/${EGO_VER}.tar.gz -> ${P}.tar.gz"
-
-    #SRC_URI+="${EGO_SUM_SRC_URI}"
-    #S="${WORKDIR}/Amass-${PV}"
     inherit git-r3
     EGIT_REPO_URI="https://${EGO_PN}.git"
     EGIT_COMMIT="${EGO_VER}"
 
-	src_unpack() {
-		git-r3_src_unpack
-		go-module_live_vendor
-	}
+    src_unpack() {
+        git-r3_src_unpack
+        go-module_live_vendor
+    }
 
     KEYWORDS="~amd64 ~x86 ~arm64 ~arm"
 fi
@@ -49,11 +47,11 @@ src_compile() {
     set -- env \
         CGO_ENABLED=0 \
         go build -o "bin/${PN}" -mod=vendor -v -work -x ${build_flags} \
-            ${EGO_PN}
+            .
     echo "$@"
     "$@" || die
 }
 
 src_install() {
-    dobin bin/${PN}
+    dobin bin/*
 }