gentoo resync : 14.05.2020

5 files changed, 170 insertions, 603 deletions

diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 14562f5300bb..5a27edd35a11 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,10 +1,6 @@
 AUX makefile.patch 856 BLAKE2B d4de5c95330577bf2a25b8c50aa3193c3b57ce740abe12bc3996af18eda54c1514e2129a1e28f0bca7384b1f4b78e19e8b35e07e816a23cc04a93ba2804214d0 SHA512 51c0552984791190fc44159de1797094dffc01cf6ef90a3219b069ae2417c0ff5020a19b34d26b0c3f7d1a1bc9184078948f669a4186893561833ff88afdb316
-DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd SHA512 a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
-DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050 SHA512 796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
-DIST refind-src-0.11.3.tar.gz 3792206 BLAKE2B 369b25dbc97d83f9143ccbe19e89b5975f0796f1e4a2decfc124e4b45c5ef1db8f3e2bb83413f596ca28e82e67b0b9c5682b557a5422e3146780cec151d2a36e SHA512 96907b79e1c9c8199c62058bb6851fa5d6f158802f3777ba19a62c6c0d7d5b49132754bcafa925510fd21c8bafe8ce393117070a628baf4c277fa5f8f536b797
 DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a12021cfe80df80a83c4dbd47cd40b0d8afbdc510abb44de3029ff15ed49372bd59e0b156f4c27eab3ef7bd6ccc3c7e02db SHA512 529962ae432edaf1895ba98deb00a23c66bd742578e1a367f70f7ed22dd7be7daf1960df8af410fba79ca775169120499a4c10119331b2b12b55a002d4354de1
-EBUILD refind-0.10.4-r2.ebuild 6185 BLAKE2B 077c7e57eeed02eba132dbae17c7045acfedb62ec282e8af15c28f39bab1668a952656807a8e476230b8a6735d71c930937d4386030cd3fda5e4cd9dbf4c9f94 SHA512 bacd7b2acd10ff4ac50074626364d1a97e53a82fd545669acbb9efd7b2f1da0edb86d41138155340cc0e07f756484a88f57ef7165ab88755526c57629f889138
-EBUILD refind-0.11.2.ebuild 6279 BLAKE2B 209d4d8eda0b18cf10350d2a1ef8cbda5bfa6e3e2e46534e8fcadcc370917202d38b7f7dd344315e8986cf811f5452e72dd0a11d6237eaaa5b531f3e7f5b9624 SHA512 47f9bc81cc441e94615baa06e0e6c797e5f4e7be156b51ffea20d20409dcc5e94053c48ddae1c42bb959e538e29f2bd4a0e0083ae0be584320aa3cb0ae0b5e56
-EBUILD refind-0.11.3.ebuild 6277 BLAKE2B 6253ff1ac6397d2801ea1f5651c8267a391cf40fae9a651e6c4f2a6ec70d91881aaf6aea860a574b0558c1391006d3d021b55ad2cfbc0e8acdaef55b63437161 SHA512 cdf653debe9420a16a295769982931a2d913dab6dbcbd629835134273cdb29bf362c413d07e774423b8bcaffea060ae17a8ec91d0a300a14332910f7607c4284
+DIST refind-src-0.12.0.tar.gz 3898337 BLAKE2B 1197049fb7d91db64135dafda7488bdb1da4997ce6a6d49dfe635526240e3193d8c7c22597aee0f2d6754ce6061b4127d8aa21d43c9f061501de98e25de609d3 SHA512 3ade9642d7acf31097daa5308acb96a9fa3371314073b5a09601a886fc30444752efa08ed9fb35e421efb0b4eb9efbccd7b5c9bd6b3b9ed4af74c58f22a74729
 EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 9870720301e1697a91d1380832e1b0205de95e8aa1ad56de1022f17dd1b88e8c9d064f4344abc7b518d0dd0a5c662dfe4ea21cfca6f6cf4e941f6d5fee21ce85 SHA512 137a9af7e7727b2bbc40649ce7d2223f5db62e2b5c8817cb7982ca1dd0e67aa98edb250565cef65bd6bebcf79885b1d66d8a6931e6536f9561dc621b3b4c8f59
+EBUILD refind-0.12.0.ebuild 4732 BLAKE2B 501398cee52099f0a727f30866c6d890a848b8bb5f83df9db637b3b90ce40deb141b803fefaca176cb1bb731cfd00b8eeaf5bbc8a2f24c0e7e1b14244e894393 SHA512 d9339513227603715ea47ad4521722b10411c2b0243003410cf018093c222be4cf347b82c1b4a963429eb05485a444e37852f6dc52647d7277174d6be08ed8cb
 MISC metadata.xml 3821 BLAKE2B dd2985fd4728180562a6c11969c27e1d1af70e80e3c68aa4fe7ce7665b752c6aa4adb6fce27487dd97563821b13f2e97e746b6b6e0c346a212380b9c1b231de4 SHA512 e0a5ebc2757e7584afb0628b5f451458974f8ffc1c94774b0ba0eda67ba582fabe08cf8d17fce2df934bba5bded40605f665da0a236d08a53f19b422afae9336
diff --git a/sys-boot/refind/refind-0.10.4-r2.ebuild b/sys-boot/refind/refind-0.10.4-r2.ebuild
deleted file mode 100644
index 349f17cfc64e..000000000000
--- a/sys-boot/refind/refind-0.10.4-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic versionator
-
-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} -gnuefi doc -custom-cflags"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	!gnuefi? ( >=sys-boot/udk-2015 )"
-
-DOCS="NEWS.txt README.txt docs/refind docs/Styles"
-
-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
-	else
-		# Try to support anyway
-		export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
-		if [[ ${BUILDARCH} == "x86_64" ]] ; then
-			export EFIARCH=x64
-		else
-			export EFIARCH=${ARCH}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e 's:CFLAGS          =:& -fno-PIE:' -i "${S}/Make.common" || die
-
-	local f
-	for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
-		sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
-			-e 's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
-			-e '/^\s*-I \$(EDK2BASE).*$/d' \
-			"${f}" || die "Failed to patch Tianocore make file in" \
-			$(basename $(dirname ${f}))
-	done
-	for f in "${S}"/*/Make.tiano; do
-		sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
-			-e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
-			-e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) \1/' \
-			"${f}" || die "Failed to patch Tianocore make file in" \
-			$(basename $(dirname ${f}))
-	done
-	sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" \
-		|| die "Failed to patch AutoGen.c"
-	for f in "${S}"/*/AutoGen.c; do
-		cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c"
-
-			#define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel  11U
-			#define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4
-			#define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel  _PCD_SIZE_PcdFixedDebugPrintErrorLevel
-			#define _PCD_VALUE_PcdFixedDebugPrintErrorLevel  0xFFFFFFFFU
-			GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel = _PCD_VALUE_PcdFixedDebugPrintErrorLevel;
-			extern const  UINT32  _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel;
-			#define _PCD_GET_MODE_32_PcdFixedDebugPrintErrorLevel  _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel
-			//#define _PCD_SET_MODE_32_PcdFixedDebugPrintErrorLevel  ASSERT(FALSE)  // It is not allowed to set value for a FIXED_AT_BUILD PCD
-		EOF
-	done
-}
-
-src_compile() {
-	# Prepare flags
-	local pecoff_header_size
-	[[ $EFIARCH == x64 ]] && pecoff_header_size='0x228' \
-		|| pecoff_header_size='0x220'
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		GENFW="/usr/bin/GenFw"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib -Bsymbolic \
-			-L\$(EFILIB) -L\$(GNUEFILIB) \$(CRTOBJS) -znocombreloc -zdefs"
-		TIANO_LDSCRIPT="/usr/lib/GccBase.lds"
-		TIANO_LDFLAGS="-n -q --gc-sections -nostdlib \
-			--script=\$(TIANO_LDSCRIPT) \
-			--defsym=PECOFF_HEADER_SIZE=${pecoff_header_size} \
-			--entry \$(ENTRYPOINT) -u \$(ENTRYPOINT) -m \$(LD_CODE)"
-	)
-
-	# Make main EFI
-	local all_target
-	use gnuefi && all_target="gnuefi" || all_target="tiano"
-
-	if use custom-cflags; then
-		emake CFLAGS="${CFLAGS}" "${make_flags[@]}" ${all_target}
-	else
-		emake "${make_flags[@]}" ${all_target}
-	fi
-
-	# Make filesystem drivers
-	local gnuefi_target
-	use gnuefi && gnuefi_target="_gnuefi"
-	local fs
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			einfo "Building ${fs} filesystem driver"
-			if use custom-cflags; then
-				emake CFLAGS="${CFLAGS}" "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target}
-			else
-				emake "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target}
-			fi
-		fi
-	done
-}
-
-src_install() {
-	exeinto "/usr/share/${P}"
-	doexe refind-install
-	dosym "/usr/share/${P}/refind-install" "/usr/sbin/refind-install"
-
-	dodoc "${S}"/{COPYING.txt,LICENSE.txt,CREDITS.txt}
-	if use doc; then
-		doman "${S}/docs/man/"*
-		dodoc -r ${DOCS}
-	fi
-
-	insinto "/usr/share/${P}/refind"
-	doins "${S}/refind/refind_${EFIARCH}.efi"
-	doins "${S}/refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "${S}/drivers_${EFIARCH}" ]]; then
-		doins -r "${S}/drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/share/${P}/refind/tools_${EFIARCH}"
-	doins "${S}/gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "${S}/keys"
-
-	dosbin "${S}/mkrlconf"
-	dosbin "${S}/mvrefind"
-	dosbin "${S}/refind-mkdefault"
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT%/}/usr/share/${P}"
-	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/share/${P}/refind/refind.conf-sample"
-	else
-		if ! version_is_at_least "0.10.3" "${REPLACING_VERSIONS}"; 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.11.2.ebuild b/sys-boot/refind/refind-0.11.2.ebuild
deleted file mode 100644
index 5987cc179ee1..000000000000
--- a/sys-boot/refind/refind-0.11.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic versionator
-
-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} -gnuefi doc -custom-cflags"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	!gnuefi? ( >=sys-boot/udk-2015 )"
-
-DOCS="NEWS.txt README.txt docs/refind docs/Styles"
-
-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
-	else
-		# Try to support anyway
-		export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
-		if [[ ${BUILDARCH} == "x86_64" ]] ; then
-			export EFIARCH=x64
-		else
-			export EFIARCH=${ARCH}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e 's:CFLAGS          =:& -fno-PIE:' -i "${S}/Make.common" || die
-
-	local f
-	for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
-		sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
-			-e 's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
-			-e '/^\s*-I \$(EDK2BASE).*$/d' \
-			"${f}" || die "Failed to patch Tianocore make file in" \
-			$(basename $(dirname ${f}))
-	done
-	for f in "${S}"/*/Make.tiano; do
-		sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
-			-e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
-			-e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) \1/' \
-			"${f}" || die "Failed to patch Tianocore make file in" \
-			$(basename $(dirname ${f}))
-	done
-	sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" \
-		|| die "Failed to patch AutoGen.c"
-	for f in "${S}"/*/AutoGen.c; do
-		cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c"
-
-			#define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel  11U
-			#define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4
-			#define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel  _PCD_SIZE_PcdFixedDebugPrintErrorLevel
-			#define _PCD_VALUE_PcdFixedDebugPrintErrorLevel  0xFFFFFFFFU
-			GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel = _PCD_VALUE_PcdFixedDebugPrintErrorLevel;
-			extern const  UINT32  _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel;
-			#define _PCD_GET_MODE_32_PcdFixedDebugPrintErrorLevel  _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel
-			//#define _PCD_SET_MODE_32_PcdFixedDebugPrintErrorLevel  ASSERT(FALSE)  // It is not allowed to set value for a FIXED_AT_BUILD PCD
-		EOF
-	done
-}
-
-src_compile() {
-	# Prepare flags
-	local pecoff_header_size
-	[[ $EFIARCH == x64 ]] && pecoff_header_size='0x228' \
-		|| pecoff_header_size='0x220'
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		GENFW="/usr/bin/GenFw"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		GNUEFILIB="/usr/$(get_libdir)"
-		EFILIB="/usr/$(get_libdir)"
-		EFICRT0="/usr/$(get_libdir)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib -Bsymbolic \
-			-L\$(EFILIB) -L\$(GNUEFILIB) \$(CRTOBJS) -znocombreloc -zdefs"
-		TIANO_LDSCRIPT="/usr/lib/GccBase.lds"
-		TIANO_LDFLAGS="-n -q --gc-sections -nostdlib \
-			--script=\$(TIANO_LDSCRIPT) \
-			--defsym=PECOFF_HEADER_SIZE=${pecoff_header_size} \
-			--entry \$(ENTRYPOINT) -u \$(ENTRYPOINT) -m \$(LD_CODE)"
-	)
-
-	# Make main EFI
-	local all_target
-	use gnuefi && all_target="gnuefi" || all_target="tiano"
-
-	if use custom-cflags; then
-		emake CFLAGS="${CFLAGS}" "${make_flags[@]}" ${all_target}
-	else
-		emake "${make_flags[@]}" ${all_target}
-	fi
-
-	# Make filesystem drivers
-	local gnuefi_target
-	use gnuefi && gnuefi_target="_gnuefi"
-	local fs
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			einfo "Building ${fs} filesystem driver"
-			if use custom-cflags; then
-				emake CFLAGS="${CFLAGS}" "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target}
-			else
-				emake "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target}
-			fi
-		fi
-	done
-}
-
-src_install() {
-	exeinto "/usr/share/${P}"
-	doexe refind-install
-	dosym "../share/${P}/refind-install" "/usr/sbin/refind-install"
-
-	dodoc "${S}"/{COPYING.txt,LICENSE.txt,CREDITS.txt}
-	if use doc; then
-		doman "${S}/docs/man/"*
-		dodoc -r ${DOCS}
-	fi
-
-	insinto "/usr/share/${P}/refind"
-	doins "${S}/refind/refind_${EFIARCH}.efi"
-	doins "${S}/refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "${S}/drivers_${EFIARCH}" ]]; then
-		doins -r "${S}/drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/share/${P}/refind/tools_${EFIARCH}"
-	doins "${S}/gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "${S}/keys"
-
-	dosbin "${S}/mkrlconf"
-	dosbin "${S}/mvrefind"
-	dosbin "${S}/refind-mkdefault"
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT%/}/usr/share/${P}"
-	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/share/${P}/refind/refind.conf-sample"
-	else
-		if ! version_is_at_least "0.10.3" "${REPLACING_VERSIONS}"; 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.11.3.ebuild b/sys-boot/refind/refind-0.11.3.ebuild
deleted file mode 100644
index 61fa68128311..000000000000
--- a/sys-boot/refind/refind-0.11.3.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic eapi7-ver
-
-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} -gnuefi doc -custom-cflags"
-
-DEPEND="gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	!gnuefi? ( >=sys-boot/udk-2015 )"
-
-DOCS="NEWS.txt README.txt docs/refind docs/Styles"
-
-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
-	else
-		# Try to support anyway
-		export BUILDARCH=$( uname -m | sed s,i[3456789]86,ia32, )
-		if [[ ${BUILDARCH} == "x86_64" ]] ; then
-			export EFIARCH=x64
-		else
-			export EFIARCH=${ARCH}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# bug 598647 - PIE not supported
-	sed -e 's:CFLAGS          =:& -fno-PIE:' -i "${S}/Make.common" || die
-
-	local f
-	for f in "${S}"/*/Make.tiano "${S}"/Make.common; do
-		sed -i -e 's/^\(include .*target.txt.*\)$/#\1/' \
-			-e 's@^\(TIANO_INCLUDE_DIRS\s*=\s*-I\s*\).*$@\1/usr/include/udk \\@' \
-			-e '/^\s*-I \$(EDK2BASE).*$/d' \
-			"${f}" || die "Failed to patch Tianocore make file in" \
-			$(basename $(dirname ${f}))
-	done
-	for f in "${S}"/*/Make.tiano; do
-		sed -i -e 's@^\(EFILIB\s*=\s*\).*$@\1/usr/lib@' \
-			-e 's@\$(EFILIB).*/\([^/]*\).lib@-l\1@' \
-			-e 's/\(--start-group\s*\$(ALL_EFILIBS)\)/-L \$(EFILIB) \1/' \
-			"${f}" || die "Failed to patch Tianocore make file in" \
-			$(basename $(dirname ${f}))
-	done
-	sed -i -e '/Guids/i#include "AutoGen.h"\n' "${S}/filesystems/AutoGen.c" \
-		|| die "Failed to patch AutoGen.c"
-	for f in "${S}"/*/AutoGen.c; do
-		cat >>"${f}" <<-EOF || die "Failed to patch AutoGen.c"
-
-			#define _PCD_TOKEN_PcdFixedDebugPrintErrorLevel  11U
-			#define _PCD_SIZE_PcdFixedDebugPrintErrorLevel 4
-			#define _PCD_GET_MODE_SIZE_PcdFixedDebugPrintErrorLevel  _PCD_SIZE_PcdFixedDebugPrintErrorLevel
-			#define _PCD_VALUE_PcdFixedDebugPrintErrorLevel  0xFFFFFFFFU
-			GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel = _PCD_VALUE_PcdFixedDebugPrintErrorLevel;
-			extern const  UINT32  _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel;
-			#define _PCD_GET_MODE_32_PcdFixedDebugPrintErrorLevel  _gPcd_FixedAtBuild_PcdFixedDebugPrintErrorLevel
-			//#define _PCD_SET_MODE_32_PcdFixedDebugPrintErrorLevel  ASSERT(FALSE)  // It is not allowed to set value for a FIXED_AT_BUILD PCD
-		EOF
-	done
-}
-
-src_compile() {
-	# Prepare flags
-	local pecoff_header_size
-	[[ $EFIARCH == x64 ]] && pecoff_header_size='0x228' \
-		|| pecoff_header_size='0x220'
-	local make_flags=(
-		ARCH="${BUILDARCH}"
-		GENFW="/usr/bin/GenFw"
-		CC="$(tc-getCC)"
-		AS="$(tc-getAS)"
-		LD="$(tc-getLD)"
-		AR="$(tc-getAR)"
-		GNUEFILIB="/usr/$(get_libdir)"
-		EFILIB="/usr/$(get_libdir)"
-		EFICRT0="/usr/$(get_libdir)"
-		RANLIB="$(tc-getRANLIB)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		GNUEFI_LDFLAGS="-T \$(GNUEFI_LDSCRIPT) -shared -nostdlib -Bsymbolic \
-			-L\$(EFILIB) -L\$(GNUEFILIB) \$(CRTOBJS) -znocombreloc -zdefs"
-		TIANO_LDSCRIPT="/usr/lib/GccBase.lds"
-		TIANO_LDFLAGS="-n -q --gc-sections -nostdlib \
-			--script=\$(TIANO_LDSCRIPT) \
-			--defsym=PECOFF_HEADER_SIZE=${pecoff_header_size} \
-			--entry \$(ENTRYPOINT) -u \$(ENTRYPOINT) -m \$(LD_CODE)"
-	)
-
-	# Make main EFI
-	local all_target
-	use gnuefi && all_target="gnuefi" || all_target="tiano"
-
-	if use custom-cflags; then
-		emake CFLAGS="${CFLAGS}" "${make_flags[@]}" ${all_target}
-	else
-		emake "${make_flags[@]}" ${all_target}
-	fi
-
-	# Make filesystem drivers
-	local gnuefi_target
-	use gnuefi && gnuefi_target="_gnuefi"
-	local fs
-	for fs in ${FS_USE}; do
-		fs=${fs#+}
-		if use "${fs}"; then
-			einfo "Building ${fs} filesystem driver"
-			if use custom-cflags; then
-				emake CFLAGS="${CFLAGS}" "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target}
-			else
-				emake "${make_flags[@]}" -C "${S}/filesystems" ${fs}${gnuefi_target}
-			fi
-		fi
-	done
-}
-
-src_install() {
-	exeinto "/usr/share/${P}"
-	doexe refind-install
-	dosym "../share/${P}/refind-install" "/usr/sbin/refind-install"
-
-	dodoc "${S}"/{COPYING.txt,LICENSE.txt,CREDITS.txt}
-	if use doc; then
-		doman "${S}/docs/man/"*
-		dodoc -r ${DOCS}
-	fi
-
-	insinto "/usr/share/${P}/refind"
-	doins "${S}/refind/refind_${EFIARCH}.efi"
-	doins "${S}/refind.conf-sample"
-	doins -r images icons fonts banners
-
-	if [[ -d "${S}/drivers_${EFIARCH}" ]]; then
-		doins -r "${S}/drivers_${EFIARCH}"
-	fi
-
-	insinto "/usr/share/${P}/refind/tools_${EFIARCH}"
-	doins "${S}/gptsync/gptsync_${EFIARCH}.efi"
-
-	insinto "/etc/refind.d"
-	doins -r "${S}/keys"
-
-	dosbin "${S}/mkrlconf"
-	dosbin "${S}/mvrefind"
-	dosbin "${S}/refind-mkdefault"
-}
-
-pkg_postinst() {
-	elog "rEFInd has been built and installed into ${EROOT%/}/usr/share/${P}"
-	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/share/${P}/refind/refind.conf-sample"
-	else
-		if ! version_is_at_least "0.10.3" "${REPLACING_VERSIONS}"; 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.ebuild b/sys-boot/refind/refind-0.12.0.ebuild
new file mode 100644
index 000000000000..9091a88cfcb1
--- /dev/null
+++ b/sys-boot/refind/refind-0.12.0.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 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 ""
+	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-apps/gptfdisk for ESP management"
+	elog ""
+	elog "refind-mkdefault requires >=dev-lang/python-3"
+	elog ""
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		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.12.0"; then
+			ewarn "This new version uses sys-apps/gptfdisk instead of sys-block/parted"
+			ewarn "to manage ESP"
+			ewarn ""
+		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
+}