commit: 267853d5d4b31f63b333c57cbbb19dc168ea7cd8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 19:57:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 19:57:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267853d5
dev-util/cargo-c: unbundle more deps, missing subslot deps
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/cargo-c/cargo-c-0.6.2-r1.ebuild | 16 ++++++++++------
dev-util/cargo-c/cargo-c-0.7.2-r1.ebuild | 21 +++++++++++++--------
dev-util/cargo-c/cargo-c-0.8.0-r1.ebuild | 21 +++++++++++++--------
dev-util/cargo-c/cargo-c-0.8.1-r1.ebuild | 21 +++++++++++++--------
dev-util/cargo-c/cargo-c-0.8.2-r1.ebuild | 19 ++++++++++++-------
dev-util/cargo-c/cargo-c-0.9.0-r1.ebuild | 16 +++++++++++-----
6 files changed, 72 insertions(+), 42 deletions(-)
diff --git a/dev-util/cargo-c/cargo-c-0.6.2-r1.ebuild
b/dev-util/cargo-c/cargo-c-0.6.2-r1.ebuild
index cf272d7803b..8baa339ac27 100644
--- a/dev-util/cargo-c/cargo-c-0.6.2-r1.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.6.2-r1.ebuild
@@ -155,11 +155,15 @@ LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="amd64 arm arm64 ppc64 x86"
-DEPEND=""
-RDEPEND="sys-libs/zlib
- dev-libs/openssl:0=
- net-libs/libssh2
+RDEPEND="dev-libs/openssl:0=
+ net-libs/libssh2:=
net-misc/curl[ssl]
-"
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+}
diff --git a/dev-util/cargo-c/cargo-c-0.7.2-r1.ebuild
b/dev-util/cargo-c/cargo-c-0.7.2-r1.ebuild
index ed31e871490..93687b17533 100644
--- a/dev-util/cargo-c/cargo-c-0.7.2-r1.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.7.2-r1.ebuild
@@ -158,18 +158,23 @@ LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-DEPEND=""
-RDEPEND="sys-libs/zlib
+RDEPEND="dev-libs/libgit2:=
dev-libs/openssl:0=
- dev-libs/libgit2
- net-libs/libssh2
+ net-libs/libssh2:=
net-misc/curl[ssl]
-"
-
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
src_unpack() {
cargo_src_unpack
- tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}"
+ tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}" || die
+}
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
}
diff --git a/dev-util/cargo-c/cargo-c-0.8.0-r1.ebuild
b/dev-util/cargo-c/cargo-c-0.8.0-r1.ebuild
index 582ce98e1a8..1867417c710 100644
--- a/dev-util/cargo-c/cargo-c-0.8.0-r1.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.8.0-r1.ebuild
@@ -158,18 +158,23 @@ LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-DEPEND=""
-RDEPEND="sys-libs/zlib
+RDEPEND="dev-libs/libgit2:=
dev-libs/openssl:0=
- dev-libs/libgit2
- net-libs/libssh2
+ net-libs/libssh2:=
net-misc/curl[ssl]
-"
-
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
src_unpack() {
cargo_src_unpack
- tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}"
+ tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}" || die
+}
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
}
diff --git a/dev-util/cargo-c/cargo-c-0.8.1-r1.ebuild
b/dev-util/cargo-c/cargo-c-0.8.1-r1.ebuild
index 1182b510201..ce73eb06b58 100644
--- a/dev-util/cargo-c/cargo-c-0.8.1-r1.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.8.1-r1.ebuild
@@ -159,18 +159,23 @@ LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-DEPEND=""
-RDEPEND="sys-libs/zlib
+RDEPEND="dev-libs/libgit2:=
dev-libs/openssl:0=
- dev-libs/libgit2
- net-libs/libssh2
+ net-libs/libssh2:=
net-misc/curl[ssl]
-"
-
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
src_unpack() {
cargo_src_unpack
- tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}"
+ tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}" || die
+}
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
}
diff --git a/dev-util/cargo-c/cargo-c-0.8.2-r1.ebuild
b/dev-util/cargo-c/cargo-c-0.8.2-r1.ebuild
index dd140482361..e791306969c 100644
--- a/dev-util/cargo-c/cargo-c-0.8.2-r1.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.8.2-r1.ebuild
@@ -160,18 +160,23 @@ LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-RDEPEND="dev-libs/openssl:0=
- dev-libs/libgit2
- net-libs/libssh2
+RDEPEND="dev-libs/libgit2:=
+ dev-libs/openssl:0=
+ net-libs/libssh2:=
net-misc/curl[ssl]
- sys-libs/zlib
-"
+ sys-libs/zlib"
DEPEND="${RDEPEND}"
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
-
src_unpack() {
cargo_src_unpack
tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}" || die
}
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+}
diff --git a/dev-util/cargo-c/cargo-c-0.9.0-r1.ebuild
b/dev-util/cargo-c/cargo-c-0.9.0-r1.ebuild
index f393e1455e5..7d3f7a4df46 100644
--- a/dev-util/cargo-c/cargo-c-0.9.0-r1.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.9.0-r1.ebuild
@@ -161,18 +161,24 @@ LICENSE="Apache-2.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-RDEPEND="dev-libs/openssl:0=
- dev-libs/libgit2
- net-libs/libssh2
+RDEPEND="dev-libs/libgit2:=
+ dev-libs/openssl:0=
+ net-libs/libssh2:=
net-misc/curl[ssl]
sys-libs/zlib
"
DEPEND="${RDEPEND}"
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
-
src_unpack() {
cargo_src_unpack
tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}" || die
}
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+}
