gentoo resync : 24.07.2021

6 files changed, 14 insertions, 113 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 8a5aabd915a9..b9892d53113b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 443d9226102a..2629024db2b8 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -6,6 +6,5 @@ AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
 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-r4.ebuild b/sys-boot/elilo/elilo-3.16-r4.ebuild
deleted file mode 100644
index 8a796f6bd916..000000000000
--- a/sys-boot/elilo/elilo-3.16-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-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/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 6365bd8f3773..b715b641df42 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,5 +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
-EBUILD woeusb-5.1.2.ebuild 699 BLAKE2B 53a49822ed6b709665b30e012da3c08a1c9c67481caca1e223b81f618b4f559692bfeac7246104c92d06b28401584b4b413268d945a6b5f6687e1c7f445f223f SHA512 5869c9f80674c7d419276c6b7f4d032f486fba312626a7529a28cfc0da61d6f4297cfe97a81f8a4ac57f8dc17910aaafbfca190310b2b4898b63b22c366e0d58
-MISC metadata.xml 473 BLAKE2B c799db6c2eb4a7c3ce65860cb5deabdd9ce211015dbb22a6bc5ba641081cd08114b15f82beb095813673835aa7bbe79243cb054bca8439769a9f9630d59f6fba SHA512 b39ae796636cf8f7c368a74cc497ab9a1be27a3b94b50a391c6aa5c4b1a8ee8c726e6733c8745021e5d0305652182ebc25edfd2a2ce2593b561483f68f19b4f3
+EBUILD woeusb-5.1.2-r1.ebuild 748 BLAKE2B 1cea90984c3793b29f66ca62c8197dde0d6b929847ed1a6852e678fc4c25e414d18311299d94b2fba50126a5217cf470e13e6f0c7c2ea5bf101eecd633554f21 SHA512 458bea42c3e862d94e8d4fdd05cc7d83c13dc8f42f0e3b619b55c406b0fb6d08cee354e9fbf4a9bc770fc9fa96dcc0bae9dd8fc95049fe1b7f8e8294371d373d
+MISC metadata.xml 245 BLAKE2B bfd23a6ca9bbc58d5bcda7f3a62e7edb6b9f2faa37ea34a72a5044dcd5849cdda0d2d67a1bf52cbaab31092316177f241eed584ac711bc79e4f62b7cf463da3f SHA512 24267d023f9a39c29ca4c3db77b59f33f55b0ecc5730fd239c9f9f1da1576b7fe9c50939a72b516ad71d9945c515a5898555641f8a08254aea140343cb2c0e93
diff --git a/sys-boot/woeusb/metadata.xml b/sys-boot/woeusb/metadata.xml
index 1974cac0c1ce..2e286e79255c 100644
--- a/sys-boot/woeusb/metadata.xml
+++ b/sys-boot/woeusb/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">WoeUSB/WoeUSB</remote-id>
 	</upstream>
diff --git a/sys-boot/woeusb/woeusb-5.1.2.ebuild b/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild
index 77f857db0839..4f1d25c96d02 100644
--- a/sys-boot/woeusb/woeusb-5.1.2.ebuild
+++ b/sys-boot/woeusb/woeusb-5.1.2-r1.ebuild
@@ -3,16 +3,14 @@
 
 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"
+S="${WORKDIR}/WoeUSB-${PV}"
 
 LICENSE="CC-BY-SA-4.0 GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="test" # No test suite
 
 RDEPEND="
 	app-arch/wimlib
@@ -20,13 +18,18 @@ RDEPEND="
 	sys-block/parted
 	sys-boot/grub:2[grub_platforms_pc]
 	sys-fs/dosfstools
-	sys-fs/ntfs3g
-"
+	sys-fs/ntfs3g"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/WoeUSB-${PV}"
-
 src_prepare() {
 	default
-	sed -i -e "s/@@WOEUSB_VERSION@@/${PV}/" sbin/"${PN}" || die
+
+	sed -i "s/@@WOEUSB_VERSION@@/${PV}/" sbin/${PN} share/man/man1/${PN}.1 || die
+}
+
+src_install() {
+	dosbin sbin/${PN}
+	doman share/man/man1/${PN}.1
+
+	einstalldocs
 }