Version bump (bug #320973).

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

4 files changed, 115 insertions, 5 deletions

diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index ae3ea6d089c2..8be5c5b6728a 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.57 2010/05/28 11:39:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.58 2010/06/24 01:02:15 spock Exp $
+
+*memtest86+-4.10 (24 Jun 2010)
+
+  24 Jun 2010; <spock@gentoo.org> +memtest86+-4.10.ebuild,
+  +files/memtest86+-4.10-hardcoded_cc.patch:
+  Version bump (bug #320973).
 
   28 May 2010; Markus Meier <maekke@gentoo.org> memtest86+-4.00.ebuild:
   amd64/x86 stable, bug #316803
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index e4f8508e3d8c..69a63af52f4d 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -8,20 +8,23 @@ AUX memtest86+-2.01-hardcoded_cc.patch 1209 RMD160 00167b8e9f8eb49b3c291b63a754e
 AUX memtest86+-2.10-hardcoded_cc.patch 1231 RMD160 9ffb4f5bdacff75ef09e6aa760186cdd1e29c71d SHA1 fa55e18966a7c5e35b091a9899cfe51d55ea83de SHA256 3f39a0495230cf45ea0666040b1bfefd00a86dbd91ec45428f181ed6c06a10a6
 AUX memtest86+-2.11-hardcoded_cc.patch 1210 RMD160 9f153d1d4e80b37479cdbebe760c4abfcfafa2c0 SHA1 4a7ae70912561c587c4b8c3ee49577586780ff3f SHA256 d59ad2778ea95d654107052112a4f1eb631d6c790078a66a37ee6a9368f21903
 AUX memtest86+-4.00-hardcoded_cc.patch 1217 RMD160 b8dfcf77b25fb0ae9887508a1b673ebab1f6d195 SHA1 2fd3b2ed5bb10b5de4fc2b1258c6868bee9963de SHA256 1e3df89afe8734cea0fdc90131b9daf3f93d8d96451d38771e5225fde2ba1c4f
+AUX memtest86+-4.10-hardcoded_cc.patch 1229 RMD160 907caca04c1503cc1686e8e1b3e06f0941d176ed SHA1 4f9d39ee22a9867308415941bdca58cc3c5dbd1d SHA256 bb0d8f528a4b246ba11f0ac96ce18d69503af68cbfee16bd02c2958c16bc02c5
 DIST memtest86+-2.01.tar.gz 165984 RMD160 cdd94d9ea1089387bba8bd024c5cb39b741cba9f SHA1 3420652300e397891af8b263318dc08144e8b4a4 SHA256 35ad452f4fd12f07756abccccf1bce70d42596c2c5e9c29247ffc8e0b76bd1ae
 DIST memtest86+-2.10.tar.gz 165987 RMD160 e782d067899361bbf931206742318c136467c432 SHA1 a687513b118fc3d43c2b83d9baed835eb2380786 SHA256 d951e4888e8b793832ae1dad2716863fe6d96976a8cc258a7298e2cbfac8136e
 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
 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 2016 RMD160 97654801b53aff714d8a13a803b899d1bb643bb8 SHA1 9b178c98662e933d5bfbb8febb669f0e8b82f859 SHA256 8d352d249df9c098c33de3125acdf4ff8d0f6904b200de97676e0a9551d5451f
-MISC ChangeLog 9384 RMD160 3018cfd17c09461c3d885bf1776104c09c63e9ed SHA1 aacf878f42051ba8d111d849dbc300b652270894 SHA256 2336c32ff8fb47b4c40cb7688ff41e220c1f7733e8676096fce0f80103de9e52
+EBUILD memtest86+-4.10.ebuild 1948 RMD160 f7e45e6de52c4950a3e2098a5656d1ec434e56f2 SHA1 1683c88d0c8f4e21e58d26ab8218edfea93028cb SHA256 bd4c3b78a1d2a3aa1ba3a2e724132bb1495220b7b9b8cdc8595013e91ed9b6bb
+MISC ChangeLog 9550 RMD160 7a308948a4d9d447ad05c8e2e5078948e63b1b25 SHA1 b5f1d46e0701e71dd1f190f094cb7861e34f4bf5 SHA256 17d36594bd40d3b531d4b38681deebdc0ea1584e1bc2667b671f9d7e32f41959
 MISC metadata.xml 435 RMD160 a41a6fd4d037bbd4a73b78aa7142b851f4920911 SHA1 b5986becb6ded15ec987b932a77bf70703c18c8c SHA256 e42cd2e2804736877a470dd088678725eb242566343d0f20b3828be43378939b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv/qzAACgkQkKaRLQcq0GKwzgCeMfZ0JdAwtSLwyEU98mIHuDmG
-HpkAn2AK9g1amxxCUpEzGhANEtIobHoQ
-=CSkB
+iEYEARECAAYFAkwirrQACgkQchej4aZK9/daWgCdFqlZIeXQcu7T/xFQ3s17Vy1b
+WVYAn215DP2xhlhPY22dKzCtrGWu6k6k
+=dmlx
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86+/files/memtest86+-4.10-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-4.10-hardcoded_cc.patch
new file mode 100644
index 000000000000..ed0705c615ea
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-4.10-hardcoded_cc.patch
@@ -0,0 +1,30 @@
+diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
+--- memtest86+-4.10-orig/Makefile	2010-06-24 00:27:22.864634431 +0200
++++ memtest86+-4.10/Makefile	2010-06-24 00:28:42.402478590 +0200
+@@ -8,10 +8,9 @@
+ #
+ FDISK=/dev/fd0
+ 
+-AS=as -32
+-CC=gcc
+-
+-CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
++CFLAGS=-Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
++CPPFLAGS=-m32
++ASFLAGS=-32
+ 
+ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
+       config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
+@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
+ 	memtest_shared.bin -o memtest.bin
+ 
+ reloc.o: reloc.c
+-	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
++	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
+ 
+ test.o: test.c
+-	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
++	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
+ 
+ clean:
+ 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86+/memtest86+-4.10.ebuild b/sys-apps/memtest86+/memtest86+-4.10.ebuild
new file mode 100644
index 000000000000..8d00e86b06e8
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-4.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-4.10.ebuild,v 1.1 2010/06/24 01:02:15 spock Exp $
+
+QA_PRESTRIPPED=/boot/memtest86plus/memtest
+
+inherit mount-boot eutils
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-4.10-hardcoded_cc.patch
+
+	sed -i -e's/$(LD) -s /$(LD) /' Makefile
+	sed -i -e's,0x10000,0x100000,' memtest.lds
+
+	if use serial ; then
+		sed -i -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' config.h
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+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() {
+	einfo
+	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"
+	einfo
+}