diff options
Diffstat (limited to 'app-misc/jq')
| -rw-r--r-- | app-misc/jq/Manifest | 6 | ||||
| -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, 12 insertions, 18 deletions
diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index 3ab419e0dce4..506621a14e87 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -9,8 +9,8 @@ AUX jq-1.7_pre20201109-fix-configure-test.patch 2324 BLAKE2B daccf3a6ea7868bdb85 AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a7384664ab990eca053d0b4521f1c863af97f9f64afeeb600109ba0f44f155497954c48c6907df198c24d503006c42aada2a97 SHA512 64cc678b5d0850aa9ffc4cd4ef340fa22b3ce120a8b302757528633a7dd785aad1559a0b0abd3e0b1fe3b0d92cfcc388910c84f7cdefca876c864b01358ac04f 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 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69 EBUILD jq-1.7_pre20201109-r1.ebuild 2438 BLAKE2B b25860c0d8eb96b90fa79cfbe7f3fdc23b6376d0142dbc0fee9224aa3793c64d4345c18d49e88440884432885d68facef23724fbc279559f81d44fa835e1e821 SHA512 965be67264be11a74a2ce6486c2271062731eda59eadfd470a8fc29aac93d3c7bcb9fe677551926b9e14111cdc97205e5f1345b74bc3c949c148076d242b2813 -EBUILD jq-1.7_pre20230210.ebuild 2611 BLAKE2B 63f88fe5bcd8b23205c003b39e3ec0be2c98c5c77e666da72f5a457c335b1c142dfac787c67b139847a60dd229133cb2541fd9d08df10371dd1febb03fdd5abd SHA512 1f647c7dd676091680cdb97bd44740bbebcd8f2d146f4ab40a12cf43cc8953937bd38d887e12e737e0e56a439b62c57e6da825d02a092d8e5a51e7864479d5a4 -MISC metadata.xml 621 BLAKE2B 25da1d13b32964ec540f4e25f8d29807e5f954d3e47ace2143abfdd192382153e05947c4ccae46dd3c3608cc083ad1701f6aa66ab3b6b3c6866e858eab342be5 SHA512 955c6e85739c4b46f02e9f194a7534cd90e098014ee8df42587d3bc357ee25da45db830ea2736724c7f962b137e604b9818c7fe6c4427dadbb9d58ef4682da2b +EBUILD jq-1.7_rc1.ebuild 2306 BLAKE2B d2d1e5344732ffb13d6c920bb12cf8b51e47160eee3df54923a768c2a1d8f31e36fdd0b2973b98362e6d45bd53933563f04e5d9e5d5f70cc337db07a5b01f7f3 SHA512 49e50dc70af4be20a0f7837301826dcdb79644e6c66acc10bcf238855f898beda686089281182f4b4c9ef15dc30f8f7834721c6b9c2802f6f4bfa8af8bf1d9be +MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04 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> |