Skip to content

Commit 742e997

Browse files
committed
app-misc/jq: Sync with Gentoo
It's from Gentoo commit 79d039542c3c53925c72db7a58db0cf06f33faae.
1 parent 6dee947 commit 742e997

File tree

9 files changed

+16
-235
lines changed

9 files changed

+16
-235
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
2-
DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a
1+
DIST jq-1.7.gh.tar.gz 1267139 BLAKE2B b6a54f9beaabd7915d7a8f14cda9621573f1796af53fe1645561a7a199787a7e9b2b2df038208f23e63f339dec567851b70696ffb8194986250527333d36d44e SHA512 01676319fe98d5ab1e278430b2c58ec594191cc9485a20312d658c0e199ac7ea5f5e934817ce98da0864ec7e0a018aae9b87525260e8ab6a7bde918db483bd84

sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.6-runpath.patch

Lines changed: 0 additions & 17 deletions
This file was deleted.

sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.6-segfault-fix.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.7-visible-null.patch

Lines changed: 0 additions & 41 deletions
This file was deleted.

sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.7-warnings.patch

Lines changed: 0 additions & 44 deletions
This file was deleted.

sdk_container/src/third_party/portage-stable/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.6-r3.ebuild

Lines changed: 0 additions & 78 deletions
This file was deleted.

sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7_pre20201109.ebuild renamed to sdk_container/src/third_party/portage-stable/app-misc/jq/jq-1.7.ebuild

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1-
# Copyright 1999-2021 Gentoo Authors
1+
# Copyright 1999-2023 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

4-
EAPI=7
4+
EAPI=8
55

66
inherit autotools
77

8-
COMMIT_HASH="a17dd3248a666d01be75f6b16be37e80e20b0954"
9-
8+
MY_PV="${PV/_/}"
9+
MY_P="${PN}-${MY_PV}"
1010
DESCRIPTION="A lightweight and flexible command-line JSON processor"
1111
HOMEPAGE="https://stedolan.github.io/jq/"
12-
#SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
13-
SRC_URI="https://github.com/stedolan/jq/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
14-
S="${WORKDIR}/${PN}-${COMMIT_HASH}"
12+
SRC_URI="https://github.com/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
13+
S="${WORKDIR}/${PN}-${MY_P}"
1514

1615
LICENSE="MIT CC-BY-3.0"
1716
SLOT="0"
18-
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
17+
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris"
1918
IUSE="+oniguruma static-libs test"
2019

21-
ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
20+
ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
2221
DEPEND="
2322
>=sys-devel/bison-3.0
2423
sys-devel/flex
@@ -32,19 +31,14 @@ RDEPEND="
3231
PATCHES=(
3332
"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
3433
"${FILESDIR}"/jq-1.7-runpath.patch
35-
"${FILESDIR}"/jq-1.7-warnings.patch
36-
"${FILESDIR}"/jq-1.7-visible-null.patch
37-
# https://bugs.gentoo.org/776385
38-
"${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch
3934
)
4035

4136
RESTRICT="!test? ( test )"
4237
REQUIRED_USE="test? ( oniguruma )"
4338

4439
src_prepare() {
4540
sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
46-
sed -r -e "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
47-
-i configure.ac || die
41+
printf "#!/bin/sh\\nprintf '%s'\\n\n" "${MY_PV}" > scripts/version || die
4842

4943
# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
5044
# but the bundled copy of oniguruma still gets eautoreconf'd since it
@@ -53,6 +47,9 @@ src_prepare() {
5347
rm -rf "${S}"/modules/oniguruma || die
5448

5549
default
50+
51+
sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die
52+
5653
eautoreconf
5754
}
5855

@@ -80,7 +77,7 @@ src_test() {
8077
}
8178

8279
src_install() {
83-
local DOCS=( AUTHORS NEWS README.md )
80+
local DOCS=( AUTHORS NEWS.md README.md SECURITY.md )
8481
default
8582

8683
use static-libs || { find "${D}" -name '*.la' -delete || die; }

sdk_container/src/third_party/portage-stable/app-misc/jq/metadata.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<name>Patrick McLean</name>
1111
</maintainer>
1212
<use>
13-
<flag name="oniguruma">Use dev-libs/oniguruma for regular expression support</flag>
13+
<flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression support</flag>
1414
</use>
1515
<upstream>
1616
<remote-id type="cpe">cpe:/a:jq_project:jq</remote-id>
17-
<remote-id type="github">stedolan/jq</remote-id>
17+
<remote-id type="github">jqlang/jq</remote-id>
1818
</upstream>
1919
</pkgmetadata>

0 commit comments

Comments
 (0)