gentoo auto-resync : 27:12:2023 - 01:38:47

3 files changed, 33 insertions, 16 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 60bc9fa5dfc5..a043d25a6f47 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -22,7 +22,7 @@ DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641
 DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca SHA512 0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
 EBUILD grub-2.06-r8.ebuild 9122 BLAKE2B eb7832c1928d3cb97561fe2f4ea71e5782c9546846736413907c704be8733b96f9df5d150988b5c75bc996d32f201470a7b53a673e3436f95bc3071ec5bc76f1 SHA512 9d0088f1069ad98f9265699b69d14e7211c97cac3893dfccd1530d6a89c2c25e82d9d0c900969dd4c90bb5d1bb550f1ffa238685d47a19f456cad4780cb888bb
 EBUILD grub-2.06-r9.ebuild 8785 BLAKE2B 35b4296ad4697de0c46addda3c8bd21d4a9c4b7daec9b8e5077c3c9a8987de44157c55dfa0edca2290c30e4b3e16d83aae163a6911166dcbbe44e9d12883d106 SHA512 4d92f2fb5d0fd82e3e8d403c38323fefe1cdadbb1940fa9916e4b088e8e06030fee05e24d1d7b986dd6300b5e673954071835ef5e8d69308b7dd3f38f06b5fee
-EBUILD grub-2.12.ebuild 8967 BLAKE2B f58e674ef61966943194d9726ae6bdb5859392d6f76b02fa580a7b3c4e1d78081076afb3bf2799913d71d2f92dea7543226f2b5e56414d3d605388a0931dc4bf SHA512 0f7a00d14acaa295a218f7a7c4efd6393cb2439254bc1d1916de3d9e2bb24d617cae534e0e1360fe00b6483ad7bfdd65fb88670d7f5d2a991c022ecd38b4233d
+EBUILD grub-2.12-r1.ebuild 9023 BLAKE2B f0b5e6ed80c9182738cc6b480458d7c96f8f4249a7f942451ddfc62e8703122d858f848a3087847254b6727acae02192a1800115534d34ac64956f11f93fa2b7 SHA512 a4558ebf8ef2a1919165dd877e42e684d54006df59059757f5242600514a795a311d7ce5c0f9b41b823be626a871ae49e27f4749a06fb73630ad81f93087fa30
 EBUILD grub-2.12_rc1-r1.ebuild 8836 BLAKE2B 03bf4217b5fdc7a990a6ff75f56b7314b1fdf13a37eec095f9ed225a0c806b866ac4f430baa788b33a44f6db9ca12322a28feb240c2fcc7ff4ec821204c7b2f9 SHA512 08ad201c95e92f8ad00c41cffd9a64a7766cbc596fde52d50a670e7e6c7cd14f106c24ca21f90473d29128d898922bdea8de417eb06bea9b75712626b9a4e62c
-EBUILD grub-9999.ebuild 8367 BLAKE2B 536b80ecdbe7bc95785163140b411295b3c45975453437677bd52cd609278b9106cad4a190c1b8d18deb974442aa0436a98968b52b17445ecbb6f11e49496084 SHA512 d07b4eef487972a9e04dc8889a1dfa81a3fdec2d93aba02cb8def75d896d29ec9c006ef4ef8180d9550fbe31402193086f8dd0928eb53af6a076ae74465f7cab
+EBUILD grub-9999.ebuild 8788 BLAKE2B 205fb21d716077e90d036b8d49e58c0bc05812e832304c4b9aa87149bb8d57993798185c9d45d15ed4f7cd1a713c384041240fcf70ba857a0d6a664f4978c879 SHA512 4db0df4c2c78abeee710169ff713c7988e69866751f5cbf0203b0152701213f15fedea659d013f0cbe6213f6d8b4353964af68f2f07cba1f2999384a2fea48d7
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/grub-2.12.ebuild b/sys-boot/grub/grub-2.12-r1.ebuild
index af2c3e716ed0..26b25794d046 100644
--- a/sys-boot/grub/grub-2.12.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -33,10 +33,12 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
 	inherit autotools
 fi
 
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs verify-sig
+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/_/'~'}
@@ -52,6 +54,7 @@ if [[ ${PV} != 9999 ]]; then
 		"
 		S=${WORKDIR}/${P%_*}
 	fi
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 else
 	inherit git-r3
@@ -88,7 +91,7 @@ REQUIRED_USE="
 	grub_platforms_loongson? ( fonts )
 "
 
-BDEPEND="
+BDEPEND+="
 	${PYTHON_DEPS}
 	>=sys-devel/flex-2.5.35
 	sys-devel/bison
@@ -114,17 +117,16 @@ BDEPEND="
 		virtual/pkgconfig
 	)
 	truetype? ( virtual/pkgconfig )
-	verify-sig? ( sec-keys/openpgp-keys-danielkiper )
 "
 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 )
@@ -185,7 +187,7 @@ src_prepare() {
 	fi
 
 	# Avoid error due to extra_deps.lst missing from source tarball:
-	#	make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'.  Stop.
+	#       make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'.  Stop.
 	echo "depends bli part_gpt" > grub-core/extra_deps.lst || die
 }
 
@@ -231,7 +233,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
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