6 files changed, 273 insertions, 0 deletions
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 203002ab162e..7b01436a808b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index f204eb0cd09c..ef6ad7cd34da 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -1,5 +1,7 @@
 DIST refind-src-0.10.4.tar.gz 3970380 BLAKE2B 0d14c005d3e93a1f0008b6c65e34eb6391c4a4a488b4fa7842c8f0b68eb2cc5be150c8718f01a65454db7b86ffa5873a3d1a96429eaed0cb92c1d29c8d2f7dcd SHA512 a75a6210ee51427c474e69c2de8c719545b2599c19f1c7541048b77ab1996a0e4b4b5fd4840f6240cd6704e5f5338cbaff432d7dc5ec4042854e26d6df18bed5
 DIST refind-src-0.10.8.tar.gz 4059265 BLAKE2B 597d8df1cb74f6f686c5b702c02eb2712adb2076934f1ffc746ca9aaf3d349d6384c8aa09d17fe440b656cc054ee928131f8ecbc059fe0b654e9c32799e54e86 SHA512 a4576920dd68a9436ee6d008787104842e192c6a5eb52cc580258bc8e13daadf170c21270e8cfd86f27733e3e86b050af9102d35c939677b1f1c3627aeeafb32
+DIST refind-src-0.11.2.tar.gz 4533034 BLAKE2B fa05781fc1d87d314677f8e670bd7282b591fd3b6f4a5863e81cb962fdb773c774faabb6c45544b0659c8d5c4ef7ce1dba8d798a4caa97364ad7aa2532a42050 SHA512 796d86f05152d93340773c2dfbae0ca50ab036373ebed60fcc80404ee269ef4bc100df4b141d555d3363b820c3e9234fc0cf637791061281c86329958dca3479
 EBUILD refind-0.10.4-r2.ebuild 6184 BLAKE2B e49d6ce4d20d75f36eadb7153acdc6ced59bbc5afc5a4b5e94b67078a61923f41fbf9b1f44999365039172bfc2b8e6ea58122051df14347e175eddf70c4be6dd SHA512 4169cd79dc65ff764e94ec10437ad1c10871a31f0bf20de3ace5c5d35be6a66caa6c138772ede5178145ec9ef46293377f3603bf8123821b3abd33718aaa4f0e
 EBUILD refind-0.10.8.ebuild 6186 BLAKE2B 8548bf8dc911eb501c0a1f8e3614133e00c5a0732f751f051276937cd84d36279226ca176bde6cc520c5e7ff92162aca8118f2bfa71ee387f549ec37c960a000 SHA512 d2b4d180f7c2d8c0734656d308b063e33f8b9ff7c7b11378d8d775f62012eb4f81844af62dacaf2def0c663d8a1bc4db1d0d0bfd920a3145762e873069051e8f
+EBUILD refind-0.11.2.ebuild 6278 BLAKE2B e724a6c9b4ed09a971f0d5c12bb109087faf243f45f1f37232fdac5e6ce750bfc33c5fb0261152daf698f7fc8abee7cf7ae1a258275be996d7b5ed9e34716f91 SHA512 6a876170d43c10a8c2f5b701d729f7510b8e68f78c01432698fb6190f39aa2b7a7901faf6fd0b64486f6565e66b729e9d24136601d4a032e8e17985bcb982c3f
 MISC metadata.xml 3924 BLAKE2B 0b6d9ed6c48bbd09f1ca3d7661d4b9c1c6800ba551341ee8a434cdf15872561a58221bfd58cca59d3e14785a7fdecfa98e82ec281f805d5fe200ff5115fafad7 SHA512 40432e3b97f448c671c9af35f25457481069f7c4b43e7d93958cf93e52856badf576f878f656185c58eda880e6e1eb1bc6c4a96d67d6f7a6b569da870bcea6bd
diff --git a/sys-boot/refind/refind-0.11.2.ebuild b/sys-boot/refind/refind-0.11.2.ebuild
new file mode 100644
index 000000000000..6f050a747dcf
--- /dev/null
+++ b/sys-boot/refind/refind-0.11.2.ebuild
@@ -0,0 +1,200 @@
+# 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/sbsigntool 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/woeusb/Manifest b/sys-boot/woeusb/Manifest
new file mode 100644
index 000000000000..9260d94a3858
--- /dev/null
+++ b/sys-boot/woeusb/Manifest
@@ -0,0 +1,3 @@
+DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965
+EBUILD woeusb-3.1.5.ebuild 1038 BLAKE2B 37b0cbbb3becf15978702f8dd0e8d9d4deca181ccac043ba4448b8622d058aaa0f849fbebfb43f7b5c513749c4cf7383e0790d0501904d6569dc14361f18cde2 SHA512 5aa5d30c887963f1d4b6b7a1efec47635f2275c2fd8e1434360cd336f699e5b7e4df66b3aff19852eeb7150236a43d67b12ba4e681436f551939d084d5756c53
+MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/metadata.xml b/sys-boot/woeusb/metadata.xml
new file mode 100644
index 000000000000..8e2305513d49
--- /dev/null
+++ b/sys-boot/woeusb/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>pacho@gentoo.org</email>
+</maintainer>
+<use>
+	<flag name="minimal">Install only woeusb tool</flag>
+</use>
+</pkgmetadata>
diff --git a/sys-boot/woeusb/woeusb-3.1.5.ebuild b/sys-boot/woeusb/woeusb-3.1.5.ebuild
new file mode 100644
index 000000000000..d1da40809082
--- /dev/null
+++ b/sys-boot/woeusb/woeusb-3.1.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools wxwidgets
+
+DESCRIPTION="Creates windows installer on usb media from an iso image"
+HOMEPAGE="https://github.com/slacka/WoeUSB"
+SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+	sys-apps/util-linux
+	sys-block/parted
+	sys-fs/dosfstools
+	sys-fs/ntfs3g
+	sys-boot/grub:2[grub_platforms_pc]
+	!minimal? ( x11-libs/wxGTK:${WX_GTK_VER} )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/WoeUSB-${PV}"
+
+src_prepare() {
+	default
+	find . -type f -print0 | xargs -0 sed -i "s/@@WOEUSB_VERSION@@/${PV}/" || die
+	if ! use minimal; then
+		setup-wxwidgets
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	! use minimal && default
+}
+
+src_compile() {
+	! use minimal && default
+}
+
+src_test() {
+	! use minimal && default
+}
+
+src_install() {
+	if use minimal; then
+		dosbin src/woeusb
+		einstalldocs
+	else
+		default
+	fi
+}