gentoo resync : 28.04.2019

20 files changed, 477 insertions, 117 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index a287d2b6bd8e..62376ba7defb 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index bf5e8043a779..e837f78c364f 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -9,8 +9,10 @@ AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2121 BLAKE2B 398195f59537d40a4f61eadf5be9
 AUX grub.default-3 2532 BLAKE2B f59b8e862b7069603a975327d51507aae4568bfc80d7aa237f620008b00520a5a14b0c95e3f9c277360e1dfafc83bcc815970b47a69bf469ad7e594956f47c60 SHA512 2faf5e730331b7d04045ee64d990227ef02f1b14a1cf88b5b71a18c91a9a8cba773a601eb3f5442092f6937935efed02629a278bd6822fac60f9c72045e4b13d
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
 DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
+DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3
 DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3
 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
-EBUILD grub-2.02-r3.ebuild 7989 BLAKE2B e2b0f83371bb78715e19074d7e4c7761357b1475856afce13184214403df205c3b2d010c8a7fde754aa05257f3ab3624c9a9a1a76e198e8d5849f5e9443a7bdd SHA512 64d71a99cd808c4c430f110a4c3d4d4c8e400b8a018df34b61b8876afbe5f2ef9067f885cdc6e8139f427d3c4222c25ac35eef06d376f2ea36ffd897c8a2788b
-EBUILD grub-9999.ebuild 7760 BLAKE2B dae14cc051202ad4d108fa87c0a807eb6e56a37f5e8ee9d3856d2a906253fe613525f55b48687c66cb56fd95c0b2325fb3239f7c537b62cf3357ffdeecca4cc8 SHA512 6ce034bc107994049df25ebff3909da4bbf6ee5d5619836c7824ebfeda7e7e7d8d7352afacae662a270d9715e6b2ed9ae1e0b5cef37963b7bc9851cef9edf410
+EBUILD grub-2.02-r3.ebuild 7983 BLAKE2B 68cafd89dafd6c623422e47012643f68ea20b66c5f87817625a34a5a019c62079e1832ef34fc2eb78c308543bd082cd9662f3002ddd6041a49bb4e88761b5058 SHA512 79a1463b4a47efc00b8ba73a1876f12cdca5ca3cfc7a4711044c310eddb24484b2603ba131ed598dac96b4a3e94b2f36cc0b9288b2998dd936433cf1a615ed23
+EBUILD grub-2.04_rc1.ebuild 7776 BLAKE2B b1463eb677b030af63b3191983ce2dbe19e0318b4139eb1652c7992aab0e53a3ade17383b03452ee748364192cd40d656f52fe60e22daf96a95994fd3d9bd128 SHA512 7e71680b2b23865450d051b1c424d3dec9dbfd1eea3b0b01ec0fc5470f453e1f4dab771ecbcf3194c2bb7dceb4ed5f880bb54315b71b11f5d75094b9b42dbe3d
+EBUILD grub-9999.ebuild 7764 BLAKE2B e10ed35013b2432695b780b6ab59c0f8338b6d3a1eb78eb9cc54de3ab82ed562d7d5d6221477ebf48af293b13c7b82deb64e0617d4bc31c17f8000816020eef6 SHA512 d73f8f8ea009c67d50daa57461a7cf0fbb90e693a0bd2585ca85b4fb73ef619d69c9c814c55cbd8db79424e5bbc87022568ae5d8df99f740dad9761fdd6cc483
 MISC metadata.xml 1149 BLAKE2B c0a364b1d8139f26f7dd09ba49dd68d591c7532e2eec25dae97caea49be8bfc92c8d5c69dcc77d89f58367fa04a73526cc55768f93222effc6c6e47a52b53500 SHA512 45d0425236957395e275bd340aeabfcd03451b037c616c54cf8babdc3bdee6aa3706fa7565f595ba4391773d331353b8920a627094c01289935a1a9aedc1f7bf
diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild
index 8067036a24cc..343fae3197de 100644
--- a/sys-boot/grub/grub-2.02-r3.ebuild
+++ b/sys-boot/grub/grub-2.02-r3.ebuild
@@ -7,7 +7,7 @@ GRUB_AUTOGEN=1
 GRUB_AUTORECONF=1
 
 if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+	PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 	inherit python-any-r1
 fi
 
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
new file mode 100644
index 000000000000..4c20d004b21d
--- /dev/null
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999  ]]; then
+	GRUB_AUTORECONF=1
+	GRUB_BOOTSTRAP=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+	PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+	inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+	WANT_LIBTOOL=none
+	inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+	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="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+	else
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+		S=${WORKDIR}/${P%_*}
+	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.0.01
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+	grub_platforms_coreboot? ( fonts )
+	grub_platforms_qemu? ( fonts )
+	grub_platforms_ieee1275? ( fonts )
+	grub_platforms_loongson? ( fonts )
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	app-misc/pax-utils
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/help2man
+	sys-apps/texinfo
+	fonts? (
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	test? (
+		app-admin/genromfs
+		app-arch/cpio
+		app-arch/lzop
+		app-emulation/qemu
+		dev-libs/libisoburn
+		sys-apps/miscfiles
+		sys-block/parted
+		sys-fs/squashfs-tools
+	)
+	themes? (
+		app-arch/unzip
+		media-libs/freetype:2
+		virtual/pkgconfig
+	)
+	truetype? ( virtual/pkgconfig )
+"
+COMMON_DEPEND="
+	app-arch/xz-utils
+	>=sys-libs/ncurses-5.2-r5:0=
+	debug? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	libzfs? ( sys-fs/zfs )
+	mount? ( sys-fs/fuse:0 )
+	truetype? ( media-libs/freetype:2= )
+	ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+	ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+	grub_platforms_xen? ( app-emulation/xen-tools:= )
+	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+"
+DEPEND="${COMMON_DEPEND}
+	${BDEPEND}
+	static? (
+		app-arch/xz-utils[static-libs(+)]
+		truetype? (
+			app-arch/bzip2[static-libs(+)]
+			media-libs/freetype[static-libs(+)]
+			sys-libs/zlib[static-libs(+)]
+			virtual/pkgconfig
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		grub_platforms_efi-32? ( sys-boot/efibootmgr )
+		grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	)
+	!sys-boot/grub:0 !sys-boot/grub-static
+	nls? ( sys-devel/gettext )
+"
+
+RESTRICT="strip !test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		pushd "${P}" >/dev/null || die
+		local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+		local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+		git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+		git-r3_checkout "${GNULIB_URI}" gnulib
+		popd >/dev/null || die
+	fi
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i -e /autoreconf/d autogen.sh || die
+
+	# Nothing in Gentoo packages 'american-english' in the exact path
+	# wanted for the test, but all that is needed is a compressible text
+	# file, and we do have 'words' from miscfiles in the same path.
+	sed -i \
+		-e '/CFILESSRC.*=/s,american-english,words,' \
+		tests/util/grub-fs-tester.in \
+		|| die
+
+	if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+		python_setup
+	fi
+
+	if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+		eautopoint --force
+		AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+	elif [[ -n ${GRUB_AUTOGEN} ]]; then
+		./autogen.sh || die
+	fi
+
+	if [[ -n ${GRUB_AUTORECONF} ]]; then
+		eautoreconf
+	fi
+}
+
+grub_do() {
+	multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+	multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+	local platform
+
+	case ${MULTIBUILD_VARIANT} in
+		efi*) platform=efi ;;
+		xen*) platform=xen ;;
+		guessed) ;;
+		*) platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	case ${MULTIBUILD_VARIANT} in
+		*-32)
+			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+				local CTARGET=i386
+			fi ;;
+		*-64)
+			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+				local CTARGET=x86_64
+				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+			fi ;;
+	esac
+
+	local myeconfargs=(
+		--disable-werror
+		--program-prefix=
+		--libdir="${EPREFIX}"/usr/lib
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		$(use_enable debug mm-debug)
+		$(use_enable device-mapper)
+		$(use_enable mount grub-mount)
+		$(use_enable nls)
+		$(use_enable themes grub-themes)
+		$(use_enable truetype grub-mkfont)
+		$(use_enable libzfs)
+		$(use sdl && use_enable debug grub-emu-sdl)
+		${platform:+--with-platform=}${platform}
+
+		# Let configure detect this where supported
+		$(usex efiemu '' '--disable-efiemu')
+	)
+
+	if use fonts; then
+		ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+	fi
+
+	if use themes; then
+		ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	fi
+
+	local ECONF_SOURCE="${S}"
+	econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# Bug 508758.
+	replace-flags -O3 -O2
+
+	# We don't want to leak flags onto boot code.
+	export HOST_CCASFLAGS=${CCASFLAGS}
+	export HOST_CFLAGS=${CFLAGS}
+	export HOST_CPPFLAGS=${CPPFLAGS}
+	export HOST_LDFLAGS=${LDFLAGS}
+	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+	use static && HOST_LDFLAGS+=" -static"
+
+	tc-ld-disable-gold #439082 #466536 #526348
+	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+	unset LDFLAGS
+
+	tc-export CC NM OBJCOPY RANLIB STRIP
+	tc-export BUILD_CC # Bug 485592
+
+	MULTIBUILD_VARIANTS=()
+	local p
+	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+	done
+	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+	grub_do grub_configure
+}
+
+src_compile() {
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
+	grub_do emake
+	use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+	# The qemu dependency is a bit complex.
+	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+	grub_do emake check
+}
+
+src_install() {
+	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+	einstalldocs
+
+	insinto /etc/default
+	newins "${FILESDIR}"/grub.default-3 grub
+}
+
+pkg_postinst() {
+	elog "For information on how to configure GRUB2 please refer to the guide:"
+	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+	if has_version 'sys-boot/grub:0'; then
+		elog "A migration guide for GRUB Legacy users is available:"
+		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may consider installing the following optional packages:"
+		optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
+		optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
+		optfeature "Enable RAID device detection" sys-fs/mdadm
+	fi
+}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1a0431125250..38c9444f69aa 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999  ]]; then
 fi
 
 if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+	PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 	inherit python-any-r1
 fi
 
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 		S=${WORKDIR}/${P%_*}
 	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
diff --git a/sys-boot/netboot/Manifest b/sys-boot/netboot/Manifest
index 3de472080cd5..55bdaee07853 100644
--- a/sys-boot/netboot/Manifest
+++ b/sys-boot/netboot/Manifest
@@ -1,4 +1,5 @@
 AUX netboot-0.10.2-ldflags.patch 1208 BLAKE2B e9b6bbfafbb05341d807bde22c0b54a99e17b8f8370065bd8ba8bb20ebfb3cf3495205fd70397303c8e1abdb485b336710f1d1d7ab8aeef4feb6befba91bfcfe SHA512 ab96af0ddd9956c293cf1088597b543e312bb10f535b26e379692dd94b14a34f56d9ee71c1c82e6946702d69f1665a92acff42afe4d0036d56f28c533f8f1bd3
 DIST netboot-0.10.2.tar.gz 1457791 BLAKE2B bd7fbaa1c87990ebac3dfb22f947146b19c199ceb579d32ded9a58bed6bcae34b02a1bf9cf5c079ba389ba24ca6f89fb6b4faf0b3ed028f9fe56b8dc083d8507 SHA512 422e78833c36e9975a77226523e14ebf8b5af5c02e98628ee030459ebf9f26d020551265899e84ea27bf6ab43c4d9bf8edc6722f942f49103bac897c7cc4fa3e
+EBUILD netboot-0.10.2-r1.ebuild 1650 BLAKE2B 47566aef05d0679ab869aefec982c9f1e1f60c8f61170561ed0d9dc2a946869e01ea855aa79fc88a72a94df776b07296a2550ebd49bae92233f058fc34c72c34 SHA512 e0ec5ff39d7ad2fde3216657e2f10a5c178570c1f1b899ab1cac8dea0db5560b4bc96a2d95f23fd196c776d9eddf599b3523d2cd64a793ea4d020bc17009af77
 EBUILD netboot-0.10.2.ebuild 1116 BLAKE2B 585efcea4dd20dfb07605e41b1dfeb44f81edc8ab2952198258156d18d87a1849c6cf7b6f511eb19353625c6f549d779e72b425ed302535301b0c14c711524d7 SHA512 13c6c05c03f5878a7f883bd5140182495b154bcc66b3125d769f751e90ecba83e56cb851f364c0c06b6e2d7618057b3a8fcbb499af108b20deb5ecddece312b2
-MISC metadata.xml 244 BLAKE2B a6df47dff32404b3f421b4cad7e6e4bd40fe7390ee48f379327c710b09569f46710b21eeeed3a74f2f1aa59c1797c6c766c4cf0a1e2a273aacdfae89c67a987c SHA512 fad9a4d73b1f625842d6ee8f3db1cadd4db9c32cd8c67b4caf8b3825ff5305b80a7319e2912c7113468bbb43751b102d3dce4df195b4d6c8db1de8fa2523cf52
+MISC metadata.xml 960 BLAKE2B f2262581782a9583c19256558cef60be3524fcdf054ccb0a80497bb5c284b7101071ebf258b4ae4f8c26e2085c47fff2b59701a3f25b4b2dbb6a13c545bb1ae3 SHA512 a7df07a46e8bd89d1a32f4def00f91956c63c0452f46b5482b5f26e579f0509f0f4ca736127c9c88bc83c34c9d849bbd3be7992ef57faa766251f63139e7aa22
diff --git a/sys-boot/netboot/metadata.xml b/sys-boot/netboot/metadata.xml
index 7fcd5c3e9ed2..51c8a76d3fe5 100644
--- a/sys-boot/netboot/metadata.xml
+++ b/sys-boot/netboot/metadata.xml
@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Netboot enables a computer with a compatible CPU to boot without access to a hdd or floppy.
+		The computer has to be equipped so it can load the operating system over an IP network from a server.
+		All tools required for this are included in the netboot package. 
+	</longdescription>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/netboot/bugs/</bugs-to>
 		<remote-id type="sourceforge">netboot</remote-id>
 	</upstream>
+	<use>
+		<flag name="bootrom">Install the bootrom binary for creation of rom files, which can be used for booting via floppy or rom.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-boot/netboot/netboot-0.10.2-r1.ebuild b/sys-boot/netboot/netboot-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..64a626b55466
--- /dev/null
+++ b/sys-boot/netboot/netboot-0.10.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Allows to remote boot a computer over an IP network"
+HOMEPAGE="http://netboot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb +bootrom +lzo odbc static-libs"
+
+DEPEND="
+	berkdb? ( sys-libs/db:= )
+	lzo? ( dev-libs/lzo:2= )
+	odbc? ( dev-db/unixODBC:= )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# Respect users LDFLAGS
+	eapply "${FILESDIR}"/"${P}"-ldflags.patch
+
+	# Don't	install	support	binaries into libdir
+	sed -e "152s:nblibdir:bindir:" -e "153s:nblibdir:bindir:" -i misc/Makefile || die
+
+	# Don't install perl script into libdir
+	sed -e 's/nblibdir/nbmiscdir/g' -i mknbi-dos/utils/Makefile || die
+
+	# Don't install vim syntax file, as it will be installed manually
+	sed -e '/mgl.vim/d' -i mknbi-mgl/Makefile || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datadir="/usr/share/netboot"
+		$(use_with berkdb berkeley-db)
+		$(use_enable bootrom)
+		$(use_with lzo)
+		$(use_with odbc)
+		$(use_enable static-libs static)
+		--with-gnu-as86="$(tc-getAS)"
+		--with-gnu-cc86="$(tc-getCC)"
+		--with-gnu-ld86="$(tc-getLD)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# mknbi fails with parallel build
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins "${S}"/mknbi-mgl/misc/mgl.vim
+
+	dodoc README doc/{HISTORY,PROBLEMS,README.*,Spec.doc}
+
+	docinto flashcard
+	dodoc FlashCard/README FlashCard/*.ps
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-boot/quik/Manifest b/sys-boot/quik/Manifest
deleted file mode 100644
index eede1a02f525..000000000000
--- a/sys-boot/quik/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX headers.patch 991 BLAKE2B 7e56ed2481b32647b403852c3431ddaa104dbce855c958df310d49bccd7b41293d4a4ea5fc5cb82e3d75f3513237795b02d3b362e7f392d0474a38ce2947389a SHA512 8cc1f3e41248198bb08c3f70d00e340318bdf11d9d03a8c76eba2a88d67a40265f31ad6b77076b597e37edce5fc64943d09d7d32551b179a598261c6691fc01e
-AUX md-fix.diff 392 BLAKE2B 2494305806de1d652a1ac8e1f39046e7e7974d3840863f1df292203b8f8cb0ce34a39db02d5d803373fbb619934493dd8f865f0786421666646b098db43f6a1d SHA512 b118693bb6c230fba7e371e3de2ae19f2d82760558b27e12c8bc4d3e1764225c1120104e11660ab2692b39a65e9b574af599cec62e81e7051c73e102acc6a2fd
-DIST quik-2.1-6.ydl4.src.rpm 91961 BLAKE2B 3398e2278e7700e8da6a68fec135006959eda47663bf0403c041710b3edfd5cc7243a79f84464f0bf8ae91e025df5407e159710bd3ee693d9513f04dbf926fee SHA512 92cdea02afd5053fb51b390e79f4d2d404691be5de9ea3d9c88739fc4fa993b68a017be10ff1b5fa359f8c5493f34d0d743975f5ce99525bdaf5921b0146aa63
-EBUILD quik-2.1.6.ebuild 961 BLAKE2B 635adc6b7b5c548aebe7410d459966d496d2ca86004aa2e1baac015c24f0c08037d72c8c92889968525d1ac510ca4bbdd1a92d6202d330c5bf3b307d1ffdec6f SHA512 9f5bfb746e8e93f13e5aff093f3f2f1da65c9228aabda47f160b18687ebab296bf57d83edb51ba50d264e1cdc4bb3e7af06d899b1a804e13f7c84d2abc8b0d8c
-MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-boot/quik/files/headers.patch b/sys-boot/quik/files/headers.patch
deleted file mode 100644
index eccfba698e17..000000000000
--- a/sys-boot/quik/files/headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- util/elfextract.c.bak	2006-12-04 23:08:33.000000000 -0500
-+++ util/elfextract.c	2006-12-04 23:08:45.000000000 -0500
-@@ -6,7 +6,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #define __KERNEL__
--#include <linux/elf.h>
-+#include <elf.h>
- 
- FILE *fi, *fo;
- char *ni, *no;
---- second/quik.h.bak	2006-12-04 23:10:08.000000000 -0500
-+++ second/quik.h	2006-12-04 23:10:12.000000000 -0500
-@@ -26,7 +26,7 @@
- int tolower(int c);
- int stricmp(const char *s1, const char *s2);
- int strncmp(const char * cs,const char * ct,size_t count);
--int strlen(const char *s1);
-+// int strlen(const char *s1);
- char *strcpy(char * dest,const char *src);
- char *strncpy(char * dest,const char *src,size_t count);
- char *strchr(const char * s, int c);
---- second/misc.c.bak	2010-02-09 22:18:47.000000000 -0500
-+++ second/misc.c	2010-02-09 22:18:52.000000000 -0500
-@@ -11,7 +11,7 @@
-  */
- #include <linux/kernel.h>
- 
--#include <asm/page.h>
-+// #include <asm/page.h>
- 
- #include <sys/types.h>
- #include "setjmp.h"
diff --git a/sys-boot/quik/files/md-fix.diff b/sys-boot/quik/files/md-fix.diff
deleted file mode 100644
index 2319397d93f1..000000000000
--- a/sys-boot/quik/files/md-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/quik_md.h.bak	2005-05-27 00:42:36.000000000 +1000
-+++ include/quik_md.h	2005-05-27 00:42:43.000000000 +1000
-@@ -88,8 +88,6 @@
- #define BOOTDEV(dev,i) ((dev)->devs[(i)]->bootdev)
- #define SPART(dev,i) ((dev)->devs[(i)]->spart)
- 
--dev_info_t * new_dev_info (unsigned char);
--void free_dev_info (dev_info_t *);
- int md_get_version (int);
- mdev_info_t * md_get_info (const char *);
- 
diff --git a/sys-boot/quik/metadata.xml b/sys-boot/quik/metadata.xml
deleted file mode 100644
index 5eb05198076b..000000000000
--- a/sys-boot/quik/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-boot/quik/quik-2.1.6.ebuild b/sys-boot/quik/quik-2.1.6.ebuild
deleted file mode 100644
index 1a0ca2e1926f..000000000000
--- a/sys-boot/quik/quik-2.1.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs mount-boot eutils
-
-MY_PV=${PV%.*}-${PV#*.*.}
-
-HOMEPAGE="http://penguinppc.org/bootloaders/quik/"
-DESCRIPTION="OldWorld PowerMac Bootloader"
-SRC_URI="http://www.shiner.info/files/Yellow%20Dog%20Linux%204/quik/quik-${MY_PV}.ydl4.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cd "${WORKDIR}"
-	rpm2targz "${DISTDIR}/quik-${MY_PV}.ydl4.src.rpm"
-	tar -xzf "${WORKDIR}/quik-${MY_PV}.ydl4.src.tar.gz" || die
-	tar -xzf "${WORKDIR}/quik_2.1.orig.tar.gz" || die
-
-	cd "${WORKDIR}/quik-2.1"
-	epatch "${WORKDIR}/quik_2.1-6.diff.gz"
-	epatch "${FILESDIR}/md-fix.diff"
-	epatch "${FILESDIR}/headers.patch"
-}
-
-src_compile() {
-	cd "${WORKDIR}/quik-2.1"
-	emake || die
-}
-
-src_install() {
-	cd "${WORKDIR}/quik-2.1"
-	DESTDIR=${D} make install
-	prepman /usr
-}
diff --git a/sys-boot/raspberrypi-mkimage/Manifest b/sys-boot/raspberrypi-mkimage/Manifest
index f788d19b8f80..43fb287a25f7 100644
--- a/sys-boot/raspberrypi-mkimage/Manifest
+++ b/sys-boot/raspberrypi-mkimage/Manifest
@@ -3,5 +3,5 @@ AUX raspberrypi-mkimage-0_p20120201-boot-uncompressed.txt 201 BLAKE2B aec1ca6637
 AUX raspberrypi-mkimage-0_p20120201-imagetool-uncompressed-python3.patch 224 BLAKE2B 6b758469b620406246ff19a911271e60d20c31b573a17b45193dbf5df68a623d80400c72f5ff75a25388ab72c1e9dff9e18a516ed3112b2f2c55f63031ff492d SHA512 338a39f6050b1f49640aa42b6100bdaea965d44f541d57ea5758efe83f0ba4749b135f20474a14d66ebd8c46a22d4db4ed87bdbd849b04421a067f5376dfa9dd
 AUX raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.patch 1294 BLAKE2B 2c64091cca326a285dababae93a3f5a7ff40b9684717c8c5c49514ba5b13c119da1f05b568b68bbe25d1cc606788c5a9fc515cd8278b26406f87b3b98b857c4c SHA512 71495224bbe3d5064eda438f2d5534422a5e94be8d0a47a4020feab62a67fdebe6a29ced6b97aea970e505edeebd43a8aa9642198979ad57293b6d6cf4221633
 AUX raspberrypi-mkimage-0_p20120201-imagetool-uncompressed.py 822 BLAKE2B 10897863e4a6177c0a646c85ed4d835b6971b4ff1eeb296a7022b3c874020b2350c0ebf2a3c16f6ce1422ac442b95c9fa30e626bec0e616ba34253ea09a6175a SHA512 00a3e1936b44e7a3c73b3ca0fc9597016a31dce869da04101785c1e5fd0987747a828092335402820cba96caae1c9d463a9bba6a5ec1e4ccc89bb6a31f025c5c
-EBUILD raspberrypi-mkimage-0_p20120201.ebuild 1194 BLAKE2B 83dc83e893d35441438f2228f4236b0562f9d9698e81ca2c932355a833017bb0218ff119ff8b29052012d04dd77266d28961e9b06ec659fb02415a4fe505de6b SHA512 29018cc42f1d43178adeb2c2030e642f8147da9cc82aafb9327c1d784dd1c3a26849c9cc02e6f33282a18684f896d15a33d53a23b8cee72433bda85fd0f787ed
+EBUILD raspberrypi-mkimage-0_p20120201.ebuild 1187 BLAKE2B ac16ac19113d9af2e6cac715a48671b58ff907fde43ea5973f6d06e55158e1940ce66c54f0790f47440c6b9acd1c7c2a19e559cbabdf3c436b7c440957816ae2 SHA512 e4232f08397d4f55f8f041598d0eb11e472a7cc3fa2801497ecbc3ad8ea05cd4d4eeeed31f96e1275f2483c409cf0f259aefad8938ec52c51bf976258fcb1299
 MISC metadata.xml 249 BLAKE2B 4a52a1f36d321e29fdfc7b2b391378a0fc64e56cb593df93d3bc522d327e6c438a6312cdc21f04c72242c53760f4de8cd82255499bddc53f0761c4991a61eb7b SHA512 10102614b4f775e819bdadb9db011535be6e16de0c06fbcdeddf16a45b65f0aaac58d5ae2899e9e69a6460ddcae2c1673a578bb7b30d6035c7697d872cf95baa
diff --git a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
index 202e65282d26..98b8003fea59 100644
--- a/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
+++ b/sys-boot/raspberrypi-mkimage/raspberrypi-mkimage-0_p20120201.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 4f6b94eb652a..771fc9dbf2ed 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -5,5 +5,5 @@ AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b23
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 EBUILD systemd-boot-239.ebuild 2424 BLAKE2B ec26000bf32d10242e876af86e401d249c64c58519bd2855d793d2809395b72355f4656e5a1ab5a68c0c10dff9a9fe7bc0034449a357c5322db7ad05d1078d54 SHA512 c5d2be59f5ff81923f86330f4ddba7449663ddcba332fa39373e541a92c032f481a860defaf1ea7e7306b700f7fa16ee105bf7ac517afa4dbd3670c87ddb8730
-EBUILD systemd-boot-241.ebuild 2366 BLAKE2B 36679a7987086e2e43213c7aacda8f8336d01ef2a777a8866613b9a40a6571fef279c368366efb5712b8b9305ccf648a7156fc5310d52736410cb45426d65b3b SHA512 13d20e7f96054ce489151a8c2232d5fabcb10865e5b7222e46a933752c6fd911708f4a8320a54fe4fad70b443eeaaf41688bcbe6953512067ae984f4712af4b6
+EBUILD systemd-boot-241.ebuild 2352 BLAKE2B bcc51f97daccf09f929ff56947733721a70c87e5a8842a2c3d3e2fba23dc28a9cd46e16f4b39a5b56ae4707dbfcf61ea346d7d313024378fd8c97361d574da99 SHA512 26949284b57ba3ec387984293e6646f9a9eab168659c33c1c24e16e3ffd00603e4bea39f7d8c74fc1cc4da37cf75ce9f27ff1a036ae8612b130a94182ae0017d
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-241.ebuild b/sys-boot/systemd-boot/systemd-boot-241.ebuild
index f30a18426987..99dbbaa4668a 100644
--- a/sys-boot/systemd-boot/systemd-boot-241.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-241.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
 	dev-libs/libxslt:0
 	>=dev-util/intltool-0.50
 	dev-util/gperf
-	dev-util/patchelf
+	>=dev-util/patchelf-0.10
 	virtual/pkgconfig
 "
 COMMON_DEPEND="
@@ -67,7 +67,6 @@ src_configure() {
 		-Dlibiptc=false
 		-Dlz4=false
 		-Dmicrohttpd=false
-		-Dmyhostname=false
 		-Dpam=false
 		-Dqrencode=false
 		-Dseccomp=false
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 84402cd0dfea..6535b856b69a 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,5 +1,7 @@
 DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965
 DIST woeusb-3.2.12.tar.gz 386189 BLAKE2B 53629a185d0b8ff55cb2e60eaa6cb8f9e106d3f5b24f57cf8f777dbf5b9a1e43ed423e53e4710acf9ac5ce3171da7dbfcd40b5b3f297b0db240e7c0f9a687fc0 SHA512 9a4e20003970a3313b080bde9a534fb1724382555281aa510092a3698622dae46f22483ff8968903b5685e00ebfb454718de6db7f3c61c4a2e122c961bfc270f
+DIST woeusb-3.3.0.tar.gz 386251 BLAKE2B 9767fc3ab3ae438ff126c05a197cb41550704b93f3b508ad88b7a39c74777fdd863794970ebc839f79f8b2f1da9f6041bb355783ec1040e31814fead8185439c SHA512 8cac015df2309e4978f38adae9b9da04d896301f8d9d971d3d21801b24c3287d7d405bc4b2b1e0ff285497b5777462eb8cd6ce7dce079daf49b4d5d313a449a3
 EBUILD woeusb-3.1.5.ebuild 1036 BLAKE2B 05f973a5a8fd401e9555b5d87cb961a78d0383c8944eabdd35387bb4edb0897eeb184d379647496b6765bcce1d1016cf7d5baa6abba89b6ba1483a91b090b4b8 SHA512 1c8b86ec2a14ff16ad6e82616ff2430b1a364a68ef00b03a330240800ded5e55e1ca0f518523a7c792955846a35b372b396c804c29e1b68c479ec8a49d600671
-EBUILD woeusb-3.2.12.ebuild 1038 BLAKE2B 372b8f269cd8e8e65df8ecce53d8a7838a7baae4da64147e900afe5aeaa7bdc19968aeef120bd17269d48cfdb602b521bbbd4da5dcdc2a503070d270d8c60d85 SHA512 89f65e4f0ef0e5deb11c2aae51d4d4dc55cba9db3751aa34046dd7c6a48691316e1be4a7f3e5644e5202ff4b1bdfd318e44c6ab87700fe4ea07575decd994a7a
+EBUILD woeusb-3.2.12.ebuild 1037 BLAKE2B a313a501084e00528b88ff067b7e38d21b2e11709c99cf06770b2cb92ea45b8a6a46b81eb29bdf50b0c0a5a0407b98ac5f0d90d0d754a354717cf6b86a38e2e4 SHA512 23f50d37d9df5da7cba8760cc39a5c1197024616f546c5de37d8f99741d3e06420a0ebec21f96bc788c572cab8badc09b149775740d1efe8cfa7b2efb3adf3e1
+EBUILD woeusb-3.3.0.ebuild 1038 BLAKE2B 372b8f269cd8e8e65df8ecce53d8a7838a7baae4da64147e900afe5aeaa7bdc19968aeef120bd17269d48cfdb602b521bbbd4da5dcdc2a503070d270d8c60d85 SHA512 89f65e4f0ef0e5deb11c2aae51d4d4dc55cba9db3751aa34046dd7c6a48691316e1be4a7f3e5644e5202ff4b1bdfd318e44c6ab87700fe4ea07575decd994a7a
 MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.2.12.ebuild b/sys-boot/woeusb/woeusb-3.2.12.ebuild
index 81c09abcf2ef..cad25750e3c4 100644
--- a/sys-boot/woeusb/woeusb-3.2.12.ebuild
+++ b/sys-boot/woeusb/woeusb-3.2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="minimal"
 
 RDEPEND="
diff --git a/sys-boot/woeusb/woeusb-3.3.0.ebuild b/sys-boot/woeusb/woeusb-3.3.0.ebuild
new file mode 100644
index 000000000000..81c09abcf2ef
--- /dev/null
+++ b/sys-boot/woeusb/woeusb-3.3.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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}[X] )
+"
+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
+}