From 992d51a146d493f8dd5d710e033427d323b9c739 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Oct 2023 23:58:42 +0100 Subject: gentoo auto-resync : 06:10:2023 - 23:58:42 --- app-misc/Manifest.gz | Bin 50240 -> 50255 bytes app-misc/jaq/Manifest | 4 +- app-misc/jaq/jaq-1.0.0.ebuild | 114 ++++++++++++++++++++ app-misc/jaq/jaq-1.0.0_pre1.ebuild | 117 --------------------- app-misc/jq/Manifest | 12 +-- app-misc/jq/files/jq-1.6-runpath.patch | 17 --- app-misc/jq/files/jq-1.6-segfault-fix.patch | 22 ---- app-misc/jq/files/jq-1.7-visible-null.patch | 41 -------- app-misc/jq/files/jq-1.7-warnings.patch | 44 -------- .../jq-1.7_pre20201109-fix-configure-test.patch | 54 ---------- .../jq/files/jq-1.7_pre20201109-no-git-bdep.patch | 13 --- app-misc/jq/jq-1.6-r3.ebuild | 78 -------------- app-misc/jq/jq-1.7.ebuild | 2 +- app-misc/jq/jq-1.7_pre20201109-r1.ebuild | 88 ---------------- 14 files changed, 118 insertions(+), 488 deletions(-) create mode 100644 app-misc/jaq/jaq-1.0.0.ebuild delete mode 100644 app-misc/jaq/jaq-1.0.0_pre1.ebuild delete mode 100644 app-misc/jq/files/jq-1.6-runpath.patch delete mode 100644 app-misc/jq/files/jq-1.6-segfault-fix.patch delete mode 100644 app-misc/jq/files/jq-1.7-visible-null.patch delete mode 100644 app-misc/jq/files/jq-1.7-warnings.patch delete mode 100644 app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch delete mode 100644 app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch delete mode 100644 app-misc/jq/jq-1.6-r3.ebuild delete mode 100644 app-misc/jq/jq-1.7_pre20201109-r1.ebuild (limited to 'app-misc') diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index fb30adca770d..f17f78789f62 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/jaq/Manifest b/app-misc/jaq/Manifest index 5ca7df9c0316..ba87eb663360 100644 --- a/app-misc/jaq/Manifest +++ b/app-misc/jaq/Manifest @@ -27,7 +27,7 @@ DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a012 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3 DIST itoa-1.0.8.crate 10465 BLAKE2B e518264938d044e24a4d72cab788de717c36cc7396fdbf2805fe3a3e0cdfc361c4f6fedee7bcebea6fbacff254e073da26b2400a073fa75f75523b8ed9de9938 SHA512 6171bfcd70634a2587740c145a15790e12807d2c756a25e74950daf9dd36acc662f12836c5b87e20483b4d020bc0d98a352b8e9787b0b8544bf1ee1b6a0c2c8e -DIST jaq-1.0.0_pre1.gh.tar.gz 81370 BLAKE2B 3a063410e3f40f0bbc8f08b660da414dbece43a09421f720717f958d1dc69c085ca038efa833504702eacb1a060e588c45659bcc6bcb7613370c1be7e0de364d SHA512 de5e6c6c25abbc52649f30397c10123b1e5e6a9864648f6e73d744240114eb666314f719960f636630b1428cc96b9cd91cf7c8ca31591c6b27c4eb6df85b915d +DIST jaq-1.0.0.gh.tar.gz 81696 BLAKE2B d2b7d9b936e2b385a41881abf94d19a0822eb22dfb30b55a59ed131c109badeb584836c153720e7e658ee11a90ece112d0e0866e9882fa124af08904a9ef05dd SHA512 d018230e841879c29c2e02a9278b042865716007b719f543fabdda2f18ffa1cf1c67eae8363eba985e79f8e804c51827c7f301d3d6c236d2ebf5b86511c8ce36 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9 DIST libmimalloc-sys-0.1.33.crate 1166827 BLAKE2B 0ac4664de727ad209a66f8a0ba0308815cd1be6a6ec2a73ca211cffaef51dc8a31ac4898233bdf9bf8ba260bdf466dfd751249f849f08b584243c43017d14366 SHA512 ac2161b4324436ff55b421bd5d26c5c3a54da62319299b392f9aaebd65dcd5862b8f8488738959e7e45be3165259b251643416ddd9905ddf6580807136c71616 @@ -66,5 +66,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2 -EBUILD jaq-1.0.0_pre1.ebuild 2015 BLAKE2B d8f80e5e2331455d22f819bcc2292abd95d3258ee0330119c48be7c8c1cea09619e49efe05a7f89388020ecda9255aa2828c5157ca90469a301546d3e6976749 SHA512 40d1f4767776c95ed117dff1a418946c81628b19099f0cd98b287b1981b35c767844b231f83db4eba36229b0e7afcb2303d584f2b5c362b21f304e5a981d44bf +EBUILD jaq-1.0.0.ebuild 1941 BLAKE2B 9936c432f9956d209174300c5b493cd977dd1772454b6cd6853d8dd70120017e85a303501a266439d9b7554a8eeebc88d724eaa03a47a9c3e2ffb3c2f9d80907 SHA512 5bc79fa7ba2b9f6d6518ed32ebad5f14751ccd463d6de74a26d1a2afc49dbadc0fe5e7b6e88a19e2b6f967feadfeb7bdcef658c9d14709b767dcc021ecfd7231 MISC metadata.xml 325 BLAKE2B 2e15e2db0c3a78c4c900f31700316693f33b3e570667ab3eaa7035b27433cdc4e37363d8a321ce16a86ce390bcd7f62c0ea8ff21a2d02c3eec651009f81c4023 SHA512 a513a093b135a21f21ca022f51890d1f7fea33ba833d269b76a889dabb95291da71d5aee28f1e92e01768dab1e97fa8aeabcee81c532e0168f2bad52b7d45c57 diff --git a/app-misc/jaq/jaq-1.0.0.ebuild b/app-misc/jaq/jaq-1.0.0.ebuild new file mode 100644 index 000000000000..5e773ef28914 --- /dev/null +++ b/app-misc/jaq/jaq-1.0.0.ebuild @@ -0,0 +1,114 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.10 + +EAPI=8 + +CRATES=" + ahash@0.7.6 + aho-corasick@1.0.2 + ariadne@0.1.5 + atty@0.2.14 + base64@0.21.2 + bincode@1.3.3 + bitflags@1.3.2 + cc@1.0.79 + cfg-if@1.0.0 + chumsky@0.9.2 + clap@4.0.22 + clap_derive@4.0.21 + clap_lex@0.3.2 + colored_json@3.0.1 + dyn-clone@1.0.11 + either@1.8.1 + env_logger@0.10.0 + equivalent@1.0.0 + fastrand@1.9.0 + getrandom@0.2.10 + hashbrown@0.12.3 + hashbrown@0.14.0 + heck@0.4.1 + hermit-abi@0.1.19 + hifijson@0.2.0 + indexmap@2.0.0 + instant@0.1.12 + itertools@0.10.5 + itoa@1.0.8 + libc@0.2.147 + libm@0.2.7 + libmimalloc-sys@0.1.33 + log@0.4.19 + memchr@2.5.0 + memmap2@0.5.10 + mimalloc@0.1.37 + once_cell@1.18.0 + os_str_bytes@6.4.1 + proc-macro-error-attr@1.0.4 + proc-macro-error@1.0.4 + proc-macro2@1.0.63 + quote@1.0.29 + redox_syscall@0.2.16 + regex-automata@0.3.0 + regex-syntax@0.7.3 + regex@1.9.0 + remove_dir_all@0.5.3 + ryu@1.0.14 + serde@1.0.155 + serde_derive@1.0.155 + serde_json@1.0.99 + strsim@0.10.0 + syn@1.0.109 + tempfile@3.3.0 + termcolor@1.2.0 + time-core@0.1.1 + time-macros@0.2.9 + time@0.3.22 + unicode-ident@1.0.10 + urlencoding@2.1.3 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + yansi@0.5.1 +" + +inherit cargo + +DESCRIPTION="Just another JSON query tool" +HOMEPAGE="https://github.com/01mf02/jaq" + +SRC_URI=" + https://github.com/01mf02/jaq/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" + BSD EPL-2.0 MIT Unicode-DFS-2016 + || ( Apache-2.0 Boost-1.0 ) +" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND=" + >=virtual/rust-1.72 +" + +QA_FLAGS_IGNORED="usr/bin/jaq" +QA_PRESTRIPPED="usr/bin/jaq" + +DOCS=( + README.md + examples/ +) + +src_install() { + pushd "${S}/jaq" >/dev/null || die + cargo_src_install + popd >/dev/null || die + default +} diff --git a/app-misc/jaq/jaq-1.0.0_pre1.ebuild b/app-misc/jaq/jaq-1.0.0_pre1.ebuild deleted file mode 100644 index d8b75b3b5b9b..000000000000 --- a/app-misc/jaq/jaq-1.0.0_pre1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Auto-Generated by cargo-ebuild 0.5.4 - -EAPI=8 - -CRATES=" - ahash@0.7.6 - aho-corasick@1.0.2 - ariadne@0.1.5 - atty@0.2.14 - base64@0.21.2 - bincode@1.3.3 - bitflags@1.3.2 - cc@1.0.79 - cfg-if@1.0.0 - chumsky@0.9.2 - clap@4.0.22 - clap_derive@4.0.21 - clap_lex@0.3.2 - colored_json@3.0.1 - dyn-clone@1.0.11 - either@1.8.1 - env_logger@0.10.0 - equivalent@1.0.0 - fastrand@1.9.0 - getrandom@0.2.10 - hashbrown@0.12.3 - hashbrown@0.14.0 - heck@0.4.1 - hermit-abi@0.1.19 - hifijson@0.2.0 - indexmap@2.0.0 - instant@0.1.12 - itertools@0.10.5 - itoa@1.0.8 - libc@0.2.147 - libm@0.2.7 - libmimalloc-sys@0.1.33 - log@0.4.19 - memchr@2.5.0 - memmap2@0.5.10 - mimalloc@0.1.37 - once_cell@1.18.0 - os_str_bytes@6.4.1 - proc-macro-error-attr@1.0.4 - proc-macro-error@1.0.4 - proc-macro2@1.0.63 - quote@1.0.29 - redox_syscall@0.2.16 - regex-automata@0.3.0 - regex-syntax@0.7.3 - regex@1.9.0 - remove_dir_all@0.5.3 - ryu@1.0.14 - serde@1.0.155 - serde_derive@1.0.155 - serde_json@1.0.99 - strsim@0.10.0 - syn@1.0.109 - tempfile@3.3.0 - termcolor@1.2.0 - time-core@0.1.1 - time-macros@0.2.9 - time@0.3.22 - unicode-ident@1.0.10 - urlencoding@2.1.3 - version_check@0.9.4 - wasi@0.11.0+wasi-snapshot-preview1 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-util@0.1.5 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 - yansi@0.5.1 -" - -inherit cargo - -DESCRIPTION="Just another JSON query tool" -HOMEPAGE="https://github.com/01mf02/jaq" - -MY_PV="${PV//_*/-gamma}" -MY_P="${PN}-${MY_PV}" -SRC_URI=" - https://github.com/01mf02/jaq/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz - ${CARGO_CRATE_URIS} -" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -# Dependent crate licenses -LICENSE+=" - BSD EPL-2.0 MIT Unicode-DFS-2016 - || ( Apache-2.0 Boost-1.0 ) -" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=" - >=virtual/rust-1.62 -" - -QA_FLAGS_IGNORED="usr/bin/jaq" -QA_PRESTRIPPED="usr/bin/jaq" - -DOCS=( - README.md - examples/ -) - -src_install() { - pushd "${S}/jaq" >/dev/null || die - cargo_src_install - popd >/dev/null || die - default -} diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index 89581b0a4cf2..f9a60a0a4d70 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -1,15 +1,5 @@ AUX jq-1.6-r3-never-bundle-oniguruma.patch 867 BLAKE2B 7afe5d3390071a4ccd14ae376c27db07f3d189a32973d82d77b3bd0b8826cf3ed6c032e31e0b7ffdf3834050aeb367316f8930dbb0a1a66218f86ab94cbd36ff SHA512 27b38e765e0850cb97c51015f36ebc447bd23066b640269ff4ea838946545dd86cdd975393943bf4257dc9ce8436a16b610e34883ddacc64b8106f895d1c79c3 -AUX jq-1.6-runpath.patch 563 BLAKE2B 9b7600e9673fd0a34dedd2c3c7a672b26d146778f929f639310bd1089bf4134bf1aed722701f23b108db62057b75328e2debf1b0313cdc7eef60b116173b7e5d SHA512 ce02eeba87606a1a95b301abdb42eaad2bcd6049ebac1514cd4316f0202439142c7c6d529f34770a663f10e34190ac22dde039c36c51a1e1d5300b1dc56bd555 -AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a30dc317cade0e0034b86dcf21296b7ed29c7e239204d9ab063d0418e3b8389ff7a39d688c3279c78fc4b22a126 SHA512 0c5b3f82cc6bb98413c7adf5a12e3cdeae7c611417853f3e9c5026e54d237c4f32ef47f6347b09d2cc63f0efa12b7790a588da98cf752d2d4cc0fa50978cab8b AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0 -AUX jq-1.7-visible-null.patch 1428 BLAKE2B 109f45fc72bb927fb67202aadbcb61869d427f3598e2dd14eb47ab1983cf5a9978c873d1357e6ba3a23b931ce0b10dbe67498ee83b3375c2c67a3f97980cdfbf SHA512 39067401436538d85c65a51de3bcad99868d4c0b50d27717ccbfdbd7fbb8b011447fd6a326b4849ef94f57422692f032c8fab2974f8ca888b69a316616c26498 -AUX jq-1.7-warnings.patch 1302 BLAKE2B a38e9df57a74b8a19d70fe7d5aeb191e60bfb118f42f2ed3126626d601bd87549aa5c310c825687310e2eddb708e8c32a557f89f8073ac88ab8113cec3bb3468 SHA512 d5796a30684091aeeb0faa26170b675d9827a662299b122d0026e9ae237135636806aea5638e9b7d2dd5508cdd0726767f70d840e33894a8865f4acbb31ec14d -AUX jq-1.7_pre20201109-fix-configure-test.patch 2324 BLAKE2B daccf3a6ea7868bdb85264528139ae44ba41321fe3dfd2667efc9e3343d14d8b5f1da45b996091a58ee83be863a24c7fd120f054dcbf7842df4fd9aef6642927 SHA512 ec9570e741ee996befcc4fcc411fa08fb569bf6b9cb1aa10ccbbe5a59d755f9ccc535c46dc2eb055955a4f142653184dcaa9142f0a2962c484a062231d3bd0d9 -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.gh.tar.gz 1267139 BLAKE2B b6a54f9beaabd7915d7a8f14cda9621573f1796af53fe1645561a7a199787a7e9b2b2df038208f23e63f339dec567851b70696ffb8194986250527333d36d44e SHA512 01676319fe98d5ab1e278430b2c58ec594191cc9485a20312d658c0e199ac7ea5f5e934817ce98da0864ec7e0a018aae9b87525260e8ab6a7bde918db483bd84 -DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a -EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69 -EBUILD jq-1.7.ebuild 2212 BLAKE2B 1a9a053128eb71a39daa98e6e14d84a7c184e46889b113e2190eccf7fc0aa35b27cce5c7385415e106877e2f7076c80743bd0564d1d76a8fe67f464578ebb158 SHA512 cffa5f51c814f2c42780f3307ce5504e412190a0f87d05319be420f6bcd1ad5a44f34ad78ae0e9ac123d85dc60a2b25379abfdb8d0cd056e9ed3b775479425ed -EBUILD jq-1.7_pre20201109-r1.ebuild 2438 BLAKE2B b25860c0d8eb96b90fa79cfbe7f3fdc23b6376d0142dbc0fee9224aa3793c64d4345c18d49e88440884432885d68facef23724fbc279559f81d44fa835e1e821 SHA512 965be67264be11a74a2ce6486c2271062731eda59eadfd470a8fc29aac93d3c7bcb9fe677551926b9e14111cdc97205e5f1345b74bc3c949c148076d242b2813 +EBUILD jq-1.7.ebuild 2211 BLAKE2B 08e4a7a0b2c8e687e360bad03891dec15cdd66ba4408db6dbc7c31e01ecde2a18a7bc06eb5073d77d885960b9c34c817dd8df6b9bd5cb427b35e5056afda3434 SHA512 2fae2d1bbc65f62667bfa74fe34c21b8f0a90997b696c2f202e9b160e3516966ed41294ad7b2ce2d36ea1a2505575e09d31278f8c903ad73eb160ff33cb21553 MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04 diff --git a/app-misc/jq/files/jq-1.6-runpath.patch b/app-misc/jq/files/jq-1.6-runpath.patch deleted file mode 100644 index 40a2ed02f3db..000000000000 --- a/app-misc/jq/files/jq-1.6-runpath.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 280694c..7227c9d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"]) - AC_CONFIG_MACRO_DIR([config/m4]) - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT -- -+AC_ARG_ENABLE([rpathhack], -+ [AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])], -+ [ -+AC_MSG_RESULT([patching libtool to fix rpath]) -+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -+ ], -+ []) diff --git a/app-misc/jq/files/jq-1.6-segfault-fix.patch b/app-misc/jq/files/jq-1.6-segfault-fix.patch deleted file mode 100644 index 8eb7d456bc6b..000000000000 --- a/app-misc/jq/files/jq-1.6-segfault-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001 -From: William Langford -Date: Tue, 20 Nov 2018 09:58:25 -0500 -Subject: [PATCH] Add missing jv_copy when printing with -ar - ---- - src/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index b154689e..61ae43f9 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) { - while (jv_is_valid(result = jq_next(jq))) { - if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) { - if (options & ASCII_OUTPUT) { -- jv_dumpf(result, stdout, JV_PRINT_ASCII); -+ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII); - } else { - fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout); - } diff --git a/app-misc/jq/files/jq-1.7-visible-null.patch b/app-misc/jq/files/jq-1.7-visible-null.patch deleted file mode 100644 index 41e55df72111..000000000000 --- a/app-misc/jq/files/jq-1.7-visible-null.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/jv_print.c b/src/jv_print.c -index 2e781bb..e621b31 100644 ---- a/src/jv_print.c -+++ b/src/jv_print.c -@@ -32,7 +32,7 @@ static const jv_kind color_kinds[] = - static char color_bufs[sizeof(color_kinds)/sizeof(color_kinds[0])][16]; - static const char *color_bufps[8]; - static const char* def_colors[] = -- {COL("1;30"), COL("0;37"), COL("0;37"), COL("0;37"), -+ {COL("1;90"), COL("0;37"), COL("0;37"), COL("0;37"), - COL("0;32"), COL("1;37"), COL("1;37")}; - #define FIELD_COLOR COL("34;1") - -diff --git a/tests/shtest b/tests/shtest -index 8ed62b2..2d3f0da 100755 ---- a/tests/shtest -+++ b/tests/shtest -@@ -280,12 +280,12 @@ fi - - # Check $JQ_COLORS - $JQ -Ccn . > $d/color --printf '\033[1;30mnull\033[0m\n' > $d/expect -+printf '\033[1;90mnull\033[0m\n' > $d/expect - cmp $d/color $d/expect - JQ_COLORS='4;31' $JQ -Ccn . > $d/color - printf '\033[4;31mnull\033[0m\n' > $d/expect - cmp $d/color $d/expect --JQ_COLORS='1;30:0;31:0;32:0;33:0;34:1;35:1;36' \ -+JQ_COLORS='1;90:0;31:0;32:0;33:0;34:1;35:1;36' \ - $JQ -Ccn '[{"a":true,"b":false},123,null]' > $d/color - ( - printf '\033[1;35m[\033[1;36m{' -@@ -298,7 +298,7 @@ printf '[0m\033[0;31mfalse\033' - printf '[0m\033[1;36m\033[1;36' - printf 'm}\033[0m\033[1;35m,\033[' - printf '0;33m123\033[0m\033[1;' --printf '35m,\033[1;30mnull\033' -+printf '35m,\033[1;90mnull\033' - printf '[0m\033[1;35m\033[1;35' - printf 'm]\033[0m\n' - ) > $d/expect diff --git a/app-misc/jq/files/jq-1.7-warnings.patch b/app-misc/jq/files/jq-1.7-warnings.patch deleted file mode 100644 index 0047ca391cae..000000000000 --- a/app-misc/jq/files/jq-1.7-warnings.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/builtin.c b/src/builtin.c -index bf80c7b..12db573 100644 ---- a/src/builtin.c -+++ b/src/builtin.c -@@ -1,5 +1,6 @@ - #define _BSD_SOURCE - #define _GNU_SOURCE -+#define _DEFAULT_SOURCE - #ifndef __sun__ - # define _XOPEN_SOURCE - # define _XOPEN_SOURCE_EXTENDED 1 -diff --git a/src/jv_dtoa.c b/src/jv_dtoa.c -index 33feb99..fcbd902 100644 ---- a/src/jv_dtoa.c -+++ b/src/jv_dtoa.c -@@ -2327,7 +2327,7 @@ retlow1: - jvp_strtod - (struct dtoa_context* C, const char *s00, char **se) - { -- int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1, test_scale; -+ int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1; - int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign; - CONST char *s, *s0, *s1; - double aadj, aadj1; -diff --git a/src/jv_dtoa_tsd.c b/src/jv_dtoa_tsd.c -index 0f95df4..e5209dd 100644 ---- a/src/jv_dtoa_tsd.c -+++ b/src/jv_dtoa_tsd.c -@@ -24,7 +24,7 @@ static void tsd_dtoa_ctx_fini() { - } - - static void tsd_dtoa_ctx_init() { -- if (pthread_key_create(&dtoa_ctx_key, tsd_dtoa_ctx_dtor) != 0) { -+ if (pthread_key_create(&dtoa_ctx_key, (void (*)(void *))tsd_dtoa_ctx_dtor) != 0) { - fprintf(stderr, "error: cannot create thread specific key"); - abort(); - } -@@ -43,4 +43,4 @@ inline struct dtoa_context *tsd_dtoa_context_get() { - } - } - return ctx; --} -\ No newline at end of file -+} diff --git a/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch b/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch deleted file mode 100644 index 8be52042bcc4..000000000000 --- a/app-misc/jq/files/jq-1.7_pre20201109-fix-configure-test.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/stedolan/jq/pull/2480 - -From 40bbd419ad8d1bd9cbe8b17063c323f8a40ab327 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Sep 2022 09:59:31 -0700 -Subject: [PATCH 1/2] configure: Pass _XOPEN_SOURCE when checking for strptime - -Include sys/time.h for gettimeofday since thats where its in glibc - -Signed-off-by: Khem Raj ---- a/configure.ac -+++ b/configure.ac -@@ -139,7 +139,10 @@ AC_FUNC_ALLOCA - - AC_FIND_FUNC([isatty], [c], [#include ], [0]) - AC_FIND_FUNC([_isatty], [c], [#include ], [0]) -+OLD_CFLAGS=$CFLAGS -+CFLAGS="$CFLAGS -D_XOPEN_SOURCE" - AC_FIND_FUNC([strptime], [c], [#include ], [0, 0, 0]) -+CFLAGS=$OLD_CFLAGS - AC_FIND_FUNC([strftime], [c], [#include ], [0, 0, 0, 0]) - AC_FIND_FUNC([setenv], [c], [#include ], [0, 0, 0]) - AC_FIND_FUNC([timegm], [c], [#include ], [0]) -@@ -147,7 +150,7 @@ AC_FIND_FUNC([gmtime_r], [c], [#include ], [0, 0]) - AC_FIND_FUNC([gmtime], [c], [#include ], [0]) - AC_FIND_FUNC([localtime_r], [c], [#include ], [0, 0]) - AC_FIND_FUNC([localtime], [c], [#include ], [0]) --AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) -+AC_FIND_FUNC([gettimeofday], [c], [#include ], [0, 0]) - AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define to 1 if the system has the tm_gmt_off field in struct tm])], - [], [[#include ]]) - AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])], - -From cda1734bed3b048c01452c798877d05b8c2f4c15 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 6 Sep 2022 10:00:59 -0700 -Subject: [PATCH 2/2] builtin: Replace _BSD_SOURCE with _DEFAULT_SOURCE - -newer glibc has remove _BSD_SOURCE and wants it to be replaced with _DEFAULT_SOURCE - -Fixes -/usr/include/features.h:194:3: warning: "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-W#warnings] -warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - -Signed-off-by: Khem Raj ---- a/src/builtin.c -+++ b/src/builtin.c -@@ -1,4 +1,4 @@ --#define _BSD_SOURCE -+#define _DEFAULT_SOURCE - #define _GNU_SOURCE - #ifndef __sun__ - # define _XOPEN_SOURCE - diff --git a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch b/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch deleted file mode 100644 index 726624df13d6..000000000000 --- a/app-misc/jq/files/jq-1.7_pre20201109-no-git-bdep.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 0441d4a..592ceb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,8 +1,3 @@ --m4_define([jq_version], -- m4_esyscmd_s([(git rev-parse --verify -q jq-1.0 > /dev/null && -- (git describe --tags --dirty --match 'jq-*'|sed 's/^jq-//')) || -- echo `git rev-parse --abbrev-ref HEAD`-`git describe --always --dirty`]))) -- - AC_INIT([jq], [jq_version], [https://github.com/stedolan/jq/issues], - [jq], [https://stedolan.github.io/jq]) - diff --git a/app-misc/jq/jq-1.6-r3.ebuild b/app-misc/jq/jq-1.6-r3.ebuild deleted file mode 100644 index f1172ab62ab9..000000000000 --- a/app-misc/jq/jq-1.6-r3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -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" - -LICENSE="MIT CC-BY-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos" -IUSE="oniguruma static-libs" - -ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/ -DEPEND=" - >=sys-devel/bison-3.0 - sys-devel/flex - oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] ) -" -RDEPEND=" - !static-libs? ( - oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] ) - ) -" - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch - "${FILESDIR}"/jq-1.6-runpath.patch - "${FILESDIR}"/jq-1.6-segfault-fix.patch - ) - use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; } - sed -i '/^dist_doc_DATA/d' Makefile.am || die - sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \ - configure.ac || 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 -i -e '/modules\/oniguruma/d' Makefile.am || die - rm -rf "${S}"/modules/oniguruma || die - - default - eautoreconf -} - -src_configure() { - local econfargs=( - # don't try to rebuild docs - --disable-docs - --disable-valgrind - --disable-maintainer-mode - --enable-rpathhack - $(use_enable static-libs static) - $(use_with oniguruma oniguruma yes) - ) - econf "${econfargs[@]}" -} - -src_test() { - if ! emake check; then - if [[ -r test-suite.log ]]; then - eerror "Tests failed, outputting testsuite log" - cat test-suite.log - fi - die "Tests failed" - fi -} - -src_install() { - local DOCS=( AUTHORS README.md ) - default - - use static-libs || { find "${D}" -name '*.la' -delete || die; } -} diff --git a/app-misc/jq/jq-1.7.ebuild b/app-misc/jq/jq-1.7.ebuild index 53771f0bb061..e2afba51c23a 100644 --- a/app-misc/jq/jq-1.7.ebuild +++ b/app-misc/jq/jq-1.7.ebuild @@ -14,7 +14,7 @@ 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" +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.9.3' # Keep this in sync with bundled modules/oniguruma/ diff --git a/app-misc/jq/jq-1.7_pre20201109-r1.ebuild b/app-misc/jq/jq-1.7_pre20201109-r1.ebuild deleted file mode 100644 index 6c0d7ed19c9b..000000000000 --- a/app-misc/jq/jq-1.7_pre20201109-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -COMMIT_HASH="a17dd3248a666d01be75f6b16be37e80e20b0954" - -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}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT_HASH}" - -LICENSE="MIT CC-BY-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" -IUSE="+oniguruma static-libs test" - -ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/ -DEPEND=" - >=sys-devel/bison-3.0 - sys-devel/flex - 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-runpath.patch - "${FILESDIR}"/jq-1.7-warnings.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 )" -REQUIRED_USE="test? ( oniguruma )" - -src_prepare() { - sed -e '/^dist_doc_DATA/d; s:-Wextra ::' -i Makefile.am || die - sed -r -e "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \ - -i configure.ac || 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 - eautoreconf -} - -src_configure() { - local econfargs=( - # don't try to rebuild docs - --disable-docs - --disable-valgrind - --disable-maintainer-mode - --enable-rpathhack - $(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 README.md ) - default - - use static-libs || { find "${D}" -name '*.la' -delete || die; } -} -- cgit v1.2.3