diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2023-08-07 19:16:14 -0700 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2023-08-07 19:16:22 -0700 |
| commit | e2ebb25edfdd16cf1a55e0675a7c0e3ecd1ea91c (patch) | |
| tree | 2f3b850df83220c71e6ee1731540405b47df1323 /app-misc/jq | |
| parent | dev-util/ccache: backport ICE workaround (diff) | |
| download | gentoo-e2ebb25edfdd16cf1a55e0675a7c0e3ecd1ea91c.tar.gz gentoo-e2ebb25edfdd16cf1a55e0675a7c0e3ecd1ea91c.tar.bz2 gentoo-e2ebb25edfdd16cf1a55e0675a7c0e3ecd1ea91c.zip | |
app-misc/jq: add 1.7_rc1, drop 1.7_pre20230210
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'app-misc/jq')
| -rw-r--r-- | app-misc/jq/Manifest | 2 | ||||
| -rw-r--r-- | app-misc/jq/jq-1.7_rc1.ebuild (renamed from app-misc/jq/jq-1.7_pre20230210.ebuild) | 22 | ||||
| -rw-r--r-- | app-misc/jq/metadata.xml | 2 |
3 files changed, 10 insertions, 16 deletions
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index 489984f6a2eb..0dd420118293 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -1,3 +1,3 @@ DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480 DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a -DIST jq-1.7_pre20230210.gh.tar.gz 1197799 BLAKE2B f4e90f78aa5afec88a4fc60f7a6f05f892647fcd9b59e67ea4727bb452eceead05b8cbe18b814d05665c5fadf8aaddc0cc9a06f2cb102c82503f857d0b70a485 SHA512 e7533c1dd53dad398c50b4cf37cef5d60f95eeee040d1c1ab776778fa14a093167500e1d99d71b22edc5f476079bad503c9c17f54fffefee0c5eb41b86bab406 +DIST jq-1.7_rc1.gh.tar.gz 1229662 BLAKE2B 3df964681eb8efbbab5932a5d58a3242cef5dfd9edb0486b7156f69aabbef33ee72141de14725ad2ea033bfb0dc4d3f29aa67f6ac2322ff474ba3bcceee78bd0 SHA512 c33ce7f7526d9d962c5507c9840da2a78c46e1c3b0e8b14a0e2185f4ed9d1b468f91e88bebfbf335a3cee40d357b9c30fb5b63ff780e448f8c5d4f7cc9393d95 diff --git a/app-misc/jq/jq-1.7_pre20230210.ebuild b/app-misc/jq/jq-1.7_rc1.ebuild index e9939d011f3a..ff2204b79fda 100644 --- a/app-misc/jq/jq-1.7_pre20230210.ebuild +++ b/app-misc/jq/jq-1.7_rc1.ebuild @@ -5,20 +5,19 @@ EAPI=8 inherit autotools -COMMIT_HASH="cff5336ec71b6fee396a95bb0e4bea365e0cd1e8" - +MY_PV="${PV/_/}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="A lightweight and flexible command-line JSON processor" HOMEPAGE="https://stedolan.github.io/jq/" -#SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz" -SRC_URI="https://github.com/stedolan/jq/archive/${COMMIT_HASH}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT_HASH}" +SRC_URI="https://github.com/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${MY_P}" LICENSE="MIT CC-BY-3.0" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris" IUSE="+oniguruma static-libs test" -ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/ +ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/ DEPEND=" >=sys-devel/bison-3.0 sys-devel/flex @@ -32,11 +31,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch "${FILESDIR}"/jq-1.7-runpath.patch - "${FILESDIR}"/jq-1.7-warnings-r1.patch - "${FILESDIR}"/jq-1.7-visible-null.patch - # https://bugs.gentoo.org/776385 - "${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch - "${FILESDIR}"/jq-1.7_pre20201109-fix-configure-test.patch ) RESTRICT="!test? ( test )" @@ -52,11 +46,11 @@ src_prepare() { # exists; save the cycles by nuking it. sed -e '/modules\/oniguruma/d' -i Makefile.am || die rm -rf "${S}"/modules/oniguruma || die - sed -i "s/^jq_version: .*/jq_version: \"${PV}\"/" docs/site.yml || die + sed -i "s/^jq_version: .*/jq_version: \"${MY_PV}\"/" docs/site.yml || die default - sed -i "s/\[jq_version\]/[${PV}]/" configure.ac || die + sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die eautoreconf } @@ -85,7 +79,7 @@ src_test() { } src_install() { - local DOCS=( AUTHORS NEWS README.md ) + local DOCS=( AUTHORS NEWS.md README.md SECURITY.md ) default use static-libs || { find "${D}" -name '*.la' -delete || die; } diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml index aa4e2e57a5ad..c62cb69977a6 100644 --- a/app-misc/jq/metadata.xml +++ b/app-misc/jq/metadata.xml @@ -14,6 +14,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:jq_project:jq</remote-id> - <remote-id type="github">stedolan/jq</remote-id> + <remote-id type="github">jqlang/jq</remote-id> </upstream> </pkgmetadata> |