From 54386076da44a298949ab2b666bd2af1e7e68833 Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Thu, 24 Nov 2022 17:58:40 +1100 Subject: sys-fs/bcachefs-tools: add 24_p20221124, drop 24_p20221120 Signed-off-by: Matt Jolly Closes: https://github.com/gentoo/gentoo/pull/28408 Signed-off-by: Sam James --- sys-fs/bcachefs-tools/Manifest | 2 +- .../bcachefs-tools-24_p20221120.ebuild | 267 --------------------- .../bcachefs-tools-24_p20221124.ebuild | 267 +++++++++++++++++++++ 3 files changed, 268 insertions(+), 268 deletions(-) delete mode 100644 sys-fs/bcachefs-tools/bcachefs-tools-24_p20221120.ebuild create mode 100644 sys-fs/bcachefs-tools/bcachefs-tools-24_p20221124.ebuild diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest index 4d92430ee783..e4a2d39da29a 100644 --- a/sys-fs/bcachefs-tools/Manifest +++ b/sys-fs/bcachefs-tools/Manifest @@ -4,7 +4,7 @@ DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585 DIST anyhow-1.0.66.crate 43770 BLAKE2B 8d74397c47bd64c00f015cf7ee279fa020ea39191440208d77e4a5fdb35fca531e8bb9b765be223b24050d0fd1db76fa5b516146f450937f84a5c113c9eca997 SHA512 7b4078906df2805d491dc2f29c4eec85a9f43078c0dcd9c05261c2706ed655953b693c4f59fda62547681b29cda9ac7a0789f1359bb18110403cfe34e9fb0dc3 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f -DIST bcachefs-tools-f1f88825c371f84edb85a156de5e1962503d23b2.tar.zst 946665 BLAKE2B 1e4b6869a9a52c07b8cd31f0eaccb7003b244db7d91b7199591fada3f61ab0be77b1462ef97e144f5cddf1262f3dd100e381c74ee6ae053dff38fd10eca06bbf SHA512 6d4b5b561de6d6a7a3d734d7981b0e6f621da5c550325e749a8612837322600069a6896f1f01b16da6b4649344a08549a542835bd7eb4d2acbb2f973dc46310f +DIST bcachefs-tools-48eefee7495c6e145f3fcfe6ab83f9e8bc27a1ec.tar.zst 946668 BLAKE2B 62a2bd47f7699f722849aa78e87b79e71c4af508492e8e9b28092e69b7069122f7da2dda6cecd0d6fa31153bf094c55099b3371cc30b50b92f9fa5b57624b4fc SHA512 9e999880a5e0910e85111c1b84372129cce6348f93b0aadcbf915840ed14982ac82ccb98fb52a28ac9612473255d0e1b27a29721cb9254db64660298a5ac5f18 DIST bindgen-0.59.2.crate 206267 BLAKE2B de66347fcf2d538879e49c85d2db80e86a70e27d3c84464b52a840476a31edae0cfa3e1afaba33ef0b7abadcb1e23a2fe1420e3254e0de1f6848b575a9c96620 SHA512 14c49879c7443191b877957a4fd405c7f10a1e8b70016d91bf5fe33861fc5d71982a1c685c190e4f7922cedb6c8aefadac3b0b68cbe5578da791a8da6bfedf44 DIST bitfield-0.13.2.crate 16479 BLAKE2B c34f150e135579452d5b6e13bac0fb4a3a897219660289c861646330f7050d19a10d041affe8d250bf314c35eb19ee519b1fa0dd12eed94a93a5e904b95380d9 SHA512 5ed9ad97913828d67b19d5f10a264592f4c03aba8e4ea791f7a20e61da79066daa1d5ce678c822d8f6f1d065a65a3aa6afec23980abd1da38b44dc6cbb96166f DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-24_p20221120.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-24_p20221120.ebuild deleted file mode 100644 index cfc30aa8c587..000000000000 --- a/sys-fs/bcachefs-tools/bcachefs-tools-24_p20221120.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CRATES=" - aho-corasick-0.7.19 - android_system_properties-0.1.5 - ansi_term-0.12.1 - anyhow-1.0.66 - atty-0.2.14 - autocfg-1.1.0 - bindgen-0.59.2 - bitfield-0.13.2 - bitflags-1.3.2 - bumpalo-3.11.1 - byteorder-1.4.3 - camino-1.1.1 - cc-1.0.76 - cexpr-0.6.0 - cfg-if-1.0.0 - chrono-0.4.23 - clang-sys-1.4.0 - clap-2.34.0 - codespan-reporting-0.11.1 - core-foundation-sys-0.8.3 - cxx-1.0.82 - cxx-build-1.0.82 - cxxbridge-flags-1.0.82 - cxxbridge-macro-1.0.82 - either-1.8.0 - errno-0.2.8 - errno-dragonfly-0.1.2 - fastrand-1.8.0 - filedescriptor-0.8.2 - gag-1.0.0 - getset-0.1.2 - glob-0.3.0 - heck-0.3.3 - hermit-abi-0.1.19 - iana-time-zone-0.1.53 - iana-time-zone-haiku-0.1.1 - instant-0.1.12 - itertools-0.9.0 - itoa-1.0.4 - js-sys-0.3.60 - lazy_static-1.4.0 - lazycell-1.3.0 - libc-0.2.137 - libudev-sys-0.1.4 - link-cplusplus-1.0.7 - log-0.4.17 - matchers-0.0.1 - memchr-2.5.0 - memoffset-0.5.6 - minimal-lexical-0.2.1 - nom-7.1.1 - num-integer-0.1.45 - num-traits-0.2.15 - once_cell-1.16.0 - parse-display-0.1.2 - parse-display-derive-0.1.2 - peeking_take_while-0.1.2 - pin-project-lite-0.2.9 - pkg-config-0.3.26 - proc-macro-error-1.0.4 - proc-macro-error-attr-1.0.4 - proc-macro2-1.0.47 - quote-1.0.21 - redox_syscall-0.2.16 - regex-1.7.0 - regex-automata-0.1.10 - regex-syntax-0.6.28 - remove_dir_all-0.5.3 - rpassword-4.0.5 - rustc-hash-1.1.0 - ryu-1.0.11 - scratch-1.0.2 - serde_json-1.0.88 - serde-1.0.147 - sharded-slab-0.1.4 - shlex-1.1.0 - smallvec-1.10.0 - strsim-0.8.0 - structopt-0.3.26 - structopt-derive-0.4.18 - syn-1.0.103 - tempfile-3.3.0 - term_size-0.3.2 - termcolor-1.1.3 - textwrap-0.11.0 - thiserror-1.0.37 - thiserror-impl-1.0.37 - thread_local-1.1.4 - tracing-0.1.37 - tracing-attributes-0.1.23 - tracing-core-0.1.30 - tracing-log-0.1.3 - tracing-serde-0.1.3 - tracing-subscriber-0.2.25 - udev-0.4.0 - unicode-ident-1.0.5 - unicode-segmentation-1.10.0 - unicode-width-0.1.10 - uuid-0.8.2 - valuable-0.1.0 - vec_map-0.8.2 - version_check-0.9.4 - wasm-bindgen-0.2.83 - wasm-bindgen-backend-0.2.83 - wasm-bindgen-macro-0.2.83 - wasm-bindgen-macro-support-0.2.83 - wasm-bindgen-shared-0.2.83 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 -" - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit cargo flag-o-matic multiprocessing python-any-r1 toolchain-funcs unpacker - -DESCRIPTION="Tools for bcachefs" -HOMEPAGE="https://bcachefs.org/" -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git" -else - MY_COMMIT=f1f88825c371f84edb85a156de5e1962503d23b2 - SRC_URI="https://evilpiepirate.org/git/bcachefs-tools.git/snapshot/bcachefs-tools-${MY_COMMIT}.tar.zst - $(cargo_crate_uris ${CRATES})" - S="${WORKDIR}/${PN}-${MY_COMMIT}" - KEYWORDS="~amd64" -fi - -LICENSE="Apache-2.0 BSD GPL-2 MIT" -SLOT="0" -IUSE="fuse test" -RESTRICT="!test? ( test )" - -DEPEND=" - app-arch/lz4 - app-arch/zstd - dev-libs/libaio - dev-libs/libsodium - dev-libs/userspace-rcu - sys-apps/keyutils - sys-apps/util-linux - sys-libs/zlib - virtual/udev - fuse? ( >=sys-fs/fuse-3.7.0 ) -" - -RDEPEND="${DEPEND}" - -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/docutils[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) - ') - $(unpacker_src_uri_depends) - sys-devel/clang - virtual/rust -" - -python_check_deps() { - if use test; then - python_has_version \ - "dev-python/pytest[${PYTHON_USEDEP}]" \ - "dev-python/pytest-xdist[${PYTHON_USEDEP}]" - fi - python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" - -} - -src_unpack() { - if [[ ${PV} == "9999" ]]; then - git-r3_src_unpack - local module - for module in bch_bindgen mount; do - S="${S}/rust-src/${module}" cargo_live_src_unpack - done - else - unpacker bcachefs-tools-${MY_COMMIT}.tar.zst - cargo_src_unpack - fi -} - -src_prepare() { - default - tc-export CC - sed \ - -e '/^CFLAGS/s:-O2::' \ - -e '/^CFLAGS/s:-g::' \ - -e 's:pytest-3:/bin/true:g' \ - -i Makefile || die - append-lfs-flags -} - -src_compile() { - use fuse && export BCACHEFS_FUSE=1 - export BUILD_VERBOSE=1 - export VERSION=${PV} - - default - - # Rust UUID-based mounter isn't in 'all' target, may as well use ebuild functions - local module - for module in bch_bindgen mount; do - pushd "${S}/rust-src/${module}" > /dev/null || die - LIBBCACHEFS_LIB="${S}" LIBBCACHEFS_INCLUDE="${S}" cargo_src_compile - popd > /dev/null || die - done - - ln -f "${S}/rust-src/mount/target/release/bcachefs-mount" "${S}/mount.bcachefs" || die - - use test && emake tests -} - -src_test() { - if ! use fuse; then - EPYTEST_IGNORE=( tests/test_fuse.py ) - fi - EPYTEST_DESELECT=( - # Valgrind - 'tests/test_fixture.py::test_read_after_free' - 'tests/test_fixture.py::test_undefined' - 'tests/test_fixture.py::test_write_after_free' - 'tests/test_fixture.py::test_undefined_branch' - 'tests/test_fixture.py::test_leak' - 'tests/test_fixture.py::test_check' - # Fails in portage because of usersandbox; ensure that these pass before bumping! - 'tests/test_basic.py::test_format' - 'tests/test_basic.py::test_fsck' - 'tests/test_basic.py::test_list' - 'tests/test_basic.py::test_list_inodes' - 'tests/test_basic.py::test_list_dirent' - ) - epytest -v -n "$(makeopts_jobs)" -} - -QA_FLAGS_IGNORED="usr/bin/mount.bcachefs" -# Raised upstream; we don't expect anything to link against this outside of bcachefs-tools bins, for now -QA_SONAME=".*libbcachefs.so" - -src_install() { - exeinto /usr/bin - local file - for file in bcachefs fsck.bcachefs mkfs.bcachefs mount.bcachefs mount.bcachefs.sh; do - doexe $file - done - dolib.so libbcachefs.so - doman bcachefs.8 -} - -pkg_postinst() { - if use fuse; then - ewarn "FUSE support is experimental." - ewarn "Please only use it for development purposes at the risk of losing your data." - ewarn "You have been warned." - fi -} diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-24_p20221124.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-24_p20221124.ebuild new file mode 100644 index 000000000000..fe67357e04a3 --- /dev/null +++ b/sys-fs/bcachefs-tools/bcachefs-tools-24_p20221124.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick-0.7.19 + android_system_properties-0.1.5 + ansi_term-0.12.1 + anyhow-1.0.66 + atty-0.2.14 + autocfg-1.1.0 + bindgen-0.59.2 + bitfield-0.13.2 + bitflags-1.3.2 + bumpalo-3.11.1 + byteorder-1.4.3 + camino-1.1.1 + cc-1.0.76 + cexpr-0.6.0 + cfg-if-1.0.0 + chrono-0.4.23 + clang-sys-1.4.0 + clap-2.34.0 + codespan-reporting-0.11.1 + core-foundation-sys-0.8.3 + cxx-1.0.82 + cxx-build-1.0.82 + cxxbridge-flags-1.0.82 + cxxbridge-macro-1.0.82 + either-1.8.0 + errno-0.2.8 + errno-dragonfly-0.1.2 + fastrand-1.8.0 + filedescriptor-0.8.2 + gag-1.0.0 + getset-0.1.2 + glob-0.3.0 + heck-0.3.3 + hermit-abi-0.1.19 + iana-time-zone-0.1.53 + iana-time-zone-haiku-0.1.1 + instant-0.1.12 + itertools-0.9.0 + itoa-1.0.4 + js-sys-0.3.60 + lazy_static-1.4.0 + lazycell-1.3.0 + libc-0.2.137 + libudev-sys-0.1.4 + link-cplusplus-1.0.7 + log-0.4.17 + matchers-0.0.1 + memchr-2.5.0 + memoffset-0.5.6 + minimal-lexical-0.2.1 + nom-7.1.1 + num-integer-0.1.45 + num-traits-0.2.15 + once_cell-1.16.0 + parse-display-0.1.2 + parse-display-derive-0.1.2 + peeking_take_while-0.1.2 + pin-project-lite-0.2.9 + pkg-config-0.3.26 + proc-macro-error-1.0.4 + proc-macro-error-attr-1.0.4 + proc-macro2-1.0.47 + quote-1.0.21 + redox_syscall-0.2.16 + regex-1.7.0 + regex-automata-0.1.10 + regex-syntax-0.6.28 + remove_dir_all-0.5.3 + rpassword-4.0.5 + rustc-hash-1.1.0 + ryu-1.0.11 + scratch-1.0.2 + serde_json-1.0.88 + serde-1.0.147 + sharded-slab-0.1.4 + shlex-1.1.0 + smallvec-1.10.0 + strsim-0.8.0 + structopt-0.3.26 + structopt-derive-0.4.18 + syn-1.0.103 + tempfile-3.3.0 + term_size-0.3.2 + termcolor-1.1.3 + textwrap-0.11.0 + thiserror-1.0.37 + thiserror-impl-1.0.37 + thread_local-1.1.4 + tracing-0.1.37 + tracing-attributes-0.1.23 + tracing-core-0.1.30 + tracing-log-0.1.3 + tracing-serde-0.1.3 + tracing-subscriber-0.2.25 + udev-0.4.0 + unicode-ident-1.0.5 + unicode-segmentation-1.10.0 + unicode-width-0.1.10 + uuid-0.8.2 + valuable-0.1.0 + vec_map-0.8.2 + version_check-0.9.4 + wasm-bindgen-0.2.83 + wasm-bindgen-backend-0.2.83 + wasm-bindgen-macro-0.2.83 + wasm-bindgen-macro-support-0.2.83 + wasm-bindgen-shared-0.2.83 + winapi-0.3.9 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-util-0.1.5 + winapi-x86_64-pc-windows-gnu-0.4.0 +" + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit cargo flag-o-matic multiprocessing python-any-r1 toolchain-funcs unpacker + +DESCRIPTION="Tools for bcachefs" +HOMEPAGE="https://bcachefs.org/" +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git" +else + MY_COMMIT=48eefee7495c6e145f3fcfe6ab83f9e8bc27a1ec + SRC_URI="https://evilpiepirate.org/git/bcachefs-tools.git/snapshot/bcachefs-tools-${MY_COMMIT}.tar.zst + $(cargo_crate_uris ${CRATES})" + S="${WORKDIR}/${PN}-${MY_COMMIT}" + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0 BSD GPL-2 MIT" +SLOT="0" +IUSE="fuse test" +RESTRICT="!test? ( test )" + +DEPEND=" + app-arch/lz4 + app-arch/zstd + dev-libs/libaio + dev-libs/libsodium + dev-libs/userspace-rcu + sys-apps/keyutils + sys-apps/util-linux + sys-libs/zlib + virtual/udev + fuse? ( >=sys-fs/fuse-3.7.0 ) +" + +RDEPEND="${DEPEND}" + +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) + ') + $(unpacker_src_uri_depends) + sys-devel/clang + virtual/rust +" + +python_check_deps() { + if use test; then + python_has_version \ + "dev-python/pytest[${PYTHON_USEDEP}]" \ + "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + fi + python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" + +} + +src_unpack() { + if [[ ${PV} == "9999" ]]; then + git-r3_src_unpack + local module + for module in bch_bindgen mount; do + S="${S}/rust-src/${module}" cargo_live_src_unpack + done + else + unpacker bcachefs-tools-${MY_COMMIT}.tar.zst + cargo_src_unpack + fi +} + +src_prepare() { + default + tc-export CC + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g::' \ + -e 's:pytest-3:/bin/true:g' \ + -i Makefile || die + append-lfs-flags +} + +src_compile() { + use fuse && export BCACHEFS_FUSE=1 + export BUILD_VERBOSE=1 + export VERSION=${PV} + + default + + # Rust UUID-based mounter isn't in 'all' target, may as well use ebuild functions + local module + for module in bch_bindgen mount; do + pushd "${S}/rust-src/${module}" > /dev/null || die + LIBBCACHEFS_LIB="${S}" LIBBCACHEFS_INCLUDE="${S}" cargo_src_compile + popd > /dev/null || die + done + + ln -f "${S}/rust-src/mount/target/release/bcachefs-mount" "${S}/mount.bcachefs" || die + + use test && emake tests +} + +src_test() { + if ! use fuse; then + EPYTEST_IGNORE=( tests/test_fuse.py ) + fi + EPYTEST_DESELECT=( + # Valgrind + 'tests/test_fixture.py::test_read_after_free' + 'tests/test_fixture.py::test_undefined' + 'tests/test_fixture.py::test_write_after_free' + 'tests/test_fixture.py::test_undefined_branch' + 'tests/test_fixture.py::test_leak' + 'tests/test_fixture.py::test_check' + # Fails in portage because of usersandbox; ensure that these pass before bumping! + 'tests/test_basic.py::test_format' + 'tests/test_basic.py::test_fsck' + 'tests/test_basic.py::test_list' + 'tests/test_basic.py::test_list_inodes' + 'tests/test_basic.py::test_list_dirent' + ) + epytest -v -n "$(makeopts_jobs)" +} + +QA_FLAGS_IGNORED="usr/bin/mount.bcachefs" +# Raised upstream; we don't expect anything to link against this outside of bcachefs-tools bins, for now +QA_SONAME=".*libbcachefs.so" + +src_install() { + exeinto /usr/bin + local file + for file in bcachefs fsck.bcachefs mkfs.bcachefs mount.bcachefs mount.bcachefs.sh; do + doexe $file + done + dolib.so libbcachefs.so + doman bcachefs.8 +} + +pkg_postinst() { + if use fuse; then + ewarn "FUSE support is experimental." + ewarn "Please only use it for development purposes at the risk of losing your data." + ewarn "You have been warned." + fi +} -- cgit v1.2.3-65-gdbad