diff options
Diffstat (limited to 'dev-util')
1030 files changed, 16570 insertions, 18803 deletions
diff --git a/dev-util/FlameGraph/FlameGraph-1.0.ebuild b/dev-util/FlameGraph/FlameGraph-1.0.ebuild index dbf96c39df4..13949c99653 100644 --- a/dev-util/FlameGraph/FlameGraph-1.0.ebuild +++ b/dev-util/FlameGraph/FlameGraph-1.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -DESCRIPTION="Visualization of hierarchical data, especially pofiled stack traces" +DESCRIPTION="Visualization of hierarchical data, especially profiled stack traces" HOMEPAGE="https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph" if [[ ${PV} == "9999" ]]; then @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/brendangregg/FlameGraph.git" else SRC_URI="https://github.com/brendangregg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="CDDL" @@ -19,7 +19,7 @@ SLOT="0" RDEPEND=" dev-lang/perl - virtual/awk + app-alternatives/awk " src_test() { diff --git a/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild b/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild index e4e77ba0b9f..877d6bde3fd 100644 --- a/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild +++ b/dev-util/FlameGraph/FlameGraph-1.0_p20210830.ebuild @@ -3,7 +3,7 @@ EAPI=8 -DESCRIPTION="Visualization of hierarchical data, especially pofiled stack traces" +DESCRIPTION="Visualization of hierarchical data, especially profiled stack traces" HOMEPAGE="https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph" if [[ ${PV} == "9999" ]]; then @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/brendangregg/FlameGraph.git" else SRC_URI="https://dev.gentoo.org/~flow/distfiles/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="CDDL" @@ -19,7 +19,7 @@ SLOT="0" RDEPEND=" dev-lang/perl - virtual/awk + app-alternatives/awk " src_test() { diff --git a/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild new file mode 100644 index 00000000000..c868763cdb2 --- /dev/null +++ b/dev-util/FlameGraph/FlameGraph-1.0_p20220918.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Visualization of hierarchical data, especially profiled stack traces" +HOMEPAGE="https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/brendangregg/FlameGraph.git" +else + COMMIT_ID="d9fcc272b6a08c3e3e5b7919040f0ab5f8952d65" + SRC_URI="https://github.com/brendangregg/FlameGraph/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 x86" +fi + +LICENSE="CDDL" +SLOT="0" + +S="${WORKDIR}/${PN}-${COMMIT_ID}" + +RDEPEND=" + dev-lang/perl + app-alternatives/awk +" + +src_test() { + ./test.sh || die +} + +src_install() { + dobin *.pl *.awk + dodoc README.md +} diff --git a/dev-util/FlameGraph/FlameGraph-9999.ebuild b/dev-util/FlameGraph/FlameGraph-9999.ebuild index dbf96c39df4..f92d7b48e0a 100644 --- a/dev-util/FlameGraph/FlameGraph-9999.ebuild +++ b/dev-util/FlameGraph/FlameGraph-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -DESCRIPTION="Visualization of hierarchical data, especially pofiled stack traces" +DESCRIPTION="Visualization of hierarchical data, especially profiled stack traces" HOMEPAGE="https://www.brendangregg.com/flamegraphs.html https://github.com/brendangregg/FlameGraph" if [[ ${PV} == "9999" ]]; then @@ -19,7 +19,7 @@ SLOT="0" RDEPEND=" dev-lang/perl - virtual/awk + app-alternatives/awk " src_test() { diff --git a/dev-util/FlameGraph/Manifest b/dev-util/FlameGraph/Manifest index 681eee3ee05..c77239d3e72 100644 --- a/dev-util/FlameGraph/Manifest +++ b/dev-util/FlameGraph/Manifest @@ -1,2 +1,3 @@ DIST FlameGraph-1.0.tar.gz 1049627 BLAKE2B 4ac6669de754d5c17cd783a2f4aca956f48ef5f2d02740ee63c10629b940df70ea4ea66b8ea5ebbe3c1da5ca74987383ffd700409ce469ad43eedcb72d2e8a3c SHA512 0ae27fd14f76f0db7873a50079efb2bc4fd77ee6550700746b51eeee6813fbebb233d35d744e1b397734da9f89b25c4c0de3567f283cf1218ee7baee46e1b8e8 DIST FlameGraph-1.0_p20210830.tar.gz 1057405 BLAKE2B 75669be86ace6e6ccb30bd3883c77aef9a3b6e9c1d5d62e4d22f4090d9934a37fa083fe7783e4514f5439448c7d39d3f1c3b839170ac523e44a3bca71597463b SHA512 16769c1e3e907f0b53fd544a55eb3f580a2f1af55dd22b594d6aac9f4ffa881a2cdc6ddfc3599a6479eb127c1d3aefe0052dff1932553a2bdc377aa6f995f26c +DIST FlameGraph-1.0_p20220918.tar.gz 1061640 BLAKE2B 6d4b96a21eec5c5706e108f3e4314d75a38df8bf64e96d84caaf90c7021cff58384a42df65d6def555c1a242f44d347cd82ab2f3eea5c2cebb5f42f86e6e38cc SHA512 97d57a33f4759c122ec09fe421288b31cbd227c1d81b771c76379f33cd62e1e44f5ebbd1510483df18cf355cd3ddcfc44a7a47f9ae54f30ecdae34e776dc87f1 diff --git a/dev-util/FlameGraph/metadata.xml b/dev-util/FlameGraph/metadata.xml index a7fa285c747..8c039b3de60 100644 --- a/dev-util/FlameGraph/metadata.xml +++ b/dev-util/FlameGraph/metadata.xml @@ -5,4 +5,7 @@ <name>Florian Schmaus</name> <email>flow@gentoo.org</email> </maintainer> + <upstream> + <remote-id type="github">brendangregg/FlameGraph</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest index 188f74f482a..007198d377e 100644 --- a/dev-util/ROPgadget/Manifest +++ b/dev-util/ROPgadget/Manifest @@ -1,3 +1,2 @@ -DIST ROPgadget-6.9.gh.tar.gz 9903435 BLAKE2B de20400cc4b247a080ead3060c8790447e0d543e757975a17b5638ba9d5e44ff437a1f4a43731308427e92f9062c72b3e5bcdab68816f4e3ce19a849efc7d384 SHA512 c844a856e4185261fbd2b550c95439a7cfedf41c15fd988497b43c559264d266ebd3c684af705b539ed64f56526080313e1802f3cc6486a17d69439e0aa2a394 -DIST ROPgadget-7.0.gh.tar.gz 9903868 BLAKE2B 0e63dbffe6686ca0f92d8899e467f1e0db96d3c713711e8e4b8e6fb75ec9d9a37098d9192821f47ee30f4ed8ce58751ad1718f41685036a6e5d373d8b14bd197 SHA512 f4f6e0176b34a565bbdf7f720c1f937295c49d1b88485cfb9f2c1d48971b2a45bc32a6e50b372f959e5a2afe437a083f76abe9854ff66847c1e62c2d2499bfa1 DIST ROPgadget-7.1.gh.tar.gz 10092729 BLAKE2B dc06e99347987d9eb8b346a6a55599013b7d90b996cbd59f27721f26ce6e59a1ead7c0e3824fdb4fa4d215256d6ad378b2e6eec210561a217b2fa65b2efda169 SHA512 f86956108ba5f131a609026087d4d952cb106ed03e72b04844ae551bdf5902ff70b917bc7c2bcd256591142d4f03e3aef0ceca7ad0d325fb5663f892e27b4b70 +DIST ROPgadget-7.2.gh.tar.gz 10092747 BLAKE2B 1a1de7ce06115c8ffb377d3e7c77a268d3e9a158ed9255c02f954da4a0c32732f741e7ca081fa0b75b9a5dce2fa099b8548f26d248ed0285a2290f88dadc848d SHA512 cc3f87a4a331a3c7799f197b8a9056d1da85697a47c57d03cc080aa61d6c8a00775e7f972082f92451439c36ef9d820c982194464f02ec041b5bbeb97fa26f9a diff --git a/dev-util/ROPgadget/ROPgadget-7.0.ebuild b/dev-util/ROPgadget/ROPgadget-7.0.ebuild deleted file mode 100644 index b61e7d3fa99..00000000000 --- a/dev-util/ROPgadget/ROPgadget-7.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 - -DESCRIPTION="Search for gadgets in binaries to facilitate your ROP exploitation" -HOMEPAGE="https://shell-storm.org/project/ROPgadget/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget" -else - SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/capstone-5[python,${PYTHON_USEDEP}] -" - -src_test() { - pushd test-suite-binaries || die - ./test.sh || die - popd || die -} diff --git a/dev-util/ROPgadget/ROPgadget-7.1.ebuild b/dev-util/ROPgadget/ROPgadget-7.1.ebuild index 50c40c36f4b..ea1bc21225e 100644 --- a/dev-util/ROPgadget/ROPgadget-7.1.ebuild +++ b/dev-util/ROPgadget/ROPgadget-7.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget" else SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="GPL-2" diff --git a/dev-util/ROPgadget/ROPgadget-6.9.ebuild b/dev-util/ROPgadget/ROPgadget-7.2.ebuild index b61e7d3fa99..6067689e885 100644 --- a/dev-util/ROPgadget/ROPgadget-6.9.ebuild +++ b/dev-util/ROPgadget/ROPgadget-7.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget" else SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi LICENSE="GPL-2" diff --git a/dev-util/ROPgadget/ROPgadget-9999.ebuild b/dev-util/ROPgadget/ROPgadget-9999.ebuild index 50c40c36f4b..b69a2edcac5 100644 --- a/dev-util/ROPgadget/ROPgadget-9999.ebuild +++ b/dev-util/ROPgadget/ROPgadget-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" inherit distutils-r1 diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest index 3b51748fa90..643f4fe5816 100644 --- a/dev-util/Tensile/Manifest +++ b/dev-util/Tensile/Manifest @@ -1,4 +1,3 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c -DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47 -DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3 DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734 +DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80 diff --git a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild b/dev-util/Tensile/Tensile-4.3.0-r1.ebuild deleted file mode 100644 index 7cb7e94cd25..00000000000 --- a/dev-util/Tensile/Tensile-4.3.0-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 prefix - -DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" -HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile" -SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" -S="${WORKDIR}/${PN}-rocm-${PV}" - -LICENSE="MIT" -KEYWORDS="~amd64" -SLOT="0/$(ver_cut 1-2)" - -# Not compatible with recent versions of pytest -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/msgpack[${PYTHON_USEDEP}] - >=dev-util/rocm-smi-4.3.0 -" -DEPEND="${RDEPEND} - dev-util/hip:${SLOT} -" - -PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-4.3.0-hsaco-compile-specified-arch.patch - "${FILESDIR}"/${PN}-4.3.0-gfx1031.patch - "${FILESDIR}"/${PN}-4.3.0-fix-arch-parse.patch - "${FILESDIR}"/${PN}-4.3.0-use-ninja.patch - ) - -src_prepare() { - distutils-r1_src_prepare - eapply $(prefixify_ro "${FILESDIR}"/${PN}-4.3.0-gentoopath.patch) - - pushd ${PN} || die - - sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ - -i Source/cmake/FindROCmSMI.cmake || die - sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ - -i Source/CMakeLists.txt || die - sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on - sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die # ${Tensile_ROOT}/bin does not exists; call command directly - - local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\"" - sed -e "/HipClangVersion/s/0,0,0/$(hipconfig -v)/" \ - -e "/SourcePath/s,globalParameters\[\"ScriptPath\"\],${Tensile_share_dir}," \ - -i Common.py || die - - sed -e "/CMAKE_CXX_COMPILER/s,globalParameters\[\"ROCmBinPath\"\],\"${EPREFIX}/usr/lib/hip/bin\"," -i ClientExecutable.py || die - - sed -e "/scriptDir/s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir}," -i ReplacementKernels.py || die - - sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" -i ${PN}.py || die - - sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die - - popd || die - - sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die -} - -python_install() { - distutils-r1_python_install - - python_moduleinto Tensile - pushd Tensile || die - python_domodule Components - python_newexe Utilities/merge.py ${PN}-merge -} - -src_install() { - distutils-r1_src_install - - pushd ${PN} || die - insinto /usr/share/${PN} - doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source - insinto /usr/$(get_libdir)/cmake/${PN} - doins cmake/*.cmake -} diff --git a/dev-util/Tensile/Tensile-5.1.3.ebuild b/dev-util/Tensile/Tensile-5.1.3-r1.ebuild index f2a39a52dbb..3105b82b83a 100644 --- a/dev-util/Tensile/Tensile-5.1.3.ebuild +++ b/dev-util/Tensile/Tensile-5.1.3-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 llvm prefix -LLVM_MAX_SLOT=14 +LLVM_MAX_SLOT=15 DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile" @@ -23,10 +23,10 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" RDEPEND="${PYTHON_DEPS} + sys-devel/clang:${LLVM_MAX_SLOT} dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/msgpack[${PYTHON_USEDEP}] >=dev-util/rocm-smi-4.3.0 - >=sys-devel/clang-14.0.6-r1:${LLVM_MAX_SLOT}= " DEPEND="${RDEPEND} dev-util/hip diff --git a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild b/dev-util/Tensile/Tensile-5.4.2.ebuild index 22d3a6cee45..1e347fdcee5 100644 --- a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild +++ b/dev-util/Tensile/Tensile-5.4.2.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 prefix +inherit distutils-r1 llvm prefix + +LLVM_MAX_SLOT=15 DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile" -SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz - https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/${P}-PR1419.patch.gz" +SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" S="${WORKDIR}/${PN}-rocm-${PV}" LICENSE="MIT" @@ -21,27 +22,28 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" RDEPEND="${PYTHON_DEPS} + sys-devel/clang:${LLVM_MAX_SLOT} dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/msgpack[${PYTHON_USEDEP}] >=dev-util/rocm-smi-4.3.0 " DEPEND="${RDEPEND} - dev-util/hip:= + dev-util/hip " PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch - "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch - "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch - "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch - "${FILESDIR}"/${PN}-5.0.2-adjust-parallel.patch - "${WORKDIR}"/${PN}-5.0.2-PR1419.patch + "${FILESDIR}"/${PN}-5.4.2-gfx1031.patch + "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch + "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch ) CMAKE_USE_DIR="${WORKDIR}/Source" src_prepare() { distutils-r1_src_prepare - eapply $(prefixify_ro "${FILESDIR}"/${PN}-5.0.2-gentoopath.patch) + sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" \ + "${FILESDIR}"/${PN}-5.4.2-gentoopath.patch > "${S}"/gentoopath.patch || die + eapply $(prefixify_ro "${S}"/gentoopath.patch) pushd ${PN} || die @@ -50,12 +52,15 @@ src_prepare() { sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ -i Source/CMakeLists.txt || die sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on - sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die # ${Tensile_ROOT}/bin does not exists; call command directly + + # ${Tensile_ROOT}/bin does not exists; call command directly + sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\"" - sed -e "/HipClangVersion/s/0,0,0/$(hipconfig -v)/" -i Common.py || die + sed -e "/HipClangVersion/s/0.0.0/$(hipconfig -v)/" -i Common.py || die - sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" -i ReplacementKernels.py Common.py ${PN}.py || die + sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" \ + -i ReplacementKernels.py Common.py ${PN}.py || die sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die diff --git a/dev-util/Tensile/files/Tensile-4.3.0-fix-arch-parse.patch b/dev-util/Tensile/files/Tensile-4.3.0-fix-arch-parse.patch deleted file mode 100644 index 01b94b32cb6..00000000000 --- a/dev-util/Tensile/files/Tensile-4.3.0-fix-arch-parse.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: Tensile-rocm-4.3.0/Tensile/Tensile.py -=================================================================== ---- Tensile-rocm-4.3.0.orig/Tensile/Tensile.py -+++ Tensile-rocm-4.3.0/Tensile/Tensile.py -@@ -97,7 +97,6 @@ def addCommonArguments(argParser): - """ - - (key, value) = par.split("=") -- value = eval(value) - return (key, value) - - argParser.add_argument("-d", "--device", dest="device", type=int, \ diff --git a/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch b/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch deleted file mode 100644 index da135e3b38e..00000000000 --- a/dev-util/Tensile/files/Tensile-4.3.0-gentoopath.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: Tensile-rocm-4.3.0/Tensile/Source/client/CMakeLists.txt -=================================================================== ---- Tensile-rocm-4.3.0.orig/Tensile/Source/client/CMakeLists.txt -+++ Tensile-rocm-4.3.0/Tensile/Source/client/CMakeLists.txt -@@ -50,3 +50,5 @@ endif() - foreach(arch IN LISTS TENSILE_GPU_ARCHS) - target_link_libraries(tensile_client PRIVATE "--amdgpu-target=${arch}") - endforeach(arch) -+ -+target_link_libraries(tensile_client PRIVATE LLVMSupport) -Index: Tensile-rocm-4.3.0/Tensile/Source/lib/CMakeLists.txt -=================================================================== ---- Tensile-rocm-4.3.0.orig/Tensile/Source/lib/CMakeLists.txt -+++ Tensile-rocm-4.3.0/Tensile/Source/lib/CMakeLists.txt -@@ -48,7 +48,7 @@ set(tensile_sources ${tensile_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) -Index: Tensile-rocm-4.3.0/Tensile/Common.py -=================================================================== ---- Tensile-rocm-4.3.0.orig/Tensile/Common.py -+++ Tensile-rocm-4.3.0/Tensile/Common.py -@@ -1667,7 +1667,7 @@ def assignGlobalParameters( config ): - else: - print2(" %24s: %8s (unspecified)" % (key, defaultValue)) - -- globalParameters["ROCmPath"] = "/opt/rocm" -+ globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr" - if "ROCM_PATH" in os.environ: - globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH") - if "TENSILE_ROCM_PATH" in os.environ: -Index: Tensile-rocm-4.3.0/Tensile/ClientWriter.py -=================================================================== ---- Tensile-rocm-4.3.0.orig/Tensile/ClientWriter.py -+++ Tensile-rocm-4.3.0/Tensile/ClientWriter.py -@@ -284,7 +284,7 @@ def getBuildNewClientLibraryScript(build - import io - runScriptFile = io.StringIO() - -- callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary" -+ callCreateLibraryCmd = "TensileCreateLibrary" - - - if globalParameters["MergeFiles"]: -Index: Tensile-rocm-4.3.0/Tensile/GenerateSummations.py -=================================================================== ---- Tensile-rocm-4.3.0.orig/Tensile/GenerateSummations.py -+++ Tensile-rocm-4.3.0/Tensile/GenerateSummations.py -@@ -57,7 +57,7 @@ def createLibraryForBenchmark(logicPath, - Selection. - """ - -- pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary") -+ pythonExePath = "TensileCreateLibrary" - args = [pythonExePath, \ - "--merge-files", "--no-legacy-components", \ - "--new-client-only", "--no-short-file-names", "--no-library-print-debug", "--architecture=all", \ diff --git a/dev-util/Tensile/files/Tensile-4.3.0-gfx1031.patch b/dev-util/Tensile/files/Tensile-4.3.0-gfx1031.patch deleted file mode 100644 index 99abceb7c44..00000000000 --- a/dev-util/Tensile/files/Tensile-4.3.0-gfx1031.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- Tensile-rocm-4.3.0/pytest.ini 2021-04-22 22:35:33.000000000 +0800 -+++ Tensile-rocm-4.3.0/pytest.ini 2021-09-30 17:32:21.382806851 +0800 -@@ -88,6 +88,7 @@ - xfail-gfx1011: architecture - xfail-gfx1012: architecture - xfail-gfx1030: architecture -+ xfail-gfx1031: architecture - skip-gfx000: architecture - skip-gfx900: architecture - skip-gfx906: architecture -@@ -97,3 +98,4 @@ - skip-gfx1011: architecture - skip-gfx1012: architecture - skip-gfx1030: architecture -+ skip-gfx1031: architecture ---- Tensile-rocm-4.3.0/Tensile/Common.py 2021-10-05 14:41:22.490754124 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Common.py 2021-09-30 17:33:19.041724015 +0800 -@@ -200,7 +200,7 @@ - globalParameters["MergeFiles"] = True # F=store every solution and kernel in separate file; T=store all solutions in single file - - globalParameters["MaxFileName"] = 64 # If a file name would be longer than this, shorten it with a hash. -+globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0),(10,3,1)] # assembly kernels writer supports these architectures --globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0)] # assembly kernels writer supports these architectures - - globalParameters["GenerateManifestAndExit"] = False # Output manifest file with list of expected library objects and exit - globalParameters["ClientBuildPath"] = "0_Build" # subdirectory for host code build directory -@@ -265,7 +265,7 @@ - 'gfx906':'vega20', 'gfx906:xnack+':'vega20', 'gfx906:xnack-':'vega20', - 'gfx908':'arcturus','gfx908:xnack+':'arcturus', 'gfx908:xnack-':'arcturus', - 'gfx90a':'aldebaran', 'gfx90a:xnack+':'aldebaran', 'gfx90a:xnack-':'aldebaran', -+ 'gfx1010':'navi10', 'gfx1011':'navi11', 'gfx1012':'navi12', 'gfx1030':'navi21', 'gfx1031':'navi22', -- 'gfx1010':'navi10', 'gfx1011':'navi11', 'gfx1012':'navi12', 'gfx1030':'navi21' - } - - def getArchitectureName(gfxName): ---- Tensile-rocm-4.3.0/Tensile/KernelWriterAssembly.py 2021-04-22 22:35:33.000000000 +0800 -+++ Tensile-rocm-4.3.0/Tensile/KernelWriterAssembly.py 2021-09-30 17:27:06.696711144 +0800 -@@ -2257,7 +2257,7 @@ - - # integer i8x4 - elif kernel["ProblemType"]["DataType"].isInt8x4(): -+ if self.version == (9,0,6) or self.version == (9,0,8) or self.version == (9,0,10) or self.version == (10,3,0) or self.version == (10,3,1): -- if self.version == (9,0,6) or self.version == (9,0,8) or self.version == (9,0,10) or self.version == (10,3,0): - for b in range(0, kernel["ThreadTile1"]): - for a in range(0, kernel["ThreadTile0"]): - for iui in range(0, innerUnroll): ---- Tensile-rocm-4.3.0/Tensile/Source/CMakeLists.txt 2021-04-22 22:35:33.000000000 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Source/CMakeLists.txt 2021-09-30 17:29:12.846345541 +0800 -@@ -51,7 +51,7 @@ - endif() - - if(CMAKE_CXX_COMPILER STREQUAL "hipcc") -+ set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 CACHE STRING "GPU architectures") -- set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 CACHE STRING "GPU architectures") - else() - set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906 gfx908 gfx90a CACHE STRING "GPU architectures") - endif() -@@ -104,7 +104,7 @@ - set_property( CACHE Tensile_CODE_OBJECT_VERSION PROPERTY STRINGS V2 V3) - set_property( CACHE Tensile_COMPILER PROPERTY STRINGS hipcc) - set(Tensile_ARCHITECTURE all CACHE STRING "Which GPU architecture to use") -+ set_property( CACHE Tensile_ARCHITECTURE PROPERTY STRINGS all gfx000 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1031) -- set_property( CACHE Tensile_ARCHITECTURE PROPERTY STRINGS all gfx000 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030) - set_property( CACHE Tensile_LIBRARY_FORMAT PROPERTY STRINGS yaml msgpack) - - message( STATUS "Tensile_CODE_OBJECT_VERSION from Tensile/Source/CMakeLists.txt: ${Tensile_CODE_OBJECT_VERSION}") -@@ -206,7 +206,7 @@ - ${Tensile_RUNTIME_LANGUAGE} # HIP or OCL - ${Tensile_COMPILER} # hipcc - ${Tensile_CODE_OBJECT_VERSION} # V2 or V3 -+ ${Tensile_ARCHITECTURE} # all, gfx000, gfx803, gfx900, gfx906:xnack-, gfx908:xnack-, gfx90a:xnack-, gfx1010, gfx1011, gfx1012, gfx1030, gfx1031 -- ${Tensile_ARCHITECTURE} # all, gfx000, gfx803, gfx900, gfx906:xnack-, gfx908:xnack-, gfx90a:xnack-, gfx1010, gfx1011, gfx1012, gfx1030 - ${Tensile_LIBRARY_FORMAT} # yaml or msgpack - ${Tensile_MERGE_FILES} # ON or OFF - ${Tensile_SHORT_FILE_NAMES} # ON or OFF ---- Tensile-rocm-4.3.0/Tensile/Source/lib/include/Tensile/AMDGPU.hpp 2021-04-22 22:35:33.000000000 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Source/lib/include/Tensile/AMDGPU.hpp 2021-09-30 17:48:11.277066515 +0800 -@@ -62,7 +62,8 @@ - gfx1010 = 1010, - gfx1011 = 1011, - gfx1012 = 1012, -+ gfx1030 = 1030, -+ gfx1031 = 1031 -- gfx1030 = 1030 - }; - - AMDGPU(); ---- Tensile-rocm-4.3.0/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp 2021-04-22 22:35:33.000000000 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp 2021-09-30 17:31:26.075845249 +0800 -@@ -215,6 +215,7 @@ - iot::enumCase(io, value, "gfx1011", AMDGPU::Processor::gfx1011); - iot::enumCase(io, value, "gfx1012", AMDGPU::Processor::gfx1012); - iot::enumCase(io, value, "gfx1030", AMDGPU::Processor::gfx1030); -+ iot::enumCase(io, value, "gfx1031", AMDGPU::Processor::gfx1031); - } - }; - } // namespace Serialization ---- Tensile-rocm-4.3.0/Tensile/Source/lib/source/AMDGPU.cpp 2021-04-22 22:35:33.000000000 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Source/lib/source/AMDGPU.cpp 2021-09-30 17:31:45.195486318 +0800 -@@ -82,6 +82,8 @@ - return stream << "gfx1012"; - case AMDGPU::Processor::gfx1030: - return stream << "gfx1030"; -+ case AMDGPU::Processor::gfx1031: -+ return stream << "gfx1031"; - } - return stream; - } ---- Tensile-rocm-4.3.0/Tensile/Source/TensileCreateLibrary.cmake 2021-04-22 22:35:33.000000000 +0800 -+++ Tensile-rocm-4.3.0/Tensile/Source/TensileCreateLibrary.cmake 2021-09-30 17:29:24.766121912 +0800 -@@ -138,7 +138,7 @@ - add_library(Tensile ${options} ${Tensile_SOURCE_FILES}) - # specify gpu targets - if( Tensile_ARCHITECTURE MATCHES "all" ) -+ set( Tensile_HIP_ISA "gfx803" "gfx900" "gfx906" "gfx908" "gfx1010" "gfx1011" "gfx1012" "gfx1030", "gfx1031") -- set( Tensile_HIP_ISA "gfx803" "gfx900" "gfx906" "gfx908" "gfx1010" "gfx1011" "gfx1012" "gfx1030") - else() - set( Tensile_HIP_ISA ${Tensile_ARCHITECTURE}) - endif() diff --git a/dev-util/Tensile/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch b/dev-util/Tensile/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch deleted file mode 100644 index 8e6753781a2..00000000000 --- a/dev-util/Tensile/files/Tensile-4.3.0-hsaco-compile-specified-arch.patch +++ /dev/null @@ -1,96 +0,0 @@ -https://github.com/ROCmSoftwarePlatform/Tensile/issues/1395 -https://github.com/ROCmSoftwarePlatform/Tensile/pull/1398 - ---- a/Tensile/TensileCreateLibrary.py -+++ b/Tensile/TensileCreateLibrary.py -@@ -136,6 +136,35 @@ def which(p): - return candidate - return None - -+def splitArchs(): -+ # Helper for architecture -+ def isSupported(arch): -+ return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ -+ globalParameters["AsmCaps"][arch]["SupportedSource"] -+ -+ if ";" in globalParameters["Architecture"]: -+ wantedArchs = globalParameters["Architecture"].split(";") -+ else: -+ wantedArchs = globalParameters["Architecture"].split("_") -+ archs = [] -+ cmdlineArchs = [] -+ if "all" in wantedArchs: -+ for arch in globalParameters['SupportedISA']: -+ if isSupported(arch): -+ if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): -+ if (arch == (9,0,10)): -+ archs += [gfxName(arch) + '-xnack+'] -+ cmdlineArchs += [gfxName(arch) + ':xnack+'] -+ archs += [gfxName(arch) + '-xnack-'] -+ cmdlineArchs += [gfxName(arch) + ':xnack-'] -+ else: -+ archs += [gfxName(arch)] -+ cmdlineArchs += [gfxName(arch)] -+ else: -+ for arch in wantedArchs: -+ archs += [re.sub(":", "-", arch)] -+ cmdlineArchs += [arch] -+ return archs, cmdlineArchs - - def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile): - buildPath = ensurePath(os.path.join(globalParameters['WorkingPath'], 'code_object_tmp')) -@@ -149,24 +178,8 @@ def buildSourceCodeObjectFile(CxxCompiler, outputPath, kernelFile): - objectFilename = base + '.o' - soFilename = base + '.so' - -- def isSupported(arch): -- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ -- globalParameters["AsmCaps"][arch]["SupportedSource"] -- - if (CxxCompiler == "hipcc"): -- archs = [] -- cmdlineArchs = [] -- for arch in globalParameters['SupportedISA']: -- if isSupported(arch): -- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): -- if (arch == (9,0,10)): -- archs += [gfxName(arch) + '-xnack+'] -- cmdlineArchs += [gfxName(arch) + ':xnack+'] -- archs += [gfxName(arch) + '-xnack-'] -- cmdlineArchs += [gfxName(arch) + ':xnack-'] -- else: -- archs += [gfxName(arch)] -- cmdlineArchs += [gfxName(arch)] -+ archs, cmdlineArchs = splitArchs() - - archFlags = ['--offload-arch=' + arch for arch in cmdlineArchs] - -@@ -1063,11 +1076,6 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl - sourceKernels = list([k for k in kernels if k['KernelLanguage'] == 'Source']) - asmKernels = list([k for k in kernels if k['KernelLanguage'] == 'Assembly']) - -- # Helper for architecture -- def isSupported(arch): -- return globalParameters["AsmCaps"][arch]["SupportedISA"] and \ -- globalParameters["AsmCaps"][arch]["SupportedSource"] -- - # Build a list of kernel object names. - for kernel in sourceKernels: - sourceKernelNames += [kernelWriterSource.getKernelFileBase(kernel)] -@@ -1081,15 +1089,7 @@ def buildObjectFileNames(solutionWriter, kernelWriterSource, kernelWriterAssembl - - # Source based kernels are built for all supported architectures - if (cxxCompiler == 'hipcc'): -- sourceArchs = [] -- for arch in globalParameters['SupportedISA']: -- if isSupported(arch): -- if (arch == (9,0,6) or arch == (9,0,8) or arch == (9,0,10)): -- if (arch == (9,0,10)): -- sourceArchs += [gfxName(arch) + '-xnack+'] -- sourceArchs += [gfxName(arch) + '-xnack-'] -- else: -- sourceArchs += [gfxName(arch)] -+ sourceArchs, _ = splitArchs() - else: - raise RuntimeError("Unknown compiler %s" % cxxCompiler) - diff --git a/dev-util/Tensile/files/Tensile-4.3.0-use-ninja.patch b/dev-util/Tensile/files/Tensile-4.3.0-use-ninja.patch deleted file mode 100644 index 6645efd72fb..00000000000 --- a/dev-util/Tensile/files/Tensile-4.3.0-use-ninja.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: Tensile-rocm-4.3.0/Tensile/ClientExecutable.py -=================================================================== ---- Tensile-rocm-4.3.0.orig/Tensile/ClientExecutable.py -+++ Tensile-rocm-4.3.0/Tensile/ClientExecutable.py -@@ -36,6 +36,7 @@ class CMakeEnvironment: - - args = ['cmake'] - args += itertools.chain.from_iterable([ ['-D', '{}={}'.format(key, value)] for key,value in self.options.items()]) -+ args += itertools.chain.from_iterable([ ['-G', 'Ninja'], [ '-D', 'CMAKE_EXPORT_COMPILE_COMMANDS=ON' ] ]) - args += [self.sourceDir] - - Common.print2(' '.join(args)) -@@ -43,7 +44,7 @@ class CMakeEnvironment: - subprocess.check_call(args, cwd=Common.ensurePath(self.buildDir)) - - def build(self): -- args = ['make', '-j'] -+ args = ['ninja'] - Common.print2(' '.join(args)) - with Common.ClientExecutionLock(): - subprocess.check_call(args, cwd=self.buildDir) diff --git a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch b/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch deleted file mode 100644 index b96429232c7..00000000000 --- a/dev-util/Tensile/files/Tensile-5.0.2-adjust-parallel.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 25b1621549f9b120462988913e657684645be79d Mon Sep 17 00:00:00 2001 -From: Lee Ringham <lringham@amd.com> -Date: Tue, 2 Nov 2021 14:43:07 -0600 -Subject: [PATCH] Added better control of parallelism to control memory usage - ---- - Tensile/Source/TensileCreateLibrary.cmake | 7 +++++-- - Tensile/cmake/TensileConfig.cmake | 5 +++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/Tensile/Source/TensileCreateLibrary.cmake b/Tensile/Source/TensileCreateLibrary.cmake -index 1dbacf41df..996f365bcf 100644 ---- a/Tensile/Source/TensileCreateLibrary.cmake -+++ b/Tensile/Source/TensileCreateLibrary.cmake -@@ -33,7 +33,8 @@ function(TensileCreateLibraryCmake - Tensile_LIBRARY_FORMAT - Tensile_MERGE_FILES - Tensile_SHORT_FILE_NAMES -- Tensile_LIBRARY_PRINT_DEBUG ) -+ Tensile_LIBRARY_PRINT_DEBUG -+ Tensile_CPU_THREADS ) - - # make Tensile_PACKAGE_LIBRARY and optional parameter - # to avoid breaking applications which us this -@@ -51,6 +52,7 @@ function(TensileCreateLibraryCmake - message(STATUS "Tensile_COMPILER from TensileCreateLibraryCmake : ${Tensile_COMPILER}") - message(STATUS "Tensile_ARCHITECTURE from TensileCreateLibraryCmake : ${Tensile_ARCHITECTURE}") - message(STATUS "Tensile_LIBRARY_FORMAT from TensileCreateLibraryCmake : ${Tensile_LIBRARY_FORMAT}") -+ message(STATUS "Tensile_CPU_THREADS from TensileCreateLibraryCmake : ${Tensile_CPU_THREADS}") - - #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/TensileCreateLibrary) - #execute_process(COMMAND chmod 755 ${Tensile_ROOT}/bin/Tensile) -@@ -89,7 +91,8 @@ function(TensileCreateLibraryCmake - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--code-object-version=${Tensile_CODE_OBJECT_VERSION}") - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--cxx-compiler=${Tensile_COMPILER}") - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--library-format=${Tensile_LIBRARY_FORMAT}") -- -+ set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} "--jobs=${Tensile_CPU_THREADS}") -+ - # TensileLibraryWriter positional arguments - set(Tensile_CREATE_COMMAND ${Tensile_CREATE_COMMAND} - ${Tensile_LOGIC_PATH} -diff --git a/Tensile/cmake/TensileConfig.cmake b/Tensile/cmake/TensileConfig.cmake -index 0ac8517c2c..fa8cb96305 100644 ---- a/Tensile/cmake/TensileConfig.cmake -+++ b/Tensile/cmake/TensileConfig.cmake -@@ -112,6 +112,7 @@ function(TensileCreateLibraryFiles - LIBRARY_FORMAT - TENSILE_ROOT - VAR_PREFIX -+ CPU_THREADS - ) - - # Multi value settings -@@ -184,6 +185,10 @@ function(TensileCreateLibraryFiles - set(Options ${Options} "--cmake-cxx-compiler=${Tensile_COMPILER_PATH}") - endif() - -+ if(Tensile_CPU_THREADS) -+ set(Options ${Options} "--jobs=${Tensile_CPU_THREADS}") -+ endif() -+ - if(Tensile_LIBRARY_FORMAT) - set(Options ${Options} "--library-format=${Tensile_LIBRARY_FORMAT}") - if(Tensile_LIBRARY_FORMAT MATCHES "yaml") diff --git a/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch deleted file mode 100644 index b8b59af5184..00000000000 --- a/dev-util/Tensile/files/Tensile-5.0.2-gentoopath.patch +++ /dev/null @@ -1,75 +0,0 @@ -Fix incorrect path in scripts and CMakeLists, in order to build tensile_client -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Source/client/CMakeLists.txt -+++ Tensile-rocm-5.0.2/Tensile/Source/client/CMakeLists.txt -@@ -56,3 +56,5 @@ endif() - foreach(arch IN LISTS TENSILE_GPU_ARCHS) - target_link_libraries(tensile_client PRIVATE "--amdgpu-target=${arch}") - endforeach(arch) -+ -+target_link_libraries(tensile_client PRIVATE LLVMSupport) -Index: Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Source/lib/CMakeLists.txt -+++ Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt -@@ -47,7 +47,7 @@ set(tensile_sources ${tensile_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) -Index: Tensile-rocm-5.0.2/Tensile/Common.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/Common.py -+++ Tensile-rocm-5.0.2/Tensile/Common.py -@@ -1873,7 +1873,7 @@ def assignGlobalParameters( config ): - else: - print2(" %24s: %8s (unspecified)" % (key, defaultValue)) - -- globalParameters["ROCmPath"] = "/opt/rocm" -+ globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr" - if "ROCM_PATH" in os.environ: - globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH") - if "TENSILE_ROCM_PATH" in os.environ: -Index: Tensile-rocm-5.0.2/Tensile/ClientWriter.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/ClientWriter.py -+++ Tensile-rocm-5.0.2/Tensile/ClientWriter.py -@@ -205,7 +205,7 @@ def getBuildClientLibraryScript(buildPat - import io - runScriptFile = io.StringIO() - -- callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary" -+ callCreateLibraryCmd = "TensileCreateLibrary" - - - if globalParameters["MergeFiles"]: -Index: Tensile-rocm-5.0.2/Tensile/GenerateSummations.py -=================================================================== ---- Tensile-rocm-5.0.2.orig/Tensile/GenerateSummations.py -+++ Tensile-rocm-5.0.2/Tensile/GenerateSummations.py -@@ -57,7 +57,7 @@ def createLibraryForBenchmark(logicPath, - Selection. - """ - -- pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary") -+ pythonExePath = "TensileCreateLibrary" - args = [pythonExePath, \ - "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \ - "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \ -Index: Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt -=================================================================== ---- Tensile-rocm-5.0.2.orig/HostLibraryTests/CMakeLists.txt -+++ Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt -@@ -135,7 +135,7 @@ set(test_sources ${test_sources} - ) - - if(TENSILE_USE_LLVM) -- find_package(LLVM 13.0 QUIET CONFIG) -+ find_package(LLVM PATHS @GENTOO_PORTAGE_EPREFIX@/usr/lib/llvm/roc QUIET CONFIG) - if(NOT LLVM_FOUND) - find_package(LLVM 12.0 QUIET CONFIG) - if(NOT LLVM_FOUND) diff --git a/dev-util/Tensile/files/Tensile-5.4.2-fix-arch-parse.patch b/dev-util/Tensile/files/Tensile-5.4.2-fix-arch-parse.patch new file mode 100644 index 00000000000..14263e89ef8 --- /dev/null +++ b/dev-util/Tensile/files/Tensile-5.4.2-fix-arch-parse.patch @@ -0,0 +1,12 @@ +Index: Tensile-rocm-5.3.3/Tensile/Tensile.py +=================================================================== +--- Tensile-rocm-5.3.3.orig/Tensile/Tensile.py ++++ Tensile-rocm-5.3.3/Tensile/Tensile.py +@@ -101,7 +101,6 @@ def addCommonArguments(argParser): + Allows the --global-parameters option to specify any parameters from the command line. + """ + (key, value) = par.split("=") +- value = eval(value) + return (key, value) + + argParser.add_argument("-d", "--device", dest="device", type=int, \ diff --git a/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch new file mode 100644 index 00000000000..2aed8082de0 --- /dev/null +++ b/dev-util/Tensile/files/Tensile-5.4.2-gentoopath.patch @@ -0,0 +1,67 @@ +Fix incorrect path in scripts and CMakeLists, in order to build tensile_client +=================================================================== +Index: Tensile-rocm-5.4.2/Tensile/Source/lib/CMakeLists.txt +=================================================================== +--- Tensile-rocm-5.4.2.orig/Tensile/Source/lib/CMakeLists.txt ++++ Tensile-rocm-5.4.2/Tensile/Source/lib/CMakeLists.txt +@@ -51,7 +51,7 @@ set(tensile_sources ${tensile_sources} + ) + + if(TENSILE_USE_LLVM) +- find_package(LLVM 13.0 QUIET CONFIG) ++ find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG) + if(NOT LLVM_FOUND) + find_package(LLVM 12.0 QUIET CONFIG) + if(NOT LLVM_FOUND) +Index: Tensile-rocm-5.4.2/Tensile/Common.py +=================================================================== +--- Tensile-rocm-5.4.2.orig/Tensile/Common.py ++++ Tensile-rocm-5.4.2/Tensile/Common.py +@@ -1950,7 +1950,7 @@ def assignGlobalParameters( config ): + else: + print2(" %24s: %8s (unspecified)" % (key, defaultValue)) + +- globalParameters["ROCmPath"] = "/opt/rocm" ++ globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr" + if "ROCM_PATH" in os.environ: + globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH") + if "TENSILE_ROCM_PATH" in os.environ: +Index: Tensile-rocm-5.4.2/Tensile/ClientWriter.py +=================================================================== +--- Tensile-rocm-5.4.2.orig/Tensile/ClientWriter.py ++++ Tensile-rocm-5.4.2/Tensile/ClientWriter.py +@@ -180,7 +180,7 @@ def runClient(libraryLogicPath, forBench + def getBuildClientLibraryScript(buildPath, libraryLogicPath): + callCreateLibraryCmd = ["python"] if os.name == "nt" else [] + +- callCreateLibraryCmd += [os.path.join(globalParameters["ScriptPath"] , "bin", "TensileCreateLibrary")] ++ callCreateLibraryCmd += "TensileCreateLibrary" + + if globalParameters["MergeFiles"]: + callCreateLibraryCmd += ["--merge-files"] +Index: Tensile-rocm-5.4.2/Tensile/GenerateSummations.py +=================================================================== +--- Tensile-rocm-5.4.2.orig/Tensile/GenerateSummations.py ++++ Tensile-rocm-5.4.2/Tensile/GenerateSummations.py +@@ -59,7 +59,7 @@ def createLibraryForBenchmark(logicPath, + Selection. + """ + +- pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary") ++ pythonExePath = "TensileCreateLibrary" + args = [pythonExePath, \ + "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \ + "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \ +Index: Tensile-rocm-5.4.2/HostLibraryTests/CMakeLists.txt +=================================================================== +--- Tensile-rocm-5.4.2.orig/HostLibraryTests/CMakeLists.txt ++++ Tensile-rocm-5.4.2/HostLibraryTests/CMakeLists.txt +@@ -139,7 +139,7 @@ set(test_sources ${test_sources} + ) + + if(TENSILE_USE_LLVM) +- find_package(LLVM 13.0 QUIET CONFIG) ++ find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG) + if(NOT LLVM_FOUND) + find_package(LLVM 12.0 QUIET CONFIG) + if(NOT LLVM_FOUND) diff --git a/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch b/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch new file mode 100644 index 00000000000..1f703c07c3e --- /dev/null +++ b/dev-util/Tensile/files/Tensile-5.4.2-gfx1031.patch @@ -0,0 +1,88 @@ +Index: Tensile-rocm-5.3.3/pytest.ini +=================================================================== +--- Tensile-rocm-5.3.3.orig/pytest.ini ++++ Tensile-rocm-5.3.3/pytest.ini +@@ -88,6 +88,7 @@ markers = + xfail-gfx1011: architecture + xfail-gfx1012: architecture + xfail-gfx1030: architecture ++ xfail-gfx1031: architecture + xfail-gfx1100: architecture + xfail-gfx1101: architecture + xfail-gfx1102: architecture +@@ -100,6 +101,7 @@ markers = + skip-gfx1011: architecture + skip-gfx1012: architecture + skip-gfx1030: architecture ++ skip-gfx1031: architecture + skip-gfx1100: architecture + skip-gfx1101: architecture + skip-gfx1102: architecture +Index: Tensile-rocm-5.3.3/Tensile/Common.py +=================================================================== +--- Tensile-rocm-5.3.3.orig/Tensile/Common.py ++++ Tensile-rocm-5.3.3/Tensile/Common.py +@@ -201,7 +201,7 @@ globalParameters["MergeFiles"] = True + globalParameters["NumMergedFiles"] = 1 # The number of files that kernels should be split between when merging + + globalParameters["MaxFileName"] = 64 # If a file name would be longer than this, shorten it with a hash. +-globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0), (11,0,0), (11,0,1), (11,0,2)] # assembly kernels writer supports these architectures ++globalParameters["SupportedISA"] = [(8,0,3), (9,0,0), (9,0,6), (9,0,8), (9,0,10), (10,1,0), (10,1,1), (10,1,2), (10,3,0), (10,3,1), (11,0,0), (11,0,1), (11,0,2)] # assembly kernels writer supports these architectures + + globalParameters["GenerateManifestAndExit"] = False # Output manifest file with list of expected library objects and exit + globalParameters["NewClient"] = 2 # Old client deprecated: NewClient must be set to 2. +@@ -271,7 +271,7 @@ architectureMap = { + 'gfx906':'vega20', 'gfx906:xnack+':'vega20', 'gfx906:xnack-':'vega20', + 'gfx908':'arcturus','gfx908:xnack+':'arcturus', 'gfx908:xnack-':'arcturus', + 'gfx90a':'aldebaran', 'gfx90a:xnack+':'aldebaran', 'gfx90a:xnack-':'aldebaran', +- 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', ++ 'gfx1010':'navi10', 'gfx1011':'navi12', 'gfx1012':'navi14', 'gfx1030':'navi21', 'gfx1031':'navi22', + 'gfx1100':'navi31', 'gfx1101':'navi32', 'gfx1102':'navi33' + } + +Index: Tensile-rocm-5.3.3/Tensile/Source/CMakeLists.txt +=================================================================== +--- Tensile-rocm-5.3.3.orig/Tensile/Source/CMakeLists.txt ++++ Tensile-rocm-5.3.3/Tensile/Source/CMakeLists.txt +@@ -51,7 +51,7 @@ if(NOT DEFINED CXX_VERSION_STRING) + endif() + + if(CMAKE_CXX_COMPILER STREQUAL "hipcc") +- set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") ++ set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906:xnack- gfx908:xnack- gfx90a:xnack- gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") + else() + set(TENSILE_GPU_ARCHS gfx803 gfx900 gfx906 gfx908 gfx90a gfx1010 gfx1011 gfx1012 gfx1030 gfx1100 gfx1101 gfx1102 CACHE STRING "GPU architectures") + endif() +Index: Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/AMDGPU.hpp +=================================================================== +--- Tensile-rocm-5.3.3.orig/Tensile/Source/lib/include/Tensile/AMDGPU.hpp ++++ Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/AMDGPU.hpp +@@ -63,6 +63,7 @@ namespace Tensile + gfx1011 = 1011, + gfx1012 = 1012, + gfx1030 = 1030, ++ gfx1031 = 1031, + gfx1100 = 1100, + gfx1101 = 1101, + gfx1102 = 1102 +@@ -90,6 +91,8 @@ namespace Tensile + return "gfx1012"; + case AMDGPU::Processor::gfx1030: + return "gfx1030"; ++ case AMDGPU::Processor::gfx1031: ++ return "gfx1032"; + case AMDGPU::Processor::gfx1100: + return "gfx1100"; + case AMDGPU::Processor::gfx1101: +Index: Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp +=================================================================== +--- Tensile-rocm-5.3.3.orig/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp ++++ Tensile-rocm-5.3.3/Tensile/Source/lib/include/Tensile/Serialization/Predicates.hpp +@@ -215,6 +215,7 @@ namespace Tensile + iot::enumCase(io, value, "gfx1011", AMDGPU::Processor::gfx1011); + iot::enumCase(io, value, "gfx1012", AMDGPU::Processor::gfx1012); + iot::enumCase(io, value, "gfx1030", AMDGPU::Processor::gfx1030); ++ iot::enumCase(io, value, "gfx1031", AMDGPU::Processor::gfx1031); + iot::enumCase(io, value, "gfx1100", AMDGPU::Processor::gfx1100); + iot::enumCase(io, value, "gfx1101", AMDGPU::Processor::gfx1101); + iot::enumCase(io, value, "gfx1102", AMDGPU::Processor::gfx1102); diff --git a/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch b/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch new file mode 100644 index 00000000000..f88bf00665c --- /dev/null +++ b/dev-util/Tensile/files/Tensile-5.4.2-use-ninja.patch @@ -0,0 +1,21 @@ +Index: Tensile-rocm-5.4.2/Tensile/ClientExecutable.py +=================================================================== +--- Tensile-rocm-5.4.2.orig/Tensile/ClientExecutable.py ++++ Tensile-rocm-5.4.2/Tensile/ClientExecutable.py +@@ -44,6 +44,7 @@ class CMakeEnvironment: + args = ['cmake'] + args += ['-G', 'Ninja'] if (os.name == 'nt') else [] + args += itertools.chain.from_iterable([ ['-D{}={}'.format(key, value)] for key,value in self.options.items()]) ++ args += itertools.chain.from_iterable([ ['-G', 'Ninja'], [ '-D', 'CMAKE_EXPORT_COMPILE_COMMANDS=ON' ] ]) + args += [self.sourceDir] + args = [cmake_path(arg) for arg in args] + +@@ -53,7 +54,7 @@ class CMakeEnvironment: + subprocess.check_output(args, stderr=subprocess.STDOUT, cwd=Common.ensurePath(self.buildDir)) + + def build(self): +- args = [('ninja' if (os.name == "nt") else 'make'), f'-j{CPUThreadCount()}'] ++ args = [('ninja'), f'-j{CPUThreadCount()}'] + Common.print2(' '.join(args)) + with Common.ClientExecutionLock(): + # change to use check_output to force windows cmd block util command finish diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index 5a4c631218d..ce460cffc27 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -1,6 +1,2 @@ -DIST android-tools-31.0.3-disable-werror-boringssl.patch 1815 BLAKE2B 63e911ba27e2995a11b27e2e1501c5e881d694c5477a216cb910bf1c9c1bf9f9fedffa864748ea4df668a1008124501f7815997304bc355e4ee105bf9b61f75f SHA512 db626d3680ec9f18be394bb2720c8bc7e380aac227ae6f1058476edb83784343f653afc583b06e7a2acd3f2ff500fa37d613d5efca4a9a24daedbf61b5b84015 -DIST android-tools-31.0.3-install-e2fsdroid-ext2simg.patch 2164 BLAKE2B 7f0b43ff5ae820101628399540f3e5b87bf69224f4a61a6b76b8b6b3b06f8e7162a6c1e7ee43eee928cfa96824f5efff72317b4bbfe160d8e72d96aa84e0a1d6 SHA512 d5fd63c108ca6b880b1b79cf362468335f19fad7bf2042fb667b56e34dc95acc47e1bf9c9e72be1d2bd8252a529cd49eb030d141bf735524bdaeb85482d544a9 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423 -DIST android-tools-31.0.3.tar.xz 25768908 BLAKE2B e8ca8ff93fcd3936f447926769d7b45194dd96ad99cddd570183a1cbae34dbf49a23e0c53d9eb8f5c25dd09717e1f160829752dc7ebc9404c804b48de8de9889 SHA512 d2c16325b190f77a8ffa38de18ae1aea4bf6848926620f25d14873dc4a3fda3fe2b13349fa2eee197b960ca65738a4a1d2c1f28cf8286ab79e73502e7a8e6357 -DIST android-tools-31.0.3p2.tar.xz 22458776 BLAKE2B a51f839ac44e6e998092d802eb182566f4dc2a7f47a5687e0c877fa4fa6d419b16054f75066a6afe8e458e44f8bc5750ca88a2517619379d1044202d64b2ec80 SHA512 367a502c11a136ff15a060df44df14ceec46eb5eb386babb4d38783622e363421d2ec9a65a5810fb8f2b308912c2bdb980e6fce24ba532a111e413647efe67d5 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71 diff --git a/dev-util/android-tools/android-tools-31.0.3.ebuild b/dev-util/android-tools/android-tools-31.0.3.ebuild deleted file mode 100644 index bb938d9eeee..00000000000 --- a/dev-util/android-tools/android-tools-31.0.3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit cmake python-r1 - -DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" -HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/" - -MY_PV="${PV//_/}" -SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz - https://dev.gentoo.org/~zmedico/dist/${P}-no-gtest.patch - https://dev.gentoo.org/~zmedico/dist/${P}-install-e2fsdroid-ext2simg.patch - https://dev.gentoo.org/~zmedico/dist/${P}-disable-werror-boringssl.patch -" -S="${WORKDIR}/${PN}-${MY_PV}" - -# The entire source code is Apache-2.0, except for fastboot which is BSD-2. -LICENSE="Apache-2.0 BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# dev-libs/libpcre only required for e2fsdroid -DEPEND=" - app-arch/brotli:= - app-arch/lz4:= - app-arch/zstd:= - dev-libs/libpcre2:= - >=dev-libs/protobuf-3.0.0:= - sys-libs/zlib:= - virtual/libusb:1= -" -RDEPEND="${DEPEND} - python? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-lang/go -" - -DOCS=() - -src_prepare() { - eapply "${DISTDIR}/${P}-no-gtest.patch" - cd "${S}/vendor/core" || die - eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch" - cd "${S}/vendor/libziparchive" || die - eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch" - cd "${S}" - eapply "${DISTDIR}/${P}-install-e2fsdroid-ext2simg.patch" - eapply "${DISTDIR}/${P}-disable-werror-boringssl.patch" - cd "${S}/vendor/boringssl" || die - eapply "${S}/patches/boringssl/0011-Disable-Werror.patch" - cd "${S}" - rm -r patches || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - # Statically link the bundled boringssl - -DBUILD_SHARED_LIBS=OFF - ) - cmake_src_configure -} - -src_compile() { - export GOCACHE="${T}/go-build" - export GOFLAGS="-mod=vendor" - cmake_src_compile -} - -src_install() { - cmake_src_install - use python && python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg - docinto adb - dodoc vendor/adb/*.{txt,TXT} - docinto fastboot - dodoc vendor/core/fastboot/README.md -} diff --git a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild b/dev-util/android-tools/android-tools-31.0.3_p2.ebuild deleted file mode 100644 index a67df1447ce..00000000000 --- a/dev-util/android-tools/android-tools-31.0.3_p2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7..11} ) - -inherit cmake python-r1 - -DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)" -HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/" - -MY_PV="${PV//_/}" -SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz - https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch -" -S="${WORKDIR}/${PN}-${MY_PV}" - -# The entire source code is Apache-2.0, except for fastboot which is BSD-2. -LICENSE="Apache-2.0 BSD-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~x86-linux" -IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# dev-libs/libpcre only required for e2fsdroid -DEPEND=" - app-arch/brotli:= - app-arch/lz4:= - app-arch/zstd:= - dev-libs/libpcre2:= - >=dev-libs/protobuf-3.0.0:= - sys-libs/zlib:= - virtual/libusb:1= -" -RDEPEND="${DEPEND} - python? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-lang/go -" - -DOCS=() - -src_prepare() { - eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch" - cd "${S}/vendor/core" || die - eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch" - cd "${S}/vendor/libziparchive" || die - eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch" - cd "${S}" - rm -r patches || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - # Statically link the bundled boringssl - -DBUILD_SHARED_LIBS=OFF - ) - cmake_src_configure -} - -src_compile() { - export GOCACHE="${T}/go-build" - export GOFLAGS="-mod=vendor" - cmake_src_compile -} - -src_install() { - cmake_src_install - rm "${ED}/usr/bin/mkbootimg" || die - rm "${ED}/usr/bin/unpack_bootimg" || die - rm "${ED}/usr/bin/repack_bootimg" || die - if use python; then - python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg - python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg - python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg - fi - docinto adb - dodoc vendor/adb/*.{txt,TXT} - docinto fastboot - dodoc vendor/core/fastboot/README.md -} diff --git a/dev-util/android-tools/android-tools-33.0.3.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild index 412e78a5f80..155cf7f10a4 100644 --- a/dev-util/android-tools/android-tools-33.0.3.ebuild +++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-r1 @@ -19,8 +19,8 @@ S="${WORKDIR}/${PN}-${MY_PV}" # The entire source code is Apache-2.0, except for fastboot which is BSD-2. LICENSE="Apache-2.0 BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x86-linux" -IUSE="python" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="python udev" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # dev-libs/libpcre only required for e2fsdroid @@ -34,21 +34,30 @@ DEPEND=" virtual/libusb:1= " RDEPEND="${DEPEND} + udev? ( dev-util/android-udev-rules ) python? ( ${PYTHON_DEPS} ) " BDEPEND=" dev-lang/go + dev-lang/perl " DOCS=() src_prepare() { eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch" + cd "${S}/vendor/core" || die eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch" + cd "${S}/vendor/libziparchive" || die eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch" - cd "${S}" + + cd "${S}/vendor/adb" || die + eapply "${FILESDIR}/${P}-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch" + eapply "${FILESDIR}/${P}-adb-gcc-13.patch" + + cd "${S}" || die rm -r patches || die cmake_src_prepare } diff --git a/dev-util/android-tools/files/android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch b/dev-util/android-tools/files/android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch new file mode 100644 index 00000000000..25572574d83 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch @@ -0,0 +1,120 @@ +https://github.com/anatol/android-tools/blob/2f8405a47909861c9359fe4797e7b4a0fba4dc12/patches/adb/0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch +https://github.com/nmeum/android-tools/issues/74 +https://bugs.gentoo.org/876328 + +From c830c90995fc0877348e2ed9cdeccf9b739138d2 Mon Sep 17 00:00:00 2001 +From: Anatol Pomozov <anatol.pomozov@gmail.com> +Date: Mon, 10 Oct 2022 10:47:57 -0700 +Subject: [PATCH] Update usage of usbdevfs_urb to match new kernel UAPI +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Linux kernel API has been changed by commit 94dfc73e7cf4 ("treewide: uapi: Replace zero-length arrays with flexible-array members") +where zero-length array iso_frame_desc in struct usbdevfs_urb was replaced with a proper flexible-array member. + +Current USB API usage causes a compilation error at Linux 6.0: + +In file included from /home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:28: +/usr/include/linux/usbdevice_fs.h:134:41: error: flexible array member ‘usbdevfs_urb::iso_frame_desc’ not at end of ‘struct usb_handle’ + 134 | struct usbdevfs_iso_packet_desc iso_frame_desc[]; + | ^~~~~~~~~~~~~~ +/home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:76:18: note: next member ‘usbdevfs_urb usb_handle::urb_out’ declared here + 76 | usbdevfs_urb urb_out; + | ^~~~~~~ +/home/mae/.cache/kiss/proc/121205/build/android-tools/vendor/adb/client/usb_linux.cpp:61:8: note: in the definition of ‘struct usb_handle’ + 61 | struct usb_handle { + | ^~~~~~~~~~ + +Fix it by using pointers to a struct with flexible-array members. +Current fix works both with the old and the new API. + +See https://github.com/nmeum/android-tools/issues/74 for more context. + +Tested: built on Linux against kernel 5.19 and 6.0; 'adb shell' over USB +cable +Acked-by: Gustavo A. R. Silva gustavoars@kernel.org +Change-Id: I7f0f7b35d9a3ab980d3520b541b60c7857a6b101 +Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> +--- a/client/usb_linux.cpp ++++ b/client/usb_linux.cpp +@@ -71,8 +71,8 @@ struct usb_handle { + unsigned zero_mask; + unsigned writeable = 1; + +- usbdevfs_urb urb_in; +- usbdevfs_urb urb_out; ++ usbdevfs_urb *urb_in; ++ usbdevfs_urb *urb_out; + + bool urb_in_busy = false; + bool urb_out_busy = false; +@@ -303,7 +303,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) { + std::unique_lock<std::mutex> lock(h->mutex); + D("++ usb_bulk_write ++"); + +- usbdevfs_urb* urb = &h->urb_out; ++ usbdevfs_urb* urb = h->urb_out; + memset(urb, 0, sizeof(*urb)); + urb->type = USBDEVFS_URB_TYPE_BULK; + urb->endpoint = h->ep_out; +@@ -342,7 +342,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { + std::unique_lock<std::mutex> lock(h->mutex); + D("++ usb_bulk_read ++"); + +- usbdevfs_urb* urb = &h->urb_in; ++ usbdevfs_urb* urb = h->urb_in; + memset(urb, 0, sizeof(*urb)); + urb->type = USBDEVFS_URB_TYPE_BULK; + urb->endpoint = h->ep_in; +@@ -387,7 +387,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { + } + D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length); + +- if (out == &h->urb_in) { ++ if (out == h->urb_in) { + D("[ reap urb - IN complete ]"); + h->urb_in_busy = false; + if (urb->status != 0) { +@@ -396,7 +396,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { + } + return urb->actual_length; + } +- if (out == &h->urb_out) { ++ if (out == h->urb_out) { + D("[ reap urb - OUT compelete ]"); + h->urb_out_busy = false; + h->cv.notify_all(); +@@ -500,10 +500,10 @@ void usb_kick(usb_handle* h) { + ** but this ensures that a reader blocked on REAPURB + ** will get unblocked + */ +- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in); +- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out); +- h->urb_in.status = -ENODEV; +- h->urb_out.status = -ENODEV; ++ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in); ++ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out); ++ h->urb_in->status = -ENODEV; ++ h->urb_out->status = -ENODEV; + h->urb_in_busy = false; + h->urb_out_busy = false; + h->cv.notify_all(); +@@ -519,6 +519,8 @@ int usb_close(usb_handle* h) { + + D("-- usb close %p (fd = %d) --", h, h->fd); + ++ delete h->urb_in; ++ delete h->urb_out; + delete h; + + return 0; +@@ -572,6 +574,8 @@ static void register_device(const char* dev_name, const char* dev_path, unsigned + usb->ep_out = ep_out; + usb->zero_mask = zero_mask; + usb->max_packet_size = max_packet_size; ++ usb->urb_in = new usbdevfs_urb; ++ usb->urb_out = new usbdevfs_urb; + + // Initialize mark so we don't get garbage collected after the device scan. + usb->mark = true; diff --git a/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch new file mode 100644 index 00000000000..4ba2c9a49c3 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/875575 +https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2399311 + +From ddffab649b12dce1502d63711836b58d007f6a28 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Mon, 23 Jan 2023 23:09:52 +0100 +Subject: [PATCH] Fix build with gcc 13 by including <cstdint> + +Like other versions before, gcc 13 moved some includes around and as a +result <cstdint> is no longer transitively included. Explicitly include +it for uint{32,64}_t. + +Test: local build +Change-Id: I05a27726b05427c486fd01b013dba4d698abac97 +--- a/file_sync_protocol.h ++++ b/file_sync_protocol.h +@@ -16,6 +16,8 @@ + + #pragma once + ++#include <cstdint> ++ + #define MKID(a, b, c, d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) + + #define ID_LSTAT_V1 MKID('S', 'T', 'A', 'T') diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest new file mode 100644 index 00000000000..cf87be6e22f --- /dev/null +++ b/dev-util/android-udev-rules/Manifest @@ -0,0 +1,2 @@ +DIST android-udev-rules-20220903.tar.gz 21009 BLAKE2B 4f0375b574f123e7cbd18658582568f85e3278e9fe2b673e6c9193a16845737afc99d82d0df2f6a8d0daf784132e7d523bdf767761a5d467a66bf89f86cc1046 SHA512 ca09a1b49b6cbc7df2b8c6bea1e6fcf4886938c8567002054222795493bea036e3c5a139939e43cb965d45a8ecf74c0715583ef1aade2b7783751a75ab34d540 +DIST android-udev-rules-20230104.tar.gz 21266 BLAKE2B bbae83511b1fa5e94a50ae3cc44920862de30873304c0a904b4f9d3796296deff419c05db5d716cc89587c3a7ae7a302b2b219564e452564c5f3bf092e7515af SHA512 dcc45755a5a20a74d2241b398dba0e65135bf9c5539396bd6a3415b15fd865f4d3134de53de1ae2019ffe9567c557b5a386fdfe0245107b29c234a2211e0a211 diff --git a/dev-util/android-udev-rules/android-udev-rules-20220903.ebuild b/dev-util/android-udev-rules/android-udev-rules-20220903.ebuild new file mode 100644 index 00000000000..1c1b12e6503 --- /dev/null +++ b/dev-util/android-udev-rules/android-udev-rules-20220903.ebuild @@ -0,0 +1,39 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit udev + +DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net" +HOMEPAGE="https://github.com/M0Rf30/android-udev-rules" +SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" + +RDEPEND=" + acct-group/android + virtual/udev +" + +src_prepare() { + default + + # Use the pre-existing android group + sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die +} + +src_install() { + udev_dorules 51-android.rules + einstalldocs +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/dev-util/android-udev-rules/android-udev-rules-20230104.ebuild b/dev-util/android-udev-rules/android-udev-rules-20230104.ebuild new file mode 100644 index 00000000000..12572552f91 --- /dev/null +++ b/dev-util/android-udev-rules/android-udev-rules-20230104.ebuild @@ -0,0 +1,39 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit udev + +DESCRIPTION="Android udev rules list aimed to be the most comprehensive on the net" +HOMEPAGE="https://github.com/M0Rf30/android-udev-rules" +SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND=" + acct-group/android + virtual/udev +" + +src_prepare() { + default + + # Use the pre-existing android group + sed -i 's/GROUP="adbusers"/GROUP="android"/' 51-android.rules || die +} + +src_install() { + udev_dorules 51-android.rules + einstalldocs +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} diff --git a/dev-util/android-udev-rules/metadata.xml b/dev-util/android-udev-rules/metadata.xml new file mode 100644 index 00000000000..6fe12059e54 --- /dev/null +++ b/dev-util/android-udev-rules/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>parona@protonmail.com</email> + <name>Alfred Wingate</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">M0Rf30/android-udev-rules</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-util/apitrace/apitrace-9.0-r3.ebuild b/dev-util/apitrace/apitrace-9.0-r3.ebuild index 1faadb28629..1801bf98678 100644 --- a/dev-util/apitrace/apitrace-9.0-r3.ebuild +++ b/dev-util/apitrace/apitrace-9.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit cmake-multilib multilib python-single-r1 DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs" diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest index 19683662880..f203c768e6f 100644 --- a/dev-util/aruba/Manifest +++ b/dev-util/aruba/Manifest @@ -1,4 +1,3 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e -DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4 -DIST aruba-1.1.2.tar.gz 132680 BLAKE2B 328c012eccfb988eec280a102da94150d1811fc67816c09aa2b94f1b6a06ca68e21cd4612e87fba089f4eb9f3b90716cfe121bda306936eeb53019cec539e651 SHA512 58f658c118fe83ddfbb6c361ab3ce6ae5e6084e4233dba62350eba1c911d8ad0558d1ca604206691d097a48453d608042bd992730b92971cdd3d2475d8f6ca4e DIST aruba-2.0.0.tar.gz 132762 BLAKE2B b06190d3a1698c5a2d295df16096b2bd587c60a9c428d35e8ad24204b71b7a3d86f5b52a5f601f57204903412508faad3d4032f1499d78a309a99df63e8a68e5 SHA512 214de8dd3dd29b46ddac2605bab5008ac9d9755eef53c140aea5f160aba60ed9ac71ac5e1410f59700ddd8a506faedf6b54d99682c875faeaecbb47ad8660435 +DIST aruba-2.1.0.tar.gz 130073 BLAKE2B 534bc67cbc4b5871a1bc6e37170586b3a5829e70d611dde9fe130a4cfdce98044c1a3fe29de961419a605eb4bbe8e21b8efb52a61aa8a2d2b2b9fa7e42bd3169 SHA512 f30d67ba94157eaf0477a09f4049174ff0cd6195b92c4121117775e56502178525eb5a7f69148e7f5531d6d4e67f4ecd9d840e693c38340a10819a19247021fa diff --git a/dev-util/aruba/aruba-1.0.3-r1.ebuild b/dev-util/aruba/aruba-1.0.3-r1.ebuild deleted file mode 100644 index c9d582ff382..00000000000 --- a/dev-util/aruba/aruba-1.0.3-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -USE_RUBY="ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_RECIPE_TEST="cucumber" -RUBY_FAKEGEM_RECIPE_DOC="none" -RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" -RUBY_FAKEGEM_BINDIR="exe" - -RUBY_FAKEGEM_GEMSPEC="aruba.gemspec" - -inherit ruby-fakegem - -DESCRIPTION="Cucumber steps for driving out command line applications" -HOMEPAGE="https://github.com/cucumber/aruba" -SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="MIT" - -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" -SLOT="$(ver_cut 1)" -IUSE="" - -DEPEND="${DEPEND} test? ( sys-devel/bc )" -RDEPEND="${RDEPEND}" - -ruby_add_rdepend " - >=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5 - >=dev-ruby/contracts-0.16.0:0 - >=dev-ruby/ffi-1.9 - >=dev-ruby/rspec-expectations-3.4:3 - dev-ruby/thor:1 - >=dev-util/cucumber-2.4 <dev-util/cucumber-6" - -ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )" - -all_ruby_prepare() { - # Remove bundler-related code. - sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die - rm Gemfile || die - - sed -i -e '/simplecov/I s:^:#:' \ - -e '/Before/,/^end/ s:^:#:' \ - spec/spec_helper.rb features/support/env.rb || die - rm -f features/support/simplecov_setup.rb || die - - sed -e "s:_relative ': './:" \ - -e 's/git ls-files -z/find -print0/' \ - -i ${RUBY_FAKEGEM_GEMSPEC} || die - - # Avoid features with minor output differences - sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die - sed -i -e '/Failed detection of exact multi-line output/i@wip' features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature || die - sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die - -} - -each_ruby_test() { - RSPEC_VERSION=3 ruby-ng_rspec - RUBYLIB="$(pwd)/lib" ruby-ng_cucumber -} diff --git a/dev-util/aruba/aruba-1.1.2-r1.ebuild b/dev-util/aruba/aruba-2.1.0.ebuild index 0d5d922bf2a..08d6587bf10 100644 --- a/dev-util/aruba/aruba-1.1.2-r1.ebuild +++ b/dev-util/aruba/aruba-2.1.0.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -USE_RUBY="ruby26 ruby27" +EAPI=8 +USE_RUBY="ruby27 ruby30 ruby31" RUBY_FAKEGEM_RECIPE_TEST="cucumber" RUBY_FAKEGEM_RECIPE_DOC="none" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" +RUBY_FAKEGEM_BINDIR="exe" RUBY_FAKEGEM_GEMSPEC="aruba.gemspec" @@ -17,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/aruba" SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" SLOT="$(ver_cut 1)" IUSE="" @@ -27,17 +28,18 @@ RDEPEND="${RDEPEND}" ruby_add_rdepend " =dev-ruby/bundler-2* >=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5 - >=dev-ruby/contracts-0.16.0:0 <dev-ruby/contracts-0.18:0 + >=dev-ruby/contracts-0.16.0 <dev-ruby/contracts-0.18 >=dev-ruby/rspec-expectations-3.4:3 dev-ruby/thor:1 - >=dev-util/cucumber-2.4 <dev-util/cucumber-7" + >=dev-util/cucumber-2.4 <dev-util/cucumber-9 + !<dev-util/aruba-1.1.2-r1" ruby_add_bdepend "test? ( dev-ruby/pry dev-ruby/rspec:3 )" all_ruby_prepare() { # Remove bundler-related code. sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die - rm Gemfile || die + #rm Gemfile || die sed -i -e '/simplecov/I s:^:#:' \ -e '/Before/,/^end/ s:^:#:' \ @@ -46,11 +48,12 @@ all_ruby_prepare() { sed -e 's:_relative ": "./:' \ -e 's/git ls-files -z/find * -print0/' \ + -e '/\(pry-doc\|rake-manifest\|rubocop\|yard-junk\)/ s:^:#:' \ -i ${RUBY_FAKEGEM_GEMSPEC} || die # Avoid features with minor output differences - sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die - sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die + sed -i -e '/Use .aruba. with .Minitest./i\ @wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die + sed -i -e '/Create files for Minitest/i\ @wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die # Avoid feature that requires aruba to be installed already rm -r features/03_testing_frameworks/cucumber/disable_bundler.feature || die @@ -58,5 +61,5 @@ all_ruby_prepare() { each_ruby_test() { RSPEC_VERSION=3 ruby-ng_rspec - RUBYLIB="$(pwd)/lib" ruby-ng_cucumber + RUBYLIB="$(pwd)/lib" ruby-ng_cucumber --tags "not @wip" } diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest index a5baf609566..80f3b13b602 100644 --- a/dev-util/astyle/Manifest +++ b/dev-util/astyle/Manifest @@ -1,2 +1 @@ -DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2 diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild deleted file mode 100644 index 7396f1662f6..00000000000 --- a/dev-util/astyle/astyle-3.0.1-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2 - -DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code" -HOMEPAGE="http://astyle.sourceforge.net/" -SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz" - -LICENSE="MIT" -SLOT="0/3.0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="examples java static-libs" - -DEPEND="app-arch/xz-utils - java? ( >=virtual/jdk-1.6:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}" - -src_prepare() { - if use java ; then - java-pkg-opt-2_src_prepare - sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \ - -e "s:ar crs:$(tc-getAR) crs:" \ - -i build/gcc/Makefile || die - else - default - fi -} - -src_configure() { - append-cxxflags -std=c++11 - tc-export CXX - default -} - -src_compile() { - # ../build/clang/Makefile is identical except for CXX line. - emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \ - ${PN} \ - shared \ - $(usev java) \ - $(usex static-libs static '') -} - -src_install() { - doheader src/${PN}.h - - pushd src/bin >/dev/null || die - dobin ${PN} - - local libastylename="lib${PN}.so.${PV}" - local libastylejname="lib${PN}j.so.${PV}" - local libdestdir="${EPREFIX}/usr/$(get_libdir)" - - dolib.so "${libastylename}" - dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)" - dosym "${libastylename}" "${libdestdir}/lib${PN}.so" - if use java ; then - dolib.so "${libastylejname}" - dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)" - dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so" - fi - if use static-libs ; then - dolib.a lib${PN}.a - fi - popd >/dev/null || die - if use examples ; then - docinto examples - dodoc -r file/. - docompress -x /usr/share/doc/${PF}/examples - fi - local HTML_DOCS=( doc/. ) - einstalldocs -} - -pkg_postinst() { - if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then - elog "Artistic Style 3.0 introduces new configuration verbiage more fitting" - elog "for modern use. Some options that were valid in 2.06 or older are now" - elog "deprecated. For more information, consult astyle's release notes at" - elog "http://astyle.sourceforge.net/news.html. To view offline, see:" - elog - elog "${EROOT%/}/usr/share/doc/${P}/html" - fi -} diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild index 7f30eabb7a3..82c533c6d7d 100644 --- a/dev-util/astyle/astyle-3.1-r2.ebuild +++ b/dev-util/astyle/astyle-3.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit flag-o-matic toolchain-funcs versionator java-pkg-opt-2 +inherit flag-o-matic toolchain-funcs java-pkg-opt-2 DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code" HOMEPAGE="http://astyle.sourceforge.net/" @@ -57,11 +57,11 @@ src_install() { local libdestdir="/usr/$(get_libdir)" dolib.so "${libastylename}" - dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(get_major_version)" + dosym "${libastylename}" "${libdestdir}/lib${PN}.so.$(ver_cut 1)" dosym "${libastylename}" "${libdestdir}/lib${PN}.so" if use java ; then dolib.so "${libastylejname}" - dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(get_major_version)" + dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so.$(ver_cut 1)" dosym "${libastylejname}" "${libdestdir}/lib${PN}j.so" fi if use static-libs ; then @@ -76,14 +76,3 @@ src_install() { local HTML_DOCS=( doc/. ) einstalldocs } - -pkg_postinst() { - if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then - elog "Artistic Style 3.0 introduces new configuration verbiage more fitting" - elog "for modern use. Some options that were valid in 2.06 or older are now" - elog "deprecated. For more information, consult astyle's release notes at" - elog "http://astyle.sourceforge.net/news.html. To view offline, see:" - elog - elog "${EROOT%/}/usr/share/doc/${P}/html" - fi -} diff --git a/dev-util/b2/Manifest b/dev-util/b2/Manifest index 1879967af9e..38bd7479eb2 100644 --- a/dev-util/b2/Manifest +++ b/dev-util/b2/Manifest @@ -1 +1 @@ -DIST b2-4.9.2.tar.gz 975882 BLAKE2B 83c2ef85c9f1ae20922541ca8c344316f1660ee069426e3a9907c0a19e1c94db470c67d0c29a1f31788eddb86ab414ab06b9713f8ea53d974d1d8f0ca29f4aa5 SHA512 eab180770608b863dcf6a5fbc626e1733cf4353cf62f4189bd28258a03591fdb7853f5dddb4d3dad60f1bb06db5415025b792a30c2c65f7b1278f61e33f903e3 +DIST b2-4.9.3.tar.gz 975934 BLAKE2B 8d16e7227676786408f0d84efb577806e304a9181b89656dad1243b5b0b48e67d4226fa51ea97d4ea10110e4ea86f3ae2884d711fa4b04e36bdaa68dff0a4710 SHA512 8f861074a50720ad5469277a469523ef5f87ef2aab65d745f4c5e6af0ed8f40af91c43cd42b7845982c065974026ce1ecc77a831cd0c698c7e22fa848cc81009 diff --git a/dev-util/b2/b2-4.9.2.ebuild b/dev-util/b2/b2-4.9.3.ebuild index d099df235ed..a61edf4131e 100644 --- a/dev-util/b2/b2-4.9.2.ebuild +++ b/dev-util/b2/b2-4.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="examples" RESTRICT="test" @@ -24,7 +24,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.9.2-disable_python_rpath.patch "${FILESDIR}"/${PN}-4.9.2-darwin-gentoo-toolchain.patch "${FILESDIR}"/${PN}-4.9.2-add-none-feature-options.patch - "${FILESDIR}"/${PN}-4.9.2-respect-user-flags.patch "${FILESDIR}"/${PN}-4.9.2-no-implicit-march-flags.patch "${FILESDIR}"/${PN}-4.9.2-odr.patch ) @@ -36,7 +35,10 @@ src_configure() { src_compile() { cd engine || die - edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python + + # upstream doesn't want separate flags for CPPFLAGS/LDFLAGS + # https://github.com/bfgroup/b2/pull/187#issuecomment-1335688424 + edo ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}" -d+2 --without-python } src_test() { diff --git a/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch b/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch deleted file mode 100644 index b0de4f0e885..00000000000 --- a/dev-util/b2/files/b2-4.9.2-respect-user-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/engine/build.sh -+++ b/engine/build.sh -@@ -496,7 +496,7 @@ modules/set.cpp \ - if test_true ${B2_DEBUG_OPT} ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" - else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" - fi -- ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 ) -+ ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${CPPFLAGS} ${B2_CXXFLAGS} ${LDFLAGS} ${B2_SOURCES} -o b2 ) - } - - if test_true ${B2_VERBOSE_OPT} ; then diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest index 45327d4db02..cafe6ecb85f 100644 --- a/dev-util/bats/Manifest +++ b/dev-util/bats/Manifest @@ -1,3 +1 @@ -DIST bats-1.5.0.tar.gz 108052 BLAKE2B 68bba9d263e4206ead7039da2b09c5211c834445efdf429dca6c53acc5409de1052ce7ffa9143e732d3aeaeb6ea6dcaf9b419adc02776e601545557dea776e36 SHA512 e0386fb32214db67ae001a2040c44277988af7fa909a820843237c7d47eedfa4e370238d5b2d06a4667b874cad4b00f2cd14624b1bc45628192e5d693bd5073a -DIST bats-1.7.0.tar.gz 124590 BLAKE2B eab244f018ec568c280d20540013eaa9e5a8d84ead8e23b9db2f8d18bbd7ebd43c60ab38cee008e0d016a219f16aa6f52733d5f891ffb8733ca8576a5738dd22 SHA512 22ca033e004087cabf645417ea184d2e1a0704575f702a94de5b63b3af6d1fd4caaecad86a5cb49687c606728d875dd13b4d5de66599b83324980fdc71cb92e2 -DIST bats-1.8.0.tar.gz 144262 BLAKE2B 4f12d4c5211535f11a3cbc856233a59e0c3bcd892c6f021055458960b450f908f3b865cee38ad2c2569be41ab81e2fdb973003be85890f70f8894c8a17812b42 SHA512 e51ea85bf2f455881a90220d783b4a261bd91331326a7184eb31ea9adf31c18a79a062fd77af12d082ccef953d992382ec19ca9a27395b2a03c4a9a120bdda76 +DIST bats-1.8.2.tar.gz 143952 BLAKE2B 0c2302f2c77f5ee0446a6559355d24fae8bb2f178b5b17778fea44ec2f069c061c2930814f73e56671bf6f7cea44a74cea9b6436ca80941a1747197ccddcec02 SHA512 7eace32f19789e081112af1ce8ab33ff210d52bd3ea84962bbec226349b3b8d8912b6a495f5524f9cc7cfe692f1d23d684c93c24e182752e2b30731670d6eeea diff --git a/dev-util/bats/bats-1.7.0.ebuild b/dev-util/bats/bats-1.7.0.ebuild deleted file mode 100644 index 5115a8c8133..00000000000 --- a/dev-util/bats/bats-1.7.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing optfeature - -MY_PN="bats-core" -DESCRIPTION="Bats-core: Bash Automated Testing System" -HOMEPAGE="https://github.com/bats-core/bats-core/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" - -DEPEND="app-shells/bash:*" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_test() { - local my_jobs=$(makeopts_jobs) - if ! command -v parallel >/dev/null; then - my_jobs=1 - fi - bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed" -} - -src_install() { - exeinto /usr/libexec/${MY_PN} - doexe libexec/${MY_PN}/* - exeinto /usr/lib/${MY_PN} - doexe lib/${MY_PN}/* - dobin bin/${PN} - - dodoc README.md - doman man/${PN}.1 man/${PN}.7 -} - -pkg_postinst() { - optfeature "Parallel Execution" sys-process/parallel -} diff --git a/dev-util/bats/bats-1.8.0.ebuild b/dev-util/bats/bats-1.8.0.ebuild deleted file mode 100644 index d42eecab71c..00000000000 --- a/dev-util/bats/bats-1.8.0.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing optfeature - -MY_PN="bats-core" -DESCRIPTION="Bats-core: Bash Automated Testing System" -HOMEPAGE="https://github.com/bats-core/bats-core/" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" - -DEPEND="app-shells/bash:*" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_test() { - local my_jobs=$(makeopts_jobs) - if ! command -v parallel >/dev/null; then - my_jobs=1 - fi - bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed" -} - -src_install() { - exeinto /usr/libexec/${MY_PN} - doexe libexec/${MY_PN}/* - exeinto /usr/lib/${MY_PN} - doexe lib/${MY_PN}/* - dobin bin/${PN} - - dodoc README.md - doman man/${PN}.1 man/${PN}.7 -} - -pkg_postinst() { - optfeature "Parallel Execution" sys-process/parallel -} diff --git a/dev-util/bats/bats-1.5.0.ebuild b/dev-util/bats/bats-1.8.2.ebuild index 250afc44096..10513ea9e56 100644 --- a/dev-util/bats/bats-1.5.0.ebuild +++ b/dev-util/bats/bats-1.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 hppa ~ppc ppc64 ~riscv ~sparc x86" DEPEND="app-shells/bash:*" RDEPEND="${DEPEND}" diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest index 4182cf2b0f1..1a96cdd89df 100644 --- a/dev-util/bazel/Manifest +++ b/dev-util/bazel/Manifest @@ -2,3 +2,4 @@ DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302 DIST bazel-4.2.2-dist.zip 279304631 BLAKE2B 2a32838e50b63c4b6400aced10085c6c9aacf28641ea555a44b9c4ed8991fc29658b4d420b26179e8eed0e00cfe7391e8eec84c7851f17493c74d1c5682427af SHA512 123f73dc87053e37705bb729f82bd722d6d2799fe106f79c51cf5566fb2771d824108cbe275aad55ae590b970c549008b433704cbf1245394769e950796eb8db DIST bazel-5.0.0-dist.zip 235894565 BLAKE2B 3798eb9111772809f0345e0c74bef38d8f9d44a7f20844f20aad187a2e177f4999ffa0e1cc1719e4284cdc7c72295bb903d32ce56821c72ee2908f4d939d0769 SHA512 2a9a972d1cce6b50f959fec3d37506914208169c8aa36e5ec5f9a27942e9beff1080a544a18e9bd5eb13dc434c1864cda0594e6da5b78c2f41085abf808c22d7 DIST bazel-5.1.1-dist.zip 236073335 BLAKE2B dacc98db99a4877bcda743058f8d34c276d893bec14a595155587f9d0a2716caf106e1d08917f8103b9c15c45433285cce2063f15a2653d3d1a4a6b67242876f SHA512 84e2f72df1838fc88a39853afc510bca835fea28590e9aac2138b5416d2f8d9aefd082c81012a2066194fdc440b00b44f9f188b5c896461acebfeb9cd40efc7c +DIST bazel-5.3.0-dist.zip 235314819 BLAKE2B 771a940e083d569b0297d37877e6d52c16f698bc5141e2c9c895d5d6cdd9e93203fbc941eca7daa4b40026551c25a5bf45d0862b8b13993bc40434aa6bb99dd3 SHA512 6c98e904596764a309e98ea2453c751dc0bf27c683462c5654b72076f8537bccf6c5103ccea60fa3a3dffeaa76b07db80a594feb96ed566282d10bb04f0e1455 diff --git a/dev-util/bazel/bazel-5.3.0.ebuild b/dev-util/bazel/bazel-5.3.0.ebuild new file mode 100644 index 00000000000..36ee3e954ac --- /dev/null +++ b/dev-util/bazel/bazel-5.3.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 bazel java-pkg-2 multiprocessing + +DESCRIPTION="Fast and correct automated build system" +HOMEPAGE="https://bazel.build/" + +SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="examples tools" +# strip corrupts the bazel binary +# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794) +RESTRICT="strip test" +RDEPEND=">=virtual/jre-11:*" +DEPEND=" + virtual/jdk:11 + app-arch/unzip + app-arch/zip" + +S="${WORKDIR}" + +pkg_setup() { + if has ccache ${FEATURES}; then + ewarn "${PN} usually fails to compile with ccache, you have been warned" + fi + java-pkg-2_pkg_setup +} + +src_unpack() { + # Only unpack the main distfile + unpack ${P}-dist.zip +} + +src_prepare() { + default + + # F: fopen_wr + # S: deny + # P: /proc/self/setgroups + # A: /proc/self/setgroups + # R: /proc/24939/setgroups + # C: /usr/lib/systemd/systemd + addpredict /proc +} + +src_compile() { + export JAVA_HOME=$(java-config --jre-home) # so keepwork works + export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags) + --java_runtime_version=local_jdk + --tool_java_runtime_version=local_jdk" + VERBOSE=yes ./compile.sh || die "Failed compiling bazel" + + ./scripts/generate_bash_completion.sh \ + --bazel=output/bazel \ + --output=bazel-complete.bash \ + --prepend=scripts/bazel-complete-header.bash \ + --prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions" +} + +src_test() { + output/bazel test \ + --verbose_failures \ + --spawn_strategy=standalone \ + --genrule_strategy=standalone \ + --verbose_test_summary \ + examples/cpp:hello-success_test || die + output/bazel shutdown +} + +src_install() { + dobin output/bazel + newbashcomp bazel-complete.bash ${PN} + bashcomp_alias ${PN} ibazel + insinto /usr/share/zsh/site-functions + doins scripts/zsh_completion/_bazel + + if use examples; then + docinto examples + dodoc -r examples/* + docompress -x /usr/share/doc/${PF}/examples + fi + # could really build tools but I don't know which ones + # are actually used + if use tools; then + docinto tools + dodoc -r tools/* + docompress -x /usr/share/doc/${PF}/tools + docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata + fi +} diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index 73a6230bfb0..28364436f5d 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -1,2 +1,2 @@ -DIST bcc-0.24.0.tar.gz 4640711 BLAKE2B 91d333c21c55de6a0ae78f9bb0b003803578525746e63ca5047896c0b2ed03ee880e03a84511470576e888e46559c67a8ebfdfe49d8785d094e2361bb20c5c2e SHA512 951672e3a8e5ad56eedf513477317ec3d3b4cf2d594bbfce20f3d19ddf7ce255e9dcfc69d9b05bb765a16e769c8e42d7c57071ddb86fb32437f527d3d25d19b6 DIST bcc-0.25.0.tar.gz 4984989 BLAKE2B 7547e3db293c1eef617b3bb58231f40a4bd3d58f425666dcb58bf77a69d74b468f07d07e01cdf2be89820318c9f3c213047b2d6dd654e08e6a60a3ecc2573252 SHA512 9f71f6c21d1f66054985562168d5848352f5029383e9c65c907a6f044258bc23df842cc65db20bfaaf33789e69c9b8e7b606a32dc882cbdf093b71768c8b521d +DIST bcc-0.26.0.tar.gz 5255485 BLAKE2B 934b63148dc1e4f017ab97681c6df69c9d5ab1db44c2bb1608644e1d91b745c25759fb1a6c5c543888e23a4e0c4a2e5738b772e0b02ea9901f8bec1a8b15cdd3 SHA512 394872a5780cc7651c91b584ccc13f18f64585b5843364433c042d9ded70faaf15a2e1125d51498508427b089f5bf826f13004d15a1892aada1a5f228a2a8adb diff --git a/dev-util/bcc/bcc-0.25.0.ebuild b/dev-util/bcc/bcc-0.25.0.ebuild index 3587e236d29..0164b733409 100644 --- a/dev-util/bcc/bcc-0.25.0.ebuild +++ b/dev-util/bcc/bcc-0.25.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) LLVM_MAX_SLOT=14 inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs @@ -94,7 +94,7 @@ src_configure() { local bcc_python_impls python_foreach_impl python_add_impl - local -a mycmakeargs=( + local mycmakeargs=( -DREVISION=${PV%%_*} -DENABLE_LLVM_SHARED=ON -DCMAKE_USE_LIBBPF_PACKAGE=ON diff --git a/dev-util/bcc/bcc-0.24.0-r1.ebuild b/dev-util/bcc/bcc-0.26.0-r1.ebuild index 86a3d50ede4..a051049c174 100644 --- a/dev-util/bcc/bcc-0.24.0-r1.ebuild +++ b/dev-util/bcc/bcc-0.26.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{8..10} ) -LLVM_MAX_SLOT=14 +PYTHON_COMPAT=( python3_{9..11} ) +LLVM_MAX_SLOT=15 inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs @@ -15,7 +15,7 @@ SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" IUSE="+lua test" REQUIRED_USE=" @@ -52,7 +52,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch" - "${FILESDIR}/bcc-0.14.0-cmakelists.patch" + "${FILESDIR}/bcc-0.25.0-cmakelists.patch" "${FILESDIR}/bcc-0.23.0-man-compress.patch" ) @@ -94,7 +94,7 @@ src_configure() { local bcc_python_impls python_foreach_impl python_add_impl - local -a mycmakeargs=( + local mycmakeargs=( -DREVISION=${PV%%_*} -DENABLE_LLVM_SHARED=ON -DCMAKE_USE_LIBBPF_PACKAGE=ON diff --git a/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch b/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch deleted file mode 100644 index 3155e3cee96..00000000000 --- a/dev-util/bcc/files/bcc-0.14.0-cmakelists.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 65e78ffe..837b4939 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,14 +3,6 @@ - cmake_minimum_required(VERSION 2.8.7) - - project(bcc) --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Release) --endif() -- --if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -- set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "path to install" FORCE) --endif() -- - enable_testing() - - # populate submodules (libbpf) diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest index 85625dc946e..55d8d90db55 100644 --- a/dev-util/bcpp/Manifest +++ b/dev-util/bcpp/Manifest @@ -1 +1,4 @@ -DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73 +DIST bcpp-20221002.tgz 151426 BLAKE2B 6978b30ca684ec5e9eb781955679d333e7efdb389af2b29a341b466387bf4147bc72c54d80eaa6d57770cd720c2074881594418ccbe7aa81241ebeac938499e3 SHA512 a1d2c57e5acabf90f19d3721c79f76867c2b93af51b717af80089ab9dc5117ac28263ceb6aff6544a1040b6fc5115a229759631309c4f6ea9808c6b6eb7d1c92 +DIST bcpp-20221002.tgz.asc 729 BLAKE2B 64a211fb84ac6ca2926cb54b06945a908bb19ef15fb8784f4201b29dbc1ebe1be85e8bb0d05d14ebde126508cb33bb9e2d2411fa54b1290246263829d1f4f7f0 SHA512 867b2c04c957daff028a0eaa14ce2c7fd8718dbe9a9af5bf46b293ce51a0a49f823b18978f10f77b7363ff62691683e2945d0d71280185386f19dc7f1cc883d5 +DIST bcpp-20230130.tgz 155972 BLAKE2B f51ae04ef75125d2040f9ef2ab9fb5513ad83fc6095b85bc091bf109d43b066723743c02f703b90f5d4faeb368da86d611d9ce46237c10e31b861b473de49282 SHA512 1fd22707313c098ac2a338425029d2c6355e9042b9bba3d2a6c8d4315dc59a33ea1bfc0cf30671ab2eb1c05981c4be5313a20d357bbbbb4f14374772253b4c30 +DIST bcpp-20230130.tgz.asc 729 BLAKE2B ffd6266919c8598067b09ac9f855c3b1d93dbd4d6536dbd68a12ccbc5f8cc62e10315e44376fc72d40881e43dfa51676a1af46400aed66bf4c2ac1d4a17b499c SHA512 b52cfa95115726ec7b9575ef8a813fc5d1eb8dc7083b19508d5058b80d41203e70d3cd61a18eea4f35755f77e92ce15c2a1f24db0befb3b62dab3b71065a3955 diff --git a/dev-util/bcpp/bcpp-20210108.ebuild b/dev-util/bcpp/bcpp-20221002.ebuild index dbb5c4e1bf4..def3e0f75a5 100644 --- a/dev-util/bcpp/bcpp-20210108.ebuild +++ b/dev-util/bcpp/bcpp-20221002.ebuild @@ -1,16 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig DESCRIPTION="Indents C/C++ source code" HOMEPAGE="https://invisible-island.net/bcpp/" -SRC_URI="ftp://ftp.invisible-island.net/bcpp/${P}.tgz" +SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )" LICENSE="MIT" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )" + src_compile() { emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"' } diff --git a/dev-util/bcpp/bcpp-20230130.ebuild b/dev-util/bcpp/bcpp-20230130.ebuild new file mode 100644 index 00000000000..f5beeb1bf18 --- /dev/null +++ b/dev-util/bcpp/bcpp-20230130.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + +DESCRIPTION="Indents C/C++ source code" +HOMEPAGE="https://invisible-island.net/bcpp/" +SRC_URI="https://invisible-island.net/archives/${PN}/${P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.asc )" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )" + +src_compile() { + emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"' +} + +src_install() { + default + dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \ + txtdocs/manual.txt + + insinto /etc/bcpp + doins bcpp.cfg indent.cfg +} + +pkg_postinst() { + elog "Check the documentation for more information on how to" + elog "Run bcpp. Please note that in order to get help for" + elog "bcpp, please run bcpp -h and not the command by itself." + elog "" + elog "Configuration files are at ${EPREFIX}/etc/bcpp." + elog "To use them, use the -c option followed by the filename." +} diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest index 75749bfbe8c..ae15db49931 100644 --- a/dev-util/bear/Manifest +++ b/dev-util/bear/Manifest @@ -1,3 +1 @@ -DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5 -DIST bear-3.0.17.tar.gz 123861 BLAKE2B 9dea85c7c0ec5ec4954d08147cdac31e0b28c9780281a544687340e6e226e5403ad82f74db0fb9edd3f65c9a982531afb612e1c744430735e6de97d8d29a2189 SHA512 08e50b04c87745ae60623c32de07e710ffb4e78d9978f13cca9d51929b45477c780f1fe47178569310dca20dab5fef49dbffdf17a087c388f111eb11ffadf5b1 -DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c +DIST bear-3.0.20.tar.gz 125393 BLAKE2B 826a774beeb0596038f69b345a3659fe58f897bdb1a63f5faeac1d4242ae3cf4bf346ab82d2f87934d0786e5c0d4e835837b838a62f5a92c28ffe5e6a3d6a900 SHA512 4cf0e648b73fd4c0ac109c4a853e203efccb34ac7373d6c2f3ee3d5089853b791008990df768871dfd1268324bcce97c44657b4c3a2d1383134cba3eaec40bdd diff --git a/dev-util/bear/bear-2.4.4-r1.ebuild b/dev-util/bear/bear-2.4.4-r1.ebuild deleted file mode 100644 index 08fbed8fe87..00000000000 --- a/dev-util/bear/bear-2.4.4-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -inherit bash-completion-r1 cmake python-single-r1 - -DESCRIPTION="Build EAR generates a compilation database for clang tooling" -HOMEPAGE="https://github.com/rizsotto/Bear" -SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="test" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="test? ( - app-shells/bash - $(python_gen_cond_dep ' - dev-python/lit[${PYTHON_USEDEP}] - ') -)" - -RDEPEND="${PYTHON_DEPS}" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${P^}" - -src_configure() { - local mycmakeargs=( -DUSE_SHELL_COMPLETION=OFF ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - # need to fix it now, before tests are run - python_fix_shebang "${BUILD_DIR}"/bear/bear - python_fix_shebang test/functional/tools/cdb_diff.py -} - -src_install() { - cmake_src_install - dobashcomp shell-completion/bash/bear -} - -src_test() { - if has sandbox ${FEATURES}; then - ewarn "\'FEATURES=sandbox\' detected" - ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox" - ewarn "Skipping tests" - elif - has usersandbox ${FEATURES}; then - ewarn "\'FEATURES=usersandbox\' detected" - ewarn "Skipping tests" - elif - has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then - ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)" - ewarn "and will fail without generic cc symlink" - ewarn "Skipping tests" - else - einfo "removing unwanted/unsupported/xfail tests" - rm -v test/functional/cases/{end-to-end/scons.ft,intercept/cuda/successful_build.fts,run_pep8.ft} || die - einfo "test may use optional tools if found: qmake gfortran" - cmake_build check - fi -} diff --git a/dev-util/bear/bear-3.0.17.ebuild b/dev-util/bear/bear-3.0.17.ebuild deleted file mode 100644 index b31cd181b48..00000000000 --- a/dev-util/bear/bear-3.0.17.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit cmake python-any-r1 - -DESCRIPTION="Build EAR generates a compilation database for clang tooling" -HOMEPAGE="https://github.com/rizsotto/Bear" -SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="test" - -RDEPEND=" - >=dev-cpp/nlohmann_json-3.7:= - >=dev-db/sqlite-3.14:= - <dev-libs/libfmt-9.0.0:= - dev-libs/protobuf:= - >=dev-libs/spdlog-1.5 - >=net-libs/grpc-1.26:= -" - -DEPEND="${RDEPEND} - test? ( - >=dev-cpp/gtest-1.10 - ) -" - -BDEPEND="test? ( - sys-devel/libtool - $(python_gen_any_dep ' - dev-python/lit[${PYTHON_USEDEP}] - ') -)" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${P^}" - -PATCHES=( "${FILESDIR}/3.0.17-gcc11.patch" ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - # Turn off testing before installation - sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_UNIT_TESTS="$(usex test ON OFF)" - -DENABLE_FUNC_TESTS="$(usex test ON OFF)" - ) - cmake_src_configure -} - -src_test() { - if has sandbox ${FEATURES}; then - ewarn "\'FEATURES=sandbox\' detected" - ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox" - ewarn "Skipping tests" - elif - has usersandbox ${FEATURES}; then - ewarn "\'FEATURES=usersandbox\' detected" - ewarn "Skipping tests" - elif - has network-sandbox ${FEATURES}; then - ewarn "\'FEATURES=network-sandbox\' detected" - ewarn "Skipping tests" - elif - has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then - ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)" - ewarn "and will fail without generic cc symlink" - ewarn "Skipping tests" - else - einfo "test may use optional tools if found: qmake gfortran valgrind" - # unit tests - cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose - # functional tests - cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose - fi -} diff --git a/dev-util/bear/bear-3.0.19.ebuild b/dev-util/bear/bear-3.0.20-r1.ebuild index 71c521da77d..f3dadfccac8 100644 --- a/dev-util/bear/bear-3.0.19.ebuild +++ b/dev-util/bear/bear-3.0.20-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-any-r1 @@ -13,15 +13,15 @@ SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~riscv x86" IUSE="test" RDEPEND=" >=dev-cpp/nlohmann_json-3.7.3:= >=dev-db/sqlite-3.14:= - <dev-libs/libfmt-9.0.0:= + dev-libs/libfmt:= dev-libs/protobuf:= - >=dev-libs/spdlog-1.5 + >=dev-libs/spdlog-1.5:= >=net-libs/grpc-1.26:= " @@ -57,8 +57,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DENABLE_UNIT_TESTS="$(usex test ON OFF)" - -DENABLE_FUNC_TESTS="$(usex test ON OFF)" + -DENABLE_UNIT_TESTS="$(usex test)" + -DENABLE_FUNC_TESTS="$(usex test)" ) cmake_src_configure } diff --git a/dev-util/bear/files/3.0.17-gcc11.patch b/dev-util/bear/files/3.0.17-gcc11.patch deleted file mode 100644 index cb52a7f3621..00000000000 --- a/dev-util/bear/files/3.0.17-gcc11.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ada467c3f4038abc3c3ac964a46ec0da0e8ed1c5 Mon Sep 17 00:00:00 2001 -From: shrkamat <shrinivas.kamath@gmail.com> -Date: Sat, 11 Dec 2021 17:43:10 +0530 -Subject: [PATCH] Fix compile errors with g++ 11.02 (#434) - -Co-authored-by: Shrinivas Kamath <skamath@synamedia.com> ---- - source/citnames/source/semantic/Parsers.h | 1 + - source/libflags/include/libflags/Flags.h | 1 + - third_party/grpc/CMakeLists.txt | 5 +++++ - 3 files changed, 7 insertions(+) - -diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h -index 7a4dc8f4..0ec003ee 100644 ---- a/source/citnames/source/semantic/Parsers.h -+++ b/source/citnames/source/semantic/Parsers.h -@@ -27,6 +27,7 @@ - #include <map> - #include <optional> - #include <string> -+#include <optional> - - #include <fmt/format.h> - -diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h -index 76f772df..d92fbae2 100644 ---- a/source/libflags/include/libflags/Flags.h -+++ b/source/libflags/include/libflags/Flags.h -@@ -28,6 +28,7 @@ - #include <string_view> - #include <vector> - #include <iosfwd> -+#include <optional> - - namespace flags { - -diff --git a/third_party/grpc/CMakeLists.txt b/third_party/grpc/CMakeLists.txt -index c8a7114b..792a0c6a 100644 ---- a/third_party/grpc/CMakeLists.txt -+++ b/third_party/grpc/CMakeLists.txt -@@ -46,6 +46,11 @@ else () - -DgRPC_BUILD_TESTS:BOOL=OFF - -DgRPC_BUILD_CSHARP_EXT:BOOL=OFF - -DCMAKE_INSTALL_PREFIX:PATH=${DEPENDENCIES_INSTALL_PREFIX}/grpc_dependency -+ -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -+ -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} -+ -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS} -+ -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS} -+ -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER} - ) - - include(GNUInstallDirs) diff --git a/dev-util/bindgen/Manifest b/dev-util/bindgen/Manifest new file mode 100644 index 00000000000..2a12b1901a0 --- /dev/null +++ b/dev-util/bindgen/Manifest @@ -0,0 +1,115 @@ +DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31 +DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24 +DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00 +DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa +DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671 +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST bindgen-0.56.0.crate 198300 BLAKE2B 96a4434f5cd0dc474a344e58944acf6dea915cfe27adede48bba10c9c542e5c4748f5ab90a0cbdb6901495f985f9112383e40021e60703695b5ff3afb29fd05d SHA512 e7bc3700d3db533380b40874d258d9c3132a85bb704929922f203619dc7e62d0778d92cc23e9409a3c098095e0a29d995b9feb1409a57a402f6059d094a109fb +DIST bindgen-0.56.0.tar.gz 2229849 BLAKE2B 45eb29c1eaf8c99df8c08da99367173b42d834fb5aaecb4cbc631ec7b0493e0e952e3e99cf593290414cb82114b14797a802461c16541211edf8559f67fcbb5e SHA512 ef626eb6cdc77bdf57b84f106572f2314289ddb597126124c32a4dc3957402649904847df537e6e8db882426885e9eabe34be5ad16abea01277b748690a17626 +DIST bindgen-0.62.0.tar.gz 2278061 BLAKE2B b9642c50210fa6b954af9e15102609551d342a0b28d57bcabead743657b3cca19d9139db6ad00a09fda8b09a851f29b240359bb6ad37a26936dd3c8d4915edf5 SHA512 e4c87c6ef5daf3ec416e4b4a0c037aa118e466fc112e48732476af2650716553480ab12d86b94dc284f74f41810d7e18cbb3ae92b3288d183df25e77b48fbaf8 +DIST bindgen-0.63.0.tar.gz 2280505 BLAKE2B 5b404fd4a6b2763b19d98662f60d9ace8e0c273eab8c773d67aa0f92d7c58aac2219a4862cf849539ebab5d9a722593bb88e189ec2e8187cc4d8040bc346bd66 SHA512 b43c415c4ac55c0cf8ccba6a21b945e890321ff3c11a3afacfd8c724d83ee6e21066a7c4004727eb4d74795fcea320b6e668ce022310c050ad031633a00d1519 +DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710 +DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985 +DIST cexpr-0.4.0.crate 18023 BLAKE2B 4a55c6c80f09c1d4ee86706d8af1f52219ceee99f19ecd0618825ce5bb27535184b64c0a49a540756b0c5e9cce6e39aac271545c504fbfb37c44052d04856cb2 SHA512 31592e38d80414cd07b25f7460775eafce1f91570abc1b94af7452961604574d1ca2374c0177875569b644f615a2b6fede273f37a6ee137f9adc9c0315c59b37 +DIST cexpr-0.6.0.crate 17966 BLAKE2B cb46f066eb1f4dbac00ec86dc3e562db7ee8ea5ff17d16a60004fa020405e455b8aeb3d001f669cb33d1b62525bfd04ec657ffca4ed44a83af4a5e75b2c820e3 SHA512 766bff7ca7f9bf0885aee6f014bcfc084e7fdfcd567a49443d5340acfe8f257db109de17b24588504fc35c53f2d4303e2d22da21f73669125cfca984950cf886 +DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST clang-sys-1.0.3.crate 36455 BLAKE2B d0432eab37cef602adcb5d5a2ad90f48d7cc2d708a39e20fcaa18cbd86ed59d75e867ebb5dfb36742c1f3648ce78a785d6a7ba42fa8a8378e549374e070d2122 SHA512 e31bf0ae28f1e8c516fe2558b1ea8a46b925ddcbf4963d1e598c668331b65b139927bff58dc3ff3a80f9e258f69af2893d24ec3977cbb9f5e440a344eaf150c8 +DIST clang-sys-1.3.3.crate 37943 BLAKE2B 92ecba81573fc27de689752e7009514d0e51c4d09407d0345eee7a94f4713cfd01304b98370aa89d56a3b028912370f4967f8fda28ae9e3620fbb4af991da117 SHA512 fd922627ff66f9265aae30bf585bccab1efdea7f66b9fb95f45af0f316727bff7b791f36ef42010df5d8b3b474f36457fec03fdbb25c50cc8922c3b157387dc9 +DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf +DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8 +DIST clap-3.2.12.crate 209087 BLAKE2B 822312cd1d297dce4003224a4017f9192a765c6877933c1f28b36c99e3f6f09a827e02fdb05da2828f6df17c619d66b9fc40379a7efb6f78955fc182954c8e42 SHA512 c3c4d747241174ebf5b8917e9725a5e384ab307a71338ca58badcd187b487cc5fdac8b7ea27b6417281c4327086881d8127b16f2b0606353da0d0998e2fd87e1 +DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f +DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16 +DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf +DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181 +DIST env_logger-0.8.1.crate 32715 BLAKE2B 3a6835076cc4a01c88617e361fd1d72f7622749b2a1b12e94a5c50d8d492db6583106c9e13091eba986a0c4aa9f9f968bfa80048c0d7c295ec63ce6be6d693b9 SHA512 3a5f7892edc7c3d92cd2b487cf3a331d5b2034236b6e2b90b3193caf3d689997e9c01773d3f9138e56ab5744e8e62cabc29620ed06c0cbbe18364b0c26b55954 +DIST env_logger-0.9.0.crate 33573 BLAKE2B b9c22205ee60ba97da0d338e1d40dda989f0d766d9ebc60e610b53db882a803769fb3c093348c031183856e16a5a948342e09551953f0b98cd73437bec658bee SHA512 d7db85d2f7d16f7f97b6714e01e342ab6b784c799ef26ee322ec85fcee28a549b6e49a49200ff78eceacd0c682e941f8538a497e2a2a196040769c2365feb566 +DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 +DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d +DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46 +DIST hashbrown-0.12.2.crate 102346 BLAKE2B 99f11b141b2a3da959e8bb072b3f9d6e768eb464e9e04d151021193dad2fa0f03a5261cc3b894cb2fb4080d7cdd4a747e6c095b1a6420d515c44d74a2fca7d70 SHA512 5adbb650a40c2f9267a9c729cf377001b07eb91824470d7da459860534683b6f40fa8f14bb997a8f3df64eda561d1ba658e95b6c35502de7a76225bea8c56d46 +DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2 +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62 +DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c +DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e +DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d +DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44 +DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c +DIST libloading-0.6.5.crate 23998 BLAKE2B c1fbef198c83e794067b02ea37b3644d7a5dfe31aaeaf810e8338e0f657707caa4b08145e33483f895082110b0cb59e6b0a166197b3349ead52af39bb31f6012 SHA512 8821e67d8f212e90a33a120b095963ed2c3e862b57c8da1500491343324f6de1081ffa99cf3436a8eabd6da528e788bf4ccc7cdac4f347d94e5675c8f6917d3f +DIST libloading-0.6.7.crate 25037 BLAKE2B 108f5b10c60986ea89f4c754bd3c6d4b73f70a7352042dc1a177ae40a98f716171d242c9f52d81ec47972e55457cf2421ce0578995c644de1da3e15fe8a6d234 SHA512 4f4f37c5a04c20860c38407e8c7aa81386dfeb091773e480dfe87b5fb2a462dc195ec0c39a1add59cad7620373a671772e8f032f4efc624580c6227ae902e10e +DIST libloading-0.7.0.crate 26216 BLAKE2B 83827746f57fb5f1819aa0ccce0ffd698a3ed4b85ef0e954741691003c843ca877de81b4a97ad7c53d28f79701a5caf2fee801a68c015d19c20230f2560b5fc3 SHA512 e2089a8ecacd65522b246cebcf531b6b1ce697d4eaf294e0540e1f34bfd714037177ba802406c31e6bcc722b4f391a84709427de1c6fb441cdeb8e41fd4f1e28 +DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f +DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec +DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc +DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed +DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab +DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6 +DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa +DIST minimal-lexical-0.1.4.crate 94832 BLAKE2B 6fabbab941e583f5fd670062455e3201ff376d4524a8a797437f3a57344b222d5cccdef0a94461e4f5a239a830014f938a6c958bb2603a1dc91fcdf82bfea36f SHA512 e6794942dd9a7e4cadb5aca6db19a5aee478860d313549e2b3a2707bae9989e59b84f4f84142bc90d49eda72c5dd1ccb80bc8319c9e2b3faa52d5b803f6d7d1f +DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca +DIST nom-7.0.0.crate 120442 BLAKE2B 209c7cac6942b62e213b433c0b41a4efe2a70b6cebd379cec81ca93fc86c917b29efefd54eb2c0468bbcf071b99ab3fd6efb633d1f82ab915387abaf8b6ba9df SHA512 7f640071cd5b1870255a7182580cc94f24e69eeae06b1a1f193e91e26c1b01bf46c8baac56fdf220191ec50bf7994ef125ae1991d4c4659d0d8f7809552313f9 +DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988 +DIST os_str_bytes-6.2.0.crate 21037 BLAKE2B 0ba546e68579a9221a84a66a6be0ddb5a27d78b70ca307bd514648e2a39a60265f85082f47c07ad64801c865ef613cce5f3b65e828bd594ac45fc6b00e0828d3 SHA512 aecfd7ad0433ffe532d72c6c269eefb7e7097cc1acdfe91511ecdaa7ad4db5d97026268bd216c70bf4fe17f23bc02b1fbbe95a28b8fedda3f812b3ce78723c75 +DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721 +DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1 +DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be +DIST proc-macro2-1.0.43.crate 41512 BLAKE2B da0577094cb0b8b419f3160bab6342f97865b01337be4cd7a344d4dea98fc2f8905dd05a56427792379f59565a25f8e16cfe4a37edb3bf77bf2e703f27953fdb SHA512 3139c668dbf593afeb77b970c77edc70f7b46b42d80f1d0e30773dedb14ab98c9eeca0dc953bc940610954860fbce663174ea6c270b8711db45aef4d57f3b910 +DIST quickcheck-0.4.1.crate 20003 BLAKE2B 3da062bd2d49cc8aff156dba16de13682cf5e290b9777d6e65e80f572be28267cfd6a55f662d7208bfa1f532d1b58c3846ae86d3b696091d0373cdb3a8c9b30c SHA512 175d8f6f34d4bde3d1292575e1cb8557025f584dfda7a0c9b39cf4f6f2c52dad7dee4807bbc8796d39046f6ff5085a93ba715f0a3f3c915e49dc3ecadd5ca170 +DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953 +DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8 +DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3 +DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a +DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e +DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 +DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 +DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 +DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87 +DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5 +DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 +DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f +DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0 +DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de +DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571 +DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506 +DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa +DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5 +DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c +DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 +DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069 +DIST shlex-1.0.0.crate 4555 BLAKE2B c39f219b68e7a85fc0a0bb2df38d3b232a80815f5e541a03173d308c0274f55c61e54887c95c22d51b2e62339365bf5deac5b0d0ab3bb5d40fb70b8f75f1755b SHA512 aea9827adb630b9ed71423fb216113ee20dba31e5f1e7d078445e8bd77e7e9bfe64ea2e73f3be0fcaa472023b724793f86c06ff8efb9e4cc133f805bcf11c560 +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 +DIST syn-1.0.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10 +DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe +DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a +DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702 +DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a +DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a +DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd +DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0 +DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35 +DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b +DIST unicode-ident-1.0.3.crate 35031 BLAKE2B d8d20829b97e7f1b9710feb6773cc5c4d25de6509772491e6f508a489285e32ec3a14ae689a1f1cd01ff5e2d4301b98579155535e03e240c8605b5737c9c5de5 SHA512 7ebdcfd7131a0e7a834f7e973b9cf813495259e0a0606539623d3f9bb51f9c6414908e71281d6a77397021e48d41c400a704c65990aaa8ca8d0a6095d9b3ed47 +DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0 +DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2 +DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374 +DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9 +DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26 +DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd +DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7 +DIST which-3.1.1.crate 8071 BLAKE2B b53adc5136f26fc1be6ae18987d0129527cfd6eb2fb1f0876600ff55ac2f935f608337ff89478f3aed2e8c97a08c474109382a56eabe67dc788b744d90c73ad9 SHA512 3677d709eced54a332e68d9c9385708205838301a576da0c4d88049403a81676c3939a97cd1bec4ab261c7e8fb6211956b47afe5d1fee84d9c4ecf4eb30184f5 +DIST which-4.2.2.crate 8589 BLAKE2B 360ea38f7fcb357f558f8e80a2c951d016e4f5dd45f1294f1b85a6ab441cf89fb6f3192b63ca42491693f2eeb57c048d8d0f9ca9f1d857301288b098b138b07c SHA512 25fe54f3703d865bdda04a26720839d6cf52300558e1abdf339eec985cc085fc983ea44a3b36767ef56748c865d432b0105a9fbe677f4b4deee8ec0af9dda59c +DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +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 diff --git a/dev-util/bindgen/bindgen-0.56.0.ebuild b/dev-util/bindgen/bindgen-0.56.0.ebuild new file mode 100644 index 00000000000..8c19800a859 --- /dev/null +++ b/dev-util/bindgen/bindgen-0.56.0.ebuild @@ -0,0 +1,81 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +aho-corasick-0.7.15 +ansi_term-0.11.0 +atty-0.2.14 +bindgen-0.56.0 +bitflags-1.2.1 +cexpr-0.4.0 +cfg-if-0.1.10 +cfg-if-1.0.0 +clang-sys-1.0.3 +clap-2.33.3 +diff-0.1.12 +env_logger-0.8.1 +glob-0.3.0 +hermit-abi-0.1.17 +humantime-2.0.1 +lazy_static-1.4.0 +lazycell-1.3.0 +libc-0.2.80 +libloading-0.6.5 +log-0.4.11 +memchr-2.3.4 +nom-5.1.2 +peeking_take_while-0.1.2 +proc-macro2-1.0.24 +quote-1.0.7 +regex-1.4.2 +regex-syntax-0.6.21 +rustc-hash-1.1.0 +shlex-0.1.1 +strsim-0.8.0 +termcolor-1.1.0 +textwrap-0.11.0 +thread_local-1.0.1 +unicode-width-0.1.8 +unicode-xid-0.2.1 +vec_map-0.8.2 +version_check-0.9.2 +which-3.1.1 +winapi-0.3.9 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit rust-toolchain cargo + +DESCRIPTION="Automatically generates Rust FFI bindings to C (and some C++) libraries" +HOMEPAGE="https://rust-lang.github.io/rust-bindgen" +SRC_URI="https://github.com/rust-lang/rust-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris)" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" + +DEPEND="virtual/rust[rustfmt]" +RDEPEND="${DEPEND} + sys-devel/clang:=" + +QA_FLAGS_IGNORED="usr/bin/bindgen" + +S="${WORKDIR}/rust-${P}" + +src_test () { + # required by clang during tests + local -x TARGET="$(rust_abi)" + + cargo_src_test --bins --lib +} + +src_install () { + cargo_src_install + + einstalldocs +} diff --git a/dev-util/bindgen/bindgen-0.62.0.ebuild b/dev-util/bindgen/bindgen-0.62.0.ebuild new file mode 100644 index 00000000000..d83f5616651 --- /dev/null +++ b/dev-util/bindgen/bindgen-0.62.0.ebuild @@ -0,0 +1,124 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +aho-corasick-0.5.3 +aho-corasick-0.7.18 +ansi_term-0.12.1 +atty-0.2.14 +autocfg-1.1.0 +bitflags-1.3.2 +block-0.1.6 +cc-1.0.73 +cexpr-0.6.0 +cfg-if-1.0.0 +clang-sys-1.3.3 +clap-2.34.0 +clap-3.2.12 +clap_lex-0.2.4 +diff-0.1.12 +either-1.6.1 +env_logger-0.3.5 +env_logger-0.9.0 +fuchsia-cprng-0.1.1 +getrandom-0.2.3 +glob-0.3.0 +hashbrown-0.12.2 +hermit-abi-0.1.19 +humantime-2.1.0 +indexmap-1.9.1 +kernel32-sys-0.2.2 +lazy_static-1.4.0 +lazycell-1.3.0 +libc-0.2.126 +libloading-0.6.7 +libloading-0.7.0 +log-0.3.9 +log-0.4.14 +malloc_buf-0.0.6 +memchr-0.1.11 +memchr-2.5.0 +minimal-lexical-0.1.4 +nom-7.0.0 +objc-0.2.7 +os_str_bytes-6.2.0 +peeking_take_while-0.1.2 +ppv-lite86-0.2.10 +proc-macro2-1.0.43 +quickcheck-0.4.1 +quote-1.0.9 +rand-0.3.23 +rand-0.4.6 +rand-0.8.4 +rand_chacha-0.3.1 +rand_core-0.3.1 +rand_core-0.4.2 +rand_core-0.6.3 +rand_hc-0.3.1 +rdrand-0.4.0 +redox_syscall-0.2.9 +regex-0.1.80 +regex-1.5.5 +regex-syntax-0.3.9 +regex-syntax-0.6.25 +remove_dir_all-0.5.3 +rustc-hash-1.1.0 +shlex-1.0.0 +strsim-0.10.0 +strsim-0.8.0 +syn-1.0.99 +tempdir-0.3.7 +tempfile-3.2.0 +termcolor-1.1.3 +textwrap-0.11.0 +textwrap-0.15.0 +thread-id-2.0.0 +thread_local-0.2.7 +unicode-ident-1.0.3 +unicode-width-0.1.10 +utf8-ranges-0.1.3 +vec_map-0.8.2 +version_check-0.9.3 +wasi-0.10.2+wasi-snapshot-preview1 +which-4.2.2 +winapi-0.2.8 +winapi-0.3.9 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit rust-toolchain cargo + +DESCRIPTION="Automatically generates Rust FFI bindings to C (and some C++) libraries" +HOMEPAGE="https://rust-lang.github.io/rust-bindgen" +SRC_URI="https://github.com/rust-lang/rust-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris)" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" + +DEPEND="virtual/rust[rustfmt]" +RDEPEND="${DEPEND} + sys-devel/clang:=" + +QA_FLAGS_IGNORED="usr/bin/bindgen" + +S="${WORKDIR}/rust-${P}" + +src_test () { + # required by clang during tests + local -x TARGET="$(rust_abi)" + + cargo_src_test --bins --lib +} + +src_install () { + cargo_src_install --path "${S}/bindgen-cli" + + einstalldocs +} diff --git a/dev-util/bindgen/bindgen-0.63.0.ebuild b/dev-util/bindgen/bindgen-0.63.0.ebuild new file mode 100644 index 00000000000..d83f5616651 --- /dev/null +++ b/dev-util/bindgen/bindgen-0.63.0.ebuild @@ -0,0 +1,124 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" +aho-corasick-0.5.3 +aho-corasick-0.7.18 +ansi_term-0.12.1 +atty-0.2.14 +autocfg-1.1.0 +bitflags-1.3.2 +block-0.1.6 +cc-1.0.73 +cexpr-0.6.0 +cfg-if-1.0.0 +clang-sys-1.3.3 +clap-2.34.0 +clap-3.2.12 +clap_lex-0.2.4 +diff-0.1.12 +either-1.6.1 +env_logger-0.3.5 +env_logger-0.9.0 +fuchsia-cprng-0.1.1 +getrandom-0.2.3 +glob-0.3.0 +hashbrown-0.12.2 +hermit-abi-0.1.19 +humantime-2.1.0 +indexmap-1.9.1 +kernel32-sys-0.2.2 +lazy_static-1.4.0 +lazycell-1.3.0 +libc-0.2.126 +libloading-0.6.7 +libloading-0.7.0 +log-0.3.9 +log-0.4.14 +malloc_buf-0.0.6 +memchr-0.1.11 +memchr-2.5.0 +minimal-lexical-0.1.4 +nom-7.0.0 +objc-0.2.7 +os_str_bytes-6.2.0 +peeking_take_while-0.1.2 +ppv-lite86-0.2.10 +proc-macro2-1.0.43 +quickcheck-0.4.1 +quote-1.0.9 +rand-0.3.23 +rand-0.4.6 +rand-0.8.4 +rand_chacha-0.3.1 +rand_core-0.3.1 +rand_core-0.4.2 +rand_core-0.6.3 +rand_hc-0.3.1 +rdrand-0.4.0 +redox_syscall-0.2.9 +regex-0.1.80 +regex-1.5.5 +regex-syntax-0.3.9 +regex-syntax-0.6.25 +remove_dir_all-0.5.3 +rustc-hash-1.1.0 +shlex-1.0.0 +strsim-0.10.0 +strsim-0.8.0 +syn-1.0.99 +tempdir-0.3.7 +tempfile-3.2.0 +termcolor-1.1.3 +textwrap-0.11.0 +textwrap-0.15.0 +thread-id-2.0.0 +thread_local-0.2.7 +unicode-ident-1.0.3 +unicode-width-0.1.10 +utf8-ranges-0.1.3 +vec_map-0.8.2 +version_check-0.9.3 +wasi-0.10.2+wasi-snapshot-preview1 +which-4.2.2 +winapi-0.2.8 +winapi-0.3.9 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit rust-toolchain cargo + +DESCRIPTION="Automatically generates Rust FFI bindings to C (and some C++) libraries" +HOMEPAGE="https://rust-lang.github.io/rust-bindgen" +SRC_URI="https://github.com/rust-lang/rust-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris)" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" + +DEPEND="virtual/rust[rustfmt]" +RDEPEND="${DEPEND} + sys-devel/clang:=" + +QA_FLAGS_IGNORED="usr/bin/bindgen" + +S="${WORKDIR}/rust-${P}" + +src_test () { + # required by clang during tests + local -x TARGET="$(rust_abi)" + + cargo_src_test --bins --lib +} + +src_install () { + cargo_src_install --path "${S}/bindgen-cli" + + einstalldocs +} diff --git a/dev-util/bindgen/metadata.xml b/dev-util/bindgen/metadata.xml new file mode 100644 index 00000000000..b2d0cf7158d --- /dev/null +++ b/dev-util/bindgen/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <name>Rust Project</name> + <email>rust@gentoo.org</email> + </maintainer> + <maintainer type="project"> + <name>Gentoo Kernel Project</name> + <email>kernel@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">rust-lang/rust-bindgen</remote-id> + <changelog>https://github.com/rust-lang/rust-bindgen/blob/master/CHANGELOG.md</changelog> + </upstream> +</pkgmetadata> diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest index 04ebc2d345a..c33fa9abf30 100644 --- a/dev-util/bitcoin-tx/Manifest +++ b/dev-util/bitcoin-tx/Manifest @@ -1,10 +1,5 @@ -DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871 -DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae -DIST bitcoin-21.2.knots20210629.patches.tar.xz 711680 BLAKE2B da49c6ab075b2478482daeafefcad507f12718e4ed2af847e64aa30ff0839876b9a5b68bc53f2327c9e18df51870d50f7e7d6b2215d5fde1d147567d9d60ffa5 SHA512 e0386f2712053475548c3d7fa927117d1fefa27d447c1398bec152e601a9be0af7a1b03f83f5345b03af252b372091548ce75075f42e4831f4e85f622531962b DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d -DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e +DIST bitcoin-24.0.1.tar.gz 11412628 BLAKE2B 2a8c83aecd12d8d40305d78ede1f389884ee62cfe4af39a9b416b8887a595f3393d599ebe9ddeb576bba5896923feb7ee45ba32d7d4cb0ce9e6d0ef39ecf83c7 SHA512 de1ddb543429f70b0b55a46500e0bc4807cca1b1655a28f8ab186d6f6e620f8cf82420bbdf412976ffed9bc6d742926b19933429c734edaf7430a4f8c37e1685 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f -DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46 -DIST bitcoin-v0.21.2.tar.gz 7768110 BLAKE2B fe8616235caba29ebf3a36d1a8484d5d534db0f7a6486822e88f8322eb9b7220b1c7539feee5b9486129eb97d5a6810b8542e627a6bf3451094821f56cd8d9f8 SHA512 4b3554b0f4a5f68d42a9bec273558098239c5b8be35248d1957d00076a8c57bf3d6cfb7af57b7340b0df7aea49c9bf2607a58cbb1573482527be4bd6da812dc0 DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild deleted file mode 100644 index e112dc6a8e4..00000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -BITCOINCORE_COMMITHASH="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a" -KNOTS_PV="${PV}.knots20200815" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="knots" - -DEPEND=" - dev-libs/boost:= - >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] - >=dev-libs/univalue-1.0.4:= -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 -" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2020/08/01/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r1.ebuild index eba9ff93c5e..0d5b506d3da 100644 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild +++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ IUSE="knots" DEPEND=" dev-libs/boost:= - >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] + ~dev-libs/libsecp256k1-0.1_pre20201028:=[recovery,schnorr] >=dev-libs/univalue-1.0.4:= " RDEPEND="${DEPEND}" diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild deleted file mode 100644 index c7ebffda8f7..00000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -BITCOINCORE_COMMITHASH="194b9b8792d9b0798fdb570b79fa51f1d1f5ebaf" -KNOTS_PV="${PV}.knots20210629" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/$(ver_cut 1-2).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="knots" - -DEPEND=" - dev-libs/boost:= - >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] - >=dev-libs/univalue-1.0.4:= -" -RDEPEND="${DEPEND}" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2021/05/01/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild deleted file mode 100644 index ebfc9e5de37..00000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-21.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -BITCOINCORE_COMMITHASH="af591f2068d0363c92d9756ca39c43db85e5804c" -KNOTS_PV="${PV}.knots20210629" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v0.${PV}.tar.gz - https://bitcoinknots.org/files/$(ver_cut 1).x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="knots" - -DEPEND=" - dev-libs/boost:= - >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] - >=dev-libs/univalue-1.0.4:= -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/automake-1.13 -" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/21.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2021/09/29/release-0.${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch" - eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch" - eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch" - fi - - eapply_user - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-22.0-r1.ebuild index 9c3c211276e..7d8aa96f012 100644 --- a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild +++ b/dev-util/bitcoin-tx/bitcoin-tx-22.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,12 +18,12 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="knots" RDEPEND=" dev-libs/boost:= - >dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr] + ~dev-libs/libsecp256k1-0.1_pre20201028:=[recovery,schnorr] >=dev-libs/univalue-1.0.4:= " DEPEND="${RDEPEND}" diff --git a/dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild new file mode 100644 index 00000000000..0b44b98f9cb --- /dev/null +++ b/dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 + +DESCRIPTION="Command-line Bitcoin transaction tool" +HOMEPAGE="https://bitcoincore.org/" +SRC_URI=" + https://bitcoincore.org/bin/bitcoin-core-${PV}/${P/-tx}.tar.gz +" +S="${WORKDIR}"/${P/-tx} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + +# TODO: Can we drop virtual/bitcoin-leveldb from some bitcoin-*? +# (only bitcoin-qt, bitcoind should need it?) +RDEPEND=" + >=dev-libs/boost-1.64.0:= + >=dev-libs/libsecp256k1-0.2:=[recovery,schnorr] + virtual/bitcoin-leveldb +" +DEPEND="${RDEPEND}" + +DOCS=( + doc/bips.md + doc/release-notes.md +) + +PATCHES=( + "${FILESDIR}"/24.0.1-syslibs.patch +) + +pkg_pretend() { + elog "You are building ${PN} from Bitcoin Core." + elog "For more information, see:" + elog "https://bitcoincore.org/en/releases/${PV}/" +} + +src_prepare() { + default + + eautoreconf + rm -r src/leveldb src/secp256k1 || die +} + +src_configure() { + local myeconfargs=( + --disable-asm + --without-qtdbus + --disable-ebpf + --without-natpmp + --without-qrencode + --without-miniupnpc + --disable-tests + --disable-wallet + --disable-zmq + --enable-util-tx + --disable-util-util + --disable-util-cli + --disable-util-wallet + --disable-bench + --without-libs + --without-daemon + --without-gui + --disable-fuzz + --disable-fuzz-binary + --disable-ccache + --with-system-libsecp256k1 + --with-system-univalue + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newbashcomp contrib/${PN}.bash-completion ${PN} +} diff --git a/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch b/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch new file mode 100644 index 00000000000..00404a2ff02 --- /dev/null +++ b/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch @@ -0,0 +1,281 @@ +Originally based on 22.0-fix_build_without_leveldb.patch. + +- Allow system libsecp256k1 +- Allow system leveldb +- Abort if runtime leveldb != compiled-against leveldb +- Handle berkdb support being disabled better +--- a/configure.ac ++++ b/configure.ac +@@ -1362,6 +1362,23 @@ if test "$enable_fuzz_binary" = "yes"; then + CHECK_RUNTIME_LIB + fi + ++dnl Check for libsecp256k1, only if explicitly requested ++AC_ARG_WITH([system-libsecp256k1], ++ [AS_HELP_STRING([--with-system-libsecp256k1], ++ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])], ++ [system_libsecp256k1=$withval], ++ [system_libsecp256k1=no] ++) ++if test x$system_libsecp256k1 != xno; then ++ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) ++else ++ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' ++ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' ++fi ++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno]) ++AC_SUBST(libsecp256k1_CFLAGS) ++AC_SUBST(libsecp256k1_LIBS) ++ + if test "$enable_wallet" != "no"; then + dnl Check for libdb_cxx only if wallet enabled + if test "$use_bdb" != "no"; then +@@ -1413,11 +1430,76 @@ if test "$use_usdt" != "no"; then + fi + AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"]) + ++build_leveldb=yes + if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then + use_upnp=no + use_natpmp=no + use_zmq=no ++ build_leveldb=no ++fi ++ ++if test x$build_leveldb = xno; then ++ system_leveldb=no ++fi ++dnl Check for leveldb, only if explicitly requested ++if test x$system_leveldb != xno; then ++ build_leveldb=no ++ LEVELDB_CPPFLAGS= ++ AC_CHECK_LIB([leveldb],[main],[ ++ LIBLEVELDB=-lleveldb ++ ],[ ++ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[ ++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[ ++ AC_MSG_CHECKING([for memenv.h path]) ++ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) ++ ],[ ++ AC_CHECK_HEADER([memenv.h],[],[ ++ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) ++ ]) ++ ]) ++ ++ AC_MSG_CHECKING([library containing leveldb::NewMemEnv]) ++ TEMP_LIBS="$LIBS" ++ TEMP_CPPFLAGS="$CPPFLAGS" ++ CPPFLAGS="$CPPFLAGS $LEVELDB_CPPFLAGS" ++ for searchlib in "" "-lmemenv" ERR; do ++ if test "x$searchlib" = "xERR"; then ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([LevelDB's memenv helper not found; using --with-system-leveldb is not supported anyway]) ++ fi ++ searchlib="$searchlib $LIBLEVELDB" ++ LIBS="$searchlib $TEMP_LIBS" ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ ++ #include <leveldb/env.h> ++ #include <leveldb/helpers/memenv.h> ++ ++ int main() { ++ leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default()); ++ delete myenv; ++ } ++ ])],[ ++ AC_MSG_RESULT([$searchlib]) ++ LIBMEMENV="$searchlib" ++ break ++ ]) ++ done ++ LIBS="$TEMP_LIBS" ++ CPPFLAGS="$TEMP_CPPFLAGS" + fi ++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$build_leveldb = xyes]) ++AC_SUBST(LEVELDB_CPPFLAGS) ++AC_SUBST(LIBLEVELDB) ++AC_SUBST(LIBMEMENV) ++AC_ARG_WITH([system-leveldb], ++ [AS_HELP_STRING([--with-system-leveldb], ++ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], ++ [system_leveldb=$withval], ++ [system_leveldb=no] ++) + + dnl Check for libminiupnpc (optional) + if test "$use_upnp" != "no"; then +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -23,7 +23,7 @@ noinst_PROGRAMS = + TESTS = + BENCHMARKS = + +-BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS) ++BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) + + LIBBITCOIN_NODE=libbitcoin_node.a + LIBBITCOIN_COMMON=libbitcoin_common.a +@@ -32,7 +32,11 @@ LIBBITCOIN_CLI=libbitcoin_cli.a + LIBBITCOIN_UTIL=libbitcoin_util.a + LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.la + LIBBITCOINQT=qt/libbitcoinqt.a ++if EMBEDDED_LIBSECP256K1 + LIBSECP256K1=secp256k1/libsecp256k1.la ++else ++LIBSECP256K1=$(libsecp256k1_LIBS) ++endif + + if ENABLE_ZMQ + LIBBITCOIN_ZMQ=libbitcoin_zmq.a +@@ -67,8 +71,10 @@ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI) + endif + noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO) + ++if EMBEDDED_LIBSECP256K1 + $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(wildcard secp256k1/include/*) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) ++endif + + # Make is not made aware of per-object dependencies to avoid limiting building parallelization + # But to build the less dependent modules first, we manually select their order here: +@@ -1080,7 +1086,9 @@ endif + include Makefile.minisketch.include + + include Makefile.crc32c.include ++if EMBEDDED_LEVELDB + include Makefile.leveldb.include ++endif + + include Makefile.test_util.include + include Makefile.test_fuzz.include +--- a/src/Makefile.test.include ++++ b/src/Makefile.test.include +@@ -377,8 +377,9 @@ if ENABLE_BENCH + $(BENCH_BINARY) --sanity-check > /dev/null + endif + endif ++if EMBEDDED_LIBSECP256K1 + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check +- ++endif + if ENABLE_TESTS + UNIVALUE_TESTS = univalue/test/object univalue/test/unitester + noinst_PROGRAMS += $(UNIVALUE_TESTS) +--- a/src/dbwrapper.cpp ++++ b/src/dbwrapper.cpp +@@ -7,26 +7,45 @@ + #include <fs.h> + #include <logging.h> + #include <random.h> ++#include <node/interface_ui.h> + #include <tinyformat.h> + #include <util/strencodings.h> + #include <util/system.h> ++#include <util/translation.h> + + #include <algorithm> + #include <cassert> + #include <cstdarg> + #include <cstdint> + #include <cstdio> ++#include <leveldb/c.h> + #include <leveldb/cache.h> + #include <leveldb/db.h> + #include <leveldb/env.h> + #include <leveldb/filter_policy.h> +-#include <leveldb/helpers/memenv/memenv.h> ++#include <leveldb/helpers/memenv.h> + #include <leveldb/iterator.h> + #include <leveldb/options.h> + #include <leveldb/status.h> + #include <memory> + #include <optional> + ++bool dbwrapper_SanityCheck() ++{ ++ unsigned long header_version = (leveldb::kMajorVersion << 16) | leveldb::kMinorVersion; ++ unsigned long library_version = (leveldb_major_version() << 16) | leveldb_minor_version(); ++ ++ if (header_version != library_version) { ++ InitError(Untranslated(strprintf("Compiled with LevelDB %d.%d, but linked with LevelDB %d.%d (incompatible).", ++ leveldb::kMajorVersion, leveldb::kMinorVersion, ++ leveldb_major_version(), leveldb_minor_version() ++ ))); ++ return false; ++ } ++ ++ return true; ++} ++ + class CBitcoinLevelDBLogger : public leveldb::Logger { + public: + // This code is adapted from posix_logger.h, which is why it is using vsprintf. +--- a/src/dbwrapper.h ++++ b/src/dbwrapper.h +@@ -31,6 +31,8 @@ class Env; + static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64; + static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024; + ++bool dbwrapper_SanityCheck(); ++ + class dbwrapper_error : public std::runtime_error + { + public: +--- a/src/kernel/checks.cpp ++++ b/src/kernel/checks.cpp +@@ -3,9 +3,10 @@ + // file COPYING or http://www.opensource.org/licenses/mit-license.php. + + #include <kernel/checks.h> +- ++#include <dbwrapper.h> + #include <key.h> + #include <random.h> ++#include <node/interface_ui.h> + #include <util/time.h> + #include <util/translation.h> + +@@ -15,6 +16,10 @@ namespace kernel { + + std::optional<bilingual_str> SanityChecks(const Context&) + { ++ if (!dbwrapper_SanityCheck()) { ++ return Untranslated("Database sanity check failure. Aborting."); ++ } ++ + if (!ECC_InitSanityCheck()) { + return Untranslated("Elliptic curve cryptography sanity check failure. Aborting."); + } +--- a/src/qt/createwalletdialog.cpp ++++ b/src/qt/createwalletdialog.cpp +@@ -12,6 +12,7 @@ + + #include <qt/guiutil.h> + ++#include <QMessageBox> + #include <QPushButton> + + CreateWalletDialog::CreateWalletDialog(QWidget* parent) : +@@ -94,9 +95,16 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) : + ui->external_signer_checkbox->setChecked(false); + #endif + +-#ifndef USE_BDB +- ui->descriptor_checkbox->setEnabled(false); +- ui->descriptor_checkbox->setChecked(true); ++#ifdef USE_BDB ++ connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); ++#else ++ connect(ui->buttonBox, &QDialogButtonBox::accepted, [this]() { ++ if (!this->isDescriptorWalletChecked()) { ++ QMessageBox::critical(this, tr("Cannot create wallet"), tr("This build was compiled without BDB support, so only experimental descriptor wallets are supported.")); ++ return; ++ } ++ this->accept(); ++ }); + #endif + + #ifndef ENABLE_EXTERNAL_SIGNER diff --git a/dev-util/bitrise/bitrise-1.24.0.ebuild b/dev-util/bitrise/bitrise-1.24.0.ebuild index 59ddcd2ba0d..5932eadff4f 100644 --- a/dev-util/bitrise/bitrise-1.24.0.ebuild +++ b/dev-util/bitrise/bitrise-1.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ EGO_ON="github.com/bitrise-io" EGO_PN="${EGO_ON}/${PN}" DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine" -HOMEPAGE="https://www.bitrise.io/cli" +HOMEPAGE="https://app.bitrise.io/cli" SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" diff --git a/dev-util/bitrise/metadata.xml b/dev-util/bitrise/metadata.xml index 459e8441668..79232992197 100644 --- a/dev-util/bitrise/metadata.xml +++ b/dev-util/bitrise/metadata.xml @@ -1,18 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>karol.wrotniak@droidsonroids.pl</email> - <name>Karol Wrótniak</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription>Run your Bitrise automations with this CLI tool on any Mac or Linux machine, and use the same configuration on bitrise.io (automation service, with a mobile app focus). Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with stepman and envman. For a nice & quick intro you should check: https://www.bitrise.io/cli</longdescription> + <!-- maintainer-needed --> + <longdescription> + Run your Bitrise automations with this CLI tool on any Mac or Linux + machine, and use the same configuration on bitrise.io (automation + service, with a mobile app focus). Part of the Bitrise Continuous + Integration, Delivery and Automations Stack, with <pkg>dev-util/stepman</pkg> + and <pkg>dev-util/envman</pkg>. For a nice & quick intro you should check: + https://app.bitrise.io/cli + </longdescription> <upstream> <bugs-to>https://github.com/bitrise-io/bitrise/issues</bugs-to> - <changelog>https://github.com/bitrise-io/bitrise/blob/master/CHANGELOG.md</changelog> <doc>https://github.com/bitrise-io/bitrise/blob/master/README.md</doc> <remote-id type="github">bitrise-io/bitrise</remote-id> </upstream> diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest deleted file mode 100644 index 7e0c5659414..00000000000 --- a/dev-util/boost-build/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a SHA512 70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312 diff --git a/dev-util/boost-build/boost-build-1.79.0-r1.ebuild b/dev-util/boost-build/boost-build-1.79.0-r1.ebuild deleted file mode 100644 index 74cea514f58..00000000000 --- a/dev-util/boost-build/boost-build-1.79.0-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://www.boost.org/build/" -SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" -S="${WORKDIR}/boost_${MY_PV}/tools/build/src" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples" -RESTRICT="test" - -RDEPEND="!dev-util/b2" - -PATCHES=( - "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch - "${FILESDIR}"/${PN}-1.78.0-darwin-gentoo-toolchain.patch - "${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch - "${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch - "${FILESDIR}"/${PN}-1.78.0-no-implicit-march-flags.patch -) - -src_unpack() { - tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed" -} - -src_prepare() { - default - - pushd .. >/dev/null || die - eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch - popd >/dev/null || die -} - -src_configure() { - # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) - append-lfs-flags -} - -src_compile() { - cd engine || die - ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed" -} - -src_test() { - # Forget tests, bjam is a lost cause - : -} - -src_install() { - dobin engine/{bjam,b2} - - insinto /usr/share/boost-build/src - doins -r "${FILESDIR}/site-config.jam" \ - ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ - build kernel options tools util - - find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die - - dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt - - if use examples; then - docinto examples - dodoc -r ../example/. - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch deleted file mode 100644 index b7b47cc93a4..00000000000 --- a/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/python.jam -+++ b/tools/python.jam -@@ -1000,7 +1000,7 @@ - # linux). - : $(usage-requirements) - <testing.launcher>$(set-PYTHONPATH) -- <library-path>$(libraries) <dll-path>$(dll-path) <library>python.lib -+ <library-path>$(libraries) <library>python.lib - ; - } - diff --git a/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch deleted file mode 100644 index 3f8b177c710..00000000000 --- a/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test/startup_v2.py -+++ b/test/startup_v2.py -@@ -50,7 +50,7 @@ - return re.match(expected, actual, re.DOTALL) != None - - --t = BoostBuild.Tester(match=match_re, boost_build_path="", pass_toolset=0) -+t = BoostBuild.Tester(match=match_re, boost_build_path="/invalid/location", pass_toolset=0) - t.set_tree("startup") - check_for_existing_boost_build_jam(t) - diff --git a/dev-util/boost-build/files/boost-build-1.73.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.73.0-add-none-feature-options.patch deleted file mode 100644 index 1918a2456af..00000000000 --- a/dev-util/boost-build/files/boost-build-1.73.0-add-none-feature-options.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/tools/features/debug-feature.jam -+++ b/tools/features/debug-feature.jam -@@ -18,7 +18,7 @@ - |# # end::doc[] - - feature.feature debug-symbols -- : on off -+ : on off none - : propagated ; - - #| tag::prof-doc[] ---- a/tools/features/optimization-feature.jam -+++ b/tools/features/optimization-feature.jam -@@ -16,7 +16,7 @@ - |# # end::doc[] - - feature.feature optimization -- : off speed space -+ : off none speed space - : propagated ; - - #| tag::inline-doc[] diff --git a/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch b/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch deleted file mode 100644 index 2289e706ca7..00000000000 --- a/dev-util/boost-build/files/boost-build-1.76.0-respect-user-flags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/engine/build.sh -+++ b/engine/build.sh -@@ -496,7 +496,7 @@ - if test_true ${B2_DEBUG_OPT} ; then B2_CXXFLAGS="${B2_CXXFLAGS_DEBUG}" - else B2_CXXFLAGS="${B2_CXXFLAGS_RELEASE} -DNDEBUG" - fi -- ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${B2_CXXFLAGS} ${B2_SOURCES} -o b2 ) -+ ( B2_VERBOSE_OPT=${TRUE} echo_run ${B2_CXX} ${CPPFLAGS} ${B2_CXXFLAGS} ${LDFLAGS} ${B2_SOURCES} -o b2 ) - ( B2_VERBOSE_OPT=${TRUE} echo_run cp b2 bjam ) - } - diff --git a/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch deleted file mode 100644 index 8de98014dbd..00000000000 --- a/dev-util/boost-build/files/boost-build-1.78.0-darwin-gentoo-toolchain.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid adding all kinds of things to the toolchain's flags that within -Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, -arch, etc. - ---- a/tools/darwin.jam -+++ b/tools/darwin.jam -@@ -240,6 +240,9 @@ - } - } - -+ # leave compiler flags etc. up to the toolchain -+ return $(version-feature) ; -+ - if $(version-feature) - { - if $(.debug-configuration) diff --git a/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch deleted file mode 100644 index 093f40d0307..00000000000 --- a/dev-util/boost-build/files/boost-build-1.78.0-no-implicit-march-flags.patch +++ /dev/null @@ -1,284 +0,0 @@ ---- a/tools/gcc.jam -+++ b/tools/gcc.jam -@@ -1129,140 +1129,10 @@ - # x86 and compatible - # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. - # Use i686 instead for 32-bit. --toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ; --cpu-flags gcc OPTIONS : x86 : native : -march=native ; --cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; --cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; --cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; --cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; --cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; --cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; --cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; --cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; --cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; --cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; --cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; --cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; --cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; --cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; --cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; --cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; --cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; --cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; --cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; --cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; --cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; --cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; --cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ; --cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; --cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; --cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; --cpu-flags gcc OPTIONS : x86 : icelake-client : -march=icelake-client ; --cpu-flags gcc OPTIONS : x86 : icelake-server : -march=icelake-server ; --cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ; --cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ; --cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ; --cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; --cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; --cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; --cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ; --cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ; --cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ; --cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ; --cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ; - ## --cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ; --cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ; --cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ; --cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ; --cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ; --cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ; --cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ; --cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ; --cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ; --cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ; --cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ; --cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ; --cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ; --cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; --cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; --cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; --cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ; --cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; --cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; --cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; --cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; --cpu-flags gcc OPTIONS : x86 : c7 : -march=c7 ; - ## --cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; - # Sparc --cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; --cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; --cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; --cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ; --cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ; --cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ; --cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ; --cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ; --cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ; --cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ; --cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ; --cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ; - # RS/6000 & PowerPC --cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ; --cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ; --cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ; --cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ; --cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ; --cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ; --cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ; --cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ; --cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ; --cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ; --cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ; --cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ; --cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ; --cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ; --cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ; --cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ; --cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ; --cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ; --cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ; --cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ; --cpu-flags gcc OPTIONS : power : power : -mcpu=power ; --cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ; --cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ; --cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ; --cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ; --cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ; --cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ; --cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ; --cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ; --cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; --cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; --cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; --cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ; --cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ; --cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; --cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; --cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; - # ARM --cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ; --cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ; --cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; --cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; - # AIX variant of RS/6000 & PowerPC - toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; ---- a/tools/gcc.py -+++ b/tools/gcc.py -@@ -737,138 +737,14 @@ - # x86 and compatible - flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32']) - flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium2', ['-march=pentium2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3', ['-march=pentium3']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3m', ['-march=pentium3m']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-m', ['-march=pentium-m']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'broadwell', ['-march=broadwell']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'skylake', ['-march=skylake']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'skylake-avx512', ['-march=skylake-avx512']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'cannonlake', ['-march=skylake-avx512', '-mavx512vbmi', '-mavx512ifma', '-msha']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'icelake-client', ['-march=icelake-client']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'icelake-server', ['-march=icelake-server']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'cascadelake', ['-march=skylake-avx512', '-mavx512vnni']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'cooperlake', ['-march=cooperlake']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'tigerlake', ['-march=tigerlake']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon', ['-march=athlon']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-tbird', ['-march=athlon-tbird']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-4', ['-march=athlon-4']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-xp', ['-march=athlon-xp']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-mp', ['-march=athlon-mp']) - ## --cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'znver1', ['-march=znver1']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'znver2', ['-march=znver2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2']) --cpu_flags('gcc', 'OPTIONS', 'x86', 'c7', ['-march=c7']) - ## --cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom']) - # Sparc - flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32']) - flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc']) --cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3']) - # RS/6000 & PowerPC - flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32']) - flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64']) --cpu_flags('gcc', 'OPTIONS', 'power', '403', ['-mcpu=403']) --cpu_flags('gcc', 'OPTIONS', 'power', '505', ['-mcpu=505']) --cpu_flags('gcc', 'OPTIONS', 'power', '601', ['-mcpu=601']) --cpu_flags('gcc', 'OPTIONS', 'power', '602', ['-mcpu=602']) --cpu_flags('gcc', 'OPTIONS', 'power', '603', ['-mcpu=603']) --cpu_flags('gcc', 'OPTIONS', 'power', '603e', ['-mcpu=603e']) --cpu_flags('gcc', 'OPTIONS', 'power', '604', ['-mcpu=604']) --cpu_flags('gcc', 'OPTIONS', 'power', '604e', ['-mcpu=604e']) --cpu_flags('gcc', 'OPTIONS', 'power', '620', ['-mcpu=620']) --cpu_flags('gcc', 'OPTIONS', 'power', '630', ['-mcpu=630']) --cpu_flags('gcc', 'OPTIONS', 'power', '740', ['-mcpu=740']) --cpu_flags('gcc', 'OPTIONS', 'power', '7400', ['-mcpu=7400']) --cpu_flags('gcc', 'OPTIONS', 'power', '7450', ['-mcpu=7450']) --cpu_flags('gcc', 'OPTIONS', 'power', '750', ['-mcpu=750']) --cpu_flags('gcc', 'OPTIONS', 'power', '801', ['-mcpu=801']) --cpu_flags('gcc', 'OPTIONS', 'power', '821', ['-mcpu=821']) --cpu_flags('gcc', 'OPTIONS', 'power', '823', ['-mcpu=823']) --cpu_flags('gcc', 'OPTIONS', 'power', '860', ['-mcpu=860']) --cpu_flags('gcc', 'OPTIONS', 'power', '970', ['-mcpu=970']) --cpu_flags('gcc', 'OPTIONS', 'power', '8540', ['-mcpu=8540']) --cpu_flags('gcc', 'OPTIONS', 'power', 'power', ['-mcpu=power']) --cpu_flags('gcc', 'OPTIONS', 'power', 'power2', ['-mcpu=power2']) --cpu_flags('gcc', 'OPTIONS', 'power', 'power3', ['-mcpu=power3']) --cpu_flags('gcc', 'OPTIONS', 'power', 'power4', ['-mcpu=power4']) --cpu_flags('gcc', 'OPTIONS', 'power', 'power5', ['-mcpu=power5']) --cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc', ['-mcpu=powerpc']) --cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc64', ['-mcpu=powerpc64']) --cpu_flags('gcc', 'OPTIONS', 'power', 'rios', ['-mcpu=rios']) --cpu_flags('gcc', 'OPTIONS', 'power', 'rios1', ['-mcpu=rios1']) --cpu_flags('gcc', 'OPTIONS', 'power', 'rios2', ['-mcpu=rios2']) --cpu_flags('gcc', 'OPTIONS', 'power', 'rsc', ['-mcpu=rsc']) --cpu_flags('gcc', 'OPTIONS', 'power', 'rs64a', ['-mcpu=rs64']) --cpu_flags('gcc', 'OPTIONS', 's390x', 'z196', ['-march=z196']) --cpu_flags('gcc', 'OPTIONS', 's390x', 'zEC12', ['-march=zEC12']) --cpu_flags('gcc', 'OPTIONS', 's390x', 'z13', ['-march=z13']) --cpu_flags('gcc', 'OPTIONS', 's390x', 'z14', ['-march=z14']) --cpu_flags('gcc', 'OPTIONS', 's390x', 'z15', ['-march=z15']) - # AIX variant of RS/6000 & PowerPC - flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32/<target-os>aix'], ['-maix32']) - flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64/<target-os>aix'], ['-maix64']) diff --git a/dev-util/boost-build/files/site-config.jam b/dev-util/boost-build/files/site-config.jam deleted file mode 100644 index 6afe52684cc..00000000000 --- a/dev-util/boost-build/files/site-config.jam +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -# Define two new variants to be used when building boost (or separate boost-libs) -# on Gentoo. The two variants make use of Gentoo-specific optimization and debug-symbols -# values "none" which are not part of the official boost distribution. -# DO NOT RELY ON THE FOLLOWING VARIANTS TO BE PRESENT ON OTHER OS! -variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ; -variant gentoodebug : debug : <optimization>none <debug-symbols>on <runtime-link>shared ; - diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest index a54bc763955..6379bf4e6bb 100644 --- a/dev-util/bpftool/Manifest +++ b/dev-util/bpftool/Manifest @@ -1,6 +1,7 @@ -DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623 -DIST patch-5.18.11.xz 595980 BLAKE2B 74b305bd21c71c9328f02183c3b098ee1e476c1d58e79120b5d9e9ab53da5c32ffe4bba6f4e4c0d75188f187b81fc898fe9fd29762695254e23702caa824f0aa SHA512 5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415 -DIST patch-5.19.2.xz 475316 BLAKE2B e1a3238a1cfb33178d1d9608821ad1f275165b0df0f4883dfd136ebe2ff31839d4cb82af60a874673b256653a0eca625dcb9016179ae9d1522099465b2014642 SHA512 53aecf0c08ce7bbd10e8f7a75397155054badeedbd20a2ef228c6726436e701095a79ae5322c8052550cbd79b8dc02b7caa30c8916cae5733a2bc04ed3157299 -DIST patch-5.19.8.xz 695676 BLAKE2B 3b661fec35c883a97f2f2b489e43cb276eb7cfe6818d37cc3482c880d8c52d3f4ce740b9791d30095d21146ae842988f684c2f7bd153359ba8d2adaaef71221c SHA512 16ee25c1a215a9a14e6bcc4ce6b1a7a83cb99c2ea7754974e247e7a84b21cab8d9f56f174fb49fc682f6a79507c0d7dc3c1162226680364eaa2e632bfb52b161 +DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 +DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 +DIST patch-5.19.12.xz 828424 BLAKE2B fa5c2a42443179dd36ee62b6b14415b261ff528296d8cf6c335012baf1408ab8b981236b247da2f8d0a68ecef5e8bc65b6e77bd8800ef1962b258fdf3f692ac1 SHA512 40ec4228cfac91607a645971ebd85e8b85d20c4d93d5fbe3fbecf87d51958c44ff218f931a1bd8f80157e66d3c956a5391cd9aef027098003b6724a6bc49b8bc +DIST patch-6.0.12.xz 635356 BLAKE2B f7407d0f95ee70e7cbb80139e61b68d2da5467a95a3d4a3c9c434616f2c6420beea483b115c60ce645d4ba586188d8beb8a82ddb32de09816d6773ba89bc21aa SHA512 d604975d02735d6ba8f98268d418397d78bf49d129aabd326599196708bf05795b17d22398ddd0229bc2944f7b152902e9638ff9aa04977c46a229566894dd00 +DIST patch-6.1.7.xz 533812 BLAKE2B b08005dfaa1247378fa2b3d1955537bcbbc6ee8c9171552e27ce51716c4c414e6b442d6ee33344431275e6b0140f315a5ea986977d102b298bb7651e5dbbbcef SHA512 e824cca5bb1e98439b152b15674292f042a5df8567ba2439a111af58084277ff800df6b326d6ecf0e3ee325d5ab2d2ddddd9dc31db7a0176828f1690bd855b2a DIST perf-5.19-binutils-2.39-patches.tar.xz 5612 BLAKE2B ec3aeadc3e2508f33dddbb419f434885b39b8220d294f3845f0bc96282923ff46dca126a04c732b8286752e56087ba5b2c5ad9526884f6d0b8b6df5665121e5e SHA512 af676e5a600e227d85f89a5ee0cfacfe1845aa56c27ef9da3ebaf578362d7e741375d30565759123b33b86d36bc9981c8c4cda113af32745cc59cf4a9275e73b diff --git a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild b/dev-util/bpftool/bpftool-5.19.12.ebuild index 3b2b5a406a2..fa8315db60c 100644 --- a/dev-util/bpftool/bpftool-5.19.2-r1.ebuild +++ b/dev-util/bpftool/bpftool-5.19.12.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..10} ) +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -27,7 +27,7 @@ S="${S_K}/tools/bpf/bpftool" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv ~x86" IUSE="caps" RDEPEND=" @@ -43,6 +43,7 @@ DEPEND=" BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} ${PYTHON_DEPS} + app-arch/tar dev-python/docutils " @@ -56,10 +57,9 @@ src_unpack() { tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" ) - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). + # We expect the tar implementation to support the -j and --wildcards option echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ + gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ "${paths[@]/#/linux-${LINUX_VER}/}" || die if [[ -n ${LINUX_PATCH} ]] ; then @@ -92,6 +92,7 @@ src_prepare() { # Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00` # bug #868123 eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches + eapply "${FILESDIR}"/${PV}-no-stack-protector.patch popd || die # dev-python/docutils installs rst2man.py, not rst2man @@ -106,6 +107,7 @@ bpftool_make() { HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ feature-libcap="$(usex caps 1 0)" \ "$@" } diff --git a/dev-util/bpftool/bpftool-5.18.11.ebuild b/dev-util/bpftool/bpftool-6.0.12.ebuild index fe508400267..4f68a43259e 100644 --- a/dev-util/bpftool/bpftool-5.18.11.ebuild +++ b/dev-util/bpftool/bpftool-6.0.12.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..10} ) +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~riscv ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="caps" RDEPEND=" @@ -41,6 +41,7 @@ DEPEND=" BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} ${PYTHON_DEPS} + app-arch/tar dev-python/docutils " @@ -54,10 +55,9 @@ src_unpack() { tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" ) - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). + # We expect the tar implementation to support the -j and --wildcards option echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ + gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ "${paths[@]/#/linux-${LINUX_VER}/}" || die if [[ -n ${LINUX_PATCH} ]] ; then @@ -86,6 +86,11 @@ src_prepare() { popd || die fi + pushd "${S_K}" >/dev/null || die + # bug #890638 + eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch + popd || die + # dev-python/docutils installs rst2man.py, not rst2man sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die } @@ -98,6 +103,7 @@ bpftool_make() { HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ feature-libcap="$(usex caps 1 0)" \ "$@" } diff --git a/dev-util/bpftool/bpftool-5.19.8.ebuild b/dev-util/bpftool/bpftool-6.1.7.ebuild index 3b2b5a406a2..4f68a43259e 100644 --- a/dev-util/bpftool/bpftool-5.19.8.ebuild +++ b/dev-util/bpftool/bpftool-6.1.7.ebuild @@ -1,10 +1,10 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit estack linux-info optfeature python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{9..10} ) +inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs MY_PV="${PV/_/-}" MY_PV="${MY_PV/-pre/-git}" @@ -20,8 +20,6 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/dev-util/perf/perf-5.19-binutils-2.39-patches.tar.xz" - S_K="${WORKDIR}/linux-${LINUX_VER}" S="${S_K}/tools/bpf/bpftool" @@ -43,6 +41,7 @@ DEPEND=" BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} ${PYTHON_DEPS} + app-arch/tar dev-python/docutils " @@ -56,10 +55,9 @@ src_unpack() { tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib" ) - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). + # We expect the tar implementation to support the -j and --wildcards option echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ + gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ "${paths[@]/#/linux-${LINUX_VER}/}" || die if [[ -n ${LINUX_PATCH} ]] ; then @@ -89,9 +87,8 @@ src_prepare() { fi pushd "${S_K}" >/dev/null || die - # Used `git format-patch 00b32625982e0c796f0abb8effcac9c05ef55bd3...600b7b26c07a070d0153daa76b3806c1e52c9e00` - # bug #868123 - eapply "${WORKDIR}"/perf-5.19-binutils-2.39-patches + # bug #890638 + eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch popd || die # dev-python/docutils installs rst2man.py, not rst2man @@ -106,6 +103,7 @@ bpftool_make() { HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \ EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \ prefix="${EPREFIX}"/usr \ + bash_compdir="$(get_bashcompdir)" \ feature-libcap="$(usex caps 1 0)" \ "$@" } diff --git a/dev-util/bpftool/files/5.19.12-no-stack-protector.patch b/dev-util/bpftool/files/5.19.12-no-stack-protector.patch new file mode 100644 index 00000000000..c9ae115ac20 --- /dev/null +++ b/dev-util/bpftool/files/5.19.12-no-stack-protector.patch @@ -0,0 +1,14 @@ + +https://bugs.gentoo.org/890638 + +--- a/tools/bpf/bpftool/Makefile 2022-12-11 23:15:18.000000000 +0100 ++++ b/tools/bpf/bpftool/Makefile 2023-01-13 10:32:09.615048492 +0100 +@@ -187,7 +187,7 @@ $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUT + -I$(or $(OUTPUT),.) \ + -I$(srctree)/tools/include/uapi/ \ + -I$(LIBBPF_BOOTSTRAP_INCLUDE) \ +- -g -O2 -Wall -target bpf -c $< -o $@ ++ -g -O2 -Wall -fno-stack-protector -target bpf -c $< -o $@ + $(Q)$(LLVM_STRIP) -g $@ + + $(OUTPUT)%.skel.h: $(OUTPUT)%.bpf.o $(BPFTOOL_BOOTSTRAP) diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 308364d6afc..d51f5f17e32 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,3 +1,2 @@ -DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614 -DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B 20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e SHA512 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734 +DIST bpftrace-0.17.0.gh.tar.gz 1033934 BLAKE2B 960582096fcf1652a65c4f8e18dcc5e17792c3b5c048dff59465fc1fc43d39e033c06ebc5c9bc88310b429a81fac5a8cfcdc261e7f0dcdcba4823b518f74fa3e SHA512 b1c8fc81b23f38bc45b4e73edd29c4cd0775e703b368612f00902fbda39dc3758038cd7afa351c1711cec467efd2a199a6b8b933b03aebd591d230d533e190d3 diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild b/dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild index 6f9fca048fd..3f624490bfe 100644 --- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild +++ b/dev-util/bpftrace/bpftrace-0.16.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,7 @@ SLOT="0" # remove keywords until build works: # https://github.com/iovisor/bpftrace/issues/2349 -#KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="fuzzing test" # lots of fixing needed @@ -27,7 +27,6 @@ RESTRICT="test" RDEPEND=" >=dev-libs/libbpf-1.0:= >=dev-util/bcc-0.25.0:= - dev-util/systemtap <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] sys-libs/binutils-libs:= @@ -39,7 +38,6 @@ DEPEND=" test? ( dev-cpp/gtest ) " BDEPEND=" - sys-apps/sed app-arch/xz-utils sys-devel/flex sys-devel/bison @@ -55,7 +53,6 @@ PATCHES=( "${FILESDIR}/bpftrace-0.16.0-install-libs.patch" "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" - "${FILESDIR}/bpftrace-0.16.0-link.patch" ) pkg_pretend() { @@ -76,7 +73,7 @@ pkg_setup() { } src_configure() { - local -a mycmakeargs=( + local mycmakeargs=( -DSTATIC_LINKING:BOOL=OFF # bug 809362, 754648 -DBUILD_TESTING:BOOL=$(usex test) diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild index 1095ed8e6fd..dca9044e1ff 100644 --- a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild +++ b/dev-util/bpftrace/bpftrace-0.16.0-r2.ebuild @@ -1,33 +1,32 @@ -# Copyright 2019-2022 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -LLVM_MAX_SLOT=15 +LLVM_MAX_SLOT=16 -inherit llvm linux-info cmake toolchain-funcs +inherit llvm linux-info cmake DESCRIPTION="High-level tracing language for eBPF" HOMEPAGE="https://github.com/iovisor/bpftrace" MY_PV="${PV//_/}" -SRC_URI=" - https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz -" +SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" LICENSE="Apache-2.0" SLOT="0" + +# remove keywords until build works: +# https://github.com/iovisor/bpftrace/issues/2349 KEYWORDS="~amd64 ~arm64 ~x86" IUSE="fuzzing test" + # lots of fixing needed RESTRICT="test" RDEPEND=" - >=dev-libs/libbpf-0.8:= - <dev-libs/libbpf-1.0:= - >=dev-util/bcc-0.13.0:= - dev-util/systemtap + >=dev-libs/libbpf-1.0:= + >=dev-util/bcc-0.25.0:= <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] sys-libs/binutils-libs:= @@ -39,22 +38,22 @@ DEPEND=" test? ( dev-cpp/gtest ) " BDEPEND=" - sys-apps/sed app-arch/xz-utils sys-devel/flex sys-devel/bison virtual/pkgconfig " -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" +QA_DT_NEEDED=" + /usr/lib.*/libbpftraceresources.so + /usr/lib.*/libcxxdemangler_llvm.so +" PATCHES=( - "${FILESDIR}/bpftrace-0.15.0-install-libs.patch" + "${FILESDIR}/bpftrace-0.16.0-install-libs.patch" "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" - "${FILESDIR}/bpftrace-0.15.0-bcc-025.patch" - "${FILESDIR}/bpftrace-0.15.0-binutils-2.39.patch" - "${FILESDIR}/bpftrace-0.15.0-llvm-15-pointers.patch" + "${FILESDIR}/bpftrace-0.16.0-opaquepointer.patch" ) pkg_pretend() { @@ -75,14 +74,12 @@ pkg_setup() { } src_configure() { - local -a mycmakeargs=( + local mycmakeargs=( -DSTATIC_LINKING:BOOL=OFF # bug 809362, 754648 - -DBUILD_SHARED_LIBS:=OFF - -DBUILD_TESTING:BOOL=OFF + -DBUILD_TESTING:BOOL=$(usex test) -DBUILD_FUZZ:BOOL=$(usex fuzzing) -DENABLE_MAN:BOOL=OFF - -DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')" ) cmake_src_configure diff --git a/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild new file mode 100644 index 00000000000..f976f34e841 --- /dev/null +++ b/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 2019-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LLVM_MAX_SLOT=16 + +inherit llvm linux-info cmake + +DESCRIPTION="High-level tracing language for eBPF" +HOMEPAGE="https://github.com/iovisor/bpftrace" +MY_PV="${PV//_/}" +SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" + +LICENSE="Apache-2.0" +SLOT="0" + +# remove keywords until build works: +# https://github.com/iovisor/bpftrace/issues/2349 +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="fuzzing test" + +# lots of fixing needed +RESTRICT="test" + +RDEPEND=" + >=dev-libs/libbpf-1.1:= + >=dev-util/bcc-0.25.0:= + >=sys-devel/llvm-10:=[llvm_targets_BPF(+)] + >=sys-devel/clang-10:= + <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= + <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)] + sys-libs/binutils-libs:= + virtual/libelf:= +" +DEPEND=" + ${COMMON_DEPEND} + dev-libs/cereal:= + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-arch/xz-utils + sys-devel/flex + sys-devel/bison + virtual/pkgconfig +" + +QA_DT_NEEDED=" + /usr/lib.*/libbpftraceresources.so + /usr/lib.*/libcxxdemangler_llvm.so +" + +PATCHES=( + "${FILESDIR}/bpftrace-0.17.0-install-libs.patch" + "${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch" + "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" +) + +pkg_pretend() { + local CONFIG_CHECK=" + ~BPF + ~BPF_EVENTS + ~BPF_JIT + ~BPF_SYSCALL + ~FTRACE_SYSCALLS + ~HAVE_EBPF_JIT + " + + check_extra_config +} + +pkg_setup() { + llvm_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DSTATIC_LINKING:BOOL=OFF + # bug 809362, 754648 + -DBUILD_TESTING:BOOL=$(usex test) + -DBUILD_FUZZ:BOOL=$(usex fuzzing) + -DENABLE_MAN:BOOL=OFF + -DUSE_SYSTEM_BPF_BCC:BOOL=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + # bug 809362 + dostrip -x /usr/bin/bpftrace + doman man/man8/*.? +} diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch deleted file mode 100644 index ef2ca76e1c5..00000000000 --- a/dev-util/bpftrace/files/bpftrace-0.15.0-bcc-025.patch +++ /dev/null @@ -1,88 +0,0 @@ -From f86c3bde84d9e75ec2780a51a1ca7dc20a4740e6 Mon Sep 17 00:00:00 2001 -From: Dominique Martinet <asmadeus@codewreck.org> -Date: Thu, 25 Aug 2022 21:47:30 +0900 -Subject: [PATCH] Fix builds against bcc >= 0.25.0 - -libbpf 1.0.0 removed bpf_load_program_attr in -https://github.com/libbpf/libbpf/commit/9476dce6fe905a6bf1d4c483f7b2b8575c4ffb2d -and bcc 0.25.0 in turn changed bcc_prog_load_xattr to use -bpf_prog_load_opts instead in -https://github.com/iovisor/bcc/commit/185143bdec6134255363446f644acd766ffb3825 - -Add a compile check to use the appropriate version - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c5c4c39630d2..f23b2ba52740 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -138,7 +138,7 @@ check_symbol_exists(bpf_attach_kfunc "${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_ - check_symbol_exists(bcc_usdt_addsem_probe "${LIBBCC_INCLUDE_DIRS}/bcc/bcc_usdt.h" HAVE_BCC_USDT_ADDSEM) - check_symbol_exists(bcc_procutils_which_so "${LIBBCC_INCLUDE_DIRS}/bcc/bcc_proc.h" HAVE_BCC_WHICH_SO) - --# bcc_prog_load_xattr needs struct bpf_load_program_attr, -+# bcc_prog_load_xattr needs struct bpf_prog_load_opts or bpf_load_program_attr, - # which is defined in libbpf - if (LIBBPF_FOUND) - check_symbol_exists(bcc_prog_load_xattr "${LIBBCC_INCLUDE_DIRS}/bcc/libbpf.h" HAVE_BCC_PROG_LOAD_XATTR) -@@ -236,6 +236,10 @@ if(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) - set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) - endif(LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) - -+if(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) -+ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) -+endif(LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) -+ - if (HAVE_BCC_KFUNC) - set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" HAVE_BCC_KFUNC) - endif(HAVE_BCC_KFUNC) -diff --git a/cmake/FindLibBcc.cmake b/cmake/FindLibBcc.cmake -index 7b4f12835786..20d2e68cd75f 100644 ---- a/cmake/FindLibBcc.cmake -+++ b/cmake/FindLibBcc.cmake -@@ -85,6 +85,16 @@ int main(void) { - return 0; - } - " LIBBCC_ATTACH_UPROBE_SEVEN_ARGS_SIGNATURE) -+CHECK_CXX_SOURCE_COMPILES(" -+#include <bcc/libbpf.h> -+ -+int main(void) { -+ struct bpf_prog_load_opts *opts = (struct bpf_prog_load_opts*) 1; -+ -+ bcc_prog_load_xattr(BPF_PROG_TYPE_UNSPEC, 0, 0, 0, opts, 0, 0, 0, true); -+ return 0; -+} -+" LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS) - SET(CMAKE_REQUIRED_INCLUDES) - - SET(CMAKE_REQUIRED_LIBRARIES ${LIBBCC_BPF_LIBRARIES}) -diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp -index 60778e53ce44..dd46f15fd8d2 100644 ---- a/src/attached_probe.cpp -+++ b/src/attached_probe.cpp -@@ -731,7 +731,24 @@ void AttachedProbe::load_prog() - continue; - } - --#ifdef HAVE_BCC_PROG_LOAD_XATTR -+#ifdef LIBBCC_PROG_LOAD_XATTRS_WITH_OPTS -+ struct bpf_prog_load_opts opts = { }; -+ -+ opts.sz = sizeof(opts); -+ opts.log_level = log_level; -+ -+ progfd_ = bcc_prog_load_xattr( -+ progtype(probe_.type), -+ name.c_str(), -+ license, -+ reinterpret_cast<struct bpf_insn *>(insns), -+ &opts, -+ prog_len, -+ log_buf.get(), -+ log_buf_size, -+ true); -+ -+#elif HAVE_BCC_PROG_LOAD_XATTR - struct bpf_load_program_attr attr = {}; - - attr.prog_type = progtype(probe_.type); diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch deleted file mode 100644 index cb4b8a9bb2d..00000000000 --- a/dev-util/bpftrace/files/bpftrace-0.15.0-binutils-2.39.patch +++ /dev/null @@ -1,87 +0,0 @@ - -Patch taken from: https://github.com/iovisor/bpftrace/pull/2328 -Removed hunk #1 (CHANGELOG.md) since it conflicts and is not required. -Bug: https://bugs.gentoo.org/868120 - -From 3be6e708d514d3378a4fe985ab907643ecbc77ee Mon Sep 17 00:00:00 2001 -From: Viktor Malik <viktor.malik@gmail.com> -Date: Mon, 15 Aug 2022 15:13:14 +0200 -Subject: [PATCH] Fix builds against libbfd(binutils) >=2.39 - -Binutils 2.39 changed signature of the init_disassemble_info function by -adding an extra parameter for styled printf function. Let CMake detect -which of the versions is present and call it appropriately. ---- - CHANGELOG.md | 2 ++ - CMakeLists.txt | 3 +++ - cmake/FindLibBfd.cmake | 10 ++++++++++ - src/bfd-disasm.cpp | 14 ++++++++++++++ - 4 files changed, 29 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8f7995afd2..2e54eb84f8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -249,6 +249,9 @@ if(HAVE_BFD_DISASM) - if(LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) - set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) - endif(LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) -+ if(LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) -+ set(BPFTRACE_FLAGS "${BPFTRACE_FLAGS}" LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) -+ endif(LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) - endif(HAVE_BFD_DISASM) - - if (LIBBPF_BTF_DUMP_FOUND) -diff --git a/cmake/FindLibBfd.cmake b/cmake/FindLibBfd.cmake -index 4f4b8c4e20..5d917b188c 100644 ---- a/cmake/FindLibBfd.cmake -+++ b/cmake/FindLibBfd.cmake -@@ -75,5 +75,15 @@ int main(void) { - abfd); - return 0; - }" LIBBFD_DISASM_FOUR_ARGS_SIGNATURE) -+CHECK_CXX_SOURCE_COMPILES(" -+// See comment in bfd-disasm.cpp for why this needs to exist -+#define PACKAGE \"bpftrace-test\" -+#include <dis-asm.h> -+ -+int main(void) { -+ init_disassemble_info(NULL, NULL, NULL, NULL); -+ return 0; -+} -+" LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE) - SET(CMAKE_REQUIRED_LIBRARIES) - endif() -diff --git a/src/bfd-disasm.cpp b/src/bfd-disasm.cpp -index f846468cd8..d4165dfac5 100644 ---- a/src/bfd-disasm.cpp -+++ b/src/bfd-disasm.cpp -@@ -38,6 +38,16 @@ static int fprintf_nop(void *out __attribute__((unused)), const char *fmt __attr - return 0; - } - -+#ifdef LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE -+static int fprintf_styled_nop(void *out __attribute__((unused)), -+ enum disassembler_style s __attribute__((unused)), -+ const char *fmt __attribute__((unused)), -+ ...) -+{ -+ return 0; -+} -+#endif -+ - static AlignState is_aligned_buf(void *buf, uint64_t size, uint64_t offset) - { - disassembler_ftype disassemble; -@@ -55,7 +65,11 @@ static AlignState is_aligned_buf(void *buf, uint64_t size, uint64_t offset) - return AlignState::Fail; - } - -+#ifdef LIBBFD_INIT_DISASM_INFO_FOUR_ARGS_SIGNATURE -+ init_disassemble_info(&info, stdout, fprintf_nop, fprintf_styled_nop); -+#else - init_disassemble_info(&info, stdout, fprintf_nop); -+#endif - - info.arch = bfd_get_arch(bfdf); - info.mach = bfd_get_mach(bfdf); diff --git a/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch deleted file mode 100644 index b20e39e4d26..00000000000 --- a/dev-util/bpftrace/files/bpftrace-0.15.0-install-libs.patch +++ /dev/null @@ -1,199 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c5c4c396..4bc3e499 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -103,9 +103,10 @@ find_package(FLEX REQUIRED) - bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE) - flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc) - add_flex_bison_dependency(flex_lexer bison_parser) --add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) --target_compile_options(parser PRIVATE "-w") --target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) -+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) -+target_compile_options(bpftraceparser PRIVATE "-w") -+target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) -+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - include(CheckSymbolExists) - set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) -diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt -index a95c60a1..f5c4d676 100644 ---- a/resources/CMakeLists.txt -+++ b/resources/CMakeLists.txt -@@ -1,6 +1,7 @@ --add_library(resources headers.cpp) -+add_library(bpftraceresources headers.cpp) - --target_include_directories(resources PUBLIC ../src) -+target_include_directories(bpftraceresources PUBLIC ../src) -+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - function(embed_headers output) - file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 66a7fd66..738d9327 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -41,7 +41,7 @@ add_library(runtime - ${BFD_DISASM_SRC} - ) - # Ensure flex+bison outputs are built first --add_dependencies(runtime parser) -+add_dependencies(runtime bpftraceparser) - - add_library(libbpftrace - build_info.cpp -@@ -58,6 +58,7 @@ add_executable(${BPFTRACE} - ) - - install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - target_link_libraries(${BPFTRACE} libbpftrace) - - if (BUILD_FUZZ) -@@ -110,6 +111,7 @@ target_include_directories(runtime PRIVATE ${CMAKE_BINARY_DIR}) - target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src) - target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast) - target_compile_definitions(runtime PRIVATE ${BPFTRACE_FLAGS}) -+install(TARGETS runtime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS}) - - # Linking -@@ -122,7 +124,8 @@ if(STATIC_LINKING) - endif(STATIC_LINKING) - - --target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm) -+target_link_libraries(libbpftrace bpftraceparser bpftraceresources -+ runtime aot bpftraceast bpftracearch cxxdemangler_llvm) - - if (LIBBPF_BTF_DUMP_FOUND) - target_include_directories(runtime PUBLIC ${LIBBPF_INCLUDE_DIRS}) -diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt -index 291d53f2..22944ddc 100644 ---- a/src/aot/CMakeLists.txt -+++ b/src/aot/CMakeLists.txt -@@ -2,6 +2,7 @@ add_library(aot aot.cpp) - target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src) - target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR}) - target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS}) -+install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - # Only build aotrt if supported bcc is used - # (https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44) -@@ -10,7 +11,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) - endif() - - add_executable(bpftrace-aotrt aot_main.cpp) --target_link_libraries(bpftrace-aotrt aot runtime arch ast_defs cxxdemangler_stdlib) -+target_link_libraries(bpftrace-aotrt aot runtime bpftracearch ast_defs cxxdemangler_stdlib) - install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR}) - - # Linking -diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt -index 127c3528..4e05d40a 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,17 +1,19 @@ - if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") -- add_library(arch aarch64.cpp) -+ add_library(bpftracearch aarch64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") -- add_library(arch ppc64.cpp) -+ add_library(bpftracearch ppc64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR - CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x") -- add_library(arch s390.cpp) -+ add_library(bpftracearch s390.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") -- add_library(arch x86_64.cpp) -+ add_library(bpftracearch x86_64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64") -- add_library(arch mips64.cpp) -+ add_library(bpftracearch mips64.cpp) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") -- add_library(arch riscv64.cpp) -+ add_library(bpftracearch riscv64.cpp) - else() - message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") - endif() -+ -+install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt -index 014295cd..c35f6ac6 100644 ---- a/src/ast/CMakeLists.txt -+++ b/src/ast/CMakeLists.txt -@@ -1,6 +1,6 @@ - add_library(ast_defs ast.cpp) - --add_library(ast -+add_library(bpftraceast - async_event_types.cpp - attachpoint_parser.cpp - int_parser.cpp -@@ -20,11 +20,13 @@ add_library(ast - target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src) - target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) - target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR}) --target_link_libraries(ast ast_defs arch bpforc parser) -+target_link_libraries(bpftraceast ast_defs bpftracearch bpforc bpftraceparser) -+install(TARGETS ast_defs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - --add_dependencies(ast_defs parser) -+add_dependencies(ast_defs bpftraceparser) - --target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS}) -+target_compile_definitions(bpftraceast PRIVATE ${BPFTRACE_FLAGS}) - - if (STATIC_LINKING) - set(clang_libs -@@ -55,11 +57,11 @@ if (STATIC_LINKING) - - - if(EMBED_USE_LLVM) -- target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") -+ target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") - else() - llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names}) -- target_link_libraries(ast ${clang_libs}) -- target_link_libraries(ast ${llvm_libs}) -+ target_link_libraries(bpftraceast ${clang_libs}) -+ target_link_libraries(bpftraceast ${llvm_libs}) - endif() - - if(STATIC_LIBC) -@@ -69,13 +71,13 @@ if (STATIC_LINKING) - else() - find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS}) - if(found_LLVM) -- target_link_libraries(ast LLVM) -+ target_link_libraries(bpftraceast LLVM) - else() - llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD}) - llvm_expand_dependencies(llvm_libs ${_llvm_libs}) -- target_link_libraries(ast ${llvm_libs}) -+ target_link_libraries(bpftraceast ${llvm_libs}) - endif() -- target_link_libraries(ast libclang) -+ target_link_libraries(bpftraceast libclang) - endif() - - add_subdirectory(bpforc) -diff --git a/src/ast/bpforc/CMakeLists.txt b/src/ast/bpforc/CMakeLists.txt -index 3f6dbefa..8ccfbb2b 100644 ---- a/src/ast/bpforc/CMakeLists.txt -+++ b/src/ast/bpforc/CMakeLists.txt -@@ -1 +1,2 @@ - add_library(bpforc bpforc.cpp) -+install(TARGETS bpforc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/src/cxxdemangler/CMakeLists.txt b/src/cxxdemangler/CMakeLists.txt -index 04cfcdd9..5677aa4b 100644 ---- a/src/cxxdemangler/CMakeLists.txt -+++ b/src/cxxdemangler/CMakeLists.txt -@@ -1,2 +1,4 @@ - add_library(cxxdemangler_stdlib cxxdemangler_stdlib.cpp) - add_library(cxxdemangler_llvm cxxdemangler_llvm.cpp) -+install(TARGETS cxxdemangler_stdlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS cxxdemangler_llvm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/dev-util/bpftrace/files/bpftrace-0.16.0-opaquepointer.patch b/dev-util/bpftrace/files/bpftrace-0.16.0-opaquepointer.patch new file mode 100644 index 00000000000..656bf0f6a63 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.16.0-opaquepointer.patch @@ -0,0 +1,450 @@ +commit a8665b2ef3199e82fd2ad076c1f07f1af2ec9272 +Author: Viktor Malik <viktor.malik@gmail.com> +Date: Mon Oct 10 14:26:38 2022 +0200 + + IR builder: get rid of getPointerElementType calls + + Usage of Value::getPointerElementType is deprecated and will be dropped + in LLVM 16 [1]. + + There are several places where we use this method: + - function (value) calls - the called function type is usually + available, so just pass it to createCall, the only exception is + CreateProbeReadStr which must have been refactored + - getting the type of alloca instruction - there is a dedicated + AllocaInst::getAllocatedType method that can be used instead + - strncmp - pass sizes of the strings to CreateStrncmp to be able to get + the correct string type (which is array of uint8) + + [1] https://llvm.org/docs/OpaquePointers.html + +diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp +index 09ae1c5e..da120ba1 100644 +--- a/src/ast/irbuilderbpf.cpp ++++ b/src/ast/irbuilderbpf.cpp +@@ -291,17 +291,16 @@ CallInst *IRBuilderBPF::CreateHelperCall(libbpf::bpf_func_id func_id, + Constant *helper_func = ConstantExpr::getCast(Instruction::IntToPtr, + getInt64(func_id), + helper_ptr_type); +- return createCall(helper_func, args, Name); ++ return createCall(helper_type, helper_func, args, Name); + } + +-CallInst *IRBuilderBPF::createCall(Value *callee, ++CallInst *IRBuilderBPF::createCall(FunctionType *callee_type, ++ Value *callee, + ArrayRef<Value *> args, + const Twine &Name) + { + #if LLVM_VERSION_MAJOR >= 11 +- auto *calleePtrType = cast<PointerType>(callee->getType()); +- auto *calleeType = cast<FunctionType>(calleePtrType->getPointerElementType()); +- return CreateCall(calleeType, callee, args, Name); ++ return CreateCall(callee_type, callee, args, Name); + #else + return CreateCall(callee, args, Name); + #endif +@@ -310,7 +309,7 @@ CallInst *IRBuilderBPF::createCall(Value *callee, + CallInst *IRBuilderBPF::CreateBpfPseudoCallId(int mapid) + { + Function *pseudo_func = module_.getFunction("llvm.bpf.pseudo"); +- return createCall(pseudo_func, ++ return CreateCall(pseudo_func, + { getInt64(BPF_PSEUDO_MAP_FD), getInt64(mapid) }, + "pseudo"); + } +@@ -349,7 +348,8 @@ CallInst *IRBuilderBPF::createMapLookup(int mapid, Value *key) + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_map_lookup_elem), + lookup_func_ptr_type); +- return createCall(lookup_func, { map_ptr, key }, "lookup_elem"); ++ return createCall( ++ lookup_func_type, lookup_func, { map_ptr, key }, "lookup_elem"); + } + + CallInst *IRBuilderBPF::CreateGetJoinMap(Value *ctx, const location &loc) +@@ -400,8 +400,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx, + CREATE_MEMCPY(value, call, type.GetSize(), 1); + else + { +- assert(value->getType()->isPointerTy() && +- (value->getType()->getPointerElementType() == getInt64Ty())); ++ assert(value->getAllocatedType() == getInt64Ty()); + // createMapLookup returns an u8* + auto *cast = CreatePointerCast(call, value->getType(), "cast"); + CreateStore(CreateLoad(getInt64Ty(), cast), value); +@@ -451,7 +450,8 @@ void IRBuilderBPF::CreateMapUpdateElem(Value *ctx, + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_map_update_elem), + update_func_ptr_type); +- CallInst *call = createCall(update_func, ++ CallInst *call = createCall(update_func_type, ++ update_func, + { map_ptr, key, val, flags }, + "update_elem"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_update_elem, loc); +@@ -475,7 +475,8 @@ void IRBuilderBPF::CreateMapDeleteElem(Value *ctx, + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_map_delete_elem), + delete_func_ptr_type); +- CallInst *call = createCall(delete_func, { map_ptr, key }, "delete_elem"); ++ CallInst *call = createCall( ++ delete_func_type, delete_func, { map_ptr, key }, "delete_elem"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_delete_elem, loc); + } + +@@ -501,72 +502,53 @@ void IRBuilderBPF::CreateProbeRead(Value *ctx, + Constant *proberead_func = ConstantExpr::getCast(Instruction::IntToPtr, + getInt64(read_fn), + proberead_func_ptr_type); +- CallInst *call = createCall(proberead_func, ++ CallInst *call = createCall(proberead_func_type, ++ proberead_func, + { dst, size, src }, + probeReadHelperName(read_fn)); + CreateHelperErrorCond(ctx, call, read_fn, loc); + } + +-Constant *IRBuilderBPF::createProbeReadStrFn(llvm::Type *dst, +- llvm::Type *src, +- AddrSpace as) +-{ +- assert(src && (src->isIntegerTy() || src->isPointerTy())); +- // int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr) +- FunctionType *probereadstr_func_type = FunctionType::get( +- getInt64Ty(), { dst, getInt32Ty(), src }, false); +- PointerType *probereadstr_func_ptr_type = PointerType::get( +- probereadstr_func_type, 0); +- return ConstantExpr::getCast(Instruction::IntToPtr, +- getInt64(selectProbeReadHelper(as, true)), +- probereadstr_func_ptr_type); +-} +- + CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, ++ Value *dst, + size_t size, + Value *src, + AddrSpace as, + const location &loc) + { +- assert(ctx && ctx->getType() == getInt8PtrTy()); + return CreateProbeReadStr(ctx, dst, getInt32(size), src, as, loc); + } + + CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx, + Value *dst, +- size_t size, +- Value *src, +- AddrSpace as, +- const location &loc) +-{ +- assert(ctx && ctx->getType() == getInt8PtrTy()); +- Constant *fn = createProbeReadStrFn(dst->getType(), src->getType(), as); +- auto read_fn = selectProbeReadHelper(as, true); +- CallInst *call = createCall(fn, +- { dst, getInt32(size), src }, +- probeReadHelperName(read_fn)); +- CreateHelperErrorCond(ctx, call, read_fn, loc); +- return call; +-} +- +-CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, + llvm::Value *size, + Value *src, + AddrSpace as, + const location &loc) + { + assert(ctx && ctx->getType() == getInt8PtrTy()); +- assert(dst && dst->getAllocatedType()->isArrayTy() && +- dst->getAllocatedType()->getArrayElementType() == getInt8Ty()); + assert(size && size->getType()->isIntegerTy()); ++ if (auto *dst_alloca = dyn_cast<AllocaInst>(dst)) ++ { ++ assert(dst_alloca->getAllocatedType()->isArrayTy() && ++ dst_alloca->getAllocatedType()->getArrayElementType() == ++ getInt8Ty()); ++ } + +- auto *size_i32 = CreateIntCast(size, getInt32Ty(), false); ++ auto *size_i32 = size; ++ if (size_i32->getType()->getScalarSizeInBits() != 32) ++ size_i32 = CreateIntCast(size_i32, getInt32Ty(), false); + +- Constant *fn = createProbeReadStrFn(dst->getType(), src->getType(), as); + auto read_fn = selectProbeReadHelper(as, true); +- CallInst *call = createCall(fn, ++ // int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr) ++ FunctionType *probereadstr_func_type = FunctionType::get( ++ getInt64Ty(), { dst->getType(), getInt32Ty(), src->getType() }, false); ++ PointerType *probereadstr_func_ptr_type = PointerType::get( ++ probereadstr_func_type, 0); ++ Constant *probereadstr_callee = ConstantExpr::getCast( ++ Instruction::IntToPtr, getInt64(read_fn), probereadstr_func_ptr_type); ++ CallInst *call = createCall(probereadstr_func_type, ++ probereadstr_callee, + { dst, size_i32, src }, + probeReadHelperName(read_fn)); + CreateHelperErrorCond(ctx, call, read_fn, loc); +@@ -725,8 +707,10 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx, + return result; + } + +-Value *IRBuilderBPF::CreateStrncmp(Value *val1, +- Value *val2, ++Value *IRBuilderBPF::CreateStrncmp(Value *str1, ++ uint64_t str1_size, ++ Value *str2, ++ uint64_t str2_size, + uint64_t n, + bool inverse) + { +@@ -755,40 +739,21 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1, + // Check if the compared strings are literals. + // If so, we can avoid storing the literal in memory. + std::optional<std::string> literal1; +- if (auto constString1 = dyn_cast<ConstantDataArray>(val1)) ++ if (auto constString1 = dyn_cast<ConstantDataArray>(str1)) + literal1 = constString1->getAsString(); +- else if (isa<ConstantAggregateZero>(val1)) ++ else if (isa<ConstantAggregateZero>(str1)) + literal1 = ""; + else + literal1 = std::nullopt; + + std::optional<std::string> literal2; +- if (auto constString2 = dyn_cast<ConstantDataArray>(val2)) ++ if (auto constString2 = dyn_cast<ConstantDataArray>(str2)) + literal2 = constString2->getAsString(); +- else if (isa<ConstantAggregateZero>(val2)) ++ else if (isa<ConstantAggregateZero>(str2)) + literal2 = ""; + else + literal2 = std::nullopt; + +- auto *val1p = dyn_cast<PointerType>(val1->getType()); +- auto *val2p = dyn_cast<PointerType>(val2->getType()); +-#ifndef NDEBUG +- if (!literal1) +- { +- assert(val1p); +- assert(val1p->getPointerElementType()->isArrayTy() && +- val1p->getPointerElementType()->getArrayElementType() == +- getInt8Ty()); +- } +- if (!literal2) +- { +- assert(val2p); +- assert(val2p->getPointerElementType()->isArrayTy() && +- val2p->getPointerElementType()->getArrayElementType() == +- getInt8Ty()); +- } +-#endif +- + Function *parent = GetInsertBlock()->getParent(); + AllocaInst *store = CreateAllocaBPF(getInt1Ty(), "strcmp.result"); + BasicBlock *str_ne = BasicBlock::Create(module_.getContext(), +@@ -815,8 +780,8 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1, + l = getInt8(literal1->c_str()[i]); + else + { +- auto *ptr_l = CreateGEP(val1p->getPointerElementType(), +- val1, ++ auto *ptr_l = CreateGEP(ArrayType::get(getInt8Ty(), str1_size), ++ str1, + { getInt32(0), getInt32(i) }); + l = CreateLoad(getInt8Ty(), ptr_l); + } +@@ -826,8 +791,8 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1, + r = getInt8(literal2->c_str()[i]); + else + { +- auto *ptr_r = CreateGEP(val2p->getPointerElementType(), +- val2, ++ auto *ptr_r = CreateGEP(ArrayType::get(getInt8Ty(), str2_size), ++ str2, + { getInt32(0), getInt32(i) }); + r = CreateLoad(getInt8Ty(), ptr_r); + } +@@ -987,11 +952,9 @@ void IRBuilderBPF::CreateGetCurrentComm(Value *ctx, + size_t size, + const location &loc) + { +- assert(buf->getType()->getPointerElementType()->isArrayTy() && +- buf->getType()->getPointerElementType()->getArrayNumElements() >= +- size && +- buf->getType()->getPointerElementType()->getArrayElementType() == +- getInt8Ty()); ++ assert(buf->getAllocatedType()->isArrayTy() && ++ buf->getAllocatedType()->getArrayNumElements() >= size && ++ buf->getAllocatedType()->getArrayElementType() == getInt8Ty()); + + // long bpf_get_current_comm(char *buf, int size_of_buf) + // Return: 0 on success or negative error +@@ -1070,7 +1033,7 @@ void IRBuilderBPF::CreateSignal(Value *ctx, Value *sig, const location &loc) + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_send_signal), + signal_func_ptr_type); +- CallInst *call = createCall(signal_func, { sig }, "signal"); ++ CallInst *call = createCall(signal_func_type, signal_func, { sig }, "signal"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_send_signal, loc); + } + +@@ -1084,7 +1047,7 @@ void IRBuilderBPF::CreateOverrideReturn(Value *ctx, Value *rc) + Constant *override_func = ConstantExpr::getCast(Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_override_return), + override_func_ptr_type); +- createCall(override_func, { ctx, rc }, "override"); ++ createCall(override_func_type, override_func, { ctx, rc }, "override"); + } + + CallInst *IRBuilderBPF::CreateSkbOutput(Value *skb, +@@ -1119,7 +1082,8 @@ CallInst *IRBuilderBPF::CreateSkbOutput(Value *skb, + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_skb_output), + skb_output_func_ptr_type); +- CallInst *call = createCall(skb_output_func, ++ CallInst *call = createCall(skb_output_func_type, ++ skb_output_func, + { skb, map_ptr, flags, data, size_val }, + "skb_output"); + return call; +@@ -1328,7 +1292,8 @@ void IRBuilderBPF::CreateSeqPrintf(Value *ctx, + CreateGEP(getInt64Ty(), meta, getInt64(0)), + "seq"); + +- CallInst *call = createCall(seq_printf_func, ++ CallInst *call = createCall(seq_printf_func_type, ++ seq_printf_func, + { seq, fmt, fmt_size, data, data_len }, + "seq_printf"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_seq_printf, loc); +diff --git a/src/ast/irbuilderbpf.h b/src/ast/irbuilderbpf.h +index b6a06778..19b28180 100644 +--- a/src/ast/irbuilderbpf.h ++++ b/src/ast/irbuilderbpf.h +@@ -106,17 +106,11 @@ public: + bool isVolatile = false, + std::optional<AddrSpace> addrSpace = std::nullopt); + CallInst *CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, ++ Value *dst, + llvm::Value *size, + Value *src, + AddrSpace as, + const location &loc); +- CallInst *CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, +- size_t size, +- Value *src, +- AddrSpace as, +- const location &loc); + CallInst *CreateProbeReadStr(Value *ctx, + Value *dst, + size_t size, +@@ -131,7 +125,12 @@ public: + pid_t pid, + AddrSpace as, + const location &loc); +- Value *CreateStrncmp(Value *val1, Value *val2, uint64_t n, bool inverse); ++ Value *CreateStrncmp(Value *str1, ++ uint64_t str1_size, ++ Value *str2, ++ uint64_t str2_size, ++ uint64_t n, ++ bool inverse); + CallInst *CreateGetNs(bool boot_time, const location &loc); + CallInst *CreateGetPidTgid(const location &loc); + CallInst *CreateGetCurrentCgroupId(const location &loc); +@@ -147,7 +146,10 @@ public: + ArrayRef<Value *> args, + const Twine &Name, + const location *loc = nullptr); +- CallInst *createCall(Value *callee, ArrayRef<Value *> args, const Twine &Name); ++ CallInst *createCall(FunctionType *callee_type, ++ Value *callee, ++ ArrayRef<Value *> args, ++ const Twine &Name); + void CreateGetCurrentComm(Value *ctx, AllocaInst *buf, size_t size, const location& loc); + void CreatePerfEventOutput(Value *ctx, + Value *data, +@@ -205,9 +207,6 @@ private: + AddrSpace as, + const location &loc); + CallInst *createMapLookup(int mapid, Value *key); +- Constant *createProbeReadStrFn(llvm::Type *dst, +- llvm::Type *src, +- AddrSpace as); + libbpf::bpf_func_id selectProbeReadHelper(AddrSpace as, bool str); + + llvm::Type *getKernelPointerStorageTy(); +diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp +index d4a5e1c7..0703d196 100644 +--- a/src/ast/passes/codegen_llvm.cpp ++++ b/src/ast/passes/codegen_llvm.cpp +@@ -1152,8 +1152,12 @@ void CodegenLLVM::visit(Call &call) + auto left_string = getString(left_arg); + auto right_string = getString(right_arg); + +- expr_ = b_.CreateStrncmp( +- left_string.first, right_string.first, size, false); ++ expr_ = b_.CreateStrncmp(left_string.first, ++ left_string.second, ++ right_string.first, ++ right_string.second, ++ size, ++ false); + } + else if (call.func == "override") + { +@@ -1284,8 +1288,7 @@ void CodegenLLVM::visit(Variable &var) + else + { + auto *var_alloca = variables_[var.ident]; +- expr_ = b_.CreateLoad(var_alloca->getType()->getPointerElementType(), +- var_alloca); ++ expr_ = b_.CreateLoad(var_alloca->getAllocatedType(), var_alloca); + } + } + +@@ -1325,7 +1328,12 @@ void CodegenLLVM::binop_string(Binop &binop) + auto right_string = getString(binop.right); + + size_t len = std::min(left_string.second, right_string.second); +- expr_ = b_.CreateStrncmp(left_string.first, right_string.first, len, inverse); ++ expr_ = b_.CreateStrncmp(left_string.first, ++ left_string.second, ++ right_string.first, ++ right_string.second, ++ len, ++ inverse); + } + + void CodegenLLVM::binop_buf(Binop &binop) +@@ -1349,7 +1357,12 @@ void CodegenLLVM::binop_buf(Binop &binop) + + size_t len = std::min(binop.left->type.GetSize(), + binop.right->type.GetSize()); +- expr_ = b_.CreateStrncmp(left_string, right_string, len, inverse); ++ expr_ = b_.CreateStrncmp(left_string, ++ binop.left->type.GetSize(), ++ right_string, ++ binop.right->type.GetSize(), ++ len, ++ inverse); + } + + void CodegenLLVM::binop_int(Binop &binop) +@@ -3498,9 +3511,8 @@ void CodegenLLVM::createIncDec(Unop &unop) + else if (unop.expr->is_variable) + { + Variable &var = static_cast<Variable &>(*unop.expr); +- Value *oldval = b_.CreateLoad( +- variables_[var.ident]->getType()->getPointerElementType(), +- variables_[var.ident]); ++ Value *oldval = b_.CreateLoad(variables_[var.ident]->getAllocatedType(), ++ variables_[var.ident]); + Value *newval; + if (is_increment) + newval = b_.CreateAdd(oldval, b_.GetIntSameSize(step, oldval)); diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch new file mode 100644 index 00000000000..a884acc7ef2 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch @@ -0,0 +1,327 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0a7914f5..b9d8f47f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,9 +125,10 @@ find_package(FLEX REQUIRED) + bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE) + flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc) + add_flex_bison_dependency(flex_lexer bison_parser) +-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) +-target_compile_options(parser PRIVATE "-w") +-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) ++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS}) ++target_compile_options(bpftraceparser PRIVATE "-w") ++target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR}) ++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + include(CheckSymbolExists) + set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) +diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt +index a95c60a1..f5c4d676 100644 +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -1,6 +1,7 @@ +-add_library(resources headers.cpp) ++add_library(bpftraceresources headers.cpp) + +-target_include_directories(resources PUBLIC ../src) ++target_include_directories(bpftraceresources PUBLIC ../src) ++install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + function(embed_headers output) + file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ce16469a..98161980 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -13,7 +13,7 @@ else() + endif () + endif() + +-add_library(runtime ++add_library(bpftraceruntime + attached_probe.cpp + bpffeature.cpp + bpftrace.cpp +@@ -43,7 +43,7 @@ add_library(runtime + ${BFD_DISASM_SRC} + ) + # Ensure flex+bison outputs are built first +-add_dependencies(runtime parser) ++add_dependencies(bpftraceruntime bpftraceparser) + + add_library(libbpftrace + build_info.cpp +@@ -60,6 +60,7 @@ add_executable(${BPFTRACE} + ) + + install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR}) ++install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + target_link_libraries(${BPFTRACE} libbpftrace) + + if (BUILD_FUZZ) +@@ -88,7 +89,7 @@ endif() + set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory") + if (KERNEL_HEADERS_DIR) + MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}") +- target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") ++ target_compile_definitions(bpftraceruntime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") + endif() + + execute_process( +@@ -108,10 +109,11 @@ endif() + + add_definitions("-DBPFTRACE_VERSION=\"${BPFTRACE_VERSION}\"") + +-target_include_directories(runtime PRIVATE ${CMAKE_BINARY_DIR}) +-target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src) +-target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast) +-target_compile_definitions(runtime PRIVATE ${BPFTRACE_FLAGS}) ++target_include_directories(bpftraceruntime PRIVATE ${CMAKE_BINARY_DIR}) ++target_include_directories(bpftraceruntime PRIVATE ${CMAKE_SOURCE_DIR}/src) ++target_include_directories(bpftraceruntime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast) ++target_compile_definitions(bpftraceruntime PRIVATE ${BPFTRACE_FLAGS}) ++install(TARGETS bpftraceruntime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS}) + + # Linking +@@ -124,8 +126,8 @@ if(STATIC_LINKING) + endif(STATIC_LINKING) + + +-target_link_libraries(runtime ${LIBBPF_LIBRARIES}) +-target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm) ++target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES}) ++target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceruntime aot bpftraceast bpftracearch cxxdemangler_llvm) + + if(LIBPCAP_FOUND) + target_link_libraries(libbpftrace ${LIBPCAP_LIBRARIES}) +@@ -135,37 +137,38 @@ if(HAVE_BFD_DISASM) + if(STATIC_LINKING) + add_library(LIBBFD STATIC IMPORTED) + set_property(TARGET LIBBFD PROPERTY IMPORTED_LOCATION ${LIBBFD_LIBRARIES}) +- target_link_libraries(runtime LIBBFD) ++ target_link_libraries(bpftraceruntime LIBBFD) + add_library(LIBOPCODES STATIC IMPORTED) + set_property(TARGET LIBOPCODES PROPERTY IMPORTED_LOCATION ${LIBOPCODES_LIBRARIES}) +- target_link_libraries(runtime LIBOPCODES) ++ target_link_libraries(bpftraceruntime LIBOPCODES) + add_library(LIBIBERTY STATIC IMPORTED) + set_property(TARGET LIBIBERTY PROPERTY IMPORTED_LOCATION ${LIBIBERTY_LIBRARIES}) +- target_link_libraries(runtime LIBIBERTY) ++ target_link_libraries(bpftraceruntime LIBIBERTY) + else() +- target_link_libraries(runtime ${LIBBFD_LIBRARIES}) +- target_link_libraries(runtime ${LIBOPCODES_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBBFD_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBOPCODES_LIBRARIES}) + endif(STATIC_LINKING) + endif(HAVE_BFD_DISASM) + + # Link to bcc libraries (without LLVM) if possible + if(LIBBCC_BPF_CONTAINS_RUNTIME) +- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES}) + else() +- target_link_libraries(runtime ${LIBBCC_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBBCC_LIBRARIES}) + endif() + + if(STATIC_BPF_BCC) + # These are not part of the static libbcc so have to be added separate +- target_link_libraries(runtime ${LIBBCC_BPF_LIBRARIES}) +- target_link_libraries(runtime ${LIBBPF_LIBRARIES}) +- target_link_libraries(runtime ${LIBBCC_LOADER_LIBRARY_STATIC}) ++ target_link_libraries(bpftraceruntime ${LIBBCC_BPF_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBBPF_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBBCC_LOADER_LIBRARY_STATIC}) + + add_library(LIBELF STATIC IMPORTED) + set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBELF_LIBRARIES}) +- target_link_libraries(runtime LIBELF) ++ set_property(TARGET LIBELF PROPERTY IMPORTED_LOCATION ${LIBBPF_LIBRARIES}) ++ target_link_libraries(bpftraceruntime LIBELF) + else() +- target_link_libraries(runtime ${LIBELF_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBELF_LIBRARIES}) + endif(STATIC_BPF_BCC) + + if (LIBDW_FOUND) +@@ -182,16 +185,16 @@ if (LIBDW_FOUND) + set_property(TARGET LIBDW PROPERTY IMPORTED_LOCATION ${LIBDW_LIBRARIES}) + target_link_libraries(LIBDW INTERFACE LIBBZ2 LIBELF LIBLZMA) + +- target_link_libraries(runtime LIBDW) ++ target_link_libraries(bpftraceruntime LIBDW) + else() +- target_link_libraries(runtime ${LIBDW_LIBRARIES}) ++ target_link_libraries(bpftraceruntime ${LIBDW_LIBRARIES}) + endif() + endif() + + # Support for std::filesystem + # GCC version <9 and Clang (all versions) require -lstdc++fs + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "9") +- target_link_libraries(runtime "stdc++fs") ++ target_link_libraries(bpftraceruntime "stdc++fs") + target_link_libraries(libbpftrace "stdc++fs") + endif() + +@@ -213,16 +216,16 @@ endif() + if (STATIC_LINKING) + if(ANDROID) + target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") +- target_link_libraries(runtime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") ++ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-ldl" "-lm" "-lz") + else() + target_link_libraries(libbpftrace "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") + target_link_libraries(libbpftrace "-Wl,-Bstatic" "-lz") +- target_link_libraries(runtime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") +- target_link_libraries(runtime "-Wl,-Bstatic" "-lz") ++ target_link_libraries(bpftraceruntime "-Wl,-Bdynamic" "-lrt" "-lpthread" "-ldl" "-lm") ++ target_link_libraries(bpftraceruntime "-Wl,-Bstatic" "-lz") + endif() + elseif(STATIC_BPF_BCC) + # partial static build, libbpf needs zlib +- target_link_libraries(runtime "-lz") ++ target_link_libraries(bpftraceruntime "-lz") + endif() + + unset(MAIN_SRC) +diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt +index c776d204..41e84317 100644 +--- a/src/aot/CMakeLists.txt ++++ b/src/aot/CMakeLists.txt +@@ -1,8 +1,9 @@ + add_library(aot aot.cpp) +-add_dependencies(aot parser) ++add_dependencies(aot bpftraceparser) + target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src) + target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR}) + target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS}) ++install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + # Only build aotrt if supported bcc is used + # (https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44) +@@ -11,7 +12,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME) + endif() + + add_executable(bpftrace-aotrt aot_main.cpp) +-target_link_libraries(bpftrace-aotrt aot runtime arch ast_defs cxxdemangler_stdlib) ++target_link_libraries(bpftrace-aotrt aot bpftraceruntime bpftracearch ast_defs cxxdemangler_stdlib) + install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR}) + + if(LIBPCAP_FOUND) +diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt +index d01d1ea3..7d96587f 100644 +--- a/src/arch/CMakeLists.txt ++++ b/src/arch/CMakeLists.txt +@@ -1,21 +1,21 @@ + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +- add_library(arch aarch64.cpp) ++ add_library(bpftracearch aarch64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7-a") +- add_library(arch arm.cpp) ++ add_library(bpftracearch arm.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR + CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") +- add_library(arch ppc64.cpp) ++ add_library(bpftracearch ppc64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR + CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x") +- add_library(arch s390.cpp) ++ add_library(bpftracearch s390.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") +- add_library(arch x86_64.cpp) ++ add_library(bpftracearch x86_64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64") +- add_library(arch mips64.cpp) ++ add_library(bpftracearch mips64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64") +- add_library(arch riscv64.cpp) ++ add_library(bpftracearch riscv64.cpp) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "loongarch64") +- add_library(arch loongarch64.cpp) ++ add_library(bpftracearch loongarch64.cpp) + else() + message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") + endif() +diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt +index c390ea6a..37019bd9 100644 +--- a/src/ast/CMakeLists.txt ++++ b/src/ast/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_library(ast_defs ast.cpp) + +-add_library(ast ++add_library(bpftraceast + async_event_types.cpp + attachpoint_parser.cpp + elf_parser.cpp +@@ -21,11 +21,13 @@ add_library(ast + target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src) + target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) + target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR}) +-target_link_libraries(ast ast_defs arch parser) ++target_link_libraries(bpftraceast ast_defs bpftracearch bpftraceparser) ++install(TARGETS ast_defs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +-add_dependencies(ast_defs parser) ++add_dependencies(ast_defs bpftraceparser) + +-target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS}) ++target_compile_definitions(bpftraceast PRIVATE ${BPFTRACE_FLAGS}) + + if (STATIC_LINKING) + set(clang_libs +@@ -58,20 +60,20 @@ if (STATIC_LINKING) + + + if(EMBED_USE_LLVM) +- target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") ++ target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group") + else() + llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names}) + + if(TARGET libclang_static) +- target_link_libraries(ast libclang_static) ++ target_link_libraries(bpftraceast libclang_static) + else() + # old LLVM versions don't export libclang_static in ClangTargets.cmake; fall back to + # libclang.a in that case +- target_link_libraries(ast libclang.a) ++ target_link_libraries(abpftracest libclang.a) + endif() + +- target_link_libraries(ast ${clang_libs}) +- target_link_libraries(ast ${llvm_libs}) ++ target_link_libraries(abpftracest ${clang_libs}) ++ target_link_libraries(abpftracest ${llvm_libs}) + endif() + + if(STATIC_LIBC) +@@ -81,11 +83,11 @@ if (STATIC_LINKING) + else() + find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS}) + if(found_LLVM) +- target_link_libraries(ast LLVM) ++ target_link_libraries(bpftraceast LLVM) + else() + llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD}) + llvm_expand_dependencies(llvm_libs ${_llvm_libs}) +- target_link_libraries(ast ${llvm_libs}) ++ target_link_libraries(bpftraceast ${llvm_libs}) + endif() +- target_link_libraries(ast libclang) ++ target_link_libraries(bpftraceast libclang) + endif() +diff --git a/src/cxxdemangler/CMakeLists.txt b/src/cxxdemangler/CMakeLists.txt +index 04cfcdd9..5677aa4b 100644 +--- a/src/cxxdemangler/CMakeLists.txt ++++ b/src/cxxdemangler/CMakeLists.txt +@@ -1,2 +1,4 @@ + add_library(cxxdemangler_stdlib cxxdemangler_stdlib.cpp) + add_library(cxxdemangler_llvm cxxdemangler_llvm.cpp) ++install(TARGETS cxxdemangler_stdlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS cxxdemangler_llvm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest index 90aef3b97f9..c40a261b226 100644 --- a/dev-util/breakpad/Manifest +++ b/dev-util/breakpad/Manifest @@ -1 +1,2 @@ DIST breakpad-2022.06.04.tar.gz 5365322 BLAKE2B eec33092a9a75161d16554af22276195945f3e1c7ce9590f89010a4d11484fe4327849c1717e159a9e019ca44d437b601b7080c68bba8c95111b97d6662dfc3f SHA512 150e5e955dc9de55d5cb4c726ae6f1a2e79e9f7bb283bae2ba835b684e7fd7532a7070e9ba982b66b68c936592bc48550a22ed8ac40e829b11aa80530f338749 +DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f diff --git a/dev-util/breakpad/breakpad-2022.06.04.ebuild b/dev-util/breakpad/breakpad-2022.06.04.ebuild index d68490afa28..66912e949d8 100644 --- a/dev-util/breakpad/breakpad-2022.06.04.ebuild +++ b/dev-util/breakpad/breakpad-2022.06.04.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,6 +46,7 @@ src_prepare() { || die sed -i \ -e "/AC_INIT/s:0.1:${PVR}:" \ + -e "/AS_VAR_APPEND/d" \ configure.ac \ || die eautoreconf diff --git a/dev-util/breakpad/breakpad-2022.07.12.ebuild b/dev-util/breakpad/breakpad-2022.07.12.ebuild new file mode 100644 index 00000000000..5fb69138314 --- /dev/null +++ b/dev-util/breakpad/breakpad-2022.07.12.ebuild @@ -0,0 +1,55 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="implement a crash-reporting system." +HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/" +SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD BSD-4" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=" + net-misc/curl +" +DEPEND="${RDEPEND} + dev-libs/linux-syscall-support + dev-embedded/libdisasm +" +BDEPEND="test? ( dev-cpp/gtest )" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-2022.06.04-gentoo.patch +) + +src_prepare() { + default + sed -i \ + -e 's|"third_party/lss\(.*\)"|<lss\1>|' \ + $(find src -name '*.cc' -o -name '*.h') \ + || die + sed -i \ + -e '/includelss/d' \ + -e '/third_party\/curl/d' \ + Makefile.am \ + || die + sed -i \ + -e "/AC_INIT/s:0.1:${PVR}:" \ + -e "/AS_VAR_APPEND/d" \ + configure.ac \ + || die + eautoreconf +} + +src_configure() { + econf \ + --enable-system-test-libs \ + || die +} diff --git a/dev-util/bsdiff/metadata.xml b/dev-util/bsdiff/metadata.xml index 115e9d64a66..a6868937271 100644 --- a/dev-util/bsdiff/metadata.xml +++ b/dev-util/bsdiff/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="cpe">cpe:/a:daemonology:bsdiff</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest index 88f41c531d8..760cdc1a7be 100644 --- a/dev-util/buildbot-badges/Manifest +++ b/dev-util/buildbot-badges/Manifest @@ -1,4 +1 @@ -DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1 SHA512 3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6 -DIST buildbot-badges-3.5.0.tar.gz 3962 BLAKE2B 48f4865136845300e447835c348736ee15a3d520db03b4e6e70b45366e723f10eeff3d7e37a1f166682374dc6c1dabb051ad6f15c9730da969a846b606bc5730 SHA512 7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19 -DIST buildbot-badges-3.6.0.tar.gz 3964 BLAKE2B e11db574b7245396c6532a3427b7494fbfcb68762b7a76b3f63ec49a2f460a2e1d8023ea1d54d7a27714990b9c8d2a0895442c41d8b65584e178f2af02b4ade3 SHA512 d133efad8d7171d122279f4e32fd7b0fa7d84bdeb66660d40b175d94d64f4344044dda186d2f1f6d5d2f2f6654461f7333339c90450a51843ce6314b457edc75 DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5 SHA512 4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f diff --git a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild deleted file mode 100644 index 37e3828ead3..00000000000 --- a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..." -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-grid-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - media-gfx/cairosvg[${PYTHON_USEDEP}] - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - dev-python/klein[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild deleted file mode 100644 index 37e3828ead3..00000000000 --- a/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..." -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-grid-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - media-gfx/cairosvg[${PYTHON_USEDEP}] - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - dev-python/klein[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild deleted file mode 100644 index 37e3828ead3..00000000000 --- a/dev-util/buildbot-badges/buildbot-badges-3.6.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..." -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-grid-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - media-gfx/cairosvg[${PYTHON_USEDEP}] - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - dev-python/klein[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild index 37e3828ead3..3936a86e6f0 100644 --- a/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild +++ b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit distutils-r1 MY_PV="${PV/_p/.post}" diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest index d69bbcae4ab..377105e12b3 100644 --- a/dev-util/buildbot-console-view/Manifest +++ b/dev-util/buildbot-console-view/Manifest @@ -1,4 +1 @@ -DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06 SHA512 072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8 -DIST buildbot-console-view-3.5.0.tar.gz 18741 BLAKE2B a2c4043bdc9eef6189cc15617212aefd7cbdf6db6d4c547c191e0a07bacc9d0cb3e9898867af207d969b294ab15664132636dec4a3c16e620fea9872ae4d0f57 SHA512 4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266 -DIST buildbot-console-view-3.6.0.tar.gz 18728 BLAKE2B 0a206e80a311deed2666a297394b7d4e31e47c703fed2040d2d6340be0cb81a6977ac54e2d215dcad02b14ec21db58dd6e677a9d2155e84110cdf37d99ae1401 SHA512 8d03b0c640b72d986e48bc5cfd1decf91f4b7bd46889d16a76ea71972e17f9504b377762e1c589448431d7c26446c01208b5f8e1b63c86bdbfb6dbc063b94472 DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33 SHA512 3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0 diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild deleted file mode 100644 index 5b7624cd297..00000000000 --- a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot console-view plugin" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-console-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild deleted file mode 100644 index 5b7624cd297..00000000000 --- a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot console-view plugin" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-console-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild deleted file mode 100644 index 5b7624cd297..00000000000 --- a/dev-util/buildbot-console-view/buildbot-console-view-3.6.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot console-view plugin" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-console-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild index 5b7624cd297..4c2a0313068 100644 --- a/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild +++ b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit distutils-r1 MY_PV="${PV/_p/.post}" diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest index e3acccf5f67..02943aadf61 100644 --- a/dev-util/buildbot-grid-view/Manifest +++ b/dev-util/buildbot-grid-view/Manifest @@ -1,4 +1 @@ -DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f SHA512 69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f -DIST buildbot-grid-view-3.5.0.tar.gz 13704 BLAKE2B 3b577c4108abb65677015a29f9af1410588f962a572e31518ac981e937e6a9bb9c7ce7f4435d573d82c5b337331eed2e9dee5c3e0722ebda6591d19e2b30b76f SHA512 a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1 -DIST buildbot-grid-view-3.6.0.tar.gz 13701 BLAKE2B c877439926a6862aba51d4ef7d4326f66967bbd9c43dff44554c9346d0beb4b890c5e9cdd20998ca9796ab86030445776ff67f85ce27e87b1fdefaeaf0895d98 SHA512 6810b5be3649e38648b1205742bb24f1d63eded41f5fb420dd3f65734fba74a1ad350d68cf750f6be752f178e6d09dba56d5b42f46c20808212f72c8c4d7326d DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b SHA512 7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild deleted file mode 100644 index 32ac344a514..00000000000 --- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot grid view web interface" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-grid-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild deleted file mode 100644 index 32ac344a514..00000000000 --- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot grid view web interface" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-grid-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild deleted file mode 100644 index 32ac344a514..00000000000 --- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot grid view web interface" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-grid-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild index 32ac344a514..3f9e5517ce0 100644 --- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild +++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit distutils-r1 MY_PV="${PV/_p/.post}" diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest index a8516f134d5..8b4dab29766 100644 --- a/dev-util/buildbot-pkg/Manifest +++ b/dev-util/buildbot-pkg/Manifest @@ -1,4 +1 @@ -DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943 SHA512 ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6 -DIST buildbot-pkg-3.5.0.tar.gz 4806 BLAKE2B 41e217bc029bb8dbdb0f95218640d57d9f9ecabfbc0310118898042bbb543d9d4e5ba88075e934a9be9b1653e2a3d3d1e159547b832f9cde08c262713a817968 SHA512 08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c -DIST buildbot-pkg-3.6.0.tar.gz 4807 BLAKE2B 3b632ef4c0c1f2dc9c39fbe37ba6165a01162e41e77e28c08b9c820425cceac08d20193e0cc74d83c35cb6ff89e9576194cf35b8cac803e9b1f04076c9f96532 SHA512 0145a7ff7dddfb139f502193e0b04ab10a39b325ae65ca01c0f0d88c251c18798ebe4713a3ff1aa376c72aa8d3155a5edb58055a50f5f9ccd1bb43de0ff8e63e DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c SHA512 5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2 diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild deleted file mode 100644 index 4d4e95e9196..00000000000 --- a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot common www build tools for packaging releases" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-pkg/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -# No real integration tests for this pkg. -# all tests are related to making releases and final checks for distribution -RESTRICT="test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -src_prepare() { - sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die - distutils-r1_src_prepare -} diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild deleted file mode 100644 index 4d4e95e9196..00000000000 --- a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot common www build tools for packaging releases" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-pkg/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -# No real integration tests for this pkg. -# all tests are related to making releases and final checks for distribution -RESTRICT="test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -src_prepare() { - sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die - distutils-r1_src_prepare -} diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild deleted file mode 100644 index 4d4e95e9196..00000000000 --- a/dev-util/buildbot-pkg/buildbot-pkg-3.6.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot common www build tools for packaging releases" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-pkg/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -# No real integration tests for this pkg. -# all tests are related to making releases and final checks for distribution -RESTRICT="test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -src_prepare() { - sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die - distutils-r1_src_prepare -} diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild index 4d4e95e9196..501c0f2c713 100644 --- a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild +++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit distutils-r1 MY_PV="${PV/_p/.post}" diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest index 5b654f46230..8aabe766b34 100644 --- a/dev-util/buildbot-waterfall-view/Manifest +++ b/dev-util/buildbot-waterfall-view/Manifest @@ -1,4 +1 @@ -DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5 SHA512 a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9 -DIST buildbot-waterfall-view-3.5.0.tar.gz 192440 BLAKE2B 46ef4e839dabb5006c740c6f04235b123be420b4d0108cf59bab075fde3dbf6bbe0b4fdfc37fd8606da3696d15f45ee4363f8c35434f944af70f884e2de1edff SHA512 381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177 -DIST buildbot-waterfall-view-3.6.0.tar.gz 193903 BLAKE2B 3029015580dedd9003ae7b723ce79b335d58fd198c4d294483377c34bb88eaade53cd704652c240670c1bab488ab60056e03aba698dcb294f09fe62def59d5f8 SHA512 520e5e1653ceb92a4eb144530fa3cc6d893c4baae15f5ffcc29f2bc66ef02f1a41d287b3d85864a5ddf0a127c0fcf2d19a0ae136e39e394228713112487af8c2 DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8dffff6196 SHA512 f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634 diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild deleted file mode 100644 index 591aebc7cf5..00000000000 --- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot waterfall-view plugin" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-waterfall-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild deleted file mode 100644 index 591aebc7cf5..00000000000 --- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot waterfall-view plugin" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-waterfall-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild deleted file mode 100644 index 591aebc7cf5..00000000000 --- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot waterfall-view plugin" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-waterfall-view/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] -" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild index 591aebc7cf5..6f7399a3a1d 100644 --- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild +++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit distutils-r1 MY_PV="${PV/_p/.post}" diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest index 79bd8d18300..aec8d3312af 100644 --- a/dev-util/buildbot-worker/Manifest +++ b/dev-util/buildbot-worker/Manifest @@ -1,4 +1 @@ -DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7 -DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed -DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b diff --git a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild deleted file mode 100644 index e80a110a289..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit readme.gentoo-r1 distutils-r1 - -MY_V="${PV/_p/.post}" -MY_P="${PN}-${MY_V}" - -DESCRIPTION="BuildBot Worker (slave) Daemon" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-worker/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/buildbot - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-1.0.0 -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added -to support starting buildbot_worker through Gentoo's init system. To use this, -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. -Set up your build worker following the documentation, make sure the -resulting directories are owned by the \"buildbot\" user and point -\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location. -The scripts can run as a different user if desired." - -python_test() { - "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/buildbot-worker.1 - - newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker - newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker - - dodir /var/lib/buildbot_worker - cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!" - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "More than one instance of a buildbot_worker can be run simultaneously." - ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance" - ewarn " rc-update add buildbot_worker.myinstance default" - ewarn " /etc/init.d/buildbot_worker.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildbot_worker@myinstance.service" - ewarn " systemctl enable buildbot_worker.target" - ewarn " systemctl start buildbot_worker.target" - fi -} - -pkg_config() { - local buildworker_path="/var/lib/buildbot_worker" - local log_path="/var/log/buildbot_worker" - - einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildworker_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" - fi - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" - cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - chown --recursive buildbot:buildbot "${instance_log_path}" \ - || die "Setting permissions for instance failed" - fi - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a buildbot_worker instance at ${instance_path}." - einfo "To change the default settings edit the buildbot.tac file in this directory." -} diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild deleted file mode 100644 index 2a3f7714573..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit readme.gentoo-r1 distutils-r1 - -MY_V="${PV/_p/.post}" -MY_P="${PN}-${MY_V}" - -DESCRIPTION="BuildBot Worker (slave) Daemon" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-worker/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/buildbot - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}] - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-1.0.0 -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - ) -" - -DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added -to support starting buildbot_worker through Gentoo's init system. To use this, -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. -Set up your build worker following the documentation, make sure the -resulting directories are owned by the \"buildbot\" user and point -\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location. -The scripts can run as a different user if desired." - -python_test() { - "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/buildbot-worker.1 - - newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker - newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker - - dodir /var/lib/buildbot_worker - cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!" - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "More than one instance of a buildbot_worker can be run simultaneously." - ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance" - ewarn " rc-update add buildbot_worker.myinstance default" - ewarn " /etc/init.d/buildbot_worker.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildbot_worker@myinstance.service" - ewarn " systemctl enable buildbot_worker.target" - ewarn " systemctl start buildbot_worker.target" - fi -} - -pkg_config() { - local buildworker_path="/var/lib/buildbot_worker" - local log_path="/var/log/buildbot_worker" - - einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildworker_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" - fi - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" - cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - chown --recursive buildbot:buildbot "${instance_log_path}" \ - || die "Setting permissions for instance failed" - fi - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a buildbot_worker instance at ${instance_path}." - einfo "To change the default settings edit the buildbot.tac file in this directory." -} diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild deleted file mode 100644 index 34360f39c45..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) -inherit readme.gentoo-r1 distutils-r1 - -MY_V="${PV/_p/.post}" -MY_P="${PN}-${MY_V}" - -DESCRIPTION="BuildBot Worker (slave) Daemon" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-worker/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/buildbot - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}] - >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-1.0.0 -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - ) -" - -DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added -to support starting buildbot_worker through Gentoo's init system. To use this, -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. -Set up your build worker following the documentation, make sure the -resulting directories are owned by the \"buildbot\" user and point -\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location. -The scripts can run as a different user if desired." - -python_test() { - "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/buildbot-worker.1 - - newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker - newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker - - dodir /var/lib/buildbot_worker - cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!" - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "More than one instance of a buildbot_worker can be run simultaneously." - ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance" - ewarn " rc-update add buildbot_worker.myinstance default" - ewarn " /etc/init.d/buildbot_worker.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildbot_worker@myinstance.service" - ewarn " systemctl enable buildbot_worker.target" - ewarn " systemctl start buildbot_worker.target" - fi -} - -pkg_config() { - local buildworker_path="/var/lib/buildbot_worker" - local log_path="/var/log/buildbot_worker" - - einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildworker_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - if [[ ! -d "${instance_path}" ]]; then - mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" - fi - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" - cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - chown --recursive buildbot:buildbot "${instance_log_path}" \ - || die "Setting permissions for instance failed" - fi - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a buildbot_worker instance at ${instance_path}." - einfo "To change the default settings edit the buildbot.tac file in this directory." -} diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild index e2d1ed832b1..89429131328 100644 --- a/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild +++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit readme.gentoo-r1 systemd distutils-r1 MY_V="${PV/_p/.post}" diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild index e22995dc22f..267add180cf 100644 --- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild +++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" inherit readme.gentoo-r1 git-r3 distutils-r1 diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest index ff13d27b323..96fb064880e 100644 --- a/dev-util/buildbot-wsgi-dashboards/Manifest +++ b/dev-util/buildbot-wsgi-dashboards/Manifest @@ -1,4 +1 @@ -DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1 SHA512 56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071 -DIST buildbot-wsgi-dashboards-3.5.0.tar.gz 5585 BLAKE2B 94c365d4140de539a0ea85b78e24acd5d789fe022eb5ff2474ebc07554d139d964c9625b684b312b2134c3fd4bf3a6628178ac72d52283bb6fcfd7b7820d51f1 SHA512 d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0 -DIST buildbot-wsgi-dashboards-3.6.0.tar.gz 5585 BLAKE2B 91de620cdb911b75ad745549e6fa7d1589206d8b17878b1779b40b84633dc9788d3dca46a34866c40d2403ed1a16c20d6159d0f0ce69d3e10f35d132cba06f35 SHA512 8377ef27f46b65ebb5e5dc638cab0e251070b940386b4681ea410562e6eaef04d4a76bfd3be229c081edb2f9df01c1385aad34a7763dcd5ce607fb0061b741e4 DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc SHA512 7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e3bbbb4e9 diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild deleted file mode 100644 index b67bfb3e65b..00000000000 --- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-wsgi-dashboards/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild deleted file mode 100644 index b67bfb3e65b..00000000000 --- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-wsgi-dashboards/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild deleted file mode 100644 index b67bfb3e65b..00000000000 --- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-wsgi-dashboards/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -BDEPEND=" - ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] -" diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild index b67bfb3e65b..0c117fbc896 100644 --- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild +++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit distutils-r1 MY_PV="${PV/_p/.post}" diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest index ed19ccd2e56..37443f8b433 100644 --- a/dev-util/buildbot-www/Manifest +++ b/dev-util/buildbot-www/Manifest @@ -1,4 +1 @@ -DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e SHA512 7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd -DIST buildbot-www-3.5.0.tar.gz 3182531 BLAKE2B dcdd6487eff9d9a0429554d79f9ee83a9086dee3524b49fa8362085dddb969e088373a843a9d872e16d18350e1623ba65258799b9b93327e218f760540ece4fa SHA512 f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e -DIST buildbot-www-3.6.0.tar.gz 3210526 BLAKE2B ab54213c457a9f5777075d00adb96863b4327cbbbc489c97609f29182fb8630cc77479ffa7e324d0d20e453bbcdc70f8ad0537a8bf55fd23d8410b8003e1399f SHA512 77a0671caa5c8a240301c7f3a2c2a26ecc69924546b7b7e641577e0f46c84380a80de43271dced0fa24a24b58b32d485d70d9af1d41a31af78af22a380653910 DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee SHA512 d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01 diff --git a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild deleted file mode 100644 index 7834a034d6b..00000000000 --- a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..." -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-www/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild deleted file mode 100644 index 7834a034d6b..00000000000 --- a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..." -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-www/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild deleted file mode 100644 index 7834a034d6b..00000000000 --- a/dev-util/buildbot-www/buildbot-www-3.6.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..." -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot-www/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" diff --git a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild index 7834a034d6b..b789ec6f1eb 100644 --- a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild +++ b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) inherit distutils-r1 MY_PV="${PV/_p/.post}" diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index ad7526384ca..c2083c50a18 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -1,4 +1 @@ -DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b -DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f -DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73 DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206 diff --git a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild b/dev-util/buildbot/buildbot-3.4.0-r1.ebuild deleted file mode 100644 index 2805b245be5..00000000000 --- a/dev-util/buildbot/buildbot-3.4.0-r1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit readme.gentoo-r1 systemd distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot build automation system" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -IUSE="crypt docker examples irc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/buildbot - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/alembic-1.6.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - crypt? ( - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - || ( - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)] - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)] - ) - dev-python/idna[${PYTHON_USEDEP}] - ) - irc? ( - dev-python/txrequests[${PYTHON_USEDEP}] - ) - docker? ( - >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/treq[${PYTHON_USEDEP}] - dev-python/txrequests[${PYTHON_USEDEP}] - dev-python/pypugjs[${PYTHON_USEDEP}] - >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] - dev-python/moto[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/lz4[${PYTHON_USEDEP}] - dev-python/ldap3[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - )" - -DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added -to support starting buildbot through Gentoo's init system. To use this, -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. -The scripts can run as a different user if desired." - -src_prepare() { - # disable all warnings as errors - sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die - - distutils-r1_src_prepare -} - -python_test() { - "${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}" -} - -src_install() { - distutils-r1_src_install - - doman docs/buildbot.1 - - if use examples; then - dodoc -r docs/examples - fi - - newconfd "${FILESDIR}/buildmaster.confd" buildmaster - newinitd "${FILESDIR}/buildmaster.initd" buildmaster - systemd_dounit "${FILESDIR}/buildmaster.target" - systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service" - systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service" - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" - ewarn " rc-update add buildmaster.myinstance default" - ewarn " /etc/init.d/buildmaster.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildmaster@myinstance.service" - ewarn " systemctl enable buildmaster.target" - ewarn " systemctl start buildmaster.target" - elog - elog "Upstream recommends the following when upgrading:" - elog "Each time you install a new version of Buildbot, you should run the" - elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." - elog "This will add files and fix (or at least detect) incompatibilities between" - elog "your old config and the new code." - fi - elog - elog "In order to create a new instance of buildmaster, execute:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config() { - local buildmaster_path="/var/lib/buildmaster" - local log_path="/var/log/buildmaster" - - einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildmaster_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - local buildbot="/usr/bin/buildbot" - if [[ ! -d "${buildmaster_path}" ]]; then - mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" - fi - "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" - mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - chown --recursive buildbot:buildbot "${instance_log_path}" \ - || die "Setting permissions for instance failed" - fi - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a buildmaster instance at ${instance_path}." - einfo "To change the default settings edit the master.cfg file in this directory." -} diff --git a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild b/dev-util/buildbot/buildbot-3.5.0-r1.ebuild deleted file mode 100644 index 38fdc881f1a..00000000000 --- a/dev-util/buildbot/buildbot-3.5.0-r1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit readme.gentoo-r1 systemd distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot build automation system" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -IUSE="crypt docker examples irc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/buildbot - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/alembic-1.6.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - crypt? ( - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - || ( - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},ssl(-)] - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt(-)] - ) - dev-python/idna[${PYTHON_USEDEP}] - ) - irc? ( - dev-python/txrequests[${PYTHON_USEDEP}] - ) - docker? ( - >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/treq[${PYTHON_USEDEP}] - dev-python/txrequests[${PYTHON_USEDEP}] - dev-python/pypugjs[${PYTHON_USEDEP}] - >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] - dev-python/moto[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/lz4[${PYTHON_USEDEP}] - dev-python/ldap3[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - )" - -DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added -to support starting buildbot through Gentoo's init system. To use this, -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. -The scripts can run as a different user if desired." - -src_prepare() { - # disable all warnings as errors - sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die - - distutils-r1_src_prepare -} - -python_test() { - "${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}" -} - -src_install() { - distutils-r1_src_install - - doman docs/buildbot.1 - - if use examples; then - dodoc -r docs/examples - fi - - newconfd "${FILESDIR}/buildmaster.confd" buildmaster - newinitd "${FILESDIR}/buildmaster.initd" buildmaster - systemd_dounit "${FILESDIR}/buildmaster.target" - systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service" - systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service" - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" - ewarn " rc-update add buildmaster.myinstance default" - ewarn " /etc/init.d/buildmaster.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildmaster@myinstance.service" - ewarn " systemctl enable buildmaster.target" - ewarn " systemctl start buildmaster.target" - elog - elog "Upstream recommends the following when upgrading:" - elog "Each time you install a new version of Buildbot, you should run the" - elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." - elog "This will add files and fix (or at least detect) incompatibilities between" - elog "your old config and the new code." - fi - elog - elog "In order to create a new instance of buildmaster, execute:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config() { - local buildmaster_path="/var/lib/buildmaster" - local log_path="/var/log/buildmaster" - - einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildmaster_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - local buildbot="/usr/bin/buildbot" - if [[ ! -d "${buildmaster_path}" ]]; then - mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" - fi - "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" - mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - chown --recursive buildbot:buildbot "${instance_log_path}" \ - || die "Setting permissions for instance failed" - fi - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a buildmaster instance at ${instance_path}." - einfo "To change the default settings edit the master.cfg file in this directory." -} diff --git a/dev-util/buildbot/buildbot-3.6.0.ebuild b/dev-util/buildbot/buildbot-3.6.0.ebuild deleted file mode 100644 index 63802dfa22a..00000000000 --- a/dev-util/buildbot/buildbot-3.6.0.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{8..10} ) -inherit readme.gentoo-r1 systemd distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot build automation system" -HOMEPAGE="https://buildbot.net/ - https://github.com/buildbot/buildbot - https://pypi.org/project/buildbot/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux" - -IUSE="crypt docker examples irc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/buildbot - >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}] - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}] - <dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/alembic-1.6.0[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - crypt? ( - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - || ( - >=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)] - >=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)] - ) - dev-python/idna[${PYTHON_USEDEP}] - ) - irc? ( - dev-python/txrequests[${PYTHON_USEDEP}] - ) - docker? ( - >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/treq[${PYTHON_USEDEP}] - dev-python/txrequests[${PYTHON_USEDEP}] - dev-python/pypugjs[${PYTHON_USEDEP}] - >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] - dev-python/moto[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/lz4[${PYTHON_USEDEP}] - dev-python/ldap3[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] - )" - -DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added -to support starting buildbot through Gentoo's init system. To use this, -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. -The scripts can run as a different user if desired." - -src_prepare() { - # disable all warnings as errors - sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die - - distutils-r1_src_prepare -} - -python_test() { - "${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}" -} - -src_install() { - distutils-r1_src_install - - doman docs/buildbot.1 - - if use examples; then - dodoc -r docs/examples - fi - - newconfd "${FILESDIR}/buildmaster.confd" buildmaster - newinitd "${FILESDIR}/buildmaster.initd" buildmaster - systemd_dounit "${FILESDIR}/buildmaster.target" - systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service" - systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service" - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" - ewarn " rc-update add buildmaster.myinstance default" - ewarn " /etc/init.d/buildmaster.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable buildmaster@myinstance.service" - ewarn " systemctl enable buildmaster.target" - ewarn " systemctl start buildmaster.target" - elog - elog "Upstream recommends the following when upgrading:" - elog "Each time you install a new version of Buildbot, you should run the" - elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." - elog "This will add files and fix (or at least detect) incompatibilities between" - elog "your old config and the new code." - fi - elog - elog "In order to create a new instance of buildmaster, execute:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config() { - local buildmaster_path="/var/lib/buildmaster" - local log_path="/var/log/buildmaster" - - einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildmaster_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - local buildbot="/usr/bin/buildbot" - if [[ ! -d "${buildmaster_path}" ]]; th |