| 1 |
commit: a8771d1e3f382efe7a47957b05f3100965a9ccf9 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 3 01:42:41 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 01:42:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8771d1e |
| 7 |
|
| 8 |
sec-keys/openpgp-keys-gentoo-developers: fix live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sec-keys/openpgp-keys-gentoo-developers/Manifest | 1 - |
| 13 |
.../openpgp-keys-gentoo-developers-20220830.ebuild | 23 +++++++++++++++++++--- |
| 14 |
.../openpgp-keys-gentoo-developers-99999999.ebuild | 23 +++++++++++++++++++--- |
| 15 |
3 files changed, 40 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sec-keys/openpgp-keys-gentoo-developers/Manifest b/sec-keys/openpgp-keys-gentoo-developers/Manifest |
| 18 |
index 6b13782a0d45..b3be0b159ad5 100644 |
| 19 |
--- a/sec-keys/openpgp-keys-gentoo-developers/Manifest |
| 20 |
+++ b/sec-keys/openpgp-keys-gentoo-developers/Manifest |
| 21 |
@@ -1,4 +1,3 @@ |
| 22 |
DIST openpgp-keys-gentoo-developers-20220711-active-devs.gpg 3237775 BLAKE2B 511e4ea8907593b5ed05c79a0bf6ae131856f0511f3f6a744f393a077ad25fe3f6780caac60d4f94965d4c0aa14debae068599f50920caeaad44303a844bf7ed SHA512 c0122037a3bfde1eec0c3ca7a303ff82f532c518427b34814c12949572c18537f617db22563c15d40fd41f0c94e6c50bcd3e0d3d7d1175400057aafbe41ae2b2 |
| 23 |
DIST openpgp-keys-gentoo-developers-20220718-active-devs.gpg 3238135 BLAKE2B a500165c89d28d1aef314ef10e639efe5b354cb39cca2c0565b43b55c580eed26d74be1d45b3be3d55d7879f25282d367cca6e04423df59191b7eedfcc1def88 SHA512 e51afcb31f81ee8596c9b2393fae41d8c67fc363d71f91296195369a428371e6151b81fd57a0cff382ad3493e57b6527126abedcdbc72b32f1bd5b2021e029eb |
| 24 |
DIST openpgp-keys-gentoo-developers-20220830-active-devs.gpg 3234718 BLAKE2B 80753222b4d2febf0d8568503d646e0258410010eefa35ea3914f5979ea05f12634676212df392f5ddbb153899cd7452ee89d412bea9de8e67abf93243444fa8 SHA512 2676fe541cdad8755f745ebd24badd7b4193bdff71f478f2442fea84e1e07b060564d437ce642b01a37ba8086a8177a84c32abf3dd794be8e587e1740bed2af2 |
| 25 |
-DIST openpgp-keys-gentoo-developers-99999999-active-devs.gpg 3238135 BLAKE2B a500165c89d28d1aef314ef10e639efe5b354cb39cca2c0565b43b55c580eed26d74be1d45b3be3d55d7879f25282d367cca6e04423df59191b7eedfcc1def88 SHA512 e51afcb31f81ee8596c9b2393fae41d8c67fc363d71f91296195369a428371e6151b81fd57a0cff382ad3493e57b6527126abedcdbc72b32f1bd5b2021e029eb |
| 26 |
|
| 27 |
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 |
| 28 |
index 4ff65eaaea85..a3505aa67f03 100644 |
| 29 |
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220830.ebuild |
| 30 |
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-20220830.ebuild |
| 31 |
@@ -9,8 +9,9 @@ inherit edo python-any-r1 |
| 32 |
DESCRIPTION="Gentoo Authority Keys (GLEP 79)" |
| 33 |
HOMEPAGE="https://www.gentoo.org/downloads/signatures/" |
| 34 |
if [[ ${PV} == 9999* ]] ; then |
| 35 |
- SRC_URI="https://qa-reports.gentoo.org/output/active-devs.gpg -> ${P}-active-devs.gpg" |
| 36 |
PROPERTIES="live" |
| 37 |
+ |
| 38 |
+ BDEPEND="net-misc/curl" |
| 39 |
else |
| 40 |
SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" |
| 41 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" |
| 42 |
@@ -23,7 +24,7 @@ SLOT="0" |
| 43 |
IUSE="test" |
| 44 |
RESTRICT="!test? ( test )" |
| 45 |
|
| 46 |
-BDEPEND=" |
| 47 |
+BDEPEND+=" |
| 48 |
$(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') |
| 49 |
sec-keys/openpgp-keys-gentoo-auth |
| 50 |
test? ( |
| 51 |
@@ -35,9 +36,25 @@ python_check_deps() { |
| 52 |
python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" |
| 53 |
} |
| 54 |
|
| 55 |
+src_unpack() { |
| 56 |
+ if [[ ${PV} == 9999* ]] ; then |
| 57 |
+ curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die |
| 58 |
+ else |
| 59 |
+ default |
| 60 |
+ fi |
| 61 |
+} |
| 62 |
+ |
| 63 |
src_compile() { |
| 64 |
export GNUPGHOME="${T}"/.gnupg |
| 65 |
|
| 66 |
+ get_gpg_keyring_dir() { |
| 67 |
+ if [[ ${PV} == 9999* ]] ; then |
| 68 |
+ echo "${WORKDIR}" |
| 69 |
+ else |
| 70 |
+ echo "${DISTDIR}" |
| 71 |
+ fi |
| 72 |
+ } |
| 73 |
+ |
| 74 |
local mygpgargs=( |
| 75 |
--no-autostart |
| 76 |
--no-default-keyring |
| 77 |
@@ -54,7 +71,7 @@ src_compile() { |
| 78 |
chmod 700 "${GNUPGHOME}" || die |
| 79 |
|
| 80 |
# Convert the binary keyring into an armored one so we can process it |
| 81 |
- edo gpg "${mygpgargs[@]}" --import "${DISTDIR}"/${P}-active-devs.gpg |
| 82 |
+ edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg |
| 83 |
edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc |
| 84 |
|
| 85 |
# Now strip out the keys which are expired and/or missing a signature |
| 86 |
|
| 87 |
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 |
| 88 |
index 4ff65eaaea85..a3505aa67f03 100644 |
| 89 |
--- a/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild |
| 90 |
+++ b/sec-keys/openpgp-keys-gentoo-developers/openpgp-keys-gentoo-developers-99999999.ebuild |
| 91 |
@@ -9,8 +9,9 @@ inherit edo python-any-r1 |
| 92 |
DESCRIPTION="Gentoo Authority Keys (GLEP 79)" |
| 93 |
HOMEPAGE="https://www.gentoo.org/downloads/signatures/" |
| 94 |
if [[ ${PV} == 9999* ]] ; then |
| 95 |
- SRC_URI="https://qa-reports.gentoo.org/output/active-devs.gpg -> ${P}-active-devs.gpg" |
| 96 |
PROPERTIES="live" |
| 97 |
+ |
| 98 |
+ BDEPEND="net-misc/curl" |
| 99 |
else |
| 100 |
SRC_URI="https://qa-reports.gentoo.org/output/keys/active-devs-${PV}.gpg -> ${P}-active-devs.gpg" |
| 101 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86" |
| 102 |
@@ -23,7 +24,7 @@ SLOT="0" |
| 103 |
IUSE="test" |
| 104 |
RESTRICT="!test? ( test )" |
| 105 |
|
| 106 |
-BDEPEND=" |
| 107 |
+BDEPEND+=" |
| 108 |
$(python_gen_any_dep 'dev-python/python-gnupg[${PYTHON_USEDEP}]') |
| 109 |
sec-keys/openpgp-keys-gentoo-auth |
| 110 |
test? ( |
| 111 |
@@ -35,9 +36,25 @@ python_check_deps() { |
| 112 |
python_has_version "dev-python/python-gnupg[${PYTHON_USEDEP}]" |
| 113 |
} |
| 114 |
|
| 115 |
+src_unpack() { |
| 116 |
+ if [[ ${PV} == 9999* ]] ; then |
| 117 |
+ curl https://qa-reports.gentoo.org/output/active-devs.gpg -o ${P}-active-devs.gpg || die |
| 118 |
+ else |
| 119 |
+ default |
| 120 |
+ fi |
| 121 |
+} |
| 122 |
+ |
| 123 |
src_compile() { |
| 124 |
export GNUPGHOME="${T}"/.gnupg |
| 125 |
|
| 126 |
+ get_gpg_keyring_dir() { |
| 127 |
+ if [[ ${PV} == 9999* ]] ; then |
| 128 |
+ echo "${WORKDIR}" |
| 129 |
+ else |
| 130 |
+ echo "${DISTDIR}" |
| 131 |
+ fi |
| 132 |
+ } |
| 133 |
+ |
| 134 |
local mygpgargs=( |
| 135 |
--no-autostart |
| 136 |
--no-default-keyring |
| 137 |
@@ -54,7 +71,7 @@ src_compile() { |
| 138 |
chmod 700 "${GNUPGHOME}" || die |
| 139 |
|
| 140 |
# Convert the binary keyring into an armored one so we can process it |
| 141 |
- edo gpg "${mygpgargs[@]}" --import "${DISTDIR}"/${P}-active-devs.gpg |
| 142 |
+ edo gpg "${mygpgargs[@]}" --import "$(get_gpg_keyring_dir)"/${P}-active-devs.gpg |
| 143 |
edo gpg "${mygpgargs[@]}" --export --armor > "${WORKDIR}"/gentoo-developers.asc |
| 144 |
|
| 145 |
# Now strip out the keys which are expired and/or missing a signature |
Archives