commit: 1e6637a457ed941ae69b1d4e535352d96ac3eb77 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Feb 19 19:30:36 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 19 19:30:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6637a4
sys-libs/pkgcraft: add 0.0.6 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-libs/pkgcraft/Manifest | 1 + sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild | 90 +++++++++ sys-libs/pkgcraft/pkgcraft-9999.ebuild | 318 +------------------------------- 3 files changed, 97 insertions(+), 312 deletions(-) diff --git a/sys-libs/pkgcraft/Manifest b/sys-libs/pkgcraft/Manifest index 25333678072f..963c27c249fc 100644 --- a/sys-libs/pkgcraft/Manifest +++ b/sys-libs/pkgcraft/Manifest @@ -174,6 +174,7 @@ DIST pkgcraft-0.0.4.crate 460046 BLAKE2B c0bb2ecd035e34321b4af0b546f12219bb51773 DIST pkgcraft-bash-4c79d69fbfc508b78ef480e2449e81b244f59ab1.tar.gz 10906926 BLAKE2B 0765989039f14e2ecc97c746f1b5f592aa0cbd79f4800a0a6e76ed533bd2bf5fbc84e9427772e0c1944d15604201663b58a0032d6ffb164f4ebd7c6ff72cbb5b SHA512 71f8ffb4d42e4f6895b6f3ec14a16e8aff8277a04015e41263762886ff7a52caa8806dbd2239eeace5073bdfa6f553e3f7d0d76d0715fd09a08141829d0706fd DIST pkgcraft-c-0.0.4.crate 14662 BLAKE2B 38fc76f4ee0829519978d7ce60e9073abad24a96e224e20bb3c07745ff58e6dec381da8501f539f54cbffda2731df893abb819736def0ceb11cbe3638d1a31ba SHA512 20f9b9cb089d39d738e7be01a159e8da6b1d6a8e24fbecaf9e2064d72bd5e2434642b8c73972516f20e6a52359f7e876b49a648bb5e5bfc00799e89d2565320b DIST pkgcraft-c-0.0.5.tar.gz 188123 BLAKE2B 636d9f3fc2e0bcd3ae16c4b770e776850d1a34b3e36dceba752999f2e9274b42894fea37e9a383447a19114fdd2ff8c2294786362a316ccbb7ec2445aa660e96 SHA512 18b61b9b4e506e2328087b03e105ac20abdac08895570ea6e48df439c00a5680ad7bef4399e1d33d8a0abfff5277bf23185feaf8e1cb3d6a4e546a4671dd9655 +DIST pkgcraft-c-0.0.6.tar.xz 18239736 BLAKE2B b037ab525abeee07f6bfa766248220bbb9d5259b735e953add63b2e363826ccb5cf96beda31e05022ec3adbbcdc7e57012f441923cecb96e73372189e8aee755 SHA512 f8c12a3f8f1a9097bfd21ad32d4ce2af16d69fa768c0647189c06678b8c110dcf23e1ef844136df763d9b6fa0d2297f82409bb7fff9eacaaf2eee073197568bf DIST plotters-0.3.4.crate 143219 BLAKE2B 3121caf7d2a62d3dd337d887ea2343981d23b26ab742fa192456d58a73ebd07d384ad6e1de58671b5c06344c2efea8e32168d830051d425a63299d15746f3a73 SHA512 04d490ad1b822195259a661dbc605ec2f8e190a5bbbbf549741b286aa888b26a2c7468d226cee7718bd69b77e026283944367504db98c0293b3db4ce45103534 DIST plotters-backend-0.3.4.crate 13416 BLAKE2B 2b7090fb98ab9c28fd8525e1b3b4ca3410dafdb80563f52b545af70db638899123455254861e95973fb9c9e178e83cccd941c7305977de033091ed957291c28d SHA512 4784da70eda90a48aab38192619cfa7df733519cadc3b9aecd339dc735a9237e03144eee4f22f5f03ca214a732e8807d179d455032dd255a8125092ea489228b DIST plotters-svg-0.3.3.crate 6916 BLAKE2B 74c2c71afefe1148c82f8695ca3ae5283bad5b084e542325f3b6d587eac23f9fc087b64033043ff52ebcd661d40bb91c33ccd0de3c424ac0916baaa3a69c63b6 SHA512 1233eece4ab91ec690f93c7134ae8e6405183aaf500b2dce6973b6e212058334b7335aa80915e40363b9d2057398028c57d0b3aa974b88bb42c4e0e4726e7a92 diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild new file mode 100644 index 000000000000..af77f15e2a08 --- /dev/null +++ b/sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild @@ -0,0 +1,90 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" " +inherit edo cargo toolchain-funcs + +DESCRIPTION="C library for pkgcraft" +HOMEPAGE="https://pkgcraft.github.io/"; + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft"; + inherit git-r3 + + S="${WORKDIR}"/${P}/crates/pkgcraft-c + + BDEPEND="test? ( dev-util/cargo-nextest )" +else + MY_P=${PN}-c-${PV} + SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz"; + S="${WORKDIR}"/${MY_P} + + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016" +SLOT="0/${PV}" +IUSE="test" +RESTRICT="!test? ( test )" + +# clang needed for bindgen +BDEPEND+=" + dev-util/cargo-c + sys-devel/clang + >=virtual/rust-1.65 +" + +QA_FLAGS_IGNORED="usr/lib.*/libpkgcraft.so.*" + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + ) + + # For scallop building bash + tc-export AR CC + + # Can pass -vv if need more output from e.g. scallop configure + edo cargo cbuild "${cargoargs[@]}" +} + +src_test() { + if [[ ${PV} == 9999 ]] ; then + # It's interesting to test the whole thing rather than just + # pkgcraft-c. + cd "${WORKDIR}"/${P} || die + + # Need nextest per README (separate processes required) + # Invocation from https://github.com/pkgcraft/pkgcraft/blob/main/.github/workflows/ci.yml#L56 + edo cargo nextest run --color always --all-features + else + # There are no tests for pkgcraft-c. Test via e.g. dev-python/pkgcraft. + :; + fi +} + +src_install() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --destdir="${ED}" + ) + + edo cargo cinstall "${cargoargs[@]}" +} diff --git a/sys-libs/pkgcraft/pkgcraft-9999.ebuild b/sys-libs/pkgcraft/pkgcraft-9999.ebuild index b89bfe9cb848..af77f15e2a08 100644 --- a/sys-libs/pkgcraft/pkgcraft-9999.ebuild +++ b/sys-libs/pkgcraft/pkgcraft-9999.ebuild @@ -3,300 +3,7 @@ EAPI=8 -CRATES=" - adler-1.0.2 - ahash-0.7.6 - aho-corasick-0.7.20 - anes-0.1.6 - annotate-snippets-0.6.1 - anyhow-1.0.68 - assert_cmd-2.0.8 - async-stream-0.3.3 - async-stream-impl-0.3.3 - async-trait-0.1.64 - async_once-0.2.6 - atty-0.2.14 - autocfg-1.1.0 - autotools-0.2.5 - axum-0.6.4 - axum-core-0.3.2 - base64-0.13.1 - base64-0.21.0 - bindgen-0.63.0 - bitflags-1.3.2 - bstr-1.2.0 - bumpalo-3.12.0 - bytes-1.4.0 - cached-0.42.0 - cached_proc_macro-0.16.0 - cached_proc_macro_types-0.1.0 - camino-1.1.2 - cast-0.3.0 - cc-1.0.79 - cexpr-0.6.0 - cfg-if-1.0.0 - chic-1.2.2 - ciborium-0.2.0 - ciborium-io-0.2.0 - ciborium-ll-0.2.0 - clang-sys-1.4.0 - clap-3.2.23 - clap-4.1.4 - clap_derive-4.1.0 - clap_lex-0.2.4 - clap_lex-0.3.1 - config-0.13.3 - crc32fast-1.3.2 - criterion-0.4.0 - criterion-plot-0.5.0 - crossbeam-channel-0.5.6 - crossbeam-deque-0.8.2 - crossbeam-epoch-0.9.13 - crossbeam-utils-0.8.14 - ctor-0.1.26 - darling-0.14.2 - darling_core-0.14.2 - darling_macro-0.14.2 - difflib-0.4.0 - dlv-list-0.3.0 - doc-comment-0.3.3 - either-1.8.1 - encoding_rs-0.8.32 - enum-as-inner-0.5.1 - errno-0.2.8 - errno-dragonfly-0.1.2 - fastrand-1.8.0 - filetime-0.2.19 - fixedbitset-0.4.2 - flate2-1.0.25 - fnv-1.0.7 - form_urlencoded-1.1.0 - futures-0.3.26 - futures-channel-0.3.26 - futures-core-0.3.26 - futures-executor-0.3.26 - futures-io-0.3.26 - futures-macro-0.3.26 - futures-sink-0.3.26 - futures-task-0.3.26 - futures-util-0.3.26 - getrandom-0.2.8 - git2-0.16.1 - glob-0.3.1 - h2-0.3.15 - half-1.8.2 - hashbrown-0.12.3 - hashbrown-0.13.2 - heck-0.4.1 - hermit-abi-0.1.19 - hermit-abi-0.2.6 - hermit-abi-0.3.0 - http-0.2.8 - http-body-0.4.5 - http-range-header-0.3.0 - httparse-1.8.0 - httpdate-1.0.2 - hyper-0.14.24 - hyper-rustls-0.23.2 - hyper-timeout-0.4.1 - ident_case-1.0.1 - idna-0.3.0 - indexmap-1.9.2 - indoc-2.0.0 - instant-0.1.12 - io-lifetimes-1.0.5 - ipnet-2.7.1 - is-terminal-0.4.3 - is_executable-1.0.1 - itertools-0.10.5 - itoa-1.0.5 - jobserver-0.1.25 - js-sys-0.3.61 - lazy_static-1.4.0 - lazycell-1.3.0 - libc-0.2.139 - libgit2-sys-0.14.2+1.5.1 - libloading-0.7.4 - libssh2-sys-0.2.23 - libz-sys-1.1.8 - linux-raw-sys-0.1.4 - lock_api-0.4.9 - log-0.4.17 - maplit-1.0.2 - matchers-0.1.0 - matchit-0.7.0 - memchr-2.5.0 - memoffset-0.7.1 - mime-0.3.16 - minimal-lexical-0.2.1 - miniz_oxide-0.6.2 - mio-0.8.5 - multimap-0.8.3 - nix-0.26.2 - nom-7.1.3 - nom8-0.2.0 - nu-ansi-term-0.46.0 - num-traits-0.2.15 - num_cpus-1.15.0 - once_cell-1.17.0 - oorandom-11.1.3 - openssl-probe-0.1.5 - openssl-sys-0.9.80 - ordered-multimap-0.4.3 - os_str_bytes-6.4.1 - overload-0.1.1 - parking_lot-0.12.1 - parking_lot_core-0.9.7 - pathdiff-0.2.1 - peeking_take_while-0.1.2 - peg-0.8.1 - peg-macros-0.8.1 - peg-runtime-0.8.1 - percent-encoding-2.2.0 - petgraph-0.6.2 - pin-project-1.0.12 - pin-project-internal-1.0.12 - pin-project-lite-0.2.9 - pin-utils-0.1.0 - pkg-config-0.3.26 - plotters-0.3.4 - plotters-backend-0.3.4 - plotters-svg-0.3.3 - ppv-lite86-0.2.17 - predicates-2.1.5 - predicates-core-1.0.5 - predicates-tree-1.0.7 - prettyplease-0.1.23 - proc-macro-error-1.0.4 - proc-macro-error-attr-1.0.4 - proc-macro2-1.0.50 - prost-0.11.6 - prost-build-0.11.6 - prost-derive-0.11.6 - prost-types-0.11.6 - quote-1.0.23 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - rayon-1.6.1 - rayon-core-1.10.2 - redox_syscall-0.2.16 - regex-1.7.1 - regex-automata-0.1.10 - regex-syntax-0.6.28 - remove_dir_all-0.5.3 - reqwest-0.11.14 - ring-0.16.20 - roxmltree-0.18.0 - rust-ini-0.18.0 - rustc-hash-1.1.0 - rustix-0.36.8 - rustls-0.20.8 - rustls-pemfile-1.0.2 - rustversion-1.0.11 - ryu-1.0.12 - same-file-1.0.6 - scopeguard-1.1.0 - sct-0.7.0 - serde-1.0.152 - serde_derive-1.0.152 - serde_json-1.0.91 - serde_spanned-0.6.1 - serde_urlencoded-0.7.1 - serde_with-2.2.0 - serde_with_macros-2.2.0 - sharded-slab-0.1.4 - shlex-1.1.0 - signal-hook-registry-1.4.0 - slab-0.4.7 - smallvec-1.10.0 - socket2-0.4.7 - spin-0.5.2 - static_assertions-1.1.0 - strsim-0.10.0 - strum-0.24.1 - strum_macros-0.24.3 - syn-1.0.107 - sync_wrapper-0.1.2 - sys-info-0.9.1 - tar-0.4.38 - tempfile-3.3.0 - termcolor-1.2.0 - termtree-0.4.0 - textwrap-0.16.0 - thiserror-1.0.38 - thiserror-impl-1.0.38 - thread_local-1.1.4 - tinytemplate-1.2.1 - tinyvec-1.6.0 - tinyvec_macros-0.1.1 - tokio-1.25.0 - tokio-io-timeout-1.2.0 - tokio-macros-1.8.2 - tokio-rustls-0.23.4 - tokio-stream-0.1.11 - tokio-util-0.7.4 - toml-0.5.11 - toml-0.7.1 - toml_datetime-0.6.1 - toml_edit-0.19.1 - tonic-0.8.3 - tonic-build-0.8.4 - tower-0.4.13 - tower-http-0.3.5 - tower-layer-0.3.2 - tower-service-0.3.2 - tracing-0.1.37 - tracing-attributes-0.1.23 - tracing-core-0.1.30 - tracing-futures-0.2.5 - tracing-log-0.1.3 - tracing-subscriber-0.3.16 - tracing-test-0.2.4 - tracing-test-macro-0.2.4 - try-lock-0.2.4 - unicode-bidi-0.3.10 - unicode-ident-1.0.6 - unicode-normalization-0.1.22 - untrusted-0.7.1 - url-2.3.1 - valuable-0.1.0 - vcpkg-0.2.15 - version_check-0.9.4 - wait-timeout-0.2.0 - walkdir-2.3.2 - want-0.3.0 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.84 - wasm-bindgen-backend-0.2.84 - wasm-bindgen-futures-0.4.34 - wasm-bindgen-macro-0.2.84 - wasm-bindgen-macro-support-0.2.84 - wasm-bindgen-shared-0.2.84 - wasm-streams-0.2.3 - web-sys-0.3.61 - webpki-0.22.0 - webpki-roots-0.22.6 - which-4.4.0 - 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 - windows-sys-0.42.0 - windows-sys-0.45.0 - windows-targets-0.42.1 - windows_aarch64_gnullvm-0.42.1 - windows_aarch64_msvc-0.42.1 - windows_i686_gnu-0.42.1 - windows_i686_msvc-0.42.1 - windows_x86_64_gnu-0.42.1 - windows_x86_64_gnullvm-0.42.1 - windows_x86_64_msvc-0.42.1 - winreg-0.10.1 - xattr-0.2.3 - xmlparser-0.13.5 -" - +CRATES=" " inherit edo cargo toolchain-funcs DESCRIPTION="C library for pkgcraft" @@ -310,14 +17,10 @@ if [[ ${PV} == 9999 ]] ; then BDEPEND="test? ( dev-util/cargo-nextest )" else - export BASH_SUBMODULE_COMMIT="4c79d69fbfc508b78ef480e2449e81b244f59ab1" - SRC_URI=" - https://github.com/pkgcraft/pkgcraft/archive/refs/tags/${PN}-c-${PV}.tar.gz - https://github.com/pkgcraft/bash/archive/${BASH_SUBMODULE_COMMIT}.tar.gz -> ${PN}-bash-${BASH_SUBMODULE_COMMIT}.tar.gz - $(cargo_crate_uris) - " + MY_P=${PN}-c-${PV} + SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz"; + S="${WORKDIR}"/${MY_P} - S="${WORKDIR}"/${PN}-${PN}-c-${PV}/crates/${PN}-c KEYWORDS="~amd64" fi @@ -346,15 +49,6 @@ src_unpack() { fi } -src_prepare() { - default - - if [[ ${PV} != 9999 ]] ; then - rm -rvf ../scallop/bash || die - ln -sv "${WORKDIR}/bash-"* ../scallop/bash || die - fi -} - src_compile() { local cargoargs=( --library-type=cdylib @@ -379,8 +73,8 @@ src_test() { # Invocation from https://github.com/pkgcraft/pkgcraft/blob/main/.github/workflows/ci.yml#L56 edo cargo nextest run --color always --all-features else - # TODO: swap to meson for tests to avoid overtesting - cargo_src_test + # There are no tests for pkgcraft-c. Test via e.g. dev-python/pkgcraft. + :; fi }
