gentoo resync : 29.12.2022

6 files changed, 21 insertions, 239 deletions

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index c3c2a077a0d1..52d48f1d64c2 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,10 +1,6 @@
-AUX makefile.patch 856 BLAKE2B d4de5c95330577bf2a25b8c50aa3193c3b57ce740abe12bc3996af18eda54c1514e2129a1e28f0bca7384b1f4b78e19e8b35e07e816a23cc04a93ba2804214d0 SHA512 51c0552984791190fc44159de1797094dffc01cf6ef90a3219b069ae2417c0ff5020a19b34d26b0c3f7d1a1bc9184078948f669a4186893561833ff88afdb316
-AUX refind-0.12.0-gcc10.patch 321 BLAKE2B 35cb0676fa14218eb90753481cb3f76718b71b8311b4df1a9bbf1ebe591d8a9bb06d68210c422266640771a84d80805274a2008fd454f417bbb4137b96003205 SHA512 38f679759698c23927d9c3934ffbb1ef26ca590b5b6103927ec9816f9f4b5f9745703ced94f1b357d9b47b84b3b8b8072ead507acedb576e7f4eed0c1834dee6
 AUX refind-0.13.2-gnuefi-3.0.14.patch 2031 BLAKE2B f70d92f26eab16baaa58ffeee1294eae5833243c26ca4b22f69d41d03fcab0a11b820de6e63c3b43171e16cd5b03688b9056ecddbb89305b0d9ce69a0abca02a SHA512 9bf3fe0413fc8d9a6a3878f786cc477127fb83e8abc306c91ea26437816e662ff46d0af363296d47596e1af82b3570b070c863d57a292941da41ca31a58dca0a
-DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db SHA512 529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
-DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3 SHA512 3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 DIST refind-src-0.13.2.tar.gz 4554759 BLAKE2B 2c3b1daf5fa100dcd4e1c801aa625e269ae9c1a99b567a271d7cdd30f95fa1e041e22984623b9a0e61f8af45966919f4b9f3a5b6c2026271d1bc37c6925f1e70 SHA512 e671d44385297295c143824dd95593f2e7bc8e282745d127b041a645aa27003467a3a23f368fd30297f33faa06bd914540d7bdc3c71ec42f6b7a38d7ee8e0ddb
-EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 52a388dc1e57232d120b745e3089bad0d12265dd7718589cc7af9a8a1defa105bb74d01f76510bcaafbcb64f435b3e4a555c64d2c4538ae3cd56027b769a36db SHA512 b17c07d927462adae1b9644bdfd53d3ab58e193f02e54b45c50cbc9f100adca01d97631aeb85c014069733e11645af47b275fa2cef65b73ebd9c39a1ab40f96c
-EBUILD refind-0.12.0-r1.ebuild 3719 BLAKE2B ca10b2ea88821c597c58b1a801d96e811088ce36b01128b6a4e1719c71b3cdb228580f0399a963a7db09fc02d4ea01d613ab51d60547388e531d101cbead8500 SHA512 9a3a367c466c82d5e92cb0a6ec52d19660db06e88a1bcf73bd12ef43dc4fd5fa4a6381f5c03e2d3a28f1c558789fc85de8b5a0d622d11079dcbc22b707370422
+DIST refind-src-0.13.3.1.tar.gz 4550242 BLAKE2B ab8dd27f82954ea6f9831f827550f27b5ca426b7783e918311ba7e178fc3509698a0107f61d0394a7893318528cb3e0c8491f4522de0a4aca6a40e0749f5a6f9 SHA512 7966df5dd8dc66cc49a329ed722a567672da8e2fa3f2334d53db65357cea17cba5a4dc5459e358de1079a938da3c63dc626d096ce28b6bf1fa2964be7359dbd1
 EBUILD refind-0.13.2.ebuild 3732 BLAKE2B d1b19ff08c3d8a414fd605daeaca564e92f0ba3efd9180dc7e960eecabcfaf4f0fb2144d6603be97e486601b1c330129e92523ce1a41b5ca183d19c505d82495 SHA512 281213176e580222e11e33559dfb5002d9ce2de45674cd193f489f3ecdc9632abb52a05e06c07b4a1a06c8d15ff720b08e1fa382f1a58305b773a655fa53ef84
-MISC metadata.xml 3852 BLAKE2B 5c6a075b5130fe3f3991350f694d9bf0b72c0e5eaad0a52daa15a0cd463b9105df04a4f59f539303daabbc58fa48a3c1190974b3df5fc71b27e0c493f5374274 SHA512 ada8758c6ec63943c1fb6b42430a87e8f78811fbfc4f39e5d6d8db8e2e2559782531dd17eb57fef588bc530b41735d1d8b44b8ebf6d7c992661329fa4357d637
+EBUILD refind-0.13.3.1.ebuild 3665 BLAKE2B 0cdf94490bc840b28bd241f841508189525bd2c120901a3275b9ee057253891d7eaa5f1710c7b4870fcd63f068e47a35012d76306ba495b7b7e96827011eff06 SHA512 63e8a6a180fa5ed56f081206b3958c6310bcad095b2dd244a1e515909aa01ce03c26d84b73de25f6eaaabbfe1e2be4c0523fe1af254abbf9e35dbed36367870d
+MISC metadata.xml 3700 BLAKE2B a09550c178969a92b11ef722b092c418f75b3d48d53b1a4395a0c350703ff0ee0d85f2c32e4895bee9a15fefc4b43dc0e1e107a3693a1e88a3866536581a75ee SHA512 4caab08d933f006512ff2f3d98094d26c7f3b00b1141f3e1f2882de2997c0138d4a2e250e933d253fbd68b4713bdfca289216fd270401566ea3717d3fc150409
diff --git a/sys-boot/refind/files/makefile.patch b/sys-boot/refind/files/makefile.patch
deleted file mode 100644
index 5db6f75b1919..000000000000
--- a/sys-boot/refind/files/makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -161,8 +161,9 @@ fs_edk2: build_edk2
- 	done
- 
- build_edk2: $(EDK2BASE)/RefindPkg
--	cd $(EDK2BASE) && \
--	. ./edksetup.sh BaseTools && \
-+	+cd $(EDK2BASE) && \
-+	. udk-workspace && \
-+	build -a $(UC_ARCH) -p MdePkg/MdePkg.dsc && \
- 	build -a $(UC_ARCH) -p RefindPkg/RefindPkg.dsc
- 	mkdir -p ./drivers_$(FILENAME_CODE)
- 
-diff --git a/filesystems/Makefile b/filesystems/Makefile
-index 99452ed..9bc984d 100644
---- a/filesystems/Makefile
-+++ b/filesystems/Makefile
-@@ -5,6 +5,7 @@
- # name of the driver to be built. This is done because of a dependency
- # in the fsw_efi.c file on the filesystem type; this file must be
- # recompiled for each new filesystem built.
-+.NOTPARALLEL:
- 
- # This program is licensed under the terms of the GNU GPL, version 3,
- # or (at your option) any later version.
diff --git a/sys-boot/refind/files/refind-0.12.0-gcc10.patch b/sys-boot/refind/files/refind-0.12.0-gcc10.patch
deleted file mode 100644
index 1f2e2bc0a5de..000000000000
--- a/sys-boot/refind/files/refind-0.12.0-gcc10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Make.common
-+++ b/Make.common
-@@ -60,7 +60,7 @@
- #
- 
- # ...for both GNU-EFI and TianoCore....
--OPTIMFLAGS      = -Os -fno-strict-aliasing
-+OPTIMFLAGS      = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
- CFLAGS          = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
- 
- # ...for GNU-EFI....
diff --git a/sys-boot/refind/metadata.xml b/sys-boot/refind/metadata.xml
index 39c685e1f5b5..c4b2438447a5 100644
--- a/sys-boot/refind/metadata.xml
+++ b/sys-boot/refind/metadata.xml
@@ -40,24 +40,22 @@ d'amorçage au moment de l'exécution le rend très facile à utiliser, en
 particulier associé à des noyau Linux qui fournissent un support EFI stub.
 	</longdescription>
 	<use lang="en">
+		<flag name="btrfs">Builds the EFI binary btrfs filesystem driver</flag>
 		<flag name="ext2">Builds the EFI binary ext2 filesystem driver</flag>
 		<flag name="ext4">Builds the EFI binary ext4 filesystem driver</flag>
-		<flag name="reiserfs">Builds the EFI binary reiserfs filesystem driver</flag>
-		<flag name="iso9660">Builds the EFI binary iso9660 filesystem driver</flag>
 		<flag name="hfs">Builds the EFI binary hfs filesystem driver</flag>
-		<flag name="btrfs">Builds the EFI binary btrfs filesystem driver</flag>
+		<flag name="iso9660">Builds the EFI binary iso9660 filesystem driver</flag>
 		<flag name="ntfs">Builds the EFI binary ntfs filesystem driver</flag>
-		<flag name="gnuefi">Compile using GNU-EFI instead of Tianocore</flag>
+		<flag name="reiserfs">Builds the EFI binary reiserfs filesystem driver</flag>
 	</use>
 	<use lang="fr">
+		<flag name="btrfs">Construire le gestionnaire EFI pour le système de fichier btrfs</flag>
 		<flag name="ext2">Construire le gestionnaire EFI pour le système de fichier ext2</flag>
 		<flag name="ext4">Construire le gestionnaire EFI pour le système de fichier ext4</flag>
-		<flag name="reiserfs">Construire le gestionnaire EFI pour le système de fichier reiserfs</flag>
-		<flag name="iso9660">Construire le gestionnaire EFI pour le système de fichier iso9660</flag>
 		<flag name="hfs">Construire le gestionnaire EFI pour le système de fichier hfs</flag>
-		<flag name="btrfs">Construire le gestionnaire EFI pour le système de fichier btrfs</flag>
+		<flag name="iso9660">Construire le gestionnaire EFI pour le système de fichier iso9660</flag>
 		<flag name="ntfs">Construire le gestionnaire EFI pour le système de fichier ntfs</flag>
-		<flag name="gnuefi">Compiler en utilisant GNU-EFI au lieu de Tianocore</flag>
+		<flag name="reiserfs">Construire le gestionnaire EFI pour le système de fichier reiserfs</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">refind</remote-id>
diff --git a/sys-boot/refind/refind-0.11.4.ebuild b/sys-boot/refind/refind-0.11.4.ebuild
deleted file mode 100644
index 37ad051eba4d..000000000000
--- a/sys-boot/refind/refind-0.11.4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multiprocessing toolchain-funcs
-
-DESCRIPTION="The UEFI Boot Manager by Rod Smith"
-HOMEPAGE="https://www.rodsbooks.com/refind/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
-IUSE="${FS_USE} custom-cflags doc gnuefi"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	!gnuefi? ( >=sys-boot/udk-2018-r1 )"
-
-DOCS=(README.txt)
-PATCHES=("${FILESDIR}/makefile.patch")
-UDK_WORKSPACE="${T}/udk"
-
-pkg_pretend() {
-	if use custom-cflags; then
-		ewarn
-		ewarn "You have enabled building with USE=custom-cflags. Be aware that"
-		ewarn "using this can result in EFI binaries that fail to run and may"
-		ewarn "fail to build at all. This is strongly advised against by upstream."
-		ewarn
-		ewarn "See https://bugs.gentoo.org/598587#c3 for more information"
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	if use x86; then
-		export EFIARCH=ia32
-		export BUILDARCH=ia32
-	elif use amd64; then
-		export EFIARCH=x64
-		export BUILDARCH=x86_64
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
-
-	# Prepare UDK workspace
-	if ! use gnuefi; then
-		mkdir "${UDK_WORKSPACE}" || die
-		ln -s "${EPREFIX}/usr/lib/udk/"{Mde,IntelFramework}{,Module}Pkg \
-			"${UDK_WORKSPACE}" || die "Could not link UDK files"
-	fi
-}
-
-src_configure() {
-	if ! use gnuefi; then
-		# Use the side effect of the script which will create configuration files
-		(. udk-workspace "${UDK_WORKSPACE}" || die)
-		sed -e "s:^#\?\s*\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$:\1 $(makeopts_jobs):" \
-			-i "${UDK_WORKSPACE}/Conf/target.txt" || die "Failed to configure target file"
-		sed -e "s:\(_\(CC\|ASM\|PP\|VFRPP\|ASLCC\|ASLPP\|DLINK\)_PATH\s*=\).*$:\1 $(tc-getCC):" \
-			-e "s:\(_ASLDLINK_PATH\s*=\).*$:\1 $(tc-getLD):" \
-			-e "s:\(_OBJCOPY_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-			-e "s:\(_RC_PATH\s*=\).*$:\1 $(tc-getOBJCOPY):" \
-			-e "s:\(_SLINK_PATH\s*=\).*$:\1 $(tc-getAR):" \
-			-e "s:-Werror::" \
-			-i "${UDK_WORKSPACE}/Conf/tools_def.txt" \
-			|| die "Failed to prepare tools definition file"
-	fi
-}
-
-src_compile() {
-	# Update fs targets depending on uses
-	local fs fs_names=()
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			fs_names+=(${fs})
-		fi
-	done
-	use gnuefi && fs_names=("${fs_names[@]/%/_gnuefi}")
-
-	# Prepare flags
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFILIB="/usr/$(get_libdir)"
-		EFILIB="/usr/$(get_libdir)"
-		EFICRT0="/usr/$(get_libdir)"
-		EDK2BASE="${UDK_WORKSPACE}"
-		EDK2_DRIVER_BASENAMES="${fs_names[*]}"
-		FILESYSTEMS="${fs_names[*]}"
-		FILESYSTEMS_GNUEFI="${fs_names[*]}"
-	)
-	if use custom-cflags; then
-		make_flags=(CFLAGS="${CFLAGS}" "${make_flags[@]}")
-	fi
-
-	emake "${make_flags[@]}" all_$(usex gnuefi gnuefi edk2)
-}
-
-src_install() {
-	exeinto "/usr/lib/${PN}"
-	doexe refind-install
-	dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
-
-	if use doc; then
-		doman "docs/man/"*
-		DOCS+=(NEWS.txt docs/refind docs/Styles)
-	fi
-	einstalldocs
-
-	insinto "/usr/lib/${PN}/refind"
-	doins "refind/refind_${EFIARCH}.efi"
-	doins "refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "drivers_${EFIARCH}" ]]; then
-		doins -r "drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}"
-	doins "gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "keys"
-
-	dosbin "mkrlconf"
-	dosbin "mvrefind"
-	dosbin "refind-mkdefault"
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}"
-	elog "You will need to use the command 'refind-install' to install"
-	elog "the binaries into your EFI System Partition"
-	elog ""
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "refind-install requires additional packages to be fully functional:"
-		elog " app-crypt/sbsigntools for binary signing for use with SecureBoot"
-		elog " sys-boot/efibootmgr for writing to NVRAM"
-		elog " sys-block/parted for automatic ESP location and mount"
-		elog ""
-		elog "refind-mkdefault requires >=dev-lang/python-3"
-		elog ""
-		elog "A sample configuration can be found at"
-		elog "${EROOT}/usr/lib/${PN}/refind/refind.conf-sample"
-	else
-		if ver_test "${REPLACING_VERSIONS}" -lt "0.10.3"; then
-			elog "The new refind-mkdefault script requires >=dev-lang/python-3"
-			elog "to be installed"
-			elog ""
-		fi
-		ewarn "Note that this installation will not update any EFI binaries"
-		ewarn "on your EFI System Partition - this needs to be done manually"
-	fi
-}
diff --git a/sys-boot/refind/refind-0.12.0-r1.ebuild b/sys-boot/refind/refind-0.13.3.1.ebuild
index 39004c2d0093..73f27787890e 100644
--- a/sys-boot/refind/refind-0.12.0-r1.ebuild
+++ b/sys-boot/refind/refind-0.13.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multiprocessing toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="The UEFI Boot Manager by Rod Smith"
 HOMEPAGE="https://www.rodsbooks.com/refind/"
@@ -11,17 +11,12 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc"
 
 DEPEND="sys-boot/gnu-efi"
 
-PATCHES=(
-	"${FILESDIR}/makefile.patch"
-	"${FILESDIR}/${P}-gcc10.patch" # Bug 723244
-)
-
 DOCS=( README.txt )
 
 pkg_pretend() {
@@ -50,7 +45,8 @@ src_prepare() {
 	default
 
 	# bug 598647 - PIE not supported
-	sed -e '/^CFLAGS/s:$: -fno-PIE:' -i Make.common || die
+	sed -e '/^CFLAGS/s/$/ -fno-PIE/' -i Make.common || die
+	sed -e '1 i\.NOTPARALLEL:' -i filesystems/Makefile || die
 }
 
 src_compile() {
@@ -76,8 +72,6 @@ src_compile() {
 		GNUEFILIB="/usr/$(get_libdir)"
 		EFILIB="/usr/$(get_libdir)"
 		EFICRT0="/usr/$(get_libdir)"
-		EDK2BASE="${UDK_WORKSPACE}"
-		EDK2_DRIVER_BASENAMES="${fs_names[*]}"
 		FILESYSTEMS="${fs_names[*]}"
 		FILESYSTEMS_GNUEFI="${fs_names[*]}"
 	)
@@ -89,9 +83,9 @@ src_compile() {
 }
 
 src_install() {
-	exeinto "/usr/lib/${PN}"
+	exeinto "/usr/$(get_libdir)/${PN}"
 	doexe refind-install
-	dosym "../lib/${PN}/refind-install" "/usr/sbin/refind-install"
+	dosym "../$(get_libdir)/${PN}/refind-install" "/usr/sbin/refind-install"
 
 	if use doc; then
 		doman "docs/man/"*
@@ -99,7 +93,7 @@ src_install() {
 	fi
 	einstalldocs
 
-	insinto "/usr/lib/${PN}/refind"
+	insinto "/usr/$(get_libdir)/${PN}/refind"
 	doins "refind/refind_${EFIARCH}.efi"
 	doins "refind.conf-sample"
 	doins -r images icons fonts banners
@@ -108,7 +102,7 @@ src_install() {
 		doins -r "drivers_${EFIARCH}"
 	fi
 
-	insinto "/usr/lib/${PN}/refind/tools_${EFIARCH}"
+	insinto "/usr/$(get_libdir)/${PN}/refind/tools_${EFIARCH}"
 	doins "gptsync/gptsync_${EFIARCH}.efi"
 
 	insinto "/etc/refind.d"
@@ -120,7 +114,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT}/usr/lib/${PN}"
+	elog "rEFInd has been built and installed into ${EROOT}/usr/$(get_libdir)/${PN}"
 	elog "You will need to use the command 'refind-install' to install"
 	elog "the binaries into your EFI System Partition"
 	elog ""
@@ -133,7 +127,7 @@ pkg_postinst() {
 	elog ""
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "A sample configuration can be found at"
-		elog "${EROOT}/usr/lib/${PN}/refind/refind.conf-sample"
+		elog "${EROOT}/usr/$(get_libdir)/${PN}/refind/refind.conf-sample"
 	else
 		if ver_test "${REPLACING_VERSIONS}" -lt "0.12.0"; then
 			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"