gentoo resync : 17.07.2021

10 files changed, 144 insertions, 94 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 74a0a0f7b373..8a5aabd915a9 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index c974f543daa8..443d9226102a 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -7,4 +7,5 @@ AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
 EBUILD elilo-3.16-r4.ebuild 2277 BLAKE2B 7b29d8511271cf92005dcc7a936c599843c8988182f7261edfa2afb6231918110bc13f2abb5c232d1c1b03f76d45dc364c31d80654eaef45571c1e78c031f094 SHA512 fd87496911f805e11ddb83ea44bc246812329bc236582c2d9ba2ac48ef50b4bcaad84b2db34f0628d35282df141f0ad95028a93b4103b550d6412d07a51c3c58
+EBUILD elilo-3.16-r5.ebuild 2268 BLAKE2B 2f0863a55a5fa846a8f81afcefb37b1ed00403985bd7cfa427505b1d52967adf9e6fd554ea4f3ec6fa941d22e59a9214e2bd4104238d37474f72f6a6a4c7563a SHA512 7d33c42bba010f6bee117e2349459d7b376b034961f430470906d13288a89ad17f5fbbd04bb0462330b6fec7893594f5f3fc7c3811132988fce9b6c4c037bab4
 MISC metadata.xml 326 BLAKE2B cc7b85b290136d54ab8857ad992bef9eca8cbb607949a50ff090ddfbbab704d87d3e028415845fddc57ea984215dfe0048d1a219dcd386dcf1c1062f657f5db8 SHA512 e40b5a31e5e5954c817f994c6215488a34b32191cfc597e5514bef2fa1ae1e36f0aca1b7e80043e452946051885a04081875edd53d285fc557cbe3277ae3d624
diff --git a/sys-boot/elilo/elilo-3.16-r5.ebuild b/sys-boot/elilo/elilo-3.16-r5.ebuild
new file mode 100644
index 000000000000..fed811421390
--- /dev/null
+++ b/sys-boot/elilo/elilo-3.16-r5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux boot loader for EFI-based systems such as IA-64"
+HOMEPAGE="https://sourceforge.net/projects/elilo/"
+SRC_URI="mirror://sourceforge/elilo/${P}-all.tar.gz
+	mirror://debian/pool/main/e/elilo/elilo_3.14-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+
+# gnu-efi contains only static libs, so there's no run-time dep on it
+DEPEND=">=sys-boot/gnu-efi-3.0g
+	dev-util/patchutils"
+# dosfstools[compat] to enable 'dosfsck' symlink
+RDEPEND="sys-boot/efibootmgr
+	sys-fs/dosfstools[compat]"
+
+S="${WORKDIR}/${P}-source"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.16-elilo-loop.patch #299665
+	"${FILESDIR}"/${PN}-3.16-gnu-efi-3.0.6-ia64.patch
+	"${FILESDIR}"/${PN}-3.16-strncpy-clash.patch
+	"${FILESDIR}"/${PN}-3.16-FLAGS.patch
+	"${FILESDIR}"/${PN}-3.16-ARCH.patch
+)
+
+src_unpack() {
+	unpack ${A} ./${P}-source.tar.gz
+	mv debian "${S}"/ || die
+}
+
+src_prepare() {
+	default
+
+	case $(tc-arch) in
+	ia64)  iarch=ia64 ;;
+	x86)   iarch=ia32 ;;
+	amd64) iarch=x86_64 ;;
+	*)     die "unknown architecture: $(tc-arch)" ;;
+	esac
+
+	# Now Gentooize it.
+	sed -i \
+		-e '1s:/bin/sh:/bin/bash:' \
+		-e "s:##VERSION##:${PV}:" \
+		-e 's:Debian GNU/:Gentoo :g' \
+		-e 's:Debian:Gentoo:g' \
+		-e 's:debian:gentoo:g' \
+		-e "s:dpkg --print-architecture:echo ${iarch}:" \
+		debian/elilo.sh || die
+}
+
+src_compile() {
+	# "prefix" on the next line specifies where to find gcc, as, ld,
+	# etc.  It's not the usual meaning of "prefix".  By blanking it we
+	# allow PATH to be searched.
+	local libdir="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
+	emake -j1 \
+		prefix= \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		HOSTARCH=${iarch} \
+		ARCH=${iarch} \
+		EFIINC="${SYSROOT}${EPREFIX}/usr/include/efi" \
+		GNUEFILIB="${libdir}" \
+		EFILIB="${libdir}" \
+		EFICRT0="${libdir}" \
+		NATIVE_CFLAGS="${CFLAGS}" \
+		NATIVE_LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	exeinto /usr/lib/elilo
+	doexe elilo.efi
+
+	newsbin debian/elilo.sh elilo
+	dosbin tools/eliloalt
+
+	insinto /etc
+	newins "${FILESDIR}"/elilo.conf.sample elilo.conf
+
+	dodoc docs/* "${FILESDIR}"/elilo.conf.sample
+	doman debian/*.[0-9]
+}
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index b7954416ffe7..fd76e2dabe7d 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -1,7 +1,5 @@
 AUX os-prober-1.76-exherbo.patch 905 BLAKE2B e8d78b730d33b5760128eaf910f20ac01dc7db3e2b3a271279859869e3c8451e7c8dd72ed5b2784a0dfbf3f31747a81509445d3793a8ed8070a1a721b1b84186 SHA512 0c3c2e4cde868e186131b08268e6344841f0830be5bf4131e5a7ded93a222097599b0a011168e4b7bd0bc97b69ece194df1d46d98eac2c921f16b3e76d004cc8
 AUX os-prober-1.78-btrfsfix.patch 14379 BLAKE2B 5aff7aad1957966355748eafb7b1b426e81428c1de9d1053e708cccb271efe97c8728887a7dbc969a78e4ff3d92cbb0b1badf7551532030b585c5211a7308323 SHA512 deefcd22ac50b9a5cdc4609eda6cc5c58f40989c17e56a8f098f529bacfef7bb65fca9775e7ea85540b850eecfd1380d9474388644f13c47459c14bc6cbe681f
-DIST os-prober_1.77.tar.xz 26660 BLAKE2B cff8d96927cf251e9d8ee95561289e9c49a89fbcf9045e7c7169f73b1eeb151797db7b075ebc14dbbdd96996d007b07001e2843cf835defd675f63595614297b SHA512 4d9c22ccc4d950644a06a17ec4424aca5ff82aeb20052dc389dd451b6b9a1799c5a9438644a29093153730af42066abbbbb78f593f2564314c9adbd43f60e39b
 DIST os-prober_1.78.tar.xz 26848 BLAKE2B eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7 SHA512 7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
-EBUILD os-prober-1.77.ebuild 1851 BLAKE2B 1570c05454c7c27e271944a94b9d6488e5c8a37231b8559b87a46551e1445d8dc25f93c87d3345b72f36da1f80e8a16914b737fb25f2ea742c758776129da5cf SHA512 9b58de5bc06dd75de053d0a103af0cd701d2b7b3e639c9d8c9b77d90d3070506cfc83fd75ea32a123c918ca58366e1a26a1b71ec2308f38d0b4af32e98b8a3c5
 EBUILD os-prober-1.78.ebuild 2232 BLAKE2B 918f76cc26698560bf10124b36643a18783fc15471494b20ebb86b11e6ffaebf88477248651db89ac4c7cd32683cd7065b72acf0a72d1b94576a5dcb782609d6 SHA512 4219e33567ebaa6e6b293fcf36d8681d4ff99ff0d6ed2399926be671ad4eef1a1ef1a6d290b0406c56583e0b1acfe01c833365bb5362ce4be0cf0f12ba0776f0
 MISC metadata.xml 383 BLAKE2B db5402f4cacef3df1728248b8fa2bf1d817d56ea41b8049e021382502dee75e1669ad691c4c7761b53127e9d3779683e9304139e28727e2ac7f36db587eb5ea0 SHA512 52ab18611ec550ab9f95f2e9e1e406dfece82615db0f1f66d862ea19603b11e0c2a358fcf430300db972be34177e787d0867a7f9530aaf598e488e13ba517f7e
diff --git a/sys-boot/os-prober/os-prober-1.77.ebuild b/sys-boot/os-prober/os-prober-1.77.ebuild
deleted file mode 100644
index 7c4cb9daf1b6..000000000000
--- a/sys-boot/os-prober/os-prober-1.77.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Utility to detect other OSs on a set of drives"
-HOMEPAGE="https://packages.debian.org/source/sid/os-prober"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# grub-mount needed per bug #607518
-RDEPEND="sys-boot/grub:2[mount]"
-DEPEND=""
-
-# bug 594250
-QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.76-exherbo.patch )
-
-DOC_CONTENTS="
-	If you intend for os-prober to detect versions of Windows installed on
-	NTFS-formatted partitions, your system must be capable of reading the
-	NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g
-"
-
-src_prepare() {
-	default
-	# use default GNU rules
-	rm Makefile || die 'rm Makefile failed'
-}
-
-src_compile() {
-	tc-export CC
-	emake newns
-}
-
-src_install() {
-	dobin os-prober linux-boot-prober
-
-	# Note: as no shared libraries are installed, /usr/lib is correct
-	exeinto /usr/lib/os-prober
-	doexe newns
-
-	insinto /usr/share/os-prober
-	doins common.sh
-
-	keepdir /var/lib/os-prober
-
-	local debarch=${ARCH%-*} dir
-
-	case ${debarch} in
-		amd64)		debarch=x86 ;;
-		ppc|ppc64)	debarch=powerpc ;;
-	esac
-
-	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
-		exeinto /usr/lib/${dir}
-		doexe ${dir}/common/*
-		if [[ -d ${dir}/${debarch} ]]; then
-			doexe ${dir}/${debarch}/*
-		fi
-		if [[ -d ${dir}/${debarch}/efi ]]; then
-			exeinto /usr/lib/${dir}/efi
-			doexe ${dir}/${debarch}/efi/*
-		fi
-	done
-
-	if use amd64 || use x86; then
-		exeinto /usr/lib/os-probes/mounted
-		doexe os-probes/mounted/powerpc/20macosx
-	fi
-
-	einstalldocs
-	dodoc debian/changelog
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index ebf4c9fdfa3e..f7b75054f759 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -2,5 +2,5 @@ AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e
 AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
-EBUILD syslinux-6.04_pre1-r2.ebuild 3230 BLAKE2B 3660882a2e363ea40753282b37eabf2ed8ba1ee13b9220631ef2e964553f141110bc4a22380ce8d5a4541fb34df1ba0630bc01a3ee3c439f18b8bf314409f2d8 SHA512 8c3412e81543f1e2e93ae5c5b7c3a6643b3059ab0cd0eb2e630e65f07ee1ce1899ea8ca11cadc77c012809affd611736dba3eabda81a67c6082991dc2e291690
+EBUILD syslinux-6.04_pre1-r2.ebuild 3251 BLAKE2B 6a9d50d935e133a6937b55c05b5f06f53c01ea20427583b4cdf5d7d1976778d653fe77d083ac3df86d9c38ff10e01db9f735e878ebf26f99937174fe29b30b77 SHA512 621bafdbdca728e8c7abf3331e13eba7a0d672215adf7fab51225394c9ee4e433323751911a58984785a9a58d01dc393752632f3d3d28c46699201d364db20d2
 MISC metadata.xml 411 BLAKE2B d3b00622fd68d6ae1b4ba7aa30c33c790b2fbdc688637d3c573cb4496f3952a62f8ae20384badda70b9cbd4ed036e0884becd212d63ec015decc511f1ee7970e SHA512 e8256115d61eeef51be14bea35df6765b356471d145ad8e43e75e6301a4557d526af5fd99b8957fb02ecd9c4a7a0bd0d3db4790abef935887bff8a102709c518
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
index 2371fdae8151..b0ed750f5a1e 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
@@ -22,7 +22,8 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE="custom-cflags"
 
-RDEPEND="sys-fs/mtools
+RDEPEND="sys-apps/util-linux
+	sys-fs/mtools
 	dev-perl/Crypt-PasswdMD5
 	dev-perl/Digest-SHA1"
 DEPEND="${RDEPEND}
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 4e67cad98fcd..6365bd8f3773 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,3 +1,5 @@
 DIST woeusb-3.3.1.tar.gz 386399 BLAKE2B 1423ecca39018c674b0eea36de732f54cfcdd14b8cc465e6d3c0639192cbd8355436b7a39ba453b19fa6f1c5b1f6938ef12f49710bc2a4af0f2eaed967e03ce7 SHA512 e3460efabaee199eb5ffc73ca99fe2d9141ed3a5f72acd2f8910b093b2b3a93928ee4eeb27d634293448f036101d8bf24aef65dc338c80e6e3e1738004594d52
+DIST woeusb-5.1.2.tar.gz 160660 BLAKE2B 86fd0581ea2524d61ef48d9adf633d350ae214842ee8f26c2937f312fce864fa188fb40dd35e8e9b15c3eef46869f0099ee005e3c49fc219486d006357f74f09 SHA512 ee1341cdcaf203e4c5007e3ac19deb0b3bbee9e7eeb5ca9a74742d107b1b3e77e5b938d2f7de9ce23b7fba51d6a266ea26fb221300613c1c4c8d0cd4f8299f8b
 EBUILD woeusb-3.3.1.ebuild 1047 BLAKE2B 53560251d0e8cc1a50bd04fc86e4022c7056ec411f7783255198f079d36d4e1c90c3e6980751decaa81ba85327aa22e72834ec0c938770134e811ca7e2e1741a SHA512 a8f12e189cd110e7d8e5f7fb9da13b53b2478f29d07e9aca11cfb5f142fc6ed792285a1b4a73dad47e2197ea265c5983d7ed3da56e96ff11e026a376d63bd037
-MISC metadata.xml 206 BLAKE2B 34bcbd403ba7357d68ee29e45bf98a056293c51377315378def09dfa5609c349f083c127d5c8dcf69b8623de07b5d4cef13b5595d2af8ce920f770ca29621e90 SHA512 6a0d1c469bd37165942bfdf61f8e71e1243282e18f46813ad3f4e12cde7053b7c7c98a3aec5806ae139c13dab13377707dcd7ecc8954df666c15d0b606f7be79
+EBUILD woeusb-5.1.2.ebuild 699 BLAKE2B 53a49822ed6b709665b30e012da3c08a1c9c67481caca1e223b81f618b4f559692bfeac7246104c92d06b28401584b4b413268d945a6b5f6687e1c7f445f223f SHA512 5869c9f80674c7d419276c6b7f4d032f486fba312626a7529a28cfc0da61d6f4297cfe97a81f8a4ac57f8dc17910aaafbfca190310b2b4898b63b22c366e0d58
+MISC metadata.xml 473 BLAKE2B c799db6c2eb4a7c3ce65860cb5deabdd9ce211015dbb22a6bc5ba641081cd08114b15f82beb095813673835aa7bbe79243cb054bca8439769a9f9630d59f6fba SHA512 b39ae796636cf8f7c368a74cc497ab9a1be27a3b94b50a391c6aa5c4b1a8ee8c726e6733c8745021e5d0305652182ebc25edfd2a2ce2593b561483f68f19b4f3
diff --git a/sys-boot/woeusb/metadata.xml b/sys-boot/woeusb/metadata.xml
index 33ad81821b88..1974cac0c1ce 100644
--- a/sys-boot/woeusb/metadata.xml
+++ b/sys-boot/woeusb/metadata.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-	<flag name="minimal">Install only woeusb tool</flag>
-</use>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">WoeUSB/WoeUSB</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/woeusb/woeusb-5.1.2.ebuild b/sys-boot/woeusb/woeusb-5.1.2.ebuild
new file mode 100644
index 000000000000..77f857db0839
--- /dev/null
+++ b/sys-boot/woeusb/woeusb-5.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Creates windows installer on usb media from an iso image"
+HOMEPAGE="https://github.com/WoeUSB/WoeUSB"
+SRC_URI="https://github.com/WoeUSB/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # No test suite
+
+RDEPEND="
+	app-arch/wimlib
+	sys-apps/util-linux
+	sys-block/parted
+	sys-boot/grub:2[grub_platforms_pc]
+	sys-fs/dosfstools
+	sys-fs/ntfs3g
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/WoeUSB-${PV}"
+
+src_prepare() {
+	default
+	sed -i -e "s/@@WOEUSB_VERSION@@/${PV}/" sbin/"${PN}" || die
+}