From 69b9309ea10ab9b57b730602ac21e97ae2e575c7 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sat, 6 Apr 2024 15:41:54 +0100 Subject: net-p2p/c-lightning: add 24.02.2, drop 23.11.2 --- net-p2p/c-lightning/Manifest | 3 - net-p2p/c-lightning/c-lightning-23.11.2.ebuild | 321 -------------------- net-p2p/c-lightning/c-lightning-24.02.2.ebuild | 333 +++++++++++++++++++++ .../files/23.11.2-build-do-not-Werror.patch | 22 -- .../files/23.11.2-build-do-not-cargo-quiet.patch | 25 -- ...1.2-build-do-not-refresh-external-modules.patch | 24 -- ...uild-remove-deprecated-AM_ENABLE_MULTILIB.patch | 25 -- .../files/23.11.2-build-use-FHS-docdir.patch | 22 -- .../files/24.02.2-build-do-not-Werror.patch | 22 ++ .../files/24.02.2-build-do-not-cargo-quiet.patch | 25 ++ ...2.2-build-do-not-refresh-external-modules.patch | 24 ++ ...uild-remove-deprecated-AM_ENABLE_MULTILIB.patch | 25 ++ .../files/24.02.2-build-use-FHS-docdir.patch | 22 ++ 13 files changed, 451 insertions(+), 442 deletions(-) delete mode 100644 net-p2p/c-lightning/c-lightning-23.11.2.ebuild create mode 100644 net-p2p/c-lightning/c-lightning-24.02.2.ebuild delete mode 100644 net-p2p/c-lightning/files/23.11.2-build-do-not-Werror.patch delete mode 100644 net-p2p/c-lightning/files/23.11.2-build-do-not-cargo-quiet.patch delete mode 100644 net-p2p/c-lightning/files/23.11.2-build-do-not-refresh-external-modules.patch delete mode 100644 net-p2p/c-lightning/files/23.11.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch delete mode 100644 net-p2p/c-lightning/files/23.11.2-build-use-FHS-docdir.patch create mode 100644 net-p2p/c-lightning/files/24.02.2-build-do-not-Werror.patch create mode 100644 net-p2p/c-lightning/files/24.02.2-build-do-not-cargo-quiet.patch create mode 100644 net-p2p/c-lightning/files/24.02.2-build-do-not-refresh-external-modules.patch create mode 100644 net-p2p/c-lightning/files/24.02.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch create mode 100644 net-p2p/c-lightning/files/24.02.2-build-use-FHS-docdir.patch (limited to 'net-p2p/c-lightning') diff --git a/net-p2p/c-lightning/Manifest b/net-p2p/c-lightning/Manifest index ed783766..1151a3aa 100644 --- a/net-p2p/c-lightning/Manifest +++ b/net-p2p/c-lightning/Manifest @@ -171,11 +171,8 @@ DIST tonic-build-0.8.4.crate 16600 BLAKE2B b025713171fe0c7e5a71edb713e545bc661c6 DIST tower-0.4.13.crate 106906 BLAKE2B 6a8f4455dcc69f6c03af703fcfb0e6b214c2ce599611ef78fd41cf411ccf06bdce241e03a1d85d36cfeadc72db9f3d9b7ed94c4fcec466c070f2357ff6e27360 SHA512 592f23eee5efa6a4f0d2ffb0d965da7e0f75a90a4320a0d0dacdd5add66513ae40902d21af2bf683573133ee984866987df2ae8eb8e632cba7a9d196985aff8c DIST tower-layer-0.3.2.crate 6023 BLAKE2B 3450211e07a40419526cf1afe063c56357dd5add53470a4146ced3d294edeb95dbd645ab46ae0e42e4877dde63b1577adb21d9cf50116c4cfe4165e115d54ea9 SHA512 d5429b40569f67937e752c2d61c39a474af32bea5ba3940dbdf5a4037fde1ef7173cbd8fcdb87d0ea15c01bf84f2d55abd51fefbab2f27aa54e656eb1748c43e DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 -DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75 DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 -DIST tracing-attributes-0.1.26.crate 32060 BLAKE2B 80e96f77194d90c324867155a22ad4b6831551ace5832434eb83268cc1919b5aedd7d193e00ce7b8764724d446bbcf0f94d01a94e1347321df8eb6858c4132c3 SHA512 ddb9f5efb33627586cef49e3bd45d45b643cdc0e280c970a32f92c8ebe3bd51428ee395c43613911e23841ffab36daad322f2a874732491aaf6a95bd5035fb44 DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0 -DIST tracing-core-0.1.31.crate 61263 BLAKE2B feec046ddd3e04995bfe24defd6ae1187fd7ad78d80d69031178f67ed534e9aa6ab6aaea92dad509f57e220df5f6f025ab8f96bbc957834126f53dcad36580c3 SHA512 66fcd0b4f32de3816b1dcbeda1af26fae0a79d088894637984dc6a0ca65b609f5f166cea376601f6a75f8e3a281da6d4450dc796aa0a7177ad615330237e2bed DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 diff --git a/net-p2p/c-lightning/c-lightning-23.11.2.ebuild b/net-p2p/c-lightning/c-lightning-23.11.2.ebuild deleted file mode 100644 index 6fa77729..00000000 --- a/net-p2p/c-lightning/c-lightning-23.11.2.ebuild +++ /dev/null @@ -1,321 +0,0 @@ -# Copyright 2019-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..12} ) -CRATES=" -addr2line@0.21.0 -adler@1.0.2 -aho-corasick@1.1.1 -anyhow@1.0.75 -asn1-rs-derive@0.4.0 -asn1-rs-impl@0.1.0 -asn1-rs@0.5.2 -async-stream-impl@0.3.5 -async-stream@0.3.5 -async-trait@0.1.73 -autocfg@1.1.0 -axum-core@0.3.4 -axum@0.6.20 -backtrace@0.3.69 -base64@0.13.1 -base64@0.21.4 -bech32@0.9.1 -bitcoin-private@0.1.0 -bitcoin@0.30.1 -bitcoin_hashes@0.12.0 -bitflags@1.3.2 -bitflags@2.4.0 -bumpalo@3.14.0 -bytes@1.5.0 -cc@1.0.83 -cfg-if@1.0.0 -cln-rpc@0.1.0 -data-encoding@2.4.0 -der-parser@8.2.0 -deranged@0.3.8 -displaydoc@0.2.4 -either@1.9.0 -env_logger@0.10.0 -equivalent@1.0.1 -errno-dragonfly@0.1.2 -errno@0.3.3 -fastrand@2.0.1 -fixedbitset@0.4.2 -fnv@1.0.7 -foreign-types-shared@0.1.1 -foreign-types@0.3.2 -futures-channel@0.3.28 -futures-core@0.3.28 -futures-executor@0.3.28 -futures-io@0.3.28 -futures-macro@0.3.28 -futures-sink@0.3.28 -futures-task@0.3.28 -futures-util@0.3.28 -futures@0.3.28 -getrandom@0.2.10 -gimli@0.28.0 -h2@0.3.21 -hashbrown@0.12.3 -hashbrown@0.14.0 -heck@0.4.1 -hermit-abi@0.3.3 -hex@0.4.3 -hex_lit@0.1.1 -home@0.5.5 -http-body@0.4.5 -http@0.2.9 -httparse@1.8.0 -httpdate@1.0.3 -humantime@2.1.0 -hyper-timeout@0.4.1 -hyper@0.14.27 -indexmap@1.9.3 -indexmap@2.0.0 -is-terminal@0.4.9 -itertools@0.10.5 -itoa@1.0.9 -js-sys@0.3.64 -lazy_static@1.4.0 -libc@0.2.148 -linux-raw-sys@0.4.7 -log@0.4.20 -matchit@0.7.3 -memchr@2.6.3 -mime@0.3.17 -minimal-lexical@0.2.1 -miniz_oxide@0.7.1 -mio@0.8.8 -multimap@0.8.3 -nom@7.1.3 -ntapi@0.3.7 -num-bigint@0.4.4 -num-integer@0.1.45 -num-traits@0.2.16 -num_cpus@1.16.0 -object@0.32.1 -oid-registry@0.6.1 -once_cell@1.18.0 -openssl-probe@0.1.5 -openssl-src@111.18.0+1.1.1n -openssl-sys@0.9.72 -openssl@0.10.38 -pem@1.1.1 -percent-encoding@2.3.0 -petgraph@0.6.4 -pin-project-internal@1.1.3 -pin-project-lite@0.2.13 -pin-project@1.1.3 -pin-utils@0.1.0 -pkg-config@0.3.25 -ppv-lite86@0.2.17 -prettyplease@0.1.25 -proc-macro2@1.0.67 -prost-build@0.11.9 -prost-derive@0.11.9 -prost-types@0.11.9 -prost@0.11.9 -quote@1.0.33 -rand@0.8.5 -rand_chacha@0.3.1 -rand_core@0.6.4 -rcgen@0.10.0 -redox_syscall@0.3.5 -regex-automata@0.3.8 -regex-syntax@0.7.5 -regex@1.9.5 -ring@0.16.20 -rustc-demangle@0.1.23 -rusticata-macros@4.1.0 -rustix@0.38.14 -rustls-pemfile@1.0.3 -rustls@0.20.9 -rustversion@1.0.14 -ryu@1.0.15 -schannel@0.1.19 -sct@0.7.0 -secp256k1-sys@0.8.1 -secp256k1@0.27.0 -security-framework-sys@2.6.1 -security-framework@2.6.1 -serde@1.0.188 -serde_derive@1.0.188 -serde_json@1.0.107 -slab@0.4.9 -socket2@0.4.9 -socket2@0.5.4 -spin@0.5.2 -syn@1.0.109 -syn@2.0.37 -sync_wrapper@0.1.2 -synstructure@0.12.6 -tempfile@3.8.0 -termcolor@1.3.0 -thiserror-impl@1.0.49 -thiserror@1.0.49 -time-core@0.1.2 -time-macros@0.2.15 -time@0.3.29 -tokio-io-timeout@1.2.0 -tokio-macros@2.1.0 -tokio-rustls@0.23.4 -tokio-stream@0.1.14 -tokio-util@0.7.9 -tokio@1.32.0 -tonic-build@0.8.4 -tonic@0.8.3 -tower-layer@0.3.2 -tower-service@0.3.2 -tower@0.4.13 -tracing-attributes@0.1.26 -tracing-core@0.1.31 -tracing-futures@0.2.5 -tracing@0.1.37 -try-lock@0.2.4 -unicode-ident@1.0.12 -unicode-xid@0.2.4 -untrusted@0.7.1 -vcpkg@0.2.15 -want@0.3.1 -wasi@0.11.0+wasi-snapshot-preview1 -wasm-bindgen-backend@0.2.87 -wasm-bindgen-macro-support@0.2.87 -wasm-bindgen-macro@0.2.87 -wasm-bindgen-shared@0.2.87 -wasm-bindgen@0.2.87 -web-sys@0.3.64 -webpki@0.22.1 -which@4.4.2 -winapi-i686-pc-windows-gnu@0.4.0 -winapi-util@0.1.6 -winapi-x86_64-pc-windows-gnu@0.4.0 -winapi@0.3.9 -windows-sys@0.48.0 -windows-targets@0.48.5 -windows_aarch64_gnullvm@0.48.5 -windows_aarch64_msvc@0.48.5 -windows_i686_gnu@0.48.5 -windows_i686_msvc@0.48.5 -windows_x86_64_gnu@0.48.5 -windows_x86_64_gnullvm@0.48.5 -windows_x86_64_msvc@0.48.5 -x509-parser@0.14.0 -yasna@0.5.2 -" - -inherit git-r3 bash-completion-r1 autotools toolchain-funcs systemd distutils-r1 cargo - -DESCRIPTION="A specification compliant Lightning Network implementation in C" -HOMEPAGE="https://github.com/ElementsProject/lightning" -EGIT_REPO_URI="https://github.com/ElementsProject/lightning.git" -EGIT_COMMIT="v${PV}" -SRC_URI="${CARGO_CRATE_URIS}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64" -IUSE="+sqlite python" - -DISTUTILS_OPTIONAL=True - -BDEPEND="${PYTHON_DEPS} - ${DISTUTILS_DEPS} - dev-python/mako:=[${PYTHON_USEDEP}] - >=dev-python/grpcio-tools-1.34.0[${PYTHON_USEDEP}] - app-text/asciidoc - sys-apps/coreutils - sys-devel/gettext - app-text/lowdown - virtual/rust[rustfmt] - dev-libs/protobuf:=" -DEPEND="dev-libs/libsodium:= - sqlite? ( dev-db/sqlite:3 ) - sys-libs/zlib:= - python? ( - >=dev-python/recommonmark-0.7[${PYTHON_USEDEP}] - >=dev-python/grpcio-1.34.0[${PYTHON_USEDEP}] - >=dev-python/protobuf-python-3[${PYTHON_USEDEP}] - )" -RDEPEND="${DEPEND} - >=net-p2p/bitcoin-cli-22.0 - acct-user/bitcoin" - -PATCHES=( - "${FILESDIR}/${PV}-build-do-not-Werror.patch" - "${FILESDIR}/${PV}-build-do-not-refresh-external-modules.patch" - "${FILESDIR}/${PV}-build-remove-deprecated-AM_ENABLE_MULTILIB.patch" - "${FILESDIR}/${PV}-build-use-FHS-docdir.patch" - "${FILESDIR}/${PV}-build-do-not-cargo-quiet.patch" -) - -src_unpack () { - git-r3_src_unpack - cargo_src_unpack -} - -src_prepare() { - default - - export PYTEST=: - export CC="$(tc-getCC)" CONFIGURATOR_CC="${CBUILD}-gcc" - export PKG_CONFIG="$(tc-getPKG_CONFIG)" - export CDEBUGFLAGS="-std=gnu11 -fstack-protector ${CFLAGS}" - - sed -i \ - -e "s:^VERSION=.*:VERSION=${PVR}:" \ - Makefile \ - || die - - local externals=( libbacktrace libsodium libwally-core ) - - for x in ${externals[@]} ; do - pushd "external/${x}" > /dev/null || die - eautoreconf - popd > /dev/null || die - done - - if use python ; then - pushd "${S}/contrib/pyln-client" > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - fi -} - -src_configure() { - ./configure \ - --prefix="${EPREFIX}/usr" \ - --enable-compat \ - --enable-rust \ - --disable-static \ - --disable-valgrind \ - --disable-address-sanitizer \ - --disable-ub-sanitize \ - --disable-fuzzing \ - || die "configure failed" -} - -src_compile() { - emake CDEBUGFLAGS="${CDEBUGFLAGS}" V=1 - - if use python ; then - pushd "${S}/contrib/pyln-client" > /dev/null || die - distutils-r1_src_compile - popd > /dev/null || die - fi -} - -src_install() { - default - - if use python ; then - pushd "${S}/contrib/pyln-client" > /dev/null || die - distutils-r1_src_install - popd > /dev/null || die - fi - - systemd_dounit contrib/init/lightningd.service - newbashcomp contrib/lightning-cli.bash-completion lightning-cli -} diff --git a/net-p2p/c-lightning/c-lightning-24.02.2.ebuild b/net-p2p/c-lightning/c-lightning-24.02.2.ebuild new file mode 100644 index 00000000..ee50a541 --- /dev/null +++ b/net-p2p/c-lightning/c-lightning-24.02.2.ebuild @@ -0,0 +1,333 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) +CRATES=" +addr2line@0.21.0 +adler@1.0.2 +aho-corasick@1.1.1 +anyhow@1.0.75 +asn1-rs-derive@0.4.0 +asn1-rs-impl@0.1.0 +asn1-rs@0.5.2 +async-stream-impl@0.3.5 +async-stream@0.3.5 +async-trait@0.1.73 +autocfg@1.1.0 +axum-core@0.3.4 +axum@0.6.20 +backtrace@0.3.69 +base64@0.13.1 +base64@0.21.4 +bech32@0.9.1 +bitcoin-private@0.1.0 +bitcoin@0.30.1 +bitcoin_hashes@0.12.0 +bitflags@1.3.2 +bitflags@2.4.0 +bumpalo@3.14.0 +bytes@1.5.0 +cc@1.0.83 +cfg-if@1.0.0 +cln-rpc@0.1.0 +data-encoding@2.4.0 +der-parser@8.2.0 +deranged@0.3.8 +displaydoc@0.2.4 +either@1.9.0 +env_logger@0.10.0 +equivalent@1.0.1 +errno-dragonfly@0.1.2 +errno@0.3.3 +fastrand@2.0.1 +fixedbitset@0.4.2 +fnv@1.0.7 +foreign-types-shared@0.1.1 +foreign-types@0.3.2 +futures-channel@0.3.28 +futures-core@0.3.28 +futures-executor@0.3.28 +futures-io@0.3.28 +futures-macro@0.3.28 +futures-sink@0.3.28 +futures-task@0.3.28 +futures-util@0.3.28 +futures@0.3.28 +getrandom@0.2.10 +gimli@0.28.0 +h2@0.3.21 +hashbrown@0.12.3 +hashbrown@0.14.0 +heck@0.4.1 +hermit-abi@0.3.3 +hex@0.4.3 +hex_lit@0.1.1 +home@0.5.5 +http-body@0.4.5 +http@0.2.9 +httparse@1.8.0 +httpdate@1.0.3 +humantime@2.1.0 +hyper-timeout@0.4.1 +hyper@0.14.27 +indexmap@1.9.3 +indexmap@2.0.0 +is-terminal@0.4.9 +itertools@0.10.5 +itoa@1.0.9 +js-sys@0.3.64 +lazy_static@1.4.0 +libc@0.2.148 +linux-raw-sys@0.4.7 +log@0.4.20 +matchers@0.1.0 +matchit@0.7.3 +memchr@2.6.3 +mime@0.3.17 +minimal-lexical@0.2.1 +miniz_oxide@0.7.1 +mio@0.8.8 +multimap@0.8.3 +nom@7.1.3 +ntapi@0.3.7 +nu-ansi-term@0.46.0 +num-bigint@0.4.4 +num-integer@0.1.45 +num-traits@0.2.16 +num_cpus@1.16.0 +object@0.32.1 +oid-registry@0.6.1 +once_cell@1.18.0 +openssl-probe@0.1.5 +openssl-src@111.18.0+1.1.1n +openssl-sys@0.9.72 +openssl@0.10.38 +overload@0.1.1 +pem@1.1.1 +percent-encoding@2.3.0 +petgraph@0.6.4 +pin-project-internal@1.1.3 +pin-project-lite@0.2.13 +pin-project@1.1.3 +pin-utils@0.1.0 +pkg-config@0.3.25 +ppv-lite86@0.2.17 +prettyplease@0.1.25 +proc-macro2@1.0.67 +prost-build@0.11.9 +prost-derive@0.11.9 +prost-types@0.11.9 +prost@0.11.9 +quote@1.0.33 +rand@0.8.5 +rand_chacha@0.3.1 +rand_core@0.6.4 +rcgen@0.10.0 +redox_syscall@0.3.5 +regex-automata@0.1.10 +regex-automata@0.3.8 +regex-syntax@0.6.29 +regex-syntax@0.7.5 +regex@1.9.5 +ring@0.16.20 +rustc-demangle@0.1.23 +rusticata-macros@4.1.0 +rustix@0.38.14 +rustls-pemfile@1.0.3 +rustls@0.20.9 +rustversion@1.0.14 +ryu@1.0.15 +schannel@0.1.19 +sct@0.7.0 +secp256k1-sys@0.8.1 +secp256k1@0.27.0 +security-framework-sys@2.6.1 +security-framework@2.6.1 +serde@1.0.188 +serde_derive@1.0.188 +serde_json@1.0.107 +sharded-slab@0.1.7 +slab@0.4.9 +smallvec@1.11.2 +socket2@0.4.9 +socket2@0.5.4 +spin@0.5.2 +syn@1.0.109 +syn@2.0.37 +sync_wrapper@0.1.2 +synstructure@0.12.6 +tempfile@3.8.0 +termcolor@1.3.0 +thiserror-impl@1.0.49 +thiserror@1.0.49 +thread_local@1.1.7 +time-core@0.1.2 +time-macros@0.2.15 +time@0.3.29 +tokio-io-timeout@1.2.0 +tokio-macros@2.1.0 +tokio-rustls@0.23.4 +tokio-stream@0.1.14 +tokio-test@0.4.3 +tokio-util@0.7.9 +tokio@1.32.0 +tonic-build@0.8.4 +tonic@0.8.3 +tower-layer@0.3.2 +tower-service@0.3.2 +tower@0.4.13 +tracing-attributes@0.1.27 +tracing-core@0.1.32 +tracing-futures@0.2.5 +tracing-log@0.2.0 +tracing-subscriber@0.3.18 +tracing@0.1.40 +try-lock@0.2.4 +unicode-ident@1.0.12 +unicode-xid@0.2.4 +untrusted@0.7.1 +valuable@0.1.0 +vcpkg@0.2.15 +want@0.3.1 +wasi@0.11.0+wasi-snapshot-preview1 +wasm-bindgen-backend@0.2.87 +wasm-bindgen-macro-support@0.2.87 +wasm-bindgen-macro@0.2.87 +wasm-bindgen-shared@0.2.87 +wasm-bindgen@0.2.87 +web-sys@0.3.64 +webpki@0.22.1 +which@4.4.2 +winapi-i686-pc-windows-gnu@0.4.0 +winapi-util@0.1.6 +winapi-x86_64-pc-windows-gnu@0.4.0 +winapi@0.3.9 +windows-sys@0.48.0 +windows-targets@0.48.5 +windows_aarch64_gnullvm@0.48.5 +windows_aarch64_msvc@0.48.5 +windows_i686_gnu@0.48.5 +windows_i686_msvc@0.48.5 +windows_x86_64_gnu@0.48.5 +windows_x86_64_gnullvm@0.48.5 +windows_x86_64_msvc@0.48.5 +x509-parser@0.14.0 +yasna@0.5.2 +" + +inherit git-r3 bash-completion-r1 autotools toolchain-funcs systemd distutils-r1 cargo + +DESCRIPTION="A specification compliant Lightning Network implementation in C" +HOMEPAGE="https://github.com/ElementsProject/lightning" +EGIT_REPO_URI="https://github.com/ElementsProject/lightning.git" +EGIT_COMMIT="v${PV}" +SRC_URI="${CARGO_CRATE_URIS}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" +IUSE="+sqlite python" + +DISTUTILS_OPTIONAL=True + +BDEPEND="${PYTHON_DEPS} + ${DISTUTILS_DEPS} + dev-python/mako:=[${PYTHON_USEDEP}] + >=dev-python/grpcio-tools-1.34.0[${PYTHON_USEDEP}] + app-text/asciidoc + sys-apps/coreutils + sys-devel/gettext + app-text/lowdown + virtual/rust[rustfmt] + dev-libs/protobuf:=" +DEPEND="dev-libs/libsodium:= + sqlite? ( dev-db/sqlite:3 ) + sys-libs/zlib:= + python? ( + >=dev-python/recommonmark-0.7[${PYTHON_USEDEP}] + >=dev-python/grpcio-1.34.0[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3[${PYTHON_USEDEP}] + )" +RDEPEND="${DEPEND} + >=net-p2p/bitcoin-cli-22.0 + acct-user/bitcoin" + +PATCHES=( + "${FILESDIR}/${PV}-build-do-not-Werror.patch" + "${FILESDIR}/${PV}-build-do-not-refresh-external-modules.patch" + "${FILESDIR}/${PV}-build-remove-deprecated-AM_ENABLE_MULTILIB.patch" + "${FILESDIR}/${PV}-build-use-FHS-docdir.patch" + "${FILESDIR}/${PV}-build-do-not-cargo-quiet.patch" +) + +src_unpack () { + git-r3_src_unpack + cargo_src_unpack +} + +src_prepare() { + default + + export PYTEST=: + export CC="$(tc-getCC)" CONFIGURATOR_CC="${CBUILD}-gcc" + export PKG_CONFIG="$(tc-getPKG_CONFIG)" + export CDEBUGFLAGS="-std=gnu11 -fstack-protector ${CFLAGS}" + + sed -i \ + -e "s:^VERSION=.*:VERSION=${PVR}:" \ + Makefile \ + || die + + local externals=( libbacktrace libsodium libwally-core ) + + for x in ${externals[@]} ; do + pushd "external/${x}" > /dev/null || die + eautoreconf + popd > /dev/null || die + done + + if use python ; then + pushd "${S}/contrib/pyln-client" > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +src_configure() { + ./configure \ + --prefix="${EPREFIX}/usr" \ + --enable-compat \ + --enable-rust \ + --disable-static \ + --disable-valgrind \ + --disable-address-sanitizer \ + --disable-ub-sanitize \ + --disable-fuzzing \ + || die "configure failed" +} + +src_compile() { + emake CDEBUGFLAGS="${CDEBUGFLAGS}" V=1 + + if use python ; then + pushd "${S}/contrib/pyln-client" > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi +} + +src_install() { + default + + if use python ; then + pushd "${S}/contrib/pyln-client" > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + fi + + systemd_dounit contrib/init/lightningd.service + newbashcomp contrib/lightning-cli.bash-completion lightning-cli +} diff --git a/net-p2p/c-lightning/files/23.11.2-build-do-not-Werror.patch b/net-p2p/c-lightning/files/23.11.2-build-do-not-Werror.patch deleted file mode 100644 index a7ad96d3..00000000 --- a/net-p2p/c-lightning/files/23.11.2-build-do-not-Werror.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f78970730173dbdf1114c5d0f85a539bbe7e3c61 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Mon, 13 May 2019 23:59:33 +0000 -Subject: [PATCH] build: do not -Werror - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 4f35f15537a4..834335109610 100755 ---- a/configure -+++ b/configure -@@ -6,7 +6,7 @@ set -e - CONFIGURATOR=ccan/tools/configurator/configurator - CONFIG_VAR_FILE=config.vars - CONFIG_HEADER=ccan/config.h --BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror" -+BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition" - - OS=$(uname -s) - ARCH=$(uname -m) diff --git a/net-p2p/c-lightning/files/23.11.2-build-do-not-cargo-quiet.patch b/net-p2p/c-lightning/files/23.11.2-build-do-not-cargo-quiet.patch deleted file mode 100644 index 6eecb030..00000000 --- a/net-p2p/c-lightning/files/23.11.2-build-do-not-cargo-quiet.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8c32248304ca1eaab2320a6a96738877c71eea2d Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Sat, 30 Apr 2022 04:40:28 +0100 -Subject: [PATCH] build: do not cargo --quiet - ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index cb549645338c..d55ce3d9d08a 100644 ---- a/Makefile -+++ b/Makefile -@@ -329,9 +329,9 @@ endif - - RUST_PROFILE ?= debug - ifneq ($(RUST_PROFILE),debug) --CARGO_OPTS := --profile=$(RUST_PROFILE) --quiet -+CARGO_OPTS := --profile=$(RUST_PROFILE) - else --CARGO_OPTS := --quiet -+CARGO_OPTS := - endif - - include external/Makefile diff --git a/net-p2p/c-lightning/files/23.11.2-build-do-not-refresh-external-modules.patch b/net-p2p/c-lightning/files/23.11.2-build-do-not-refresh-external-modules.patch deleted file mode 100644 index 45496c71..00000000 --- a/net-p2p/c-lightning/files/23.11.2-build-do-not-refresh-external-modules.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 385b8bd5d6deee43d0c8d18ea1a1c0055b0e48f8 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Mon, 13 May 2019 23:50:38 +0000 -Subject: [PATCH] build: do not refresh external modules - ---- - external/Makefile | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/external/Makefile b/external/Makefile -index 92e976092a09..f4975c4d7f37 100644 ---- a/external/Makefile -+++ b/external/Makefile -@@ -49,10 +49,6 @@ endif - EXTERNAL_LDLIBS := -L${TARGET_DIR} $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS))) - - submodcheck: $(FORCE) --ifneq ($(VERSION),) -- @tools/refresh-submodules.sh $(SUBMODULES) -- @cd external/libwally-core && ../../tools/refresh-submodules.sh src/secp256k1 --endif - - $(EXTERNAL_HEADERS): submodcheck - diff --git a/net-p2p/c-lightning/files/23.11.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch b/net-p2p/c-lightning/files/23.11.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch deleted file mode 100644 index 415a71cf..00000000 --- a/net-p2p/c-lightning/files/23.11.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8271ca3e71e258c99675c0f873724d07a8c22440 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Mon, 13 May 2019 23:47:42 +0000 -Subject: [PATCH] build: remove deprecated AM_ENABLE_MULTILIB - ---- - external/libbacktrace/configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/external/libbacktrace/configure.ac b/external/libbacktrace/configure.ac -index 2aad65ad9c7f..0cebaab8fc9a 100644 ---- a/external/libbacktrace/configure.ac -+++ b/external/libbacktrace/configure.ac -@@ -35,11 +35,6 @@ AC_CONFIG_SRCDIR(backtrace.h) - AC_CONFIG_HEADER(config.h) - AC_CONFIG_MACRO_DIR(config) - --# with_target_subdir is used when configured as part of a GCC tree. --if test -n "${with_target_subdir}"; then -- AM_ENABLE_MULTILIB(, ..) --fi -- - AC_CANONICAL_SYSTEM - target_alias=${target_alias-$host_alias} - diff --git a/net-p2p/c-lightning/files/23.11.2-build-use-FHS-docdir.patch b/net-p2p/c-lightning/files/23.11.2-build-use-FHS-docdir.patch deleted file mode 100644 index 6c861a7d..00000000 --- a/net-p2p/c-lightning/files/23.11.2-build-use-FHS-docdir.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d700c55234316630dd47d7dc3a0f8b9b65a56241 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Tue, 14 May 2019 01:33:02 +0000 -Subject: [PATCH] build: use FHS docdir - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 737f26641133..cb549645338c 100644 ---- a/Makefile -+++ b/Makefile -@@ -683,7 +683,7 @@ libexecdir = $(exec_prefix)/libexec - pkglibexecdir = $(libexecdir)/$(PKGNAME) - plugindir = $(pkglibexecdir)/plugins - datadir = $(PREFIX)/share --docdir = $(datadir)/doc/$(PKGNAME) -+docdir = $(datadir)/doc/$(PKGNAME)-$(VERSION) - mandir = $(datadir)/man - man1dir = $(mandir)/man1 - man5dir = $(mandir)/man5 diff --git a/net-p2p/c-lightning/files/24.02.2-build-do-not-Werror.patch b/net-p2p/c-lightning/files/24.02.2-build-do-not-Werror.patch new file mode 100644 index 00000000..a7ad96d3 --- /dev/null +++ b/net-p2p/c-lightning/files/24.02.2-build-do-not-Werror.patch @@ -0,0 +1,22 @@ +From f78970730173dbdf1114c5d0f85a539bbe7e3c61 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 13 May 2019 23:59:33 +0000 +Subject: [PATCH] build: do not -Werror + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 4f35f15537a4..834335109610 100755 +--- a/configure ++++ b/configure +@@ -6,7 +6,7 @@ set -e + CONFIGURATOR=ccan/tools/configurator/configurator + CONFIG_VAR_FILE=config.vars + CONFIG_HEADER=ccan/config.h +-BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror" ++BASE_WARNFLAGS="-Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition" + + OS=$(uname -s) + ARCH=$(uname -m) diff --git a/net-p2p/c-lightning/files/24.02.2-build-do-not-cargo-quiet.patch b/net-p2p/c-lightning/files/24.02.2-build-do-not-cargo-quiet.patch new file mode 100644 index 00000000..6eecb030 --- /dev/null +++ b/net-p2p/c-lightning/files/24.02.2-build-do-not-cargo-quiet.patch @@ -0,0 +1,25 @@ +From 8c32248304ca1eaab2320a6a96738877c71eea2d Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Sat, 30 Apr 2022 04:40:28 +0100 +Subject: [PATCH] build: do not cargo --quiet + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index cb549645338c..d55ce3d9d08a 100644 +--- a/Makefile ++++ b/Makefile +@@ -329,9 +329,9 @@ endif + + RUST_PROFILE ?= debug + ifneq ($(RUST_PROFILE),debug) +-CARGO_OPTS := --profile=$(RUST_PROFILE) --quiet ++CARGO_OPTS := --profile=$(RUST_PROFILE) + else +-CARGO_OPTS := --quiet ++CARGO_OPTS := + endif + + include external/Makefile diff --git a/net-p2p/c-lightning/files/24.02.2-build-do-not-refresh-external-modules.patch b/net-p2p/c-lightning/files/24.02.2-build-do-not-refresh-external-modules.patch new file mode 100644 index 00000000..45496c71 --- /dev/null +++ b/net-p2p/c-lightning/files/24.02.2-build-do-not-refresh-external-modules.patch @@ -0,0 +1,24 @@ +From 385b8bd5d6deee43d0c8d18ea1a1c0055b0e48f8 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 13 May 2019 23:50:38 +0000 +Subject: [PATCH] build: do not refresh external modules + +--- + external/Makefile | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/external/Makefile b/external/Makefile +index 92e976092a09..f4975c4d7f37 100644 +--- a/external/Makefile ++++ b/external/Makefile +@@ -49,10 +49,6 @@ endif + EXTERNAL_LDLIBS := -L${TARGET_DIR} $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS))) + + submodcheck: $(FORCE) +-ifneq ($(VERSION),) +- @tools/refresh-submodules.sh $(SUBMODULES) +- @cd external/libwally-core && ../../tools/refresh-submodules.sh src/secp256k1 +-endif + + $(EXTERNAL_HEADERS): submodcheck + diff --git a/net-p2p/c-lightning/files/24.02.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch b/net-p2p/c-lightning/files/24.02.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch new file mode 100644 index 00000000..415a71cf --- /dev/null +++ b/net-p2p/c-lightning/files/24.02.2-build-remove-deprecated-AM_ENABLE_MULTILIB.patch @@ -0,0 +1,25 @@ +From 8271ca3e71e258c99675c0f873724d07a8c22440 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 13 May 2019 23:47:42 +0000 +Subject: [PATCH] build: remove deprecated AM_ENABLE_MULTILIB + +--- + external/libbacktrace/configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/external/libbacktrace/configure.ac b/external/libbacktrace/configure.ac +index 2aad65ad9c7f..0cebaab8fc9a 100644 +--- a/external/libbacktrace/configure.ac ++++ b/external/libbacktrace/configure.ac +@@ -35,11 +35,6 @@ AC_CONFIG_SRCDIR(backtrace.h) + AC_CONFIG_HEADER(config.h) + AC_CONFIG_MACRO_DIR(config) + +-# with_target_subdir is used when configured as part of a GCC tree. +-if test -n "${with_target_subdir}"; then +- AM_ENABLE_MULTILIB(, ..) +-fi +- + AC_CANONICAL_SYSTEM + target_alias=${target_alias-$host_alias} + diff --git a/net-p2p/c-lightning/files/24.02.2-build-use-FHS-docdir.patch b/net-p2p/c-lightning/files/24.02.2-build-use-FHS-docdir.patch new file mode 100644 index 00000000..6c861a7d --- /dev/null +++ b/net-p2p/c-lightning/files/24.02.2-build-use-FHS-docdir.patch @@ -0,0 +1,22 @@ +From d700c55234316630dd47d7dc3a0f8b9b65a56241 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Tue, 14 May 2019 01:33:02 +0000 +Subject: [PATCH] build: use FHS docdir + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 737f26641133..cb549645338c 100644 +--- a/Makefile ++++ b/Makefile +@@ -683,7 +683,7 @@ libexecdir = $(exec_prefix)/libexec + pkglibexecdir = $(libexecdir)/$(PKGNAME) + plugindir = $(pkglibexecdir)/plugins + datadir = $(PREFIX)/share +-docdir = $(datadir)/doc/$(PKGNAME) ++docdir = $(datadir)/doc/$(PKGNAME)-$(VERSION) + mandir = $(datadir)/man + man1dir = $(mandir)/man1 + man5dir = $(mandir)/man5 -- cgit v1.2.3