Version bump (bug #357201).

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

3 files changed, 82 insertions, 7 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index a97797d9957c..ff3056754d5c 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/memtest86+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.60 2011/01/09 03:23:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.61 2011/03/16 23:00:26 spock Exp $
+
+*memtest86+-4.20 (16 Mar 2011)
+
+  16 Mar 2011; Michał Januszewski <spock@gentoo.org> +memtest86+-4.20.ebuild:
+  Version bump (bug #357201).
 
   09 Jan 2011; Mike Frysinger <vapier@gentoo.org> memtest86+-4.00.ebuild,
   memtest86+-4.10.ebuild, memtest86+-4.10-r1.ebuild:
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 58f132f7dd50..7ca6dc85abed 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX make-memtest86+-boot-floppy 2499 RMD160 afe647152769ae90ae3058dd8e33e451dacdd2c8 SHA1 feed092c75926b5b6ed4ef6fce9a1ec07e66d2f2 SHA256 88d8768592abdd224b9cd041152c78ef50eedeef3620f0d00f51c0eaeef8158a
 AUX make-memtest86+-boot-floppy.1 1165 RMD160 541139ac0a82950ec782603d74e9c53e30fcd49b SHA1 6fbaa20c2e08266147d6adae42195775aae4a13b SHA256 240c921fe2cbb4d70b5e06fc06d798c6018ece8a238fdeebf3ad02a6043ed5d7
@@ -14,18 +14,20 @@ DIST memtest86+-2.10.tar.gz 165987 RMD160 e782d067899361bbf931206742318c136467c4
 DIST memtest86+-2.11.tar.gz 165937 RMD160 2f210dd17725ead0ef3daf1181184d2a7a071774 SHA1 5cebc90126403c1e918fd05670546800b66ed113 SHA256 43876a7221e39cde791f20d04ecb071adfa08975cac2e511d04359619ce16c0e
 DIST memtest86+-4.00.tar.gz 270327 RMD160 df039946c829fae3123336fbee0005afc2360e14 SHA1 15e77d79fe528e64e5803bff24048dd642f87c46 SHA256 6ec42f549da81b715bfc5c55b93b74774fb5c35f7578c7eecebab3ca37866ca4
 DIST memtest86+-4.10.tar.gz 205077 RMD160 dc1083c8097f5f9f8c7725513b31adecb23379c4 SHA1 a5a912be36d27e8886a07ae3ab2a2531711eca1e SHA256 f81935088726e75c0faab9fcf6ab08b73829b509db8d72f920a532b74f15aa4f
+DIST memtest86+-4.20.tar.gz 206044 RMD160 abf74cfd34c220b104c3f364d782a4fcd2b7ec8a SHA1 df49a3d0b003c575d5a26dedc3d66dbe905db1b6 SHA256 5630ce978d0e6b671891df4253fc5c54659764d0cdfc7515ac0df3d8dd9e8737
 EBUILD memtest86+-2.01.ebuild 1390 RMD160 087717dbdb8fe993df5880f382e4689d4d14633a SHA1 e1f32f03fa4b7d8d47ccd63f94e1132706dcb39b SHA256 a5f27eb3b8331eeb70ce87203058bc4d9f30f7c59779a7b0ecc4e4a8793e3dbd
 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 2041 RMD160 1078d54e8d229d444b6f694190d72b109bb43b5c SHA1 2b222c476e8aefb17bd2a8671b0f018d533fb61e SHA256 e18a99a12bf5c2fcf4548e3d374a00bd1d96f0570abcbc5b3c7bfad2a8b20597
 EBUILD memtest86+-4.10-r1.ebuild 1945 RMD160 5b0efb9db87243ade8c031d04e3e93811687a268 SHA1 90ebd04fc28a2bb873c71d58e1275a2bb8a6fc05 SHA256 8fdc1c3f3d4b3b7baec72bc21baefbf772e801f4a797d9fc37f84b69fd845481
 EBUILD memtest86+-4.10.ebuild 1974 RMD160 e17e2746b695ffb0718afe29a6a7667d960485a2 SHA1 250730dcba61400e8ce67b270f2ad04715778574 SHA256 79032c391ec3a6193714a0bd12dd080ca98d268ab335b4b0f334b933d211d5fb
-MISC ChangeLog 9920 RMD160 50271ff07abf97af35637279b54c10b480012d34 SHA1 f453588b128445f43d00c7028df3947b5e60a5b7 SHA256 8c916503fa19982a65056ffbef6b25d83a00852a7cc0c76bb19a775a988464e7
+EBUILD memtest86+-4.20.ebuild 1941 RMD160 5d608593561849f70ffcdefd3b43685c6719ba9c SHA1 e78432744cc9f8b507e2b827b275c79ccc15d13e SHA256 88d9c12384303c23d7eebf1074a60ca43307061f3c0dc4ab59437c7d2c2850bb
+MISC ChangeLog 10061 RMD160 bd70987391adef1d5aa84cdb4528a050ba2760a7 SHA1 6477927cdff12ef1001b4685b8ccb565afa1ba16 SHA256 fb0f90d3b865ef0207c3e8c74fcbcb1d2c471f44dd075634d6407d32c6c74c39
 MISC metadata.xml 435 RMD160 a41a6fd4d037bbd4a73b78aa7142b851f4920911 SHA1 b5986becb6ded15ec987b932a77bf70703c18c8c SHA256 e42cd2e2804736877a470dd088678725eb242566343d0f20b3828be43378939b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0pKi8ACgkQaC/OocHi7JY1LAEAkEF07BgOPAivtdYe4EY1dupp
-MiZOXCDIQAydtJZ6LHUBAIiep52YVWXxsT4qaSORv+mu56es8bkEaUwP8FCXOg/S
-=i6pv
+iEYEARECAAYFAk2BQRcACgkQchej4aZK9/eloQCdHIB+Xtfjg2X9M6GJ8uMMWQEL
+EI0Anje1hfqt8IKCOGb5DTqFBNDOh3uV
+=JrmS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/memtest86+-4.20.ebuild b/sys-apps/memtest86+/memtest86+-4.20.ebuild
new file mode 100644
index 000000000000..8a27951ec551
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-4.20.ebuild
@@ -0,0 +1,68 @@
+# 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.20.ebuild,v 1.1 2011/03/16 23:00:26 spock 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() {
+	mount-boot_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
+}