diff options
| author |   Sam James <sam@gentoo.org> | 2021-11-04 19:07:38 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-11-04 19:07:38 +0000 |
| commit | f7c9880325c44bde2b3ffbc54f5e5c865a526709 (patch) | |
| tree | 21bfe74e112e5d1ee383c13ca692f8cf30a7259d /app-misc | |
| parent | app-emulation/crun: add 1.2 (diff) | |
| download | gentoo-f7c9880325c44bde2b3ffbc54f5e5c865a526709.tar.gz gentoo-f7c9880325c44bde2b3ffbc54f5e5c865a526709.tar.bz2 gentoo-f7c9880325c44bde2b3ffbc54f5e5c865a526709.zip | |
app-misc/ca-certificates: fix Python dependencies
Closes: https://bugs.gentoo.org/821706
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild index 589797be2800..86df307180a7 100644 --- a/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20211016.3.72.ebuild @@ -62,6 +62,8 @@ CDEPEND="app-misc/c_rehash BDEPEND="${CDEPEND}" if ! ${PRECOMPILED} ; then BDEPEND+=" ${PYTHON_DEPS}" + # See bug #821706 + BDEPEND+=" $(python_gen_any_dep 'dev-python/cryptography[${PYTHON_USEDEP}]')" fi DEPEND="" @@ -74,11 +76,19 @@ RDEPEND="${CDEPEND} S=${WORKDIR} +python_check_deps() { + has_version -b "dev-python/cryptography[${PYTHON_USEDEP}]" +} + pkg_setup() { # For the conversion to having it in CONFIG_PROTECT_MASK, # we need to tell users about it once manually first. [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \ || ewarn "You should run update-ca-certificates manually after etc-update" + + if ! ${PRECOMPILED} ; then + python-any-r1_pkg_setup + fi } src_unpack() { @@ -127,8 +137,8 @@ src_prepare() { src_compile() { cd "image/${EPREFIX}" || die if ! ${PRECOMPILED} ; then - python_setup local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}" + # Grab the database from the nss sources. cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die emake -C "${d}" |