gentoo resync : 23.06.2018

3 files changed, 49 insertions, 24 deletions

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a83341f3433b..0e7c07f80069 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -19,5 +19,5 @@ DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce5
 EBUILD memtest86+-4.20-r1.ebuild 1950 BLAKE2B 7748912836525d02d7909675f7c8b362f253fc3567495d243b0a08e3570d382c300de6239c3052af5b60db1761157754555f6f98793a7c285aeadc7b2f274cee SHA512 5bff802747e652f95f2b8bd7c4d73efaf581c5008f1bb6c17aa492335939012b9ef661a2986447a0e6f9493c522ea9cbd93f4ca3e6164f7142543b8a05adf2c4
 EBUILD memtest86+-4.20-r3.ebuild 1756 BLAKE2B 1e9d161b3358030cfc89d3b1c439d9494ac2063af1db9c28432e60200b5825a675ea421f6c7161bc7a9f151efdcfb1483a669aa60a4bcdd97961e00b2f643111 SHA512 3cc41d0ccd74282b5ed2929359829f4377478605b06c868728e9446f3b1df8a5f38166d793f0c800428b17b724118e0eafdfb44791ef577c8bef87d614d422e2
 EBUILD memtest86+-5.01-r2.ebuild 2384 BLAKE2B 6a7205c3fa74bd10c7c290151a49c2e6cb4bb966bf193a34956c763eca1969d2930a9abae09f5558facb37ce74c5ae32ae20824f6e75809b8f2e9fde310d6963 SHA512 a2912927e8d490829a187959711c85438649a912e440af637f1a9d401a574dcaf368203337123f5c9168897e5bdca0658170c2b07861bc4b10b40e53693820f4
-EBUILD memtest86+-5.01-r3.ebuild 2408 BLAKE2B fc6fdc809f71a7b4a3f1dfe674620e5fe5db0a625e052ce383b6b243e8b53a2007738909e1ddca083f18e6291e1b336ba4fd54d79010e75ff035a08eb1f2e625 SHA512 8bd022e82a78e0832a97700499ad2842a6c1d9b4816a0a86418e443ddabfd231c35a9e4bb8fcdbc2b5f768dd2add1bc37f15c1aadc1f93a2dbb87c4e5200faf9
-MISC metadata.xml 476 BLAKE2B 04c497fd2a119d193e675c9ad1059c4f709f755b40f415d31027f7b486153c5d5f456b948c096ab2c63c73173c8a9f51c639a92fc68745c8305dbc8b8b0f0572 SHA512 2db5664e0ed634a23de2a1b03cec34a7ffb262730b2f561890ba1ff135296ce493cb13f83b4ef7b72b36ecd72f58d68905ddc408b02c3a152281e93086e11e1e
+EBUILD memtest86+-5.01-r4.ebuild 2803 BLAKE2B 7a403c8b07e6908975ca3c645d23889f84cb454b6ea1bf07ef5a96ff4532447006887c8c6a6ec2657ca308c6314bde760e6680390ff9fcbd0f18a4528a949ada SHA512 49fdc3ef564b050e5a07b9271f536ace2567cdab70f841bb0574558293aee6ce841421c9d8ff3a257ab51793a7290ca604acbcc0a930eed261c80a2531ad7fa1
+MISC metadata.xml 563 BLAKE2B bd4e7ef2022ed705fc3902cd113f20b057b672dd50a9cf9362f56d4ccf1be9bab1fdb45d162cd646deb2acdab6829942da59f6dce0475a2d51c060662a33b9dd SHA512 26d725110c8b6214fce06feae590d1c437b64c9884ee5bc5421b4804b9391d7b928e11a270d84421ffbb5ea7a7b551dd26484565706499bdfbe871aef7ffb61b
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
index 54b1ab6e21dc..e9528e637a87 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r3.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit mount-boot eutils toolchain-funcs
 
@@ -12,15 +12,19 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy iso serial"
+IUSE="+boot floppy iso serial"
 
 BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest"
+QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
+QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
 
 RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
 DEPEND="iso? ( app-cdr/cdrtools )"
 
+pkg_pretend() {
+	use boot && mount-boot_pkg_pretend
+}
+
 src_prepare() {
 	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
 	epatch "${FILESDIR}/${P}-gcc-473.patch" \
@@ -39,6 +43,7 @@ src_prepare() {
 			config.h \
 			|| die "sed failed"
 	fi
+	default
 }
 
 src_configure() {
@@ -56,7 +61,12 @@ src_compile() {
 src_test() { :; }
 
 src_install() {
-	insinto "${BOOTDIR}"
+	if use boot; then
+		insinto "${BOOTDIR}"
+		doins memtest memtest.bin
+	fi
+
+	insinto /usr/share/${PN}
 	use iso && newins mt*.iso memtest.iso
 	doins memtest memtest.bin
 
@@ -71,20 +81,34 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	use boot && mount-boot_pkg_preinst
+}
+
 pkg_postinst() {
-	mount-boot_pkg_postinst
-
-	elog "memtest86+ has been installed in ${BOOTDIR}/"
-	elog "You may wish to update your bootloader configs by adding these lines:"
-	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
-	elog "   as /etc/grub.d/39_${PN}"
-	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
-	elog "    > title=${PN}"
-	elog "    > root (hd?,?)"
-	elog "    > kernel ${BOOTDIR}/memtest.bin"
-	elog " - For lilo:"
-	elog "    > image  = ${BOOTDIR}/memtest.bin"
-	elog "    > label  = ${PN}"
-	elog ""
-	elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	if use boot; then
+		mount-boot_pkg_postinst
+
+		elog "memtest86+ has been installed in ${BOOTDIR}/"
+		elog "You may wish to update your bootloader configs by adding these lines:"
+		elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+		elog "   as /etc/grub.d/39_${PN}"
+		elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+		elog "    > title=${PN}"
+		elog "    > root (hd?,?)"
+		elog "    > kernel ${BOOTDIR}/memtest.bin"
+		elog " - For lilo:"
+		elog "    > image  = ${BOOTDIR}/memtest.bin"
+		elog "    > label  = ${PN}"
+		elog ""
+		elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
+	fi
+}
+
+pkg_prerm() {
+	use boot && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	use boot && mount-boot_pkg_postrm
 }
diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index fc17238d1174..1745d86466f6 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -6,8 +6,9 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
-	<flag name="serial">Compile with serial console support</flag>
+	<flag name="boot">Also install to /boot instead of just /usr/share/memtest86+/</flag>
 	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
 	<flag name="iso">Compile an ISO image</flag>
+	<flag name="serial">Compile with serial console support</flag>
 </use>
 </pkgmetadata>