gentoo resync : 10.11.2019

7 files changed, 14 insertions, 85 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index c11bb6b30686..74ba76d71bc0 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/makebootfat/Manifest b/sys-boot/makebootfat/Manifest
index 80e58441a7ba..de344d92bb31 100644
--- a/sys-boot/makebootfat/Manifest
+++ b/sys-boot/makebootfat/Manifest
@@ -1,3 +1,3 @@
 DIST makebootfat-1.4.tar.gz 146722 BLAKE2B 00ad12565951691df2e7af90ae1777c6c6e2253efc61350046cc3ece3342054267f8bdf7ec2303ee203f7af757e7bbda7843104480fb4529eeed2a33456b7f22 SHA512 638356c951670187960d0050d963116391d4b494bc9b082b3d4673188450e47f22fda5733aa09b15cfbb1640807676f5f8743dd094b9931f150b445eb8d335dd
-EBUILD makebootfat-1.4.ebuild 560 BLAKE2B d1f7e725c9cac4098a7ef3f3351a621c9a31f816c29d39883148efbd466087507533fd5589417e470940c2d8b7a39bccaaa3fb6664ff24e6782f2c205d78e127 SHA512 2b66715d20b9093e794f6f10502e16508ca40f483d0dda54ac9dfbc91366109d34a50713ad9e6466dad8625962128c3c5d59b8db785a99bd3dadc66a3cfd06f0
+EBUILD makebootfat-1.4.ebuild 536 BLAKE2B cdd0a16625a64b5a2d8213e0783bc7a2e63b3827e5d48758793274fa9afbffb27f2598dab3b1d4b83bde8e5ac80be46164c0c97d713888addc4bf1ede23dd93d SHA512 e3c409ca46c7febd2c482a185bea18d20a76978cc9e229852856fdb472f3777fcfd75d027252cb6742ace98bf65255221f81ddfe21290090a2756342289dedd2
 MISC metadata.xml 296 BLAKE2B f3d58cc444c8e92f74b67e0c1041639bdebb1dde6ed34665eeee96ddd2428e6d7631b974c9643b514f914d55fb4464bf1dba9117697fc2df9d4863168fc3ba74 SHA512 da7799c8fc7fa55a87627c32493dedaedef72d7d3e3fa2bc4eb7eff936c07774653b90c9a47602efabb7d8f9956ce0baed6bc2bb6879058b9326599fa58fbd11
diff --git a/sys-boot/makebootfat/makebootfat-1.4.ebuild b/sys-boot/makebootfat/makebootfat-1.4.ebuild
index 3e58073508c8..5482bdde364a 100644
--- a/sys-boot/makebootfat/makebootfat-1.4.ebuild
+++ b/sys-boot/makebootfat/makebootfat-1.4.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Command line utility able to create bootable USB disks"
 HOMEPAGE="http://advancemame.sourceforge.net/boot-readme.html"
 SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -16,11 +16,12 @@ RDEPEND="sys-boot/syslinux"
 DEPEND="${RDEPEND}"
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
 	insinto /usr/share/makebootfat
-	doins mbrfat.bin || die
+	doins mbrfat.bin
 
 	dodoc doc/*.txt
-	dohtml doc/*.html
+	docinto html
+	dodoc doc/*.html
 }
diff --git a/sys-boot/shlilo-lantank/Manifest b/sys-boot/shlilo-lantank/Manifest
index ed6e09d78821..8b7df0221f50 100644
--- a/sys-boot/shlilo-lantank/Manifest
+++ b/sys-boot/shlilo-lantank/Manifest
@@ -1,4 +1,4 @@
 AUX lilo.conf 279 BLAKE2B 6ee9990dd47e34c84295997c5386e8e0d1817d8d5820c3ac3832fb8119e2f2c7a526bd5a0cf252c4d8094c5327d4d9156bd798024a3ee21c30d407fce140a0ee SHA512 317f08697ad868b105bd2df9615527b321453cffeff7834e0f2b64d2c012aff25068662ab4e5f9d0cd6ab155b17301cafad4bf982fc4d7c1e52b6dbdf207ef46
 DIST sh-lilo-sel-20040408.tar.gz 85932 BLAKE2B ed6547022d0459a2cd3fdb234ef6f909fe07501662b1ea8808e0f6c2179a4d408e1de85b7efffb9f53712374818681b9c86c8a6302332bfa94ba00c575e05038 SHA512 81d79d3fda076b8e6ae9112e0f93f5bd544cb4613eff1ec7cd21decd9350489c6b3f5bf4d19a77ca8d60658a08fa3a464dfe5d66617c4d61e929641fc1c5ff16
-EBUILD shlilo-lantank-20040408.ebuild 638 BLAKE2B 40b97b0eef78cddcfe31f5c2ce8495e85dccda5199b9c6fb875dd2b09163922618bfc4074c0b1974b8d996fe7cfb9ac4d149bec65de25479150369dded2afcca SHA512 b983767269203567e95b84e4f1e7d552d203b3c564d154edf4b1b17e871a3617e86bb778f76e75b94122407176937fd516adcea6f17124820de29f7974f63f6b
+EBUILD shlilo-lantank-20040408.ebuild 614 BLAKE2B d665bf20de079a9016bc98898f9189fb33d2c2d846c6370e6bb31920615396d27ca18e303426f3fcec17530e58d91c84591b512c176d97408487b4ab21f26ea8 SHA512 78680c7c99bd7190df118fff663cb9561c6359e5b023b704281c81bf366a730f407d35ad28d28b619f35ea3b5776e515e2b1078bcef87f77cde6328beeae50f1
 MISC metadata.xml 257 BLAKE2B fc90bab7767542f2f05339c836064cc76e1f9575c30ce502c60ca0afc2d0b26dbd4185d0829d046ac6251c4ae0d6c234ee6862d9cf3db67871a030223b786b3d SHA512 7af06754c364d6434a6f11c9cf1516a6cceb3a9f376717de2a48ffa1d953bdb304e1041b63cb80d89236a94ecb5c867b7a66ca3bcf6c69d4f54992514cc9415a
diff --git a/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild b/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
index 400a7583cb2f..2226078e9a1a 100644
--- a/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
+++ b/sys-boot/shlilo-lantank/shlilo-lantank-20040408.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit mount-boot
 
@@ -24,11 +24,11 @@ src_compile() { :; }
 
 src_install() {
 	into /
-	dosbin precompiled/lilo || die
+	dosbin precompiled/lilo
 	insinto /boot
-	doins precompiled/boot.b || die
+	doins precompiled/boot.b
 	dosym . /boot/boot
 	insinto /etc
-	doins "${FILESDIR}"/lilo.conf || die
+	doins "${FILESDIR}"/lilo.conf
 	dodoc ChangeLog README TODO
 }
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index de4dac10cb1d..1963f6499f5b 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,11 +1,9 @@
 AUX syslinux-4.05-nopie.patch 519 BLAKE2B 9ffea4b38c2f6de65883b256d83b270a4f3e3642827e4de9b711d396a1f3d386f9d894802cf22fcc7c64e8f3528ebfcb252e5db47f4bea586fcb4e110eb581ef SHA512 75160574c024bd841cd5e098d81f89c8532153cfd98beb17ca1549e0bdd7106d6494e8436e56560d3e501318fd8109b5f5765d244dcdfcbfc5306d35f9cbb4a8
 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
-DIST syslinux-4.07.tar.bz2 5761877 BLAKE2B 2fe28f268f896601a045564b1e3dde618d57ebf4098d007f7e45119ad019fa88221658608f88e55d4d09cd297140427cdeaf03a40a2341d732064a0630fe92b5 SHA512 8efbd14803ec74c5ee699a754b4727e4b975c08afd4dbb39f4b7ccdb90743e4459cd4609c6f1065c7b7efaa26c9d465806254891795d363758f35a2fe5704ae5
 DIST syslinux-5.10.tar.xz 5315660 BLAKE2B 19d6861bb6220fe57e12d8d6118d37b197c3c771e4d2e7a51ce7db39219e3c837e6d1543d7a3927820f3a34da34ce849f9badbaf9cd83cb5ee24fd5ed7b705f2 SHA512 56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5
 DIST syslinux-6.03.tar.xz 6855224 BLAKE2B 9caccf8bed4e3c3e87393c9dc8f3b3d267c14469bbf8135a648ea41d8a43a4aedbf2b007c6b9a6853de8866152f5bc33e5ea85fca1db86c5f2fac88d97189b0f SHA512 dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
-EBUILD syslinux-4.07.ebuild 1774 BLAKE2B 19ca9b3432e8e9a6d2640ed2579c59dfe635e19a8d64433f22a2a14ae31c8b5e7900481ebf72056a718e8d854c9f2e8f6ee6c5e9419448de48b45c45695002fb SHA512 b7d584bfdf681719f93c1e3f3fb892c39f61092dcc9149619c04af0179d5665f8317f045d6314f782b30e27a925d16d85d2c6a269779f844c3fcdbe2b400387c
 EBUILD syslinux-5.10.ebuild 2230 BLAKE2B 995ee83ea6a912f0af1ca97e4a960e569c385118e9f234f4f6421d7ab7f409e49c3c4b5fb6bafd6264bfe39c1318f49b142bba809a0dba378ebcef395c2a0809 SHA512 7d61dd6de70b5cd11754b81777bfcdb63c116ad5c772aa9e907bcf6bfe8d918afae8797dae362c888d4d16845fbe1d2077ac7c374f8bbe1f7c5069d2d570c0bb
 EBUILD syslinux-6.03.ebuild 3421 BLAKE2B 253a2b38846a07d3bdda05536c2d570e393b9182352e4e936f3213346fb8b0ee5573e5df2bb67bbc692dc5c52569ad3a667a19c14eb58ca7ec1e79ee46e67298 SHA512 041fa544ef45df4732597993c19448728ae6272a87306ff40cdb72e2dc3de5a7b54feb88f27a2660a2aa6932cb47682b42996bab618586bfdf608a959a1d1330
 EBUILD syslinux-6.04_pre1.ebuild 3489 BLAKE2B 78481eb4d56f6670a9e3dd6fb8a1b4abfc8cdf67ab3d549c16e88f6cc8a908c4ace33d04e857ea40b7990a1e06d9fa04573077a876634fa77d3f00bd35b3fa12 SHA512 3d628c258a6671c4977d98e575d05d88101451f2d962433eec373777921773658460fba7e7f992d1857ae5a28f64faa02b6bed8bdd5bac8a65311b8e009aaffe
diff --git a/sys-boot/syslinux/syslinux-4.07.ebuild b/sys-boot/syslinux/syslinux-4.07.ebuild
deleted file mode 100644
index 021f559c7eb9..000000000000
--- a/sys-boot/syslinux/syslinux-4.07.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
-HOMEPAGE="https://syslinux.zytor.com/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="custom-cflags"
-
-RDEPEND="sys-fs/mtools
-		dev-perl/Crypt-PasswdMD5
-		dev-perl/Digest-SHA1"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	virtual/os-headers"
-
-S=${WORKDIR}/${P/_/-}
-
-# This ebuild is a departure from the old way of rebuilding everything in syslinux
-# This departure is necessary since hpa doesn't support the rebuilding of anything other
-# than the installers.
-
-# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Fix building on hardened
-	epatch "${FILESDIR}"/${PN}-4.05-nopie.patch
-
-	rm -f gethostip #bug 137081
-
-	# Don't prestrip or override user LDFLAGS, bug #305783
-	local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
-		sample/Makefile utils/Makefile"
-	sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
-
-	if use custom-cflags; then
-		sed -i ${SYSLINUX_MAKEFILES} \
-			-e 's|-g -Os||g' \
-			-e 's|-Os||g' \
-			-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
-			|| die "sed custom-cflags failed"
-	else
-		QA_FLAGS_IGNORED="
-			/sbin/extlinux
-			/usr/bin/memdiskfind
-			/usr/bin/gethostip
-			/usr/bin/isohybrid
-			/usr/bin/syslinux
-			"
-	fi
-
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" installer || die
-}
-
-src_install() {
-	emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
-	dodoc README NEWS doc/*.txt || die
-}