public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lucio Sauer" <watermanpaint@posteo.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/libsignal-ffi/
Date: Wed,  7 Aug 2024 13:59:28 +0000 (UTC)	[thread overview]
Message-ID: <1723038984.e50a65b49039fcbb6213f24a5ed6e3434486c8da.watermanpaint@gentoo> (raw)

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() {


WARNING: multiple messages have this Message-ID (diff)
From: "Lucio Sauer" <watermanpaint@posteo.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-libs/libsignal-ffi/
Date: Wed,  7 Aug 2024 23:36:19 +0000 (UTC)	[thread overview]
Message-ID: <1723038984.e50a65b49039fcbb6213f24a5ed6e3434486c8da.watermanpaint@gentoo> (raw)
Message-ID: <20240807233619.eqG_S_ELXV508GUyIpdtOtsnxyI3IwKkIsO7YqIiV-g@z> (raw)

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() {


             reply	other threads:[~2024-08-07 13:59 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-07 13:59 Lucio Sauer [this message]
2024-08-07 23:36 ` [gentoo-commits] repo/proj/guru:master commit in: dev-libs/libsignal-ffi/ Lucio Sauer
  -- strict thread matches above, loose matches on Subject: below --
2025-01-11 22:19 [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-11-19 10:42 Julien Roy
2024-11-19 10:42 Julien Roy
2024-10-13  9:21 Takuya Wakazono
2024-08-09 14:56 Lucio Sauer
2024-06-17 12:42 Alarig Le Lay
2024-06-17 12:38 Alarig Le Lay
2024-06-17  9:49 Alarig Le Lay
2024-05-14 19:07 Julien Roy
2024-04-08 11:44 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-04-08 11:44 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-04-07 15:25 Julien Roy
2024-04-06  1:19 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-04-06  0:06 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-04-06  0:06 Julien Roy
2024-03-22  0:24 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-03-22  0:24 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-03-20 11:46 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-03-20 11:43 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-03-19 22:06 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-03-19 21:24 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1723038984.e50a65b49039fcbb6213f24a5ed6e3434486c8da.watermanpaint@gentoo \
    --to=watermanpaint@posteo.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox