1 |
commit: 373d4d774e238deb76a0c9552065f6b12d225dbb |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 15 05:31:33 2021 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 15 05:53:59 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=373d4d77 |
7 |
|
8 |
app-misc/jp: Bump to version 0.1.3.1 and switch to my jpp "fork" |
9 |
|
10 |
I've forked the package since upstream has been unresponsive |
11 |
to jp merge requests for some time, though JMESPath lives on. |
12 |
I intend to keep the original jp command as-is, while adding |
13 |
extensions to the new jpp command. |
14 |
|
15 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
16 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
17 |
|
18 |
app-misc/jp/Manifest | 2 +- |
19 |
app-misc/jp/{jp-0.1.3.ebuild => jp-0.1.3.1.ebuild} | 22 +++++++++++++++++----- |
20 |
app-misc/jp/metadata.xml | 14 +++++++++++--- |
21 |
3 files changed, 29 insertions(+), 9 deletions(-) |
22 |
|
23 |
diff --git a/app-misc/jp/Manifest b/app-misc/jp/Manifest |
24 |
index d2350ffe51f..4cbdc511c69 100644 |
25 |
--- a/app-misc/jp/Manifest |
26 |
+++ b/app-misc/jp/Manifest |
27 |
@@ -1 +1 @@ |
28 |
-DIST jp-0.1.3.tar.gz 62719 BLAKE2B cb7783cc5e23c279237a12284e7be2e6af25477d89a087dc5b5717e3aece7325fd7f056310ed79dead578425177df96911df092ecf82e3e75c935db1137a0341 SHA512 bf7c5ad2889404145b2e5e9e3e30f7e136fc81b7026114801bdd8ea65b78609d91c20f35c4717aff1bfb9750cdf5a8d9f405177ac8716851cbf391ee8c7e1e04 |
29 |
+DIST jpp-0.1.3.1.tar.gz 64129 BLAKE2B a3663ee0a6b212a455dbe4c01f83fb450a5d17ff8f2173becc970133ed9a29b102280fbeb13730eebe69ebf481703e382df8456d030abbff695a5cc72a0faa36 SHA512 65844497d988645717363f812c14886e1a5befa925085527029145c4b5c7a3466c193bb6a8f1bc47c66e5cd616ae87eee25077278a48abcc4980dda08d3fc6bb |
30 |
|
31 |
diff --git a/app-misc/jp/jp-0.1.3.ebuild b/app-misc/jp/jp-0.1.3.1.ebuild |
32 |
similarity index 54% |
33 |
rename from app-misc/jp/jp-0.1.3.ebuild |
34 |
rename to app-misc/jp/jp-0.1.3.1.ebuild |
35 |
index 9370bd2d418..2d61bd19fce 100644 |
36 |
--- a/app-misc/jp/jp-0.1.3.ebuild |
37 |
+++ b/app-misc/jp/jp-0.1.3.1.ebuild |
38 |
@@ -4,15 +4,21 @@ |
39 |
EAPI=7 |
40 |
inherit go-module |
41 |
|
42 |
+MY_PN=jpp |
43 |
+MY_P=${MY_PN}-${PV} |
44 |
+ |
45 |
DESCRIPTION="Command line interface to JMESPath" |
46 |
-HOMEPAGE="https://github.com/jmespath/jp http://jmespath.org" |
47 |
-SRC_URI="https://github.com/jmespath/jp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" |
48 |
+HOMEPAGE="https://github.com/pipebus/jpp https://github.com/jmespath/jp http://jmespath.org" |
49 |
+SRC_URI="https://github.com/pipebus/jpp/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" |
50 |
|
51 |
LICENSE="Apache-2.0 MIT" |
52 |
SLOT="0" |
53 |
KEYWORDS="~amd64" |
54 |
-IUSE="" |
55 |
+IUSE="+jp +jpp" |
56 |
RESTRICT+=" test" |
57 |
+REQUIRED_USE="|| ( jp jpp )" |
58 |
+ |
59 |
+S=${WORKDIR}/${MY_P} |
60 |
|
61 |
src_prepare() { |
62 |
if [[ -e $S/go.mod ]]; then |
63 |
@@ -29,10 +35,16 @@ src_prepare() { |
64 |
} |
65 |
|
66 |
src_compile() { |
67 |
- go build -mod=readonly -o ./jp ./jp.go || die |
68 |
+ if use jp; then |
69 |
+ go build -mod=readonly -o ./jp ./jp.go || die |
70 |
+ fi |
71 |
+ if use jpp; then |
72 |
+ go build -mod=readonly -o ./jpp ./cmd/jpp/main.go || die |
73 |
+ fi |
74 |
} |
75 |
|
76 |
src_install() { |
77 |
- dobin "./jp" |
78 |
+ use jp && dobin "./jp" |
79 |
+ use jpp && dobin "./jpp" |
80 |
dodoc README.md |
81 |
} |
82 |
|
83 |
diff --git a/app-misc/jp/metadata.xml b/app-misc/jp/metadata.xml |
84 |
index ef594962c7b..8a062311429 100644 |
85 |
--- a/app-misc/jp/metadata.xml |
86 |
+++ b/app-misc/jp/metadata.xml |
87 |
@@ -6,8 +6,16 @@ |
88 |
<name>Zac Medico</name> |
89 |
</maintainer> |
90 |
<upstream> |
91 |
- <bugs-to>https://github.com/jmespath/jp/issues</bugs-to> |
92 |
- <changelog>https://github.com/jmespath/jp/commits/master</changelog> |
93 |
- <remote-id type="github">jmespath/jp</remote-id> |
94 |
+ <bugs-to>https://github.com/pipebus/jpp/issues</bugs-to> |
95 |
+ <changelog>https://github.com/pipebus/jpp/commits/master</changelog> |
96 |
+ <remote-id type="github">pipebus/jpp</remote-id> |
97 |
</upstream> |
98 |
+ <use> |
99 |
+ <flag name="jp"> |
100 |
+ Install jp which is the official jp CLI for JMESPath |
101 |
+ </flag> |
102 |
+ <flag name="jpp"> |
103 |
+ Install jpp which is an extended superset of the jp CLI for JMESPath |
104 |
+ </flag> |
105 |
+ </use> |
106 |
</pkgmetadata> |