mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 14:49:30 -07:00
app-misc/jq: drop 1.7.1-r1, 1.8.1
Bug: https://bugs.gentoo.org/972684 Signed-off-by: Brett A C Sheffield <bacs@librecast.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1602 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
committed by
Sam James
parent
3b593d1765
commit
e4b2c316bd
@@ -1,3 +1 @@
|
||||
DIST jq-1.7.1.gh.tar.gz 1323338 BLAKE2B 17e3b68e23f9a7f1aa8749ede6c0b8fe435990899886f0c96da36d130c17d13609ba7f910321316f0c3b35985360f8cb5e6a3b12caea5e9bc7792e128798f137 SHA512 af9c444e5306423182f467a53acdf45bb8aefa058a47f490ce16395f0aebfb7627e3843f65e96f41cd9d4b72b8ad274ab0bdb061abc6990b1158f86d2256d4ec
|
||||
DIST jq-1.8.1.gh.tar.gz 1409730 BLAKE2B 8a7cad88d62c6ec4388d8859eca2e7acdf0053f1277d61bccf87cdb6eafb69a0a00574c6b0bd5f46a512a3857ca880a9ac5f0732b3ea5e29a17fd67b90e193e7 SHA512 7eece5744008710d6098d2b945b52250184e981ed3b7a66d4e8e1d0484539a281031900fa9dda7e1004a3fcfa8b5be39814d499c66c34707b35962a365d24fde
|
||||
DIST jq-1.8.2.gh.tar.gz 1440150 BLAKE2B 1f20c8b02aac326dab44bc0222786075705c7a1aee2d7e52fd085301d65b26d490c4fa35ee88147a45f9672febf552dc1089cfbb470c93004dcc94898c84f1ab SHA512 08915a125694a68319728b21c754cd00a9e982d9a83c2b78f268eb1011452fda535bcecaf7008f231662f38ba0ab274aeb7be0d7b89e46003ab2d7143da91be5
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic
|
||||
|
||||
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/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 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="+oniguruma static-libs test"
|
||||
|
||||
ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/
|
||||
DEPEND="
|
||||
>=sys-devel/bison-3.0
|
||||
app-alternatives/lex
|
||||
oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
|
||||
"
|
||||
RDEPEND="
|
||||
!static-libs? (
|
||||
oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
|
||||
)
|
||||
"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
|
||||
"${FILESDIR}"/jq-1.7.1-runpath.patch
|
||||
)
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="test? ( oniguruma )"
|
||||
|
||||
src_prepare() {
|
||||
sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
|
||||
printf "#!/bin/sh\\nprintf '%s'\\n\n" "${MY_PV}" > scripts/version || die
|
||||
|
||||
# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
|
||||
# but the bundled copy of oniguruma still gets eautoreconf'd since it
|
||||
# exists; save the cycles by nuking it.
|
||||
sed -e '/modules\/oniguruma/d' -i Makefile.am || die
|
||||
rm -rf "${S}"/modules/oniguruma || die
|
||||
|
||||
default
|
||||
|
||||
sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# TODO: Drop on next release > 1.7.1
|
||||
# bug #944014
|
||||
append-cflags -std=gnu17
|
||||
|
||||
local econfargs=(
|
||||
# don't try to rebuild docs
|
||||
--disable-docs
|
||||
--disable-valgrind
|
||||
--disable-maintainer-mode
|
||||
$(use_enable static-libs static)
|
||||
$(use_with oniguruma oniguruma yes)
|
||||
)
|
||||
econf "${econfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if ! LD_LIBRARY_PATH="${S}/.libs" nonfatal emake check; then
|
||||
if [[ -r "${S}/test-suite.log" ]]; then
|
||||
eerror "Tests failed, outputting testsuite log"
|
||||
cat "${S}/test-suite.log"
|
||||
fi
|
||||
die "Tests failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local DOCS=( AUTHORS NEWS.md README.md SECURITY.md )
|
||||
default
|
||||
|
||||
use static-libs || { find "${D}" -name '*.la' -delete || die; }
|
||||
}
|
||||
@@ -1,86 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic
|
||||
|
||||
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/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz"
|
||||
S="${WORKDIR}/${PN}-${MY_P}"
|
||||
|
||||
LICENSE="MIT icu CC-BY-3.0"
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="+oniguruma static-libs test"
|
||||
|
||||
ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.10' # Keep this in sync with bundled vendor/oniguruma/
|
||||
DEPEND="
|
||||
>=sys-devel/bison-3.0
|
||||
app-alternatives/lex
|
||||
oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
|
||||
"
|
||||
RDEPEND="
|
||||
!static-libs? (
|
||||
oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
|
||||
)
|
||||
"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
|
||||
)
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
REQUIRED_USE="test? ( oniguruma )"
|
||||
|
||||
src_prepare() {
|
||||
sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die
|
||||
printf "#!/bin/sh\\nprintf '%s'\\n\n" "${MY_PV}" > scripts/version || die
|
||||
|
||||
# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
|
||||
# but the bundled copy of oniguruma still gets eautoreconf'd since it
|
||||
# exists; save the cycles by nuking it.
|
||||
sed -e '/vendor\/oniguruma/d' -i Makefile.am || die
|
||||
rm -rf "${S}"/vendor/oniguruma || die
|
||||
|
||||
default
|
||||
|
||||
sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# TODO: Drop on next release > 1.7.1
|
||||
# bug #944014
|
||||
append-cflags -std=gnu17
|
||||
|
||||
local econfargs=(
|
||||
# don't try to rebuild docs
|
||||
--disable-docs
|
||||
--enable-valgrind=no
|
||||
--disable-maintainer-mode
|
||||
$(use_enable static-libs static)
|
||||
$(use_with oniguruma oniguruma yes)
|
||||
)
|
||||
econf "${econfargs[@]}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if ! LD_LIBRARY_PATH="${S}/.libs" nonfatal emake check; then
|
||||
if [[ -r "${S}/test-suite.log" ]]; then
|
||||
eerror "Tests failed, outputting testsuite log"
|
||||
cat "${S}/test-suite.log"
|
||||
fi
|
||||
die "Tests failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local DOCS=( AUTHORS NEWS.md README.md SECURITY.md )
|
||||
default
|
||||
|
||||
use static-libs || { find "${D}" -name '*.la' -delete || die; }
|
||||
}
|
||||
Reference in New Issue
Block a user