commit: e50a65b49039fcbb6213f24a5ed6e3434486c8da Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Wed Aug 7 12:10:41 2024 +0000 Commit: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> CommitDate: Wed Aug 7 13:56:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e50a65b4
dev-libs/libsignal-ffi: update Cargo config file name d57601effef63b266afe7df5c8cb7dae52fa44ac renamed deprecated config to config.toml Closes: https://bugs.gentoo.org/937498 Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild | 13 ++++++------- dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild | 13 ++++++------- dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild | 4 ++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild index 2fdf4530e..299a61715 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild @@ -5,8 +5,6 @@ EAPI=8 -CRATES=" " - inherit cargo DESCRIPTION="A C ABI library which exposes Signal protocol logic" @@ -22,7 +20,6 @@ LICENSE="AGPL-3" LICENSE+=" AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" -IUSE="debug" BDEPEND=" dev-libs/protobuf @@ -33,10 +30,12 @@ src_unpack() { default cargo_gen_config ln -s "${WORKDIR}/vendor/" "${WORKDIR}/libsignal-${PV}/vendor" || die - sed -i "${ECARGO_HOME}/config" -e '/source.crates-io/d' || die - sed -i "${ECARGO_HOME}/config" -e '/replace-with = "gentoo"/d' || die - sed -i "${ECARGO_HOME}/config" -e '/local-registry = "\/nonexistent"/d' || die - cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config" || die + sed -i "${ECARGO_HOME}/config.toml" \ + -e '/source.crates-io/d' \ + -e '/replace-with = "gentoo"/d' \ + -e '/local-registry = "\/nonexistent"/d' \ + || die + cat vendor/vendor-config.toml >> "${ECARGO_HOME}/config.toml" || die } src_install() { diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild index 2fdf4530e..299a61715 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild @@ -5,8 +5,6 @@ EAPI=8 -CRATES=" " - inherit cargo DESCRIPTION="A C ABI library which exposes Signal protocol logic" @@ -22,7 +20,6 @@ LICENSE="AGPL-3" LICENSE+=" AGPL-3 Apache-2.0 BSD-2 BSD ISC MIT Unicode-DFS-2016" SLOT="0" KEYWORDS="~amd64" -IUSE="debug" BDEPEND=" dev-libs/protobuf @@ -33,10 +30,12 @@ src_unpack() { default cargo_gen_config ln -s "${WORKDIR}/vendor/" "${WORKDIR}/libsignal-${PV}/vendor" || die - sed -i "${ECARGO_HOME}/config" -e '/source.crates-io/d' || die - sed -i "${ECARGO_HOME}/config" -e '/replace-with = "gentoo"/d' || die - sed -i "${ECARGO_HOME}/config" -e '/local-registry = "\/nonexistent"/d' || die - cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config" || die + sed -i "${ECARGO_HOME}/config.toml" \ + -e '/source.crates-io/d' \ + -e '/replace-with = "gentoo"/d' \ + -e '/local-registry = "\/nonexistent"/d' \ + || die + cat vendor/vendor-config.toml >> "${ECARGO_HOME}/config.toml" || die } src_install() { diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild index daf5f5e7a..577f3cf6a 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild @@ -30,12 +30,12 @@ src_unpack() { default cargo_gen_config ln -s "${WORKDIR}/vendor/" "${WORKDIR}/libsignal-${PV}/vendor" || die - sed -i "${ECARGO_HOME}/config" \ + sed -i "${ECARGO_HOME}/config.toml" \ -e '/source.crates-io/d' \ -e '/replace-with = "gentoo"/d' \ -e '/local-registry = "\/nonexistent"/d' \ || die - cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config" || die + cat vendor/vendor-config.toml >> "${ECARGO_HOME}/config.toml" || die } src_install() {
