From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- dev-util/Manifest.gz | Bin 63848 -> 63823 bytes dev-util/bitcoin-tx/Manifest | 3 + dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild | 100 +++++++++ dev-util/bpftrace/Manifest | 8 +- dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild | 89 -------- dev-util/bpftrace/bpftrace-0.11.4.ebuild | 86 -------- dev-util/bpftrace/bpftrace-0.13.0.ebuild | 88 ++++++++ dev-util/bpftrace/bpftrace-9999.ebuild | 85 -------- .../files/bpftrace-0.11.0-install-libs.patch | 156 -------------- .../files/bpftrace-0.13.0-install-libs.patch | 143 +++++++++++++ dev-util/buildbot-pkg/Manifest | 2 +- dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild | 7 +- dev-util/cmake/Manifest | 4 +- dev-util/cmake/cmake-3.21.0_rc2.ebuild | 232 --------------------- dev-util/cmake/cmake-3.21.0_rc3.ebuild | 232 +++++++++++++++++++++ dev-util/cucumber-rails/Manifest | 2 +- .../cucumber-rails/cucumber-rails-1.8.0.ebuild | 4 +- dev-util/cucumber/Manifest | 2 +- dev-util/cucumber/cucumber-3.2.0.ebuild | 4 +- dev-util/diffoscope/Manifest | 4 +- dev-util/diffoscope/diffoscope-177-r1.ebuild | 113 ++++++++++ dev-util/diffoscope/diffoscope-177.ebuild | 113 ---------- dev-util/diffoscope/metadata.xml | 1 - dev-util/gdbus-codegen/Manifest | 2 +- dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild | 2 +- dev-util/glib-utils/Manifest | 2 +- dev-util/glib-utils/glib-utils-2.68.3.ebuild | 2 +- dev-util/google-perftools/Manifest | 2 +- .../google-perftools/google-perftools-2.9.1.ebuild | 11 +- dev-util/lldb/Manifest | 5 +- dev-util/lldb/lldb-12.0.1.9999.ebuild | 102 --------- dev-util/lldb/lldb-12.0.1.ebuild | 102 +++++++++ dev-util/lldb/lldb-12.0.1_rc4.ebuild | 102 --------- dev-util/lxqt-build-tools/Manifest | 2 +- .../lxqt-build-tools/lxqt-build-tools-0.9.0.ebuild | 2 +- dev-util/qbs/Manifest | 6 +- dev-util/qbs/metadata.xml | 12 +- dev-util/qbs/qbs-1.16.0.ebuild | 116 ----------- dev-util/qbs/qbs-1.19.1.ebuild | 120 +++++++++++ dev-util/strace/Manifest | 1 - dev-util/strace/files/strace-5.5-static.patch | 178 ---------------- dev-util/stripe-mock/Manifest | 4 +- dev-util/stripe-mock/metadata.xml | 4 - dev-util/stripe-mock/stripe-mock-0.109.0.ebuild | 22 ++ dev-util/sysprof-common/Manifest | 2 +- .../sysprof-common/sysprof-common-3.40.1.ebuild | 2 +- dev-util/sysprof/Manifest | 2 +- dev-util/sysprof/sysprof-3.40.1-r1.ebuild | 2 +- 48 files changed, 976 insertions(+), 1309 deletions(-) create mode 100644 dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-0.11.4.ebuild create mode 100644 dev-util/bpftrace/bpftrace-0.13.0.ebuild delete mode 100644 dev-util/bpftrace/bpftrace-9999.ebuild delete mode 100644 dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch create mode 100644 dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch delete mode 100644 dev-util/cmake/cmake-3.21.0_rc2.ebuild create mode 100644 dev-util/cmake/cmake-3.21.0_rc3.ebuild create mode 100644 dev-util/diffoscope/diffoscope-177-r1.ebuild delete mode 100644 dev-util/diffoscope/diffoscope-177.ebuild delete mode 100644 dev-util/lldb/lldb-12.0.1.9999.ebuild create mode 100644 dev-util/lldb/lldb-12.0.1.ebuild delete mode 100644 dev-util/lldb/lldb-12.0.1_rc4.ebuild delete mode 100644 dev-util/qbs/qbs-1.16.0.ebuild create mode 100644 dev-util/qbs/qbs-1.19.1.ebuild delete mode 100644 dev-util/strace/files/strace-5.5-static.patch create mode 100644 dev-util/stripe-mock/stripe-mock-0.109.0.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 40a6883092ad..c332f07fdbcf 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest index 222965710ba5..dc81edab8317 100644 --- a/dev-util/bitcoin-tx/Manifest +++ b/dev-util/bitcoin-tx/Manifest @@ -1,7 +1,10 @@ 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-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f +DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700 EBUILD bitcoin-tx-0.21.0.ebuild 2444 BLAKE2B 46b9ad6010bbd0a830661b8e97042c054aba009e38a339009256189b598ad1a4273811ec718656a27bc6b7b0edc08878a9030713f1d545f03b1fc326b75419e8 SHA512 cd9e34f5a9075ad4fda89fc63e662030719dbc685c48122fdb073dfedf8f6c96c7bcb5b70c1fa069db56138336e6d22892afa99bea89b004919f5dc3e91575d4 +EBUILD bitcoin-tx-0.21.1.ebuild 2380 BLAKE2B ab839a6dff59217a5141ac7bf163550f3630ede3d2474ad51f6e09c25992f03f153cb20321bfae5ec793ec5e0a4228ffbc45415bd044ca31cc64e3c967c6a70e SHA512 319a0e3668e8e75a41b92c36ca6c63860d379d05aac9f6b755afa8310176104258dafaf9922c1798ffa3a49ad1cd57262d31264c82cda675d77ac9a7f661d212 MISC metadata.xml 650 BLAKE2B fbe3b54c16dd1c935666dc6adb0994d84d7cc49a3c1da88bad93dd9c953586c43f4eb7a3d3e3ef6832e6785c0c7a503e976f43ee334af0821f2e079ea570bf83 SHA512 20f249e2987a45a939bbbb0bebc26c15423c35737368fb9ef5f9f939e2a8ad6daa24c5f11edc922e90a38735b7bbfbad3f69fcc8b407e2b0f2a8f35d3ab83b1a diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild new file mode 100644 index 000000000000..5413ee7d723b --- /dev/null +++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2021 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/0.21.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-1.58.0:=[threads(+)] + >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/bpftrace/Manifest b/dev-util/bpftrace/Manifest index 923f276a3b8d..f65e842de3c2 100644 --- a/dev-util/bpftrace/Manifest +++ b/dev-util/bpftrace/Manifest @@ -1,12 +1,10 @@ AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a -AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66 AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113 AUX bpftrace-0.12.0-fuzzing-build.patch 491 BLAKE2B 6fcc78660f69742247bedded028a4c18f933f32c424bb5d11976ff5ddbe16587948e6c75303e75daad440f2cd578fb1a4c3682ca34657a3d2b83a0f67843f994 SHA512 ab9f0b8115ac17130841e7d9b1ad59e5f2a6836acd48ab1d5c3fec45ce75a7833d033a37cb1ddcdd72cd794c202cdaeb287689f67bbb2a9baccb8628c3ff2a59 AUX bpftrace-0.12.0-install-libs.patch 6364 BLAKE2B e4b59b882c04f58c711f61653f2cb5f28a99f06891d979372e854bae1f125dba43bb64a65a14bd8e85ac97ae8b3e933ab1cc61a2ff9253113428394fbbebe599 SHA512 d9efc5bc544cb97eda647c84ee917851d3c63ff9648b2d026a8e699d5b0d3755f06983984c793cbf2efe865f15588d7d1e414e7b16026067aa5bc5dafb05c456 -DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B 50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548 SHA512 611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82 +AUX bpftrace-0.13.0-install-libs.patch 5639 BLAKE2B 985ac0627c802d2a6207e02913dac49ab75615313fd76150984074f17aa69d97387c6e492d1d15d55e1556abeff6d35cf1856a5326065ec0207a5a4c6377c170 SHA512 a0df14dc129ec066636036859dd5b06a5258aa760698383f9ebb6242f25b1d588c49f00a291d6f4e9900a7c8eb17b5df664416f666fbce543d739008ac815181 DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993 SHA512 a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345 -EBUILD bpftrace-0.11.4-r1.ebuild 1670 BLAKE2B 2ba970bb00da938ca92a88731498bcc4a8182578746b35e7d4341112c8f5abab0ec64921cbae14330b61f1c0e57b42f0c783db331da2bd9ce622a46450ccdc67 SHA512 9379627dc1e41f9134fddb8f2b6131afef0fd7d49c10f1ab746149e413ca61404e1fde9ec33200bd1148cc4f63832c921b19ac8c61ee4b5e6af34b09105f57ed -EBUILD bpftrace-0.11.4.ebuild 1617 BLAKE2B c7cc64ec9f9d2cb7254222edc3aec8622fa85dde47e316018f91af00ceecaca4837683b06763c8a30e4123097748afae38593853366f544544d7b217f47b6f92 SHA512 039d202fbf9dda331b71b89e06f47b7dbaf787a7f9d9ef39d5f2ea63fb7b9fb3734f7d145acb3f6d46d4acfa7ed594b305f99a57ef62fcfaafd88776fba1f493 +DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B 8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc SHA512 16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0 EBUILD bpftrace-0.12.1-r1.ebuild 1717 BLAKE2B b2e89c2456ab0dbdc38ce8fead1297cc4241a1f454fcc8d93fda913468b01f8f398155918089c5b2f7a91b8fde1d06e3c96ca126e4694d433b5624a62655aaef SHA512 9a28f395f250d80c001f34935e75667d39d2a80f07e4c4c37d9acb61707c5856bca560c70e1f5130a0c23aa2242b1ea3a6d2d8cf2f59418271bdccbcc69227ed -EBUILD bpftrace-9999.ebuild 1573 BLAKE2B 69c5ba3fc6278cd1b6098d174d8057c0ee758832a63716ff8864229deb35028d7ee5b738658cbb9787464391d250c35bf1933e0caf23fdbfc8d7f32422f86726 SHA512 aa783e719ee50be25065c696d291a1524b25949a43c78e9d7309cfbf5016ab413314a8575ac869bd45bb35fb9e251b0ea272f195b38cf1f20afb3b0783baacd7 +EBUILD bpftrace-0.13.0.ebuild 1717 BLAKE2B 983e2a0bab14db717143b9f3a43a0ed1f4424ad98cb77967f16d9dd97b968f4b4e4de98c41e5b9d33bef6f44ad52ce3ad004382471912b624950c871af38a750 SHA512 a2a27e804e0f851324ffcdb430f7278907fdac3056f186eb54ca8a1586991ba9fe52dd0c9b173b6b193ea2f6a2eb383f8af269b586c3b66eeda8a42cb905d5b4 MISC metadata.xml 384 BLAKE2B f15afc660256a07333c80974b7860af277b8e8d56a33c3d60e121399fe3e99f8260353bbcf44f53179829cdf8aeff1373c7ae6c8cbcfc1d4699046c6814ed10b SHA512 803c1e1c3f7e3a3a0e0e3510049385f81685fdcd4c5b6fcdf4244f476bd42861727389759a3de66493ad4d3f1c902b04a23406f119794995394858ff16983fa8 diff --git a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild b/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild deleted file mode 100644 index 76302016ee27..000000000000 --- a/dev-util/bpftrace/bpftrace-0.11.4-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace" - -if [[ ${PV} =~ 9{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/iovisor/${PN}" - BDEPEND="" -else - MY_PV="${PV//_/}" - SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - BDEPEND="app-arch/xz-utils " -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -COMMON_DEPEND=" - dev-util/systemtap - dev-libs/libbpf:= - >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] - <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] - <=sys-devel/clang-12:= - >=dev-util/bcc-0.13.0:= - virtual/libelf -" -DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest ) -" -RDEPEND="${COMMON_DEPEND}" -BDEPEND+=" - >=dev-util/cmake-3.8 - sys-devel/flex - sys-devel/bison -" - -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" - -PATCHES=( - "${FILESDIR}/bpftrace-0.11.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" -) - -# lots of fixing needed -RESTRICT="test" - -# https://bugs.gentoo.org/754648 -RESTRICT+=" strip" - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - LLVM_MAX_SLOT=11 llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs - mycmakeargs=( - "-DSTATIC_LINKING:BOOL=OFF" - "-DBUILD_TESTING:BOOL=OFF" - ) - - cmake_src_configure -} diff --git a/dev-util/bpftrace/bpftrace-0.11.4.ebuild b/dev-util/bpftrace/bpftrace-0.11.4.ebuild deleted file mode 100644 index a3a1fb797011..000000000000 --- a/dev-util/bpftrace/bpftrace-0.11.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace" - -if [[ ${PV} =~ 9{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/iovisor/${PN}" - BDEPEND="" -else - MY_PV="${PV//_/}" - SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - BDEPEND="app-arch/xz-utils " -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -COMMON_DEPEND=" - dev-util/systemtap - dev-libs/libbpf:= - >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] - <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] - <=sys-devel/clang-12:= - >=dev-util/bcc-0.13.0:= - virtual/libelf -" -DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest ) -" -RDEPEND="${COMMON_DEPEND}" -BDEPEND+=" - >=dev-util/cmake-3.8 - sys-devel/flex - sys-devel/bison -" - -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" - -PATCHES=( - "${FILESDIR}/bpftrace-0.11.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" - "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" -) - -# lots of fixing needed -RESTRICT="test" - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - LLVM_MAX_SLOT=11 llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs - mycmakeargs=( - "-DSTATIC_LINKING:BOOL=OFF" - "-DBUILD_TESTING:BOOL=OFF" - ) - - cmake_src_configure -} diff --git a/dev-util/bpftrace/bpftrace-0.13.0.ebuild b/dev-util/bpftrace/bpftrace-0.13.0.ebuild new file mode 100644 index 000000000000..3437f2e80ce1 --- /dev/null +++ b/dev-util/bpftrace/bpftrace-0.13.0.ebuild @@ -0,0 +1,88 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs llvm linux-info cmake + +DESCRIPTION="High-level tracing language for eBPF" +HOMEPAGE="https://github.com/iovisor/bpftrace" + +if [[ ${PV} =~ 9{4,} ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/iovisor/${PN}" + BDEPEND="" +else + MY_PV="${PV//_/}" + SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" + BDEPEND="app-arch/xz-utils " +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="fuzzing test" + +COMMON_DEPEND=" + dev-libs/libbpf:= + >=dev-util/bcc-0.13.0:= + dev-util/systemtap + >=sys-devel/llvm-6:=[llvm_targets_BPF(+)] + <=sys-devel/llvm-13:=[llvm_targets_BPF(+)] + <=sys-devel/clang-13:= + sys-libs/binutils-libs:= + virtual/libelf +" +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" +RDEPEND="${COMMON_DEPEND}" +BDEPEND+=" + >=dev-util/cmake-3.8 + sys-devel/flex + sys-devel/bison +" + +S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" +QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" + +PATCHES=( + "${FILESDIR}/bpftrace-0.13.0-install-libs.patch" + "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" + "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch" + "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch" +) + +# lots of fixing needed +RESTRICT="test" + +pkg_pretend() { + local CONFIG_CHECK=" + ~BPF + ~BPF_EVENTS + ~BPF_JIT + ~BPF_SYSCALL + ~FTRACE_SYSCALLS + ~HAVE_EBPF_JIT + " + + check_extra_config +} + +pkg_setup() { + LLVM_MAX_SLOT=12 llvm_pkg_setup +} + +src_prepare() { + cmake_src_prepare +} + +src_configure() { + local -a mycmakeargs=( + -DSTATIC_LINKING:BOOL=OFF + -DBUILD_TESTING:BOOL=OFF + -DBUILD_FUZZ:BOOL=$(usex fuzzing) + ) + + cmake_src_configure +} diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild deleted file mode 100644 index 2a14dc584768..000000000000 --- a/dev-util/bpftrace/bpftrace-9999.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs llvm linux-info cmake - -DESCRIPTION="High-level tracing language for eBPF" -HOMEPAGE="https://github.com/iovisor/bpftrace" - -if [[ ${PV} =~ 9{4,} ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/iovisor/${PN}" - BDEPEND="" -else - MY_PV="${PV//_/}" - SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" - BDEPEND="app-arch/xz-utils " -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -COMMON_DEPEND=" - dev-util/systemtap - =sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] - <=sys-devel/llvm-12:=[llvm_targets_BPF(+)] - <=sys-devel/clang-12:= - >=dev-util/bcc-0.13.0:= - virtual/libelf -" -DEPEND="${COMMON_DEPEND} - test? ( dev-cpp/gtest ) -" -RDEPEND="${COMMON_DEPEND}" -BDEPEND+=" - >=dev-util/cmake-3.8 - sys-devel/flex - sys-devel/bison -" - -S="${WORKDIR}/${PN}-${MY_PV:-${PV}}" -QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so" - -PATCHES=( - "${FILESDIR}/bpftrace-0.11.0-install-libs.patch" - "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch" -) - -# lots of fixing needed -RESTRICT="test" - -pkg_pretend() { - local CONFIG_CHECK=" - ~BPF - ~BPF_EVENTS - ~BPF_JIT - ~BPF_SYSCALL - ~FTRACE_SYSCALLS - ~HAVE_EBPF_JIT - " - - check_extra_config -} - -pkg_setup() { - LLVM_MAX_SLOT=11 llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local -a mycmakeargs - mycmakeargs=( - "-DSTATIC_LINKING:BOOL=OFF" - "-DBUILD_TESTING:BOOL=OFF" - ) - - cmake_src_configure -} diff --git a/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch deleted file mode 100644 index a28e37564eae..000000000000 --- a/dev-util/bpftrace/files/bpftrace-0.11.0-install-libs.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1bca8d6..1482b29 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,9 +91,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 a95c60a..f5c4d67 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 487fa9b..61b7b38 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -84,7 +84,8 @@ if (ALLOW_UNSAFE_PROBE) - target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_PROBE) - endif(ALLOW_UNSAFE_PROBE) - --target_link_libraries(bpftrace arch ast parser resources) -+target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser -+ bpftraceresources) - - target_link_libraries(bpftrace ${LIBBCC_LIBRARIES}) - if(STATIC_LINKING) -diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt -index a26c1c8..ffb5900 100644 ---- a/src/arch/CMakeLists.txt -+++ b/src/arch/CMakeLists.txt -@@ -1,13 +1,15 @@ - 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) - 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 649bf0a..b969b9c 100644 ---- a/src/ast/CMakeLists.txt -+++ b/src/ast/CMakeLists.txt -@@ -1,4 +1,4 @@ --add_library(ast -+add_library(bpftraceast - ast.cpp - attachpoint_parser.cpp - codegen_llvm.cpp -@@ -7,17 +7,18 @@ add_library(ast - printer.cpp - semantic_analyser.cpp - ) -+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - --target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src) --target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) --target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR}) --target_link_libraries(ast arch) -+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src) -+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) -+target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR}) -+target_link_libraries(bpftraceast bpftracearch) - - if (HAVE_BCC_KFUNC) -- target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC) -+ target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC) - endif(HAVE_BCC_KFUNC) - --add_dependencies(ast parser) -+add_dependencies(bpftraceast bpftraceparser) - - if (STATIC_LINKING) - set(clang_libs -@@ -41,17 +42,17 @@ if (STATIC_LINKING) - if(EMBED_LIBCLANG_ONLY) - unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM") - endif() -- target_link_libraries(ast ${CLANG_EMBEDDED_CMAKE_TARGETS}) -+ target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS}) - else() - list(INSERT clang_libs 0 libclang.a) - endif() - - if(EMBED_LLVM) -- target_link_libraries(ast ${LLVM_EMBEDDED_CMAKE_TARGETS}) -+ target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS}) - else() - llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit option orcjit ${LLVM_TARGETS_TO_BUILD}) -- 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) -@@ -60,11 +61,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/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 4104a57..59486de 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -101,7 +101,8 @@ if(HAVE_BFD_DISASM) - endif(STATIC_LINKING) - endif(HAVE_BFD_DISASM) - --target_link_libraries(bpftrace_test arch ast parser resources) -+target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser -+ bpftraceresources) - - target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES}) - if (STATIC_LINKING) diff --git a/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch new file mode 100644 index 000000000000..03fd2d13e602 --- /dev/null +++ b/dev-util/bpftrace/files/bpftrace-0.13.0-install-libs.patch @@ -0,0 +1,143 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e33bb1ca..52e1fa25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -100,9 +100,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 0361cdaa..f9c536a3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -49,6 +49,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) +@@ -109,7 +110,7 @@ if(STATIC_LINKING) + endif(STATIC_LINKING) + + +-target_link_libraries(libbpftrace parser resources ast arch) ++target_link_libraries(libbpftrace bpftraceparser bpftraceresources bpftraceast bpftracearch) + + if (LIBBPF_BTF_DUMP_FOUND) + target_include_directories(libbpftrace PUBLIC ${LIBBPF_INCLUDE_DIRS}) +diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt +index 76bb217e..6d243a7e 100644 +--- a/src/arch/CMakeLists.txt ++++ b/src/arch/CMakeLists.txt +@@ -1,15 +1,15 @@ + 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) + else() + message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}") + endif() +diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt +index 5234388c..8b40faaa 100644 +--- a/src/ast/CMakeLists.txt ++++ b/src/ast/CMakeLists.txt +@@ -1,4 +1,4 @@ +-add_library(ast ++add_library(bpftraceast + ast.cpp + attachpoint_parser.cpp + codegen_llvm.cpp +@@ -13,17 +13,18 @@ add_library(ast + signal.cpp + visitors.cpp + ) ++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src) +-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) +-target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR}) +-target_link_libraries(ast arch) ++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src) ++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast) ++target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR}) ++target_link_libraries(bpftraceast bpftracearch) + + if (HAVE_BCC_KFUNC) +- target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC) ++ target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC) + endif(HAVE_BCC_KFUNC) + +-add_dependencies(ast parser) ++add_dependencies(bpftraceast bpftraceparser) + + if (STATIC_LINKING) + set(clang_libs +@@ -54,11 +55,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) +@@ -68,11 +69,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/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest index 47dab1c7ac5a..6be2859a7f9a 100644 --- a/dev-util/buildbot-pkg/Manifest +++ b/dev-util/buildbot-pkg/Manifest @@ -13,5 +13,5 @@ EBUILD buildbot-pkg-2.8.4.ebuild 695 BLAKE2B e1512c55e95cec782aa3a33ca22c39b20d9 EBUILD buildbot-pkg-3.0.2.ebuild 697 BLAKE2B 813fc9a172557ca5ceeee78f561689aff1f44d866e01c290014bec04e2bf23ccbc87739404fb7af39bbf0b5d340bf9204393ee42082131da3144e88df52daad0 SHA512 74f1970004573262179781246c180c283285e0f435dbc328ca589f83ce02ff0335de31eb106f109c0cc76a35f063d6bad8522051d84826c69d7376d6b1b53866 EBUILD buildbot-pkg-3.1.0.ebuild 704 BLAKE2B ee91295ed2e9684c4345e7b062f76640781720f8e524e8242389d9a0f6383d3c4e50a9c1141f60c53b5f6df85a644903bc881efa70f8e722d607203378cf4b23 SHA512 732bfed55bd0ddc04871b3f05efc03d90b38204ca526408b3fdde6941480499e009dfc14d345624018976f179111dc087f4704a3e28c87b49297ef9714e32c49 EBUILD buildbot-pkg-3.1.1.ebuild 728 BLAKE2B 54ee9f1fd832d61b1a08fae145bdbd2bf52a34064d30667b0070afdec0ad1e6387eff9efb4ef465db30792d17abd26b3974c2f757dd923b10e5db26ef90aa945 SHA512 f3bd6a350d47a5652c177d368b5355e27d2df8337f3522ad90cfc1a1d78b89c771f830d9c1af1030543fa860863b69e3e9118096929e85b271f71c090b8c72b5 -EBUILD buildbot-pkg-3.2.0.ebuild 809 BLAKE2B 95e956cdfb1bcd60a322501d332062e336d8033ba6f687d672d8d26dbf81c5381485796f0cd838fdf7c7ade0b0bb4e89cf4c15d2ba29f51ce031d49bd60e89b9 SHA512 3c63b6c7f30d85661cc283cde726d244442ff09d6008d2b987c9d5a9b936ad50cbb9a7c7176aaba154bdb5f2dcd240a02fccf4ceb248e6be7b7885aaa30cbce4 +EBUILD buildbot-pkg-3.2.0.ebuild 885 BLAKE2B 5177d834cc5bdf18e5113eeaac5169d992270056721b486f9b85447ec76c997b5cd3a91d7242f9566fe002c031e4037f5022db167ae0415dcc6d632de3f9a7f7 SHA512 667f1aa136f37b9dca9cd42fdd5a6e2ac9d62a5864f81b2e58a4d788c596e2cbe37bcc8954135afe318595db58eba16d70aaead16c6200f85c849a2161d3d9bf MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild index ce173c787577..e78e9ab33131 100644 --- a/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild +++ b/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild @@ -26,7 +26,8 @@ KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux" S=${WORKDIR}/${MY_P} -src_install() { - export BUILDBOT_VERSION="${MY_PV}" - distutils-r1_src_install +python_prepare_all() { + sed -e "s:version=buildbot_pkg.getVersion(\".\"),:version=\"${MY_PV}\",:" \ + -i setup.py || die + distutils-r1_python_prepare_all } diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 4ce664076030..afbb1cf5443f 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -19,10 +19,10 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 -DIST cmake-3.21.0-rc2.tar.gz 9618429 BLAKE2B 03dbe635d64738a8e07c7d47f9cd59e90030845ae016ecde6a43f7d84a67df3d75ec6181d38ce9cf5a61724164ca58ffb3272c46e0b3634b90da129a62dd1825 SHA512 52090e700ed10cba70bcb2d4a2480e9513e5c0a0f0773d9c8d4b25e1d1dec9203f91907f634fe83b6443048a53c6c78ff903bb7d1f981bf5faf58bc970e7ffa6 +DIST cmake-3.21.0-rc3.tar.gz 9617649 BLAKE2B 85c5e6fe579d34d64a0f23ee6a5006a71f243738d4c167cd20374e2317b09bc49eede25ba64b3fb27cf43a90a6f8be2072a60920985d113c55176e0cf7c5476b SHA512 fb0d3eadde91acafeb446e12aebd9228be2ebae978d0e33cf417fdd00ed7361a99b7397568a3b12c0fdf06122ae556592eecbdfef6fc540db45ccf4974011844 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964 EBUILD cmake-3.20.5.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f -EBUILD cmake-3.21.0_rc2.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f +EBUILD cmake-3.21.0_rc3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340 diff --git a/dev-util/cmake/cmake-3.21.0_rc2.ebuild b/dev-util/cmake/cmake-3.21.0_rc2.ebuild deleted file mode 100644 index b1cc1455ac6c..000000000000 --- a/dev-util/cmake/cmake-3.21.0_rc2.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja -CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -[[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs ncurses qt5 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=app-arch/libarchive-3.3.3:= - app-crypt/rhash - >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-1.9.2-r2:0= - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-python/requests - dev-python/sphinx - ) - test? ( app-arch/libarchive[zstd] ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch - # Next patch needs to be reworked - #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - - "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # disable running of cmake in bootstrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' \ - Source/kwsys/CMakeLists.txt || die - fi - - # bootstrap script isn't exactly /bin/sh compatible - tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actually bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CMakeOnly.AllFindModules: pthread issues - # CTest.updatecvs: fails to commit as root - # Fortran: requires fortran - # RunCMake.CompilerLauncher: also requires fortran - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because - # debugedit binary is not in the expected location - # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because - # it can't find a deb package that owns libc - # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4 - # TestUpload: requires network access - "${BUILD_DIR}"/bin/ctest \ - -j "$(makeopts_jobs)" \ - --test-load "$(makeopts_loadavg)" \ - ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake_src_prepare - - if [[ ${CHOST} == *-darwin* ]] ; then - # disable Xcode hooks, bug #652134 - sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ - Source/CMakeLists.txt || die - sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ - -e '/cmGlobalXCodeGenerator.h/d' \ - Source/cmake.cxx || die - # disable isysroot usage with GCC, we've properly instructed - # where things are via GCC configuration and ldwrapper - sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ - Modules/Platform/Apple-GNU-*.cmake || die - # disable isysroot usage with clang as well - sed -i -e '/_SYSROOT_FLAG/d' \ - Modules/Platform/Apple-Clang.cmake || die - # don't set a POSIX standard, system headers don't like that, #757426 - sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmLoadCommandCommand.cxx \ - Source/cmStandardLexer.h \ - Source/cmSystemTools.cxx \ - Source/cmTimestamp.cxx - sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ - Source/cmStandardLexer.h - fi - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - -DBUILD_TESTING=$(usex test) - ) - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} diff --git a/dev-util/cmake/cmake-3.21.0_rc3.ebuild b/dev-util/cmake/cmake-3.21.0_rc3.ebuild new file mode 100644 index 000000000000..b1cc1455ac6c --- /dev/null +++ b/dev-util/cmake/cmake-3.21.0_rc3.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja +CMAKE_REMOVE_MODULES_LIST=( none ) +inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ + toolchain-funcs virtualx xdg-utils + +MY_P="${P/_/-}" + +DESCRIPTION="Cross platform Make" +HOMEPAGE="https://cmake.org/" +SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + +LICENSE="CMake" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc emacs ncurses qt5 test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-arch/libarchive-3.3.3:= + app-crypt/rhash + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-1.9.2-r2:0= + >=dev-libs/libuv-1.10.0:= + >=net-misc/curl-7.21.5[ssl] + sys-libs/zlib + virtual/pkgconfig + emacs? ( >=app-editors/emacs-23.1:* ) + ncurses? ( sys-libs/ncurses:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-python/requests + dev-python/sphinx + ) + test? ( app-arch/libarchive[zstd] ) +" + +S="${WORKDIR}/${MY_P}" + +SITEFILE="50${PN}-gentoo.el" + +PATCHES=( + # prefix + "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch + "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch + "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch + + # handle gentoo packaging in find modules + "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch + # Next patch needs to be reworked + #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch + "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch + + # respect python eclasses + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch + + "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544 + + # upstream fixes (can usually be removed with a version bump) +) + +cmake_src_bootstrap() { + # disable running of cmake in bootstrap command + sed -i \ + -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ + bootstrap || die "sed failed" + + # execinfo.h on Solaris isn't quite what it is on Darwin + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i -e 's/execinfo\.h/blablabla.h/' \ + Source/kwsys/CMakeLists.txt || die + fi + + # bootstrap script isn't exactly /bin/sh compatible + tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \ + --prefix="${T}/cmakestrap/" \ + --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ + || die "Bootstrap failed" +} + +cmake_src_test() { + # fix OutDir and SelectLibraryConfigurations tests + # these are altered thanks to our eclass + sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ + "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ + || die + + pushd "${BUILD_DIR}" > /dev/null + + local ctestargs + [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" + + # Excluded tests: + # BootstrapTest: we actually bootstrap it every time so why test it. + # BundleUtilities: bundle creation broken + # CMakeOnly.AllFindModules: pthread issues + # CTest.updatecvs: fails to commit as root + # Fortran: requires fortran + # RunCMake.CompilerLauncher: also requires fortran + # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because + # debugedit binary is not in the expected location + # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because + # it can't find a deb package that owns libc + # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4 + # TestUpload: requires network access + "${BUILD_DIR}"/bin/ctest \ + -j "$(makeopts_jobs)" \ + --test-load "$(makeopts_loadavg)" \ + ${ctestargs} \ + -E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \ + || die "Tests failed" + + popd > /dev/null +} + +src_prepare() { + cmake_src_prepare + + if [[ ${CHOST} == *-darwin* ]] ; then + # disable Xcode hooks, bug #652134 + sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ + Source/CMakeLists.txt || die + sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ + -e '/cmGlobalXCodeGenerator.h/d' \ + Source/cmake.cxx || die + # disable isysroot usage with GCC, we've properly instructed + # where things are via GCC configuration and ldwrapper + sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ + Modules/Platform/Apple-GNU-*.cmake || die + # disable isysroot usage with clang as well + sed -i -e '/_SYSROOT_FLAG/d' \ + Modules/Platform/Apple-Clang.cmake || die + # don't set a POSIX standard, system headers don't like that, #757426 + sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmLoadCommandCommand.cxx \ + Source/cmStandardLexer.h \ + Source/cmSystemTools.cxx \ + Source/cmTimestamp.cxx + sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ + Source/cmStandardLexer.h + fi + + # Add gcc libs to the default link paths + sed -i \ + -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ + -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ + -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ + Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" + if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { + # Fix linking on Solaris + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl + + local mycmakeargs=( + -DCMAKE_USE_SYSTEM_LIBRARIES=ON + -DCMAKE_DOC_DIR=/share/doc/${PF} + -DCMAKE_MAN_DIR=/share/man + -DCMAKE_DATA_DIR=/share/${PN} + -DSPHINX_MAN=$(usex doc) + -DSPHINX_HTML=$(usex doc) + -DBUILD_CursesDialog="$(usex ncurses)" + -DBUILD_TESTING=$(usex test) + ) + use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use emacs && elisp-compile Auxiliary/cmake-mode.el +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + if use emacs; then + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + insinto /usr/share/vim/vimfiles/syntax + doins Auxiliary/vim/syntax/cmake.vim + + insinto /usr/share/vim/vimfiles/indent + doins Auxiliary/vim/indent/cmake.vim + + insinto /usr/share/vim/vimfiles/ftdetect + doins "${FILESDIR}/${PN}.vim" + + dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} +} + +pkg_postinst() { + use emacs && elisp-site-regen + if use qt5; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen + if use qt5; then + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update + fi +} diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest index b753ebf56e5c..df09bcc3c724 100644 --- a/dev-util/cucumber-rails/Manifest +++ b/dev-util/cucumber-rails/Manifest @@ -1,5 +1,5 @@ DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439 DIST cucumber-rails-2.2.0.gem 136704 BLAKE2B 660037bb5938ad01aa0b1188e5e48522f9932662d6578f1c0a107cdacbd5cf8527e48b6ddb2c91d975577a71db0259a7250d762004ef0a49ebc063f45103aab0 SHA512 ca8a0ce9c9cdb1306b6a5f8e3d9ba68a2beb3d0a35a58fd6c51ba3ce76e2104045b2768054d27bb4bfcd437534aeb6d39fa2be87396f3a4084c0044201e96252 -EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8 +EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 4e2c858cfbb65f591442aefb56f6c50916c58adec4a40394a578f4cbc09dc5a2770a7d2da02d2897bf052957395b51157c77319370e882e2c55c406bcb871c05 SHA512 72d72915af22e3ed24e9a9e1965cad8f5a37c1748302787b7ba665f6dcf1834e19fbabdfc7257fa338b2db777ed8b1d0d1355d2377c33b2ac07a4d9666bc0ca9 EBUILD cucumber-rails-2.2.0.ebuild 1196 BLAKE2B 204bff27ac75def4b5e88ccfb332b824d8cceec2672f4a2b298c9afc4c32c5c176fd03534fbd6136c9f6d9356a2692ad4a6b1dbf43444334735e3f5e28a714f2 SHA512 70a349b9c1e0b6417fc9e7625ae09f670220bef05f7a8a5c820637ff2cae11b0a5918bee4baa29b1a2e701d6f37d4b2844fabb497a2003abda5857dfafcbdbc9 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7 diff --git a/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild index c81500b4da15..3198b85de304 100644 --- a/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild +++ b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby25 ruby26 ruby27" # There are also cucumber features. They require a Rails project with # factory girl which we don't have packaged yet. diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest index 166443f44a0c..0b2bc1bdf04b 100644 --- a/dev-util/cucumber/Manifest +++ b/dev-util/cucumber/Manifest @@ -1,5 +1,5 @@ DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441 EBUILD cucumber-3.1.2.ebuild 2750 BLAKE2B a2098d1c0860e45a13a27badd5485ad0a2cc4743cae3585cc3832b6f8a04b82ac335a8853667384848ded290f74677548957e2b51198391f23a56ed1333a1bdc SHA512 5a851d7d42761cee2c48149c8fc65c2daddec95fc3a9940cd1661cf830248e450a903f4d9978900b82c750ce2bf63e24585e64f9e302133a523bad560a28a52a -EBUILD cucumber-3.2.0.ebuild 2866 BLAKE2B 7c47db83a5af8c7989af5c0a94dc08dc3c6cbce57794ca828216631850ea38dd05324a02d3497fe0cfb3a09e0c4f16972ecc91f9825ea9cac6ff6fbfd53da590 SHA512 205d0ab2b0353f45870fde9c07769d09c58b6b3f5c6c006a56a35509bd8635112e5cfeebb2773085f5e9b946f7f0f3b77490edac3aeeefa4b1927a10c03eddd2 +EBUILD cucumber-3.2.0.ebuild 2865 BLAKE2B 9c2d2d01edfff03b79c3b602faaf95ff6ffd8877b51691b1dfa66db409ddafc1de227d6517a6aeba9feea2e18c1cdb81860f28ab659faa12029350d0df67e61d SHA512 e3ccf6f584b8ecc7936feefc24684e7eda0510f1601d42b00b65318a50b32e9bcdb98de9c722dc05e5af5f859d2e4be354ff114901a93e49409e964b44424be5 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902 diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild index 74102d4c3a77..6899c1c9f403 100644 --- a/dev-util/cucumber/cucumber-3.2.0.ebuild +++ b/dev-util/cucumber/cucumber-3.2.0.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P} RUBY_S="cucumber-ruby-${PV}" LICENSE="Ruby" -KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~s390 sparc x86" SLOT="0" IUSE="examples test" @@ -40,7 +40,7 @@ ruby_add_rdepend " dev-util/cucumber-core:3.2 >=dev-util/cucumber-expressions-6.0.1:6.0 >=dev-util/cucumber-wire-0.0.1:0 - =dev-ruby/diff-lcs-1.3*:0 + >=dev-ruby/diff-lcs-1.3:0 >=dev-ruby/gherkin-5.1.0:5 >=dev-ruby/multi_json-1.7.5 >=dev-ruby/multi_test-0.1.2 diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest index ad16b90c9532..2ece204ea9db 100644 --- a/dev-util/diffoscope/Manifest +++ b/dev-util/diffoscope/Manifest @@ -1,3 +1,3 @@ DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811 -EBUILD diffoscope-177.ebuild 3323 BLAKE2B acb100745327084b7476a4bc7f3df3d056974106f3c4b8c3ff1ec85e0e204df3ff43b892e8206424bc908b149130b7a6e40f828e885539f59c941d9a2f3bb907 SHA512 34a3dea18d4534232cea448f8565b4aae038f57bbfcf1b29bffd634dc12c5c15b1fd6b2a66959f57d7087984dd8dcab48b8f52cc5c54796a6fe606979db8e7cb -MISC metadata.xml 2135 BLAKE2B a8df7a939e9436d3a7d41d80248db5aa0db08d23fa6d984c224e1d239aed5d102748dd873d02e06825a8793c7b5a35b5ea33ab62875eeaba83978712608a8b26 SHA512 54e366ed683867a9e97295dc426e5c68d6d06c63e9fb5b9245df21c575965540373c9d23fc20e7e7f44f82bbe0187ae17d0e63deca64b92270012648c17c76be +EBUILD diffoscope-177-r1.ebuild 3327 BLAKE2B 5a02d7069b31bd8db1f2f590c9825da2acfe7ce7c37e49a184f1add658ad415c4c008e959926ea470d4e0f1f3247e8ffe0613148e292c345eceba1bcb53d7082 SHA512 d1cdef68e7565fd3635d3cacf2c5617acf66dd1e7fb53c3fd72fd0bd7c9d6b48f167c83d385fcb3f38c0efd5a60b053a1fc3dc91b0876a3f6065cb168f416053 +MISC metadata.xml 2077 BLAKE2B 2f4d188accf1f75c139a388f564ef5130ea8e74e403072871e4b73b848eaf405076bae7190565f374c193cb4f3fd0be16e3c781ac73df1d1cfb36101142b59eb SHA512 683e181724871d636610c7cfa93c714ceddba7e95b80fda8837e04b396f63049307b23b0471cfc19c46de5bd8b6f7bc868412f8f1c817933ac9507e7280b2272 diff --git a/dev-util/diffoscope/diffoscope-177-r1.ebuild b/dev-util/diffoscope/diffoscope-177-r1.ebuild new file mode 100644 index 000000000000..d2d8b5e5dda3 --- /dev/null +++ b/dev-util/diffoscope/diffoscope-177-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="ncurses" +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Will try to get to the bottom of what makes files or directories different" +HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file +find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma +mono opendocument pascal pdf postscript R rpm sqlite squashfs +ssh tar test tcpdump zip zlib zstd" + +RESTRICT="!test? ( test )" + +# pull in optional tools for tests: +# img2txt: bug #797688 +# docx2txt: bug #797688 +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + app-text/docx2txt + media-libs/libcaca + ) +" +RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] + dev-python/libarchive-c[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + acl? ( sys-apps/acl ) + binutils? ( sys-devel/binutils ) + bzip2? ( app-arch/bzip2 ) + libcaca? ( media-libs/libcaca ) + colord? ( x11-misc/colord ) + cpio? ( app-arch/cpio ) + diff? ( sys-apps/diffutils ) + docx? ( app-text/docx2txt ) + dtc? ( sys-apps/dtc ) + e2fsprogs? ( sys-fs/e2fsprogs ) + file? ( sys-apps/file ) + find? ( sys-apps/findutils ) + gettext? ( sys-devel/gettext ) + gif? ( media-libs/giflib ) + gpg? ( app-crypt/gnupg ) + haskell? ( dev-lang/ghc ) + hdf5? ( sci-libs/hdf5 ) + hex? ( app-editors/vim-core ) + imagemagick? ( media-gfx/imagemagick ) + iso? ( app-cdr/cdrtools ) + java? ( virtual/jdk ) + llvm? ( sys-devel/llvm ) + lzma? ( app-arch/xz-utils ) + mono? ( dev-lang/mono ) + opendocument? ( app-text/odt2txt ) + pascal? ( dev-lang/fpc ) + pdf? ( + app-text/pdftk + app-text/poppler + dev-python/PyPDF2[${PYTHON_USEDEP}] + ) + postscript? ( app-text/ghostscript-gpl ) + R? ( dev-lang/R ) + rpm? ( app-arch/rpm ) + sqlite? ( dev-db/sqlite:3 ) + squashfs? ( sys-fs/squashfs-tools ) + ssh? ( net-misc/openssh ) + tar? ( app-arch/tar ) + tcpdump? ( net-analyzer/tcpdump ) + zip? ( app-arch/unzip ) + zlib? ( app-arch/gzip ) + zstd? ( app-arch/zstd ) +" +# Presence if filemagic's magic.py breaks imports +# of dev-python/python-magic: https://bugs.gentoo.org/716482 +RDEPEND+=" !dev-python/filemagic" + +distutils_enable_tests pytest + +python_test() { + local exclude=( + # test seems to use different tarball + tests/test_presenters.py::test_text_proper_indentation + + # needs triage + tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found + + # needs triage + tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode + + # img2txt based failures, bug #797688 + tests/comparators/test_ico_image.py::test_diff + tests/comparators/test_ico_image.py::test_diff_meta + tests/comparators/test_ico_image.py::test_diff_meta2 + tests/comparators/test_ico_image.py::test_has_visuals + tests/comparators/test_jpeg_image.py::test_diff + tests/comparators/test_jpeg_image.py::test_compare_non_existing + tests/comparators/test_jpeg_image.py::test_diff_meta + tests/comparators/test_jpeg_image.py::test_has_visuals + + # docx2txt based falures, bug #797688 + tests/comparators/test_docx.py::test_diff + ) + epytest ${exclude[@]/#/--deselect } +} diff --git a/dev-util/diffoscope/diffoscope-177.ebuild b/dev-util/diffoscope/diffoscope-177.ebuild deleted file mode 100644 index 6b1e9ecce520..000000000000 --- a/dev-util/diffoscope/diffoscope-177.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="ncurses" -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Will try to get to the bottom of what makes files or directories different" -HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file -find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm -mono opendocument pascal pdf postscript R rpm sqlite squashfs -ssh tar test tcpdump xz zip zstd" - -RESTRICT="!test? ( test )" - -# pull in optional tools for tests: -# img2txt: bug #797688 -# docx2txt: bug #797688 -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - app-text/docx2txt - media-libs/libcaca - ) -" -RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}] - dev-python/libarchive-c[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - acl? ( sys-apps/acl ) - binutils? ( sys-devel/binutils ) - bzip2? ( app-arch/bzip2 ) - libcaca? ( media-libs/libcaca ) - colord? ( x11-misc/colord ) - cpio? ( app-arch/cpio ) - diff? ( sys-apps/diffutils ) - docx? ( app-text/docx2txt ) - dtc? ( sys-apps/dtc ) - e2fsprogs? ( sys-fs/e2fsprogs ) - file? ( sys-apps/file ) - find? ( sys-apps/findutils ) - gettext? ( sys-devel/gettext ) - gif? ( media-libs/giflib ) - gpg? ( app-crypt/gnupg ) - gzip? ( app-arch/gzip ) - haskell? ( dev-lang/ghc ) - hdf5? ( sci-libs/hdf5 ) - hex? ( app-editors/vim-core ) - imagemagick? ( media-gfx/imagemagick ) - iso? ( app-cdr/cdrtools ) - java? ( virtual/jdk ) - llvm? ( sys-devel/llvm ) - mono? ( dev-lang/mono ) - opendocument? ( app-text/odt2txt ) - pascal? ( dev-lang/fpc ) - pdf? ( - app-text/pdftk - app-text/poppler - dev-python/PyPDF2[${PYTHON_USEDEP}] - ) - postscript? ( app-text/ghostscript-gpl ) - R? ( dev-lang/R ) - rpm? ( app-arch/rpm ) - sqlite? ( dev-db/sqlite:3 ) - squashfs? ( sys-fs/squashfs-tools ) - ssh? ( net-misc/openssh ) - tar? ( app-arch/tar ) - tcpdump? ( net-analyzer/tcpdump ) - xz? ( app-arch/xz-utils ) - zip? ( app-arch/unzip ) - zstd? ( app-arch/zstd ) -" -# Presence if filemagic's magic.py breaks imports -# of dev-python/python-magic: https://bugs.gentoo.org/716482 -RDEPEND+=" !dev-python/filemagic" - -distutils_enable_tests pytest - -python_test() { - local exclude=( - # test seems to use different tarball - tests/test_presenters.py::test_text_proper_indentation - - # needs triage - tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found - - # needs triage - tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode - - # img2txt based failures, bug #797688 - tests/comparators/test_ico_image.py::test_diff - tests/comparators/test_ico_image.py::test_diff_meta - tests/comparators/test_ico_image.py::test_diff_meta2 - tests/comparators/test_ico_image.py::test_has_visuals - tests/comparators/test_jpeg_image.py::test_diff - tests/comparators/test_jpeg_image.py::test_compare_non_existing - tests/comparators/test_jpeg_image.py::test_diff_meta - tests/comparators/test_jpeg_image.py::test_has_visuals - - # docx2txt based falures, bug #797688 - tests/comparators/test_docx.py::test_diff - ) - epytest ${exclude[@]/#/--deselect } -} diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml index 7ece4d4c186d..5cde47747fc8 100644 --- a/dev-util/diffoscope/metadata.xml +++ b/dev-util/diffoscope/metadata.xml @@ -35,7 +35,6 @@ Use net-misc/openssh Use app-arch/tar Use net-analyzer/tcpdump - Use app-arch/xz-utils Use app-arch/unzip diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest index 885ab950f529..c7956d5e3d4c 100644 --- a/dev-util/gdbus-codegen/Manifest +++ b/dev-util/gdbus-codegen/Manifest @@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f EBUILD gdbus-codegen-2.68.2.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b -EBUILD gdbus-codegen-2.68.3.ebuild 2188 BLAKE2B d4777e26ba0102d80cd657301fd601e24558c3ccddb3afaf3e4a56b435e2566e8226eca1ac63785833c5e7d6fa40e71156431dd763091734dae85be7869827f7 SHA512 acfe8dbdff009f529db4618627ea214e2eb01df563ae6091783a6ea131cdabe53079456f4d7d1e3b319fcff0647502f191d21bde739dc813cab4dea920f95b73 +EBUILD gdbus-codegen-2.68.3.ebuild 2184 BLAKE2B 21ff29a3015f753d8ac4c0a8d7fdcbd77651a18195efc9666c9de47cf25082bf25b6e882c1febf84cab2ed60243947f3209cd8049b3b2aa624f175aa119a85c3 SHA512 1dc4d23e495ca2bad46af51f8bd6466dd2357cbc02877bb7d1f92af7d342bf4084399972fcaf6a4d9244f18a716ed70ed1e788709ec4c2edfcd75bcfada51efe MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild index a5bd7e419617..0ca0060ac287 100644 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild +++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest index e2b65f5d5c37..a1dbbb83db6d 100644 --- a/dev-util/glib-utils/Manifest +++ b/dev-util/glib-utils/Manifest @@ -1,5 +1,5 @@ DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f EBUILD glib-utils-2.68.2.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b -EBUILD glib-utils-2.68.3.ebuild 2330 BLAKE2B 9c1b388930cb908f7f1d2398f76eefedc7521fcfe4cc5ab52a7ab31effc32d1f56e3f53eaa3a3f6edb57edf8ae99805277406e180b5ab27473bc4519c2008275 SHA512 d04d6b66d9c14a59d9d51478b1f135792fdc751ab18bfe4822b93ef39db5a3a2951e7cdb241428e327b07811cd2f4148664bfba223398586b0eee41632e1e33e +EBUILD glib-utils-2.68.3.ebuild 2326 BLAKE2B 23d09fddb8357ce1e14abebb09740ce76b7229d3b29529ed8faa585a1429e83b06ea48a7c1c6fed671e1e4f3aff31f44fff5033d5d6a117261912bba3ee7ff42 SHA512 d1ede0e5b98364c0d5bb6d3e9220b21dd449c2a09b6821eb251fc1a7e000bd1dc6e0fea48011970ee9d3f70f43cb083a334085cddba840a7a31ab14832ff1117 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6 diff --git a/dev-util/glib-utils/glib-utils-2.68.3.ebuild b/dev-util/glib-utils/glib-utils-2.68.3.ebuild index 33abe13ea327..30b73e45a7dc 100644 --- a/dev-util/glib-utils/glib-utils-2.68.3.ebuild +++ b/dev-util/glib-utils/glib-utils-2.68.3.ebuild @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+" SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~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 ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~x86-winnt" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest index 34124aed7a82..e4a96bc5d35a 100644 --- a/dev-util/google-perftools/Manifest +++ b/dev-util/google-perftools/Manifest @@ -5,5 +5,5 @@ DIST gperftools-2.8.tar.gz 928379 BLAKE2B e94bac4153cb5d3170d6486a9065b56d631ab2 DIST gperftools-2.9.1.tar.gz 924910 BLAKE2B fcf0491e42ff4212a63ab0af422f27f5a625c53a0b33e69f8dede96b004a0f01af104d9791a4b75d38145ae0059f5e2967ea1d09b0712cc4d930ef7aafd4f3ba SHA512 5e07f28da9afc5f1ba3df7f06ad0e146c171d33e1779bbaab21547ed234aaced02e5278c1eb8f92fc45480abd2474d6a2d4c71644fb9378f41088c56cc1bc8ab EBUILD google-perftools-2.7-r1.ebuild 2410 BLAKE2B 24f3d8e35ac243ed10d1be42498845a4c462158b56faa4a6c8ae3e18cf4d4ae4c326561d2407e702f9777d39e03b1b889efbf960c3ca64acf0cc118d735f5775 SHA512 fbb6a745414d0fc606a560cd86a9acb60f3b504a3c19128c26e96c8fab67b9ddd6b7138edbfd680f46d8e25662c7eb0c89cc07079a09f2bec1a2f0ae4feef11a EBUILD google-perftools-2.8.ebuild 2458 BLAKE2B 54871c3ba0c08bb28b18ee0aab24fca1ad455358d172f738cfee926c7290066b06ab2dc5f08c409eaa86d4b48345a2b4baa6b2db0168ca401185ba6427882bec SHA512 ba816192037a1a8bfad8b1d295fefd29da93ea06e4361c52227b120371d9cb0b5ec9da3f4861671f7ec8335c2811b058b77878553acb98dd7c8bc2d34f995c43 -EBUILD google-perftools-2.9.1.ebuild 2407 BLAKE2B 813d6b48cacb1ce4ac7df91ad5a384ec5d8c3016d7af40b655004793b517399d1b95d1ba1627a95d31000566ca7327f1cd772d1266a5b4ece511ef0adfd305c4 SHA512 cf84b11266564ac2946a1c521b0feedfc497b0c29ee5de7b9f20a16b71c8affc53755c13f3d0b5b39e022ead4f68122d14821e4914443152199c86ea46f0851d +EBUILD google-perftools-2.9.1.ebuild 2629 BLAKE2B 5a8dc4b054da9a8a1e307885b9c0f3ec5cbb892f919d522f72a283a6c08a383f70ce7ab55767bdfdcc0ec633f7a30daf19c31910aa7f3a9ef4053ffd4ffb0c15 SHA512 fac26ac94e1dfa3c2566236b31f2f452bd051fa40feb2ab0c3d950cacb281175eed1847c1865250fdb78ae25f8f9998c13889239857e4f23c9e0bb9de0d9d29c MISC metadata.xml 1128 BLAKE2B 68fdc3c01ff36a8915e07fbfbead0d1c77522dcda726287603fc77807bf062794d6255c76f53acb1e68ff9c0db7dc2da07e69632480059a814240ceec69d3bd6 SHA512 42b5ba08a7a9b64141352a3c9465f0ecea9a58ef336ede3def57165697832b0ad5b1ac4798aeb37e3ecf3d2bcc5b53f9225f31039ab585eb37d4b59303d741d0 diff --git a/dev-util/google-perftools/google-perftools-2.9.1.ebuild b/dev-util/google-perftools/google-perftools-2.9.1.ebuild index a1f7dcceb6c6..896b51dfd9c8 100644 --- a/dev-util/google-perftools/google-perftools-2.9.1.ebuild +++ b/dev-util/google-perftools/google-perftools-2.9.1.ebuild @@ -14,16 +14,21 @@ LICENSE="MIT" SLOT="0/4" # contains ASM code, with support for # freebsd x86/amd64 -# linux x86/amd64/ppc/ppc64/arm +# linux amd64/arm/arm64/ppc/ppc64/riscv/x86 # OSX ppc/amd64 # AIX ppc/ppc64 -KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" IUSE="largepages largepages64k +debug minimal optimisememory test static-libs" RESTRICT="!test? ( test )" -DEPEND="!ppc64? ( sys-libs/libunwind )" +# TODO: remove the riscv special case once either libunwind has begun supporting this arch +# or this package allows using llvm-libunwind for other arches +DEPEND="!ppc64? ( + riscv? ( sys-libs/llvm-libunwind ) + !riscv? ( sys-libs/libunwind ) +)" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest index 7e2fe722070e..9368e578bf80 100644 --- a/dev-util/lldb/Manifest +++ b/dev-util/lldb/Manifest @@ -1,11 +1,10 @@ DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 -DIST llvmorg-12.0.1-rc4.tar.gz 134278617 BLAKE2B d407421c7244bb125151e69e2a341f1af0a0cf8c1fda3b8ae3d4114c3a285d6307620bbf82b22d96d2c7782b37b0975e87be80c24e3ce1fdc71152734be1e8f8 SHA512 1a2c18435a970491eb9fc9381ba66af726e17dcbd5bf6774f9341b1e82fd35f2e5686844743f5317ebd2106b902c39e09aa98102e58a86e290b29102241c949f +DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B a9ddc5d6965882c37d0cf11e6331e77130c16ea9d60a90c8733c67b8bef0e947656a0c9e1888d483d4b497453475490b9d8bdd85f1396a8be605efec076d5db8 SHA512 7b352de97e3c2cfbf75e724f2e8a6b393bfc5d6240c4067f4f7bf3d04c52e769de6cf85743635410ea4938e587acc4fc925eb501e51733c6a80d442e0df098a0 EBUILD lldb-11.1.0.ebuild 2343 BLAKE2B ad45919d6e378904f946147277776a8f8dab3b16c64a0ee7f92e5d11d5efc67896151c1f90cf7fd08109b2343816222b1dee706bfa3c14de3ccd1c160091b4bb SHA512 461a00a379331e6e47115c412878d8bac8c8f04f233d7245548769527809a02672e3cefbcbfa3c39e2d71db1b144693fa57ce5f3328d57cd078f49683654d488 EBUILD lldb-12.0.0.ebuild 2415 BLAKE2B 12061d64f8e264dd341e4831a575473bd16b92b70a12d25e6b9f4197d784bb1f671f3591eeeac2b0e8c3ae529880fa58acaae7da5ea3a174e823c3dfe6412f6f SHA512 ae8afe01ff6959cac205830a811eab50588568f9d0016ff9ff468894375b64deb4d359140636066b72efd2eca12019522647b2b4b59b5ed1d9a90c3aeef25d7a -EBUILD lldb-12.0.1.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a -EBUILD lldb-12.0.1_rc4.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a +EBUILD lldb-12.0.1.ebuild 2420 BLAKE2B 8fd461752260d2e7d3cde1112863d43b0681d46ad129d36056b73b03c67b13c1263656e3577ab04ec729b70af167796991d20c91cfda5643fd63c898a3f2a993 SHA512 d14631da412a5e822f98ae6bc703e66383d848ace0d705363a4d0bf8e8f4f9126a1c7a472a4805b495b185d91098748d35a7a89f4047456904edb97735f5925c EBUILD lldb-13.0.0.9999.ebuild 2397 BLAKE2B c1eef59c390f1d068c0d3a88a7904de48c4d4eb11d0ac24f5da867f9b615f4fad80060c4bfb5476ebacf7d30101327e1a8f458f03b8f18bf142edd7fac1ca8e0 SHA512 cc2296e0d6dc7b5174cae77a10f3f1c175d31b3aaa122e64c96ba1f1f6e970adef1d545fa021f8338a3e18c256d60f67d150c176c3e268d0636d9ce17501703a MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 diff --git a/dev-util/lldb/lldb-12.0.1.9999.ebuild b/dev-util/lldb/lldb-12.0.1.9999.ebuild deleted file mode 100644 index 468fe7b0cf61..000000000000 --- a/dev-util/lldb/lldb-12.0.1.9999.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake llvm llvm.org python-single-r1 toolchain-funcs - -DESCRIPTION="The LLVM debugger" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE="+libedit lzma ncurses +python test" -REQUIRED_USE=${PYTHON_REQUIRED_USE} -RESTRICT="test" - -RDEPEND=" - libedit? ( dev-libs/libedit:0= ) - lzma? ( app-arch/xz-utils:= ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) - python? ( - $(python_gen_cond_dep ' - dev-python/six[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - ) - ~sys-devel/clang-${PV}[xml] - ~sys-devel/llvm-${PV} - ! https://bugreports.qt.io/ diff --git a/dev-util/qbs/qbs-1.16.0.ebuild b/dev-util/qbs/qbs-1.16.0.ebuild deleted file mode 100644 index 2ecd2be09ac4..000000000000 --- a/dev-util/qbs/qbs-1.16.0.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils toolchain-funcs - -MY_P=${PN}-src-${PV} - -DESCRIPTION="Modern build tool for software projects" -HOMEPAGE="https://doc.qt.io/qbs/" -SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -# see bug 581874 for the qttest dep in RDEPEND -RDEPEND=" - dev-qt/qtcore:5= - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - test? ( dev-qt/qttest:5 ) -" -DEPEND="${RDEPEND} - doc? ( - dev-qt/qdoc:5 - dev-qt/qthelp:5 - ) - test? ( - dev-qt/linguist-tools:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - ) -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - if ! use examples; then - sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die - fi - - echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro - - # skip several tests that fail and/or have additional deps - sed -i \ - -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ - -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ - -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ - -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ - tests/auto/blackbox/tst_blackbox.cpp || die - - # requires jdk, fails, bug 585398 - sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die -} - -src_configure() { - local myqmakeargs=( - qbs.pro # bug 523218 - -recursive - CONFIG+=qbs_disable_rpath - CONFIG+=qbs_enable_project_file_updates - $(usex test 'CONFIG+=qbs_enable_unit_tests' '') - QBS_INSTALL_PREFIX="${EPREFIX}/usr" - QBS_LIBRARY_DIRNAME="$(get_libdir)" - ) - eqmake5 "${myqmakeargs[@]}" -} - -src_test() { - einfo "Setting up test environment in ${T}" - - export HOME=${T} - export LD_LIBRARY_PATH=${S}/$(get_libdir) - export QBS_AUTOTEST_PROFILE=testProfile - - "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die - "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" ${QBS_AUTOTEST_PROFILE} || die - "${S}"/bin/qbs-config profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die - - einfo "Running autotests" - - # simply exporting LD_LIBRARY_PATH doesn't work - # we have to use a custom testrunner script - local testrunner=${WORKDIR}/gentoo-testrunner - cat <<-EOF > "${testrunner}" - #!/bin/sh - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" - exec "\$@" - EOF - chmod +x "${testrunner}" - - emake TESTRUNNER="'${testrunner}'" check -} - -src_install() { - emake INSTALL_ROOT="${D}" install - - dodoc -r changelogs README.md - - # install documentation - if use doc; then - emake docs - dodoc -r doc/qbs/html - dodoc doc/qbs.qch - docompress -x /usr/share/doc/${PF}/qbs.qch - fi -} diff --git a/dev-util/qbs/qbs-1.19.1.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild new file mode 100644 index 000000000000..3339bb574287 --- /dev/null +++ b/dev-util/qbs/qbs-1.19.1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils toolchain-funcs + +MY_P=${PN}-src-${PV} + +DESCRIPTION="Modern build tool for software projects" +HOMEPAGE="https://doc.qt.io/qbs/" +SRC_URI="https://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc examples gui test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5= + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtxml:5 + gui? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND} + test? ( + dev-qt/linguist-tools:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qttest:5 + ) +" +BDEPEND=" + dev-qt/qtcore:5 + doc? ( + dev-qt/qdoc:5 + dev-qt/qthelp:5 + ) +" + +src_prepare() { + default + + if ! use examples; then + sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die + fi + + if ! use gui; then + sed -i -e '/SUBDIRS += config-ui/ d' src/app/app.pro || die + fi + + echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro + + # skip several tests that fail and/or have additional deps + sed -i \ + -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ + -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ + -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ + tests/auto/blackbox/tst_blackbox.cpp || die + sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro || die +} + +src_configure() { + local myqmakeargs=( + qbs.pro # bug 523218 + -recursive + CONFIG+=qbs_disable_rpath + CONFIG+=qbs_enable_project_file_updates + $(usev test 'CONFIG+=qbs_enable_unit_tests') + QBS_INSTALL_PREFIX="${EPREFIX}/usr" + QBS_LIBRARY_DIRNAME="$(get_libdir)" + ) + eqmake5 "${myqmakeargs[@]}" +} + +src_test() { + einfo "Setting up test environment in ${T}" + + export HOME=${T} + export LD_LIBRARY_PATH=${S}/$(get_libdir) + export QBS_AUTOTEST_PROFILE=testProfile + + "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die + "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" ${QBS_AUTOTEST_PROFILE} || die + "${S}"/bin/qbs-config profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die + + einfo "Running autotests" + + # simply exporting LD_LIBRARY_PATH doesn't work + # we have to use a custom testrunner script + local testrunner=${WORKDIR}/gentoo-testrunner + cat <<-EOF > "${testrunner}" + #!/bin/sh + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" + exec "\$@" + EOF + chmod +x "${testrunner}" + + emake TESTRUNNER="'${testrunner}'" check +} + +src_install() { + emake -j1 INSTALL_ROOT="${D}" install + + dodoc -r changelogs CONTRIBUTING.md README.md + + # install documentation + if use doc; then + emake docs + dodoc -r doc/qbs/html + dodoc doc/qbs.qch + docompress -x /usr/share/doc/${PF}/qbs.qch + fi +} diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest index de9690886db0..be190cb17d9b 100644 --- a/dev-util/strace/Manifest +++ b/dev-util/strace/Manifest @@ -1,5 +1,4 @@ AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8 -AUX strace-5.5-static.patch 5187 BLAKE2B 9015d649d644dd4e5fe6b89d7fd4b1d759b7021627384f575e6668fa24841438c49e3acd8d09f0302374fc457001df89a9f384193ddde1da105a5b95167f944a SHA512 a1adbbcc7bc87f37b1071b888f1b2c830113cfd40c341316d7e96e72e142781f41d1b8823277ea0c61079e557460e9a43d1795e7c8cc97cbca9c6aec8d08f682 DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31 SHA512 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9 EBUILD strace-5.11.ebuild 2348 BLAKE2B 59a4676d944dc05b012d9f8b47da68b3d23f95d996dd25ccdb9aab5cda3c3cb950c1ab000aa9536df55b4ee9e59bb4f42bf865f42b295c15cd75655ffcdfc918 SHA512 00c1828d50d7b02ca56f586eb2c3187f9ccddfe38b71a230304a9e111d6d7fe7119da38ff9a4998a4cc6393971874ea6ce699dfc8ae5291f038aca762533084c diff --git a/dev-util/strace/files/strace-5.5-static.patch b/dev-util/strace/files/strace-5.5-static.patch deleted file mode 100644 index da57ee0f9388..000000000000 --- a/dev-util/strace/files/strace-5.5-static.patch +++ /dev/null @@ -1,178 +0,0 @@ ---- /Makefile.am -+++ /Makefile.am -@@ -379,7 +379,6 @@ - if USE_LIBDW - strace_SOURCES += unwind-libdw.c - strace_CPPFLAGS += $(libdw_CPPFLAGS) --strace_CFLAGS += $(libdw_CFLAGS) - strace_LDFLAGS += $(libdw_LDFLAGS) - strace_LDADD += $(libdw_LIBS) - endif ---- /configure.ac -+++ /configure.ac -@@ -48,6 +48,15 @@ - AC_DEFINE([MANPAGE_DATE], "[manpage_date]", [Date]) - AC_SUBST([MANPAGE_DATE], [manpage_date]) - -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static], -+ [link strace statically])], -+ [], [enable_static=no]) -+if test "$enable_static" = "yes"; then -+ # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. -+ LDFLAGS="$LDFLAGS -pthread -static" -+fi -+ - AC_C_BIGENDIAN - - AC_MSG_CHECKING([for supported architecture]) ---- /m4/st_libdw.m4 -+++ /m4/st_libdw.m4 -@@ -8,7 +8,6 @@ - AC_DEFUN([st_ARG_LIBDW], [dnl - - : ${libdw_CPPFLAGS=} --: ${libdw_CFLAGS=} - : ${libdw_LDFLAGS=} - : ${libdw_LIBS=} - -@@ -34,48 +33,14 @@ - have_libdw= - - AS_IF([test "x$with_libdw" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- saved_CFLAGS="$CFLAGS" -- CPPFLAGS="$CPPFLAGS $libdw_CPPFLAGS" -- CFLAGS="$CFLAGS $libdw_CFLAGS" -- -- AC_CHECK_HEADERS([elfutils/libdwfl.h], -- [AC_CHECK_LIB([dw], [dwfl_linux_proc_attach], -- [libdw_LIBS="-ldw $libdw_LIBS" -- AC_CACHE_CHECK([for elfutils version], -- [st_cv_ELFUTILS_VERSION], -- [[st_cv_ELFUTILS_VERSION="$(echo _ELFUTILS_VERSION | -- $CPP $CPPFLAGS -P -imacros elfutils/version.h - | -- grep '^[0-9]')" -- test -n "$st_cv_ELFUTILS_VERSION" || -- st_cv_ELFUTILS_VERSION=0 -- ]] -- ) -- AS_IF([test "$st_cv_ELFUTILS_VERSION" -ge 164], -- [have_libdw=yes], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_ERROR([elfutils version >= 164 is required for stack tracing support])], -- [AC_MSG_WARN([elfutils version >= 164 is required for stack tracing support])] -- ) -- ] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find dwfl_linux_proc_attach in libdw])], -- ) -- ], -- [$libdw_LDFLAGS $libdw_LIBS] -- ) -- ], -- [AS_IF([test "x$with_libdw" = xyes], -- [AC_MSG_FAILURE([failed to find elfutils/libdwfl.h])] -- ) -- ] -- ) -- -- CFLAGS="$saved_CFLAGS" -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBDW], [libdw >= 0.164]) -+ else -+ PKG_CHECK_MODULES([LIBDW], [libdw >= 0.164]) -+ fi -+ have_libdw=yes -+ libdw_CPPFLAGS="$LIBDW_CFLAGS" -+ libdw_LIBS="$LIBDW_LIBS"] - ) - - AS_IF([test "x$have_libdw" = xyes], -@@ -84,7 +49,6 @@ - [Whether to use libdw for stack tracing] - ) - AC_SUBST(libdw_CPPFLAGS) -- AC_SUBST(libdw_CFLAGS) - AC_SUBST(libdw_LDFLAGS) - AC_SUBST(libdw_LIBS) - ] ---- /m4/st_libunwind.m4 -+++ /m4/st_libunwind.m4 -@@ -28,64 +28,14 @@ - libunwind_LIBS= - - AS_IF([test "x$with_libunwind" != xno && test "x$use_unwinder" = x], -- [saved_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $libunwind_CPPFLAGS" -- -- AC_CHECK_HEADERS([libunwind-ptrace.h], -- [saved_LDFLAGS="$LDFLAGS" -- LDFLAGS="$LDFLAGS $libunwind_LDFLAGS" -- -- AC_CHECK_LIB([unwind], [backtrace], -- [libunwind_LIBS="-lunwind $libunwind_LIBS" -- -- AC_MSG_CHECKING([for unw_create_addr_space in libunwind-generic]) -- saved_LIBS="$LIBS" -- LIBS="-lunwind-generic $libunwind_LIBS $LIBS" -- -- AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], -- [[return !unw_create_addr_space(0, 0)]]) -- ], -- [AC_MSG_RESULT([yes]) -- libunwind_LIBS="-lunwind-generic $libunwind_LIBS" -- -- AC_CHECK_LIB([unwind-ptrace], [_UPT_create], -- [libunwind_LIBS="-lunwind-ptrace $libunwind_LIBS" -- use_unwinder=libunwind -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find _UPT_create in libunwind-ptrace]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- ], -- [AC_MSG_RESULT([no]) -- if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find unw_create_addr_space in libunwind-generic]) -- fi -- ] -- ) -- -- LIBS="$saved_LIBS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind]) -- fi -- ], -- [$libunwind_LIBS] -- ) -- -- LDFLAGS="$saved_LDFLAGS" -- ], -- [if test "x$with_libunwind" != xcheck; then -- AC_MSG_FAILURE([failed to find libunwind-ptrace.h]) -- fi -- ] -- ) -- -- CPPFLAGS="$saved_CPPFLAGS" -- ] -+ [if test "$enable_static" = "yes"; then -+ PKG_CHECK_MODULES_STATIC([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ else -+ PKG_CHECK_MODULES([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace]) -+ fi -+ use_unwinder="libunwind" -+ libunwind_CPPFLAGS="$LIBUNWIND_CFLAGS" -+ libunwind_LIBS="$LIBUNWIND_LIBS"] - ) - - if test "x$use_unwinder" = xlibunwind; then diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest index 4e7123c0432f..c1053dbdddaa 100644 --- a/dev-util/stripe-mock/Manifest +++ b/dev-util/stripe-mock/Manifest @@ -3,9 +3,11 @@ DIST stripe-mock-0.104.0.tar.gz 574936 BLAKE2B 681dcc2b02f5d4ca946024d1c049e499c DIST stripe-mock-0.105.0.tar.gz 583483 BLAKE2B 8015699be4cd7a0c6e81c8f89cebe23fadb02904a175fef15c5e1fe156b01b001a03ba4b42ddffd453203142b1108d5981782d23e1369bab61181e0ef3964734 SHA512 539c3315c3e4896584a656fa3157ac69331bdaf2c77b6a7433b8709971e3b248fe89f1df3eab3f3178580847109460b86f975f0a378aef48ca3c29466b076f52 DIST stripe-mock-0.106.0.tar.gz 592320 BLAKE2B 2154898ecb13516d11fe5188012829af5618a0520b19d6c3899c976ef719e5ddfe0a1bfe0c6787b9e51c695734d90e2297b8df6abc7d055a8d4df8e747d16b08 SHA512 30d5db6ace639435f0c97ce2ff38c02acdb464a09d5cf59a90ea3892b5f277e05ffb67d068b74739c2cdca3e73b2db74054079335bb28536c57457b46251bd6d DIST stripe-mock-0.107.0.tar.gz 592857 BLAKE2B 6fb58e6c38a04e443adf68bd30dbe16531abede29c104c617bd16f7fd9ce19b38bcd43df2b3fc21e9f8f5cf58a9e6413158f09a0e4746721e29180bfa8e5a26c SHA512 c455f18c242d15e20022fa17a99d4fb33ba93932d6983eb589b4e084b1bd2739a1db837ae70c4043cc4333a5a13ff4f4b16785a9ab014e556901fa975380e90b +DIST stripe-mock-0.109.0.tar.gz 604488 BLAKE2B de84bb5c549628a642c7612b86a5d3266d920e14ba76d7a03055569718cdf05a5ce1d022c645423c11f1ea82849879444c779156bbd59cd91ba89d00176af5eb SHA512 a14d0feb1bd3d191dd184218bb23bb8f7f8fa582a4b66f8dbb8d8c0c028e8757a914cf82ae7b8eaa43be246a3af4fd19744b69d8496816caacb91672fe9b8538 EBUILD stripe-mock-0.103.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c EBUILD stripe-mock-0.104.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac EBUILD stripe-mock-0.105.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac EBUILD stripe-mock-0.106.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac EBUILD stripe-mock-0.107.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac -MISC metadata.xml 755 BLAKE2B 27b837f64385f50cf83e0bd5753560f5b6878d8ae5984c6e99deaf02138791e397e5755db1033ab3b4863f75edc90caaa91309247789ca54d01362178670d862 SHA512 bac1e56b0fb021b43712b31e98042f8a30cdc3f365ce928da35491a8261f04469c666afe8e21b82c9b3095b374ffc3312a8d909e4e24a87638b0de8551ff5d10 +EBUILD stripe-mock-0.109.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac +MISC metadata.xml 642 BLAKE2B f8a0cc39447fa2a3bb6b5f488214dc6603b0b34d8e07ce087a215b333054041d84734bedca17eee874858a4fe0a7c7e0a3048a67f183d6a3ca1546c0a284fe9a SHA512 b4a32de284bf118140ca530c9705aec3ac413eb20657f6111f94865fa6456ed95cb6150f9e8a3f8fb232db1e9afe3ac4267d06c210e2fa7aa53c1e657ab531f0 diff --git a/dev-util/stripe-mock/metadata.xml b/dev-util/stripe-mock/metadata.xml index 66770fb3fc7f..517a404a679c 100644 --- a/dev-util/stripe-mock/metadata.xml +++ b/dev-util/stripe-mock/metadata.xml @@ -1,10 +1,6 @@ - - cedk@gentoo.org - Cédric Krier - m.seifert@digitalernachschub.de Michael Seifert diff --git a/dev-util/stripe-mock/stripe-mock-0.109.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.109.0.ebuild new file mode 100644 index 000000000000..05a7220e34b0 --- /dev/null +++ b/dev-util/stripe-mock/stripe-mock-0.109.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGO_SRC="github.com/stripe/stripe-mock" +EGO_PN=${EGO_SRC}/... +inherit golang-build golang-vcs-snapshot + +DESCRIPTION="Mock HTTP server that responds like the real Stripe API" +HOMEPAGE="https://github.com/stripe/stripe-mock" +SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="MIT ISC BSD-2" +SLOT="0" + +src_install() { + golang-build_src_install + dobin bin/stripe-mock + rm -rf "${D}$(get_golibdir_gopath)" || die +} diff --git a/dev-util/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest index 42717a10494d..357ac3e3ea7b 100644 --- a/dev-util/sysprof-common/Manifest +++ b/dev-util/sysprof-common/Manifest @@ -1,5 +1,5 @@ DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442 DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87 EBUILD sysprof-common-3.38.1.ebuild 494 BLAKE2B 9508543ab0484eb5ed0348dfd83f8273554f0610c2bec17727b459030044885416fb9e22c9b7c20cec762a64f5239cdbedb185f87d85c23cdf7c972f9b7755bf SHA512 95862717922174ff70179a7f150432620990a4888c928707326d607500d14dad7a40e54f2385ace9e253738618dc09ce7b987c61ee07c1b5c916bc561b45f689 -EBUILD sysprof-common-3.40.1.ebuild 501 BLAKE2B 7d7ad07960402699d823c12288f578b9eade51153c1adf6d3f5d6030cc7cf088ed323a423700bddca5b480e3f9fee1d9846a812702e293df148dd85494de7a1f SHA512 7454af2b21bf08c02bc73bf5178124be47b72e590742ffa403c238239ed8d9b5afe39271fc1f8e469d517fb68e149335fd216655bba6822b81ad7a5b03a127a3 +EBUILD sysprof-common-3.40.1.ebuild 499 BLAKE2B 403f1d1bc228f49ffb23f8a40c908e3a659c3fd5adb34cddba6e0b69c8cb25b1884f0a5cbdea57b4cf0cfede52d3fb43145abd707f5794f615faeb3dc70378f9 SHA512 7f0b2114a3d015e37f52630a5bc9d83a1ffc31818195a21855161a0735a508bc60e7b2aabc3b9ee1eafec24e037d4892228dd4711f7bbb75e931e917fda9ce5d MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild index 96a57b010725..6f87bc9b52ab 100644 --- a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild +++ b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/" LICENSE="GPL-3+ GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" !=dev-util/sysprof-3.34.1-r0 diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest index 84225bebb69a..1cf376f13040 100644 --- a/dev-util/sysprof/Manifest +++ b/dev-util/sysprof/Manifest @@ -1,5 +1,5 @@ DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442 DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87 EBUILD sysprof-3.38.1-r1.ebuild 2277 BLAKE2B 87bc003c5230751fd2b4d0e4e1f12aaf158a537782cd508b0bc6f41cf298e3086b9ef1db94ece81c583b30968d347f9c98a6d16b46bc91b699cac3a54844e153 SHA512 09c022e05fc883bc4a58087c6e82d086182d2f3d7df766792ebfb17a3a00b2a72112f6fda3de71942a18d6cc25dafb0f2a776ffc730a740067394ab52077c260 -EBUILD sysprof-3.40.1-r1.ebuild 2299 BLAKE2B 8c379c6f8ba046aa15121913147d66bbd8054c216c0dfa4a2b7f172fdee8a2df486f8f5ecd819e7d9a974512d6430819c94316e3085804aa9aeaac0740d139af SHA512 7230ff104fbd2220bf9f69ebec65e2809980454c49c6487093a483dcc24edeeab7c5e8a2ac2beab973a68c59e60b0f4f6aedb2471f805a815bcc97b3ae051d66 +EBUILD sysprof-3.40.1-r1.ebuild 2297 BLAKE2B b68aafd3ee618ca18f2d788933e7a914f3ff7c7ba46088cbd817ed2e4d57bdfa1f9aa949b02c1ec527ee8c98ee9e15e432cf0082c1b8522c4743916a2509bbde SHA512 22a659fd761ca6693d4f3d98fbd7e6522b3399681dba49daa037f34030b797b97b697a521f2b0323ce6adb20bc6ae1ffc07ee52aaba9fa992c83a66accb449c1 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d diff --git a/dev-util/sysprof/sysprof-3.40.1-r1.ebuild b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild index bbcfc1400ed8..8d316efc9e52 100644 --- a/dev-util/sysprof/sysprof-3.40.1-r1.ebuild +++ b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/" LICENSE="GPL-3+ GPL-2+" API_VERSION="4" SLOT="0/${API_VERSION}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gtk +unwind" RDEPEND=" -- cgit v1.2.3