Respect compiler and linker, remove uneeded QA_ restriction, remove redundant phase

Package-Manager: portage-2.2.0_alpha12/cvs/Linux x86_64

3 files changed, 81 insertions, 7 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 8be5c5b6728a..aaa9860c3e3d 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/memtest86+
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.58 2010/06/24 01:02:15 spock Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.59 2011/01/04 12:33:41 jlec Exp $
+
+*memtest86+-4.10-r1 (04 Jan 2011)
+
+  04 Jan 2011; Justin Lecher <jlec@gentoo.org> +memtest86+-4.10-r1.ebuild:
+  Respect compiler and linker, remove uneeded QA_ restriction, remove redundant
+  phase
 
 *memtest86+-4.10 (24 Jun 2010)
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 69a63af52f4d..8beae30ee060 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -18,13 +18,14 @@ EBUILD memtest86+-2.01.ebuild 1390 RMD160 087717dbdb8fe993df5880f382e4689d4d1463
 EBUILD memtest86+-2.10.ebuild 1392 RMD160 24bc653279fc908dd0bb2b201e47b153f46f0948 SHA1 e9634aaf5a71dffbdc676bbb707866405d0cb515 SHA256 15835cb1e972e211e9efa44fd2e69593f2fb274ba736aed1d706fef246521721
 EBUILD memtest86+-2.11.ebuild 1690 RMD160 64fcc1ecb9f9ee745b749112288eaf37bb176338 SHA1 825bdbb222c86a1c4eaaf22d5b639ab58cb2cbda SHA256 65c305b308520d7dbd5dafedc368a052a40b232fc5ddbd465c9556de4750a0a2
 EBUILD memtest86+-4.00.ebuild 2016 RMD160 97654801b53aff714d8a13a803b899d1bb643bb8 SHA1 9b178c98662e933d5bfbb8febb669f0e8b82f859 SHA256 8d352d249df9c098c33de3125acdf4ff8d0f6904b200de97676e0a9551d5451f
+EBUILD memtest86+-4.10-r1.ebuild 1918 RMD160 4e15746da2a5b60e7adad610c5c2e3afa4cffafc SHA1 f882d9fbd74c07bdb2efcb4df17e7dda71fbaf88 SHA256 5585c5e9b964dd9d46ac225846c315716f9796b5ffd31d941f8aa847dacae939
 EBUILD memtest86+-4.10.ebuild 1948 RMD160 f7e45e6de52c4950a3e2098a5656d1ec434e56f2 SHA1 1683c88d0c8f4e21e58d26ab8218edfea93028cb SHA256 bd4c3b78a1d2a3aa1ba3a2e724132bb1495220b7b9b8cdc8595013e91ed9b6bb
-MISC ChangeLog 9550 RMD160 7a308948a4d9d447ad05c8e2e5078948e63b1b25 SHA1 b5f1d46e0701e71dd1f190f094cb7861e34f4bf5 SHA256 17d36594bd40d3b531d4b38681deebdc0ea1584e1bc2667b671f9d7e32f41959
+MISC ChangeLog 9748 RMD160 5b38915c1ac2a140357aa7ef1b0fb6ba6ed27d71 SHA1 06cce4d66c1306b53f383cd4b870a24e9ef186d0 SHA256 ff4c406eb64454d40ef781a8d365f18ee3b5a3e283dacb1650adfd7af808b957
 MISC metadata.xml 435 RMD160 a41a6fd4d037bbd4a73b78aa7142b851f4920911 SHA1 b5986becb6ded15ec987b932a77bf70703c18c8c SHA256 e42cd2e2804736877a470dd088678725eb242566343d0f20b3828be43378939b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwirrQACgkQchej4aZK9/daWgCdFqlZIeXQcu7T/xFQ3s17Vy1b
-WVYAn215DP2xhlhPY22dKzCtrGWu6k6k
-=dmlx
+iEYEARECAAYFAk0jE6sACgkQgAnW8HDreRZO+wCgx4Aif+HNNkje2kdLE1ORvCaA
+g2MAoMhgZbEZvt4xgJceQijTMV9FFnjf
+=hXGu
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild b/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild
new file mode 100644
index 000000000000..9e50977009c4
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.10-r1.ebuild,v 1.1 2011/01/04 12:33:41 jlec Exp $
+
+EAPI="3"
+
+inherit mount-boot eutils toolchain-funcs
+
+DESCRIPTION="Memory tester based on memtest86"
+HOMEPAGE="http://www.memtest.org/"
+SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="floppy serial"
+
+RESTRICT="test"
+
+RDEPEND="floppy? ( >=sys-boot/grub-0.95 sys-fs/mtools )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.10-hardcoded_cc.patch
+
+	sed -i -e 's/$(LD) -s /$(LD) /' Makefile || die
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+
+	if use serial ; then
+		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h || die
+	fi
+
+	tc-export CC AS LD
+}
+
+src_install() {
+	insinto /boot/memtest86plus
+	newins memtest.bin memtest || die
+	newins memtest memtest.netbsd || die
+	dosym memtest /boot/memtest86plus/memtest.bin
+	dodoc README README.build-process
+
+	if use floppy ; then
+		dobin "${FILESDIR}"/make-memtest86+-boot-floppy
+		doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "memtest has been installed in /boot/memtest86plus/"
+	einfo "You may wish to update your bootloader configs"
+	einfo "by adding these lines:"
+	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
+	einfo "    > title=Memtest86Plus"
+	einfo "    > root (hd?,?)"
+	einfo "    > kernel /boot/memtest86plus/memtest"
+	einfo "   or try this if you get grub error 28:"
+	einfo "    > title=Memtest86Plus"
+	einfo "    > root (hd?,?)"
+	einfo "    > kernel --type=netbsd /boot/memtest86plus/memtest.netbsd"
+	einfo
+	einfo " - For lilo:"
+	einfo "    > image  = /boot/memtest86plus/memtest"
+	einfo "    > label  = Memtest86Plus"
+	echo
+}