diff options
| author |   Sam James <sam@gentoo.org> | 2023-12-26 21:38:06 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-12-26 21:38:06 +0000 |
| commit | a83c857e6470b72be0fea84579a8eb2c6fe5ee47 (patch) | |
| tree | 6f9ea73e6b65ba856651ab3f85917393dc5f49e9 /sys-boot/grub/grub-9999.ebuild | |
| parent | media-libs/x264: add note to bump with media-video/x264-encoder (diff) | |
| download | gentoo-a83c857e6470b72be0fea84579a8eb2c6fe5ee47.tar.gz gentoo-a83c857e6470b72be0fea84579a8eb2c6fe5ee47.tar.bz2 gentoo-a83c857e6470b72be0fea84579a8eb2c6fe5ee47.zip | |
sys-boot/grub: sync live
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-boot/grub/grub-9999.ebuild')
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 04c3b16c7c59..430fb57a1484 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -23,6 +23,7 @@ fi PYTHON_COMPAT=( python3_{9..11} ) WANT_LIBTOOL=none +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then inherit python-any-r1 @@ -34,17 +35,27 @@ fi inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs +MY_P=${P} if [[ ${PV} != 9999 ]]; then + inherit verify-sig + if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 MY_P=${P/_/'~'} - SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz" + SRC_URI=" + https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz + verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig ) + " S=${WORKDIR}/${MY_P} else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + SRC_URI=" + mirror://gnu/${PN}/${P}.tar.xz + verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) + " S=${WORKDIR}/${P%_*} fi - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )" + KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" @@ -80,7 +91,7 @@ REQUIRED_USE=" grub_platforms_loongson? ( fonts ) " -BDEPEND=" +BDEPEND+=" ${PYTHON_DEPS} >=sys-devel/flex-2.5.35 sys-devel/bison @@ -111,11 +122,11 @@ DEPEND=" app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( - sdl? ( media-libs/libsdl ) + sdl? ( media-libs/libsdl2 ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) - mount? ( sys-fs/fuse:0 ) + mount? ( sys-fs/fuse:3 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) @@ -149,6 +160,8 @@ src_unpack() { git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" git-r3_checkout "${GNULIB_URI}" gnulib popd >/dev/null || die + elif use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig} fi default } @@ -216,7 +229,8 @@ grub_configure() { $(use_enable themes grub-themes) $(use_enable truetype grub-mkfont) $(use_enable libzfs) - $(use_enable sdl grub-emu-sdl) + --enable-grub-emu-sdl=no + $(use_enable sdl grub-emu-sdl2) ${platform:+--with-platform=}${platform} # Let configure detect this where supported |