[net-misc/ipinfo] upgrade from upstream

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

4 files changed, 57 insertions, 96 deletions

diff --git a/net-misc/ipinfo/Manifest b/net-misc/ipinfo/Manifest
index 30f4912..05f45c1 100644
--- a/net-misc/ipinfo/Manifest
+++ b/net-misc/ipinfo/Manifest
@@ -1,26 +1 @@
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip 12593 BLAKE2B 359ee7d5efadf7957871e7fbe9671683380966044426e0318f582a5050fdc11a1168493aa7dc4690bd44eb75543536dd8390d37e14a9ac408d64374c20102e76 SHA512 205d595d76ba552b654c7c991d4df0cebddf1323915404749f28634f2bd881798f291e9dc1666a10fa00fe1fd95bb2afb091e7936a02d18082dbb4d21ee5cdac
-DIST github.com%2Fipinfo%2Fgo%2Fv2%2F@v%2Fv2.4.0.mod 158 BLAKE2B a82b10d8306fefbc571319b510fb83726684326febfdc3e35d3bb3531555dddd5a869886a23b3b0d820608f499df962fc14d172be379c87c241c03434aa83a1a SHA512 7c51b27ff064253dd3008baf039b5e1eb610874facab78245a1d428aa976bebd2c2628ed115a9e0c8db959ae8c3702bd5df162b2e52f51702400ea6e4f1ec611
-DIST github.com%2Fipinfo%2Fgo%2Fv2%2F@v%2Fv2.4.0.zip 33484 BLAKE2B 33a80a6ae6eaf70ee7b80f9da5daa02528ba1d0cd3243ac552627ddf43b344a6548cc17ab1fdb0201715330c0d10b3184aa062385653dd25e18585e39dc46285 SHA512 04e01b2cf6653e678f3046d5b8f07636d310c5732feb421b6005e7df4f465facf07e16e9a574a463fd4560cbbfa8b4c54f571862ebd4d0a2ab118569302c8fec
-DIST github.com%2Fjszwec%2Fcsvutil%2F@v%2Fv1.4.0.mod 42 BLAKE2B f8c0931251a45e79ea4e2e88e696f667396547ecda55c989b11f8074d9bf7e01d18d3fa938b2866de0191c4b5626cef120cb9d10ae19f28f0c26d9e8818c8a1d SHA512 31b1715bf6365f77d18ae8fc3987f86c1970f0021a65d47b15934cbd094c16374f395463e602ebfd00a601a822127ff0eee1316e0a4375f3553c6fdd2cdcec0a
-DIST github.com%2Fjszwec%2Fcsvutil%2F@v%2Fv1.4.0.zip 60296 BLAKE2B 3f3f6f5a4876386b8107b99f059958345728d8de5a5686c0f64cf093652ae214652bc0ebe2981b56bcfc5a995efa8e441818f9efe261b4005d489ce941adeff8 SHA512 12f38369be3c479654c44256e8efd8c62e63b3d8c659a0cf30a7af2164e296f2da30751514930f195443aac1155ce85f39220fe0083a5b9e71b6a9b2a1fd72da
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
-DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 0e37253242e439c5d26f3782ec2a3790b799c1014089101fe2a3b6996ce12b001495e11efdc1de203059231cc4d759445a43fc5e9617e56864082337383d0c41 SHA512 5a7842b9804240c1cbf50e2812f26821a0ccd68d5dbffdc3e761e0e60014dda69de842246c45569c7b09c8129bcdbcf9ddbff1071ae14b7be875a9351ed46f0a
-DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.zip 15715 BLAKE2B fecf95052bf2bf9ca21e6fdab3c9ee60a01afe8de700050877f1ce4af0c6f05ca044ea9be9228280e6dd2682616f14cfedf678a92c66c00936b8fde0fe336082 SHA512 0bd072a733e99c2af2cd83792a13a0c0f625e63ef71fa9ecf1a50c9d93c2879c5965bc5457655617ff4f23cdb854718958d9657557ab09730ed0404a252f8749
-DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20210115035449-ce105d075bb4.mod 39 BLAKE2B 2d5989e8a63d0dfe5db7ba7ddb84dd8a3d3f242af7daf266653a0ec9015b26f42ee6ae36f7ea1516dc7eca59bbdd3e1cb1d855271abb7af1956c06f1f8f626e7 SHA512 94589de21419ab98b23cbc121449e4bcfd3446c9bed290a09a4a35f4ad207cc2b3ad5391b0680c78a3459e2a7b274cc3159f27b9465274d3617b3a2c368c1f84
-DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20210115035449-ce105d075bb4.zip 8332 BLAKE2B 753351a69954737aacf706ab5fdf4eedc59e7d5e336fd667c2b637acc6ad9b39acd4695d49adb6c2b52ff3d714d0f1225c39da1cf9407936cd6a531f0724da6e SHA512 be2fda90f03a88bbfc8f2a904c2b071ae3d28ba6dc2e053fd8485cf659f34dd66d9d530a6e4759f7d08428b2b420eaade886699288ebd746e4c50b09cce05f7d
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.zip 28673 BLAKE2B d5a34f311e12038daf9c89b646bc5caf5566c08fc563fe2af3d113596d77cfe759942e35314e5b595c5704920d12b273ac30de865256b406287868d827d28938 SHA512 443917030bd593bf9ba4fee7748b5d9f15c82b7cbb21a586fc9a326de9c4f8fd8a7caf29131b0c8cf9fbf6a1363fdc7c8dd2ab897b569d3adaacfb55ad0d4601
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210420205809-ac73e9fd8988.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210420205809-ac73e9fd8988.zip 1669484 BLAKE2B 967b31ed92bc44596d7730e6efa1227a06aac80ef72289b96c80fc23d4aa616f1aa1272a4860b2b0d5659b866d5cf17d7ddd9fcc58705dc1645d4466d39aed2e SHA512 9bd579c908a7b371c94159485b3a53477c31d87b6d3764e3e6ac91299a735bae3865e284109b0fb4b7e8a7edd669b27482c6b50aea79e7b3e56cb1a65ee56659
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.zip 23324 BLAKE2B 2374b37a902f15136181d5a52759aa5f2755ef5aab7f8ad2ff58ac31a1f249d1349b32d945075c3158b7c4a89f7e22887a2cd6f565ea3ab79b9d86955fba3ff6 SHA512 2774ed5c167d2f4d26d7b0fe2ff5beeb0bd2b7a45b9cfc4bd9a57c9fd5491c960de8d9fbd5f02c090d74ba45a8842fd94beb016c53ded33f9f3d50e65d601d09
-DIST ipinfo-1.1.1.tar.gz 2155819 BLAKE2B 579a6ba17cb2328aa54bd24882c22cf3d32378c6dc6ab8552e5c8f5ed61eb8a6df1d963971f2c43e81fadf185f80ddc672e9d2b13a4fce85c23ae5b077374da0 SHA512 27798487be9c86ee6c27bd989054ca76ee2be674ac3a728ddced7e30b1a0b590a149db1ad84d47cb238537ad066e9b4c66dc05e4aab63e8454ba1fc229e8a9a8
+DIST ipinfo-2.7.0.tar.gz 2389638 BLAKE2B fdbce05bfa78c9b883b7b40a36f72af111d7a81485f53181de2ffe0c90289841afb6d5e366e26093a9ee9cefed6f510fad578b6060e661f998a9a25381824a98 SHA512 fa5ed472aa01b35b3f0c4162ffa3f2d65fc743b8db98849cf108ba5fd00f9b9b5dc4ecb99f9cf9ac882724ab08934eaf96cef18832f8927669b18bb8a9f9233c
diff --git a/net-misc/ipinfo/ipinfo-1.1.1.ebuild b/net-misc/ipinfo/ipinfo-1.1.1.ebuild
deleted file mode 100644
index 14adcf5..0000000
--- a/net-misc/ipinfo/ipinfo-1.1.1.ebuild
+++ /dev/null
@@ -1,70 +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/ipinfo/cli"
-
-EGO_SUM=(
-	"github.com/fatih/color v1.10.0"
-	"github.com/fatih/color v1.10.0/go.mod"
-	"github.com/ipinfo/go/v2 v2.4.0"
-	"github.com/ipinfo/go/v2 v2.4.0/go.mod"
-	"github.com/jszwec/csvutil v1.4.0"
-	"github.com/jszwec/csvutil v1.4.0/go.mod"
-	"github.com/mattn/go-colorable v0.1.8"
-	"github.com/mattn/go-colorable v0.1.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/patrickmn/go-cache v2.1.0+incompatible"
-	"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-	"github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4"
-	"github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a"
-	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988"
-	"golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf"
-	"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Official Command Line Interface for the IPinfo API "
-SRC_URI="https://${EGO_PN}/archive/${P}.tar.gz -> ${P}.tar.gz"
-SRC_URI+="${EGO_SUM_SRC_URI}"
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~x86 ~arm"
-IUSE="+pie"
-
-S="${WORKDIR}/cli-${P}"
-
-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 -o "bin/${PN}" -mod=vendor -v -work -x ${build_flags} \
-			./${PN}
-	echo "$@"
-	"$@" || die
-}
-
-src_install() {
-	dobin bin/${PN}
-}
diff --git a/net-misc/ipinfo/ipinfo-2.7.0.ebuild b/net-misc/ipinfo/ipinfo-2.7.0.ebuild
new file mode 120000
index 0000000..b96626e
--- /dev/null
+++ b/net-misc/ipinfo/ipinfo-2.7.0.ebuild
@@ -0,0 +1 @@
+ipinfo-9999.ebuild
\ No newline at end of file
diff --git a/net-misc/ipinfo/ipinfo-9999.ebuild b/net-misc/ipinfo/ipinfo-9999.ebuild
new file mode 100644
index 0000000..0f69a8e
--- /dev/null
+++ b/net-misc/ipinfo/ipinfo-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/ipinfo/cli"
+
+inherit go-module
+
+if [[ ${PV} == *9999* ]]; then
+    inherit git-r3
+    EGIT_REPO_URI="https://${EGO_PN}.git"
+
+    src_unpack() {
+        git-r3_src_unpack
+        #go-module_live_vendor
+    }
+else
+    EGO_VER="${P}"
+    SRC_URI="https://${EGO_PN}/archive/${EGO_VER}.tar.gz -> ${P}.tar.gz"
+
+    EGO_SUM=(
+    )
+    go-module_set_globals
+
+    SRC_URI+="${EGO_SUM_SRC_URI}"
+    S="${WORKDIR}/cli-${EGO_VER}"
+fi
+
+DESCRIPTION="Official Command Line Interface for the IPinfo API "
+LICENSE="Apache-2.0"
+SLOT="0/${PVR}"
+KEYWORDS="~amd64 ~x86 ~arm"
+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 \
+        GOCACHE="${T}/go-cache" \
+        CGO_ENABLED=0 \
+        go build -o "bin/${PN}" -mod=vendor -v -work -x ${build_flags} \
+            ./${PN}
+    echo "$@"
+    "$@" || die
+}
+
+src_install() {
+    dobin bin/${PN}
+}