commit: a8771d1e3f382efe7a47957b05f3100965a9ccf9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 3 01:42:41 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 3 01:42:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8771d1e
sec-keys/openpgp-keys-gentoo-developers: fix live ebuild Signed-off-by: Sam James <sam <AT> gentoo.org> sec-keys/openpgp-keys-gentoo-developers/Manifest | 1 - .../openpgp-keys-gentoo-developers-20220830.ebuild | 23 +++++++++++++++++++--- .../openpgp-keys-gentoo-developers-99999999.ebuild | 23 +++++++++++++++++++--- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest index 6b13782a0d45..b3be0b159ad5 100644 --- a/sec-keys/openpgp-keys-gentoo-developers/Manifest +++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest @@ -1,4 +1,3 @@ DIST openpgp-keys-gentoo-developers-20220711-active-devs.gpg 3237775 BLAKE2B 511e4ea8907593b5ed05c79a0bf6ae131856f0511f3f6a744f393a077ad25fe3f6780caac60d4f94965d4c0aa14debae068599f50920caeaad44303a844bf7ed SHA512 c0122037a3bfde1eec0c3ca7a303ff82f532c518427b34814c12949572c18537f617db22563c15d40fd41f0c94e6c50bcd3e0d3d7d1175400057aafbe41ae2b2 DIST openpgp-keys-gentoo-developers-20220718-active-devs.gpg 3238135 BLAKE2B a500165c89d28d1aef314ef10e639efe5b354cb39cca2c0565b43b55c580eed26d74be1d45b3be3d55d7879f25282d367cca6e04423df59191b7eedfcc1def88 SHA512 e51afcb31f81ee8596c9b2393fae41d8c67fc363d71f91296195369a428371e6151b81fd57a0cff382ad3493e57b6527126abedcdbc72b32f1bd5b2021e029eb DIST openpgp-keys-gentoo-developers-20220830-active-devs.gpg 3234718 BLAKE2B 80753222b4d2febf0d8568503d646e0258410010eefa35ea3914f5979ea05f12634676212df392f5ddbb153899cd7452ee89d412bea9de8e67abf93243444fa8 SHA512 2676fe541cdad8755f745ebd24badd7b4193bdff71f478f2442fea84e1e07b060564d437ce642b01a37ba8086a8177a84c32abf3dd794be8e587e1740bed2af2 -DIST openpgp-keys-gentoo-developers-99999999-active-devs.gpg 3238135 BLAKE2B a500165c89d28d1aef314ef10e639efe5b354cb39cca2c0565b43b55c580eed26d74be1d45b3be3d55d7879f25282d367cca6e04423df59191b7eedfcc1def88 SHA512 e51afcb31f81ee8596c9b2393fae41d8c67fc363d71f91296195369a428371e6151b81fd57a0cff382ad3493e57b6527126abedcdbc72b32f1bd5b2021e029eb diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220830.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220830.ebuild index 4ff65eaaea85..a3505aa67f03 100644 --- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220830.ebuild +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220830.ebuild @@ -9,8 +9,9 @@ inherit edo python-any-r1 DESCRIPTION="Gentoo Authority Keys (GLEP 79)" HOMEPAGE="https://www.gentoo.org/downloads/signatures/"; if [[ ${PV} == 9999* ]] ; then - SRC_URI="https://qa-reports.gentoo.org/output/active-devs.gpg -> ${P}-active-devs.gpg" PROPERTIES="live" + + BDEPEND="net-misc/curl" else SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" @@ -23,7 +24,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') sec-keys/openpgp-keys-gentoo-auth test? ( @@ -35,9 +36,25 @@ python_check_deps() { python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" } +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die + else + default + fi +} + src_compile() { export GNUPGHOME="${T}"/.gnupg + get_gpg_keyring_dir() { + if [[ ${PV} == 9999* ]] ; then + echo "${WORKDIR}" + else + echo "${DISTDIR}" + fi + } + local mygpgargs=( --no-autostart --no-default-keyring @@ -54,7 +71,7 @@ src_compile() { chmod 700 "${GNUPGHOME}" || die # Convert the binary keyring into an armored one so we can process it - edo gpg "${mygpgargs[@]}" --import "${DISTDIR}"/${P}-active-devs.gpg + edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc # Now strip out the keys which are expired and/or missing a signature diff --git a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild index 4ff65eaaea85..a3505aa67f03 100644 --- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild +++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild @@ -9,8 +9,9 @@ inherit edo python-any-r1 DESCRIPTION="Gentoo Authority Keys (GLEP 79)" HOMEPAGE="https://www.gentoo.org/downloads/signatures/"; if [[ ${PV} == 9999* ]] ; then - SRC_URI="https://qa-reports.gentoo.org/output/active-devs.gpg -> ${P}-active-devs.gpg" PROPERTIES="live" + + BDEPEND="net-misc/curl" else SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" @@ -23,7 +24,7 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND=" +BDEPEND+=" $(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') sec-keys/openpgp-keys-gentoo-auth test? ( @@ -35,9 +36,25 @@ python_check_deps() { python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" } +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die + else + default + fi +} + src_compile() { export GNUPGHOME="${T}"/.gnupg + get_gpg_keyring_dir() { + if [[ ${PV} == 9999* ]] ; then + echo "${WORKDIR}" + else + echo "${DISTDIR}" + fi + } + local mygpgargs=( --no-autostart --no-default-keyring @@ -54,7 +71,7 @@ src_compile() { chmod 700 "${GNUPGHOME}" || die # Convert the binary keyring into an armored one so we can process it - edo gpg "${mygpgargs[@]}" --import "${DISTDIR}"/${P}-active-devs.gpg + edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc # Now strip out the keys which are expired and/or missing a signature
