sys-apps/memtest86+: add USE=iso for building+installing a bootable ISO image

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 88964bdaa1acc9ffaee9348b67a50948df61a885..2b3c9eba4f65f9cf51fcf0d49d669df6173d8fcf 100644 (file)
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -12,14 +12,14 @@ SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="floppy serial"
+IUSE="floppy iso serial"
 
 BOOTDIR=/boot/memtest86plus
 QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd"
 QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd"
 
 RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )"
-DEPEND=""
+DEPEND="iso? ( app-cdr/cdrtools )"
 
 src_prepare() {
        sed -i -e 's,0x10000,0x100000,' memtest.lds || die
@@ -32,6 +32,7 @@ src_prepare() {
        epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638
        epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974
 
+       sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
        if use serial ; then
                sed -i \
                        -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
@@ -45,10 +46,18 @@ src_configure() {
        tc-export AS CC LD
 }
 
+src_compile() {
+       emake
+       if use iso ; then
+               ./makeiso.sh || die
+       fi
+}
+
 src_test() { :; }
 
 src_install() {
        insinto ${BOOTDIR}
+       use iso && newins mt*.iso memtest.iso
        newins memtest.bin memtest
        newins memtest memtest.netbsd
        dosym memtest ${BOOTDIR}/memtest.bin

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index f10d5787ac517f5ae8d713861b96b45086b9028e..fc17238d1174aa77a5c02e557f856fa84c6ad8c7 100644 (file)
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -8,5 +8,6 @@
 <use>
        <flag name="serial">Compile with serial console support</flag>
        <flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
+       <flag name="iso">Compile an ISO image</flag>
 </use>
 </pkgmetadata>