Version bump, closes bug #76432.

8 files changed, 55 insertions, 58 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 31ed2e750cb8..ca71f07efd2b 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.22 2004/12/07 15:10:02 solar Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.23 2005/01/02 19:15:26 chainsaw Exp $
+
+*memtest86-3.2 (02 Jan 2005)
+
+  02 Jan 2005; Tony Vroon <chainsaw@gentoo.org> -files/memtest86-3.0.patch,
+  -memtest86-3.0-r2.ebuild, memtest86-3.1a.ebuild, +memtest86-3.2.ebuild:
+  Version bump. 3.1a stable on x86. Portability update to no-PIC patching, old
+  ebuild and patch cleaned. Closes bug #76432.
 
   07 Dec 2004; <solar@gentoo.org> +files/memtest86-3.1a-test-pic.patch,
   memtest86-3.1a.ebuild:
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index 0df01616f56a..48af7bcd193c 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ca8ea7342946bdc0115570a3edaf17d0 memtest86-3.0-r2.ebuild 1959
-MD5 c7bf223a3a04518bcbb94349f0689f24 memtest86-3.1a.ebuild 1943
-MD5 ce3122dfdb224b76aa30cc382699a8ba ChangeLog 3326
+MD5 98fc24ea0a803431e2bd8533477f0175 memtest86-3.1a.ebuild 1935
+MD5 41a59f005c9232d174d4595b0c72eb87 memtest86-3.2.ebuild 1935
+MD5 e0d4b12d48ff97d1278fd932f114dffe ChangeLog 3636
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 321f79e41c5c62eb61f0fdd2a971b556 files/memtest86-3.0.patch 749
+MD5 9b8f71a15e2d7236b658f1f9e0fb79df files/memtest86-3.2-test-pic.patch 641
 MD5 979465b1a112b7a052c36a57b8878867 files/memtest86-3.1a-test-pic.patch 606
+MD5 64a30db4579e12539572f71ca895e1ed files/digest-memtest86-3.2 65
 MD5 1a7396d4f6539280d03b33e8047f9cd9 files/digest-memtest86-3.1a 66
-MD5 60d6fd47214101182d2f20bf6075f90a files/digest-memtest86-3.0-r2 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iQCVAwUBQbXHuJ4WFLgrx1GWAQI/AwP/T/ck57k7n/k5A3n314kDZIHvVzRtAyBI
-oG8b/s+5d2ZOczs/yazlQlC6j/8ldviwI1B6DjF0zFySSUr8Zwiyj8KAPDxEo4xi
-3r47uJBD6SKT47PSEkPL9MQl7WSer41gbB4MO1c/T4sSD74b5A/WElKdsWdL/sPV
-23F/fbpTZ0Q=
-=csC4
------END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.0-r2 b/sys-apps/memtest86/files/digest-memtest86-3.0-r2
deleted file mode 100644
index 4fb55f53126a..000000000000
--- a/sys-apps/memtest86/files/digest-memtest86-3.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fade21758538a5468ad9b8509edfde0d memtest86-3.0.tar.gz 104794
diff --git a/sys-apps/memtest86/files/digest-memtest86-3.2 b/sys-apps/memtest86/files/digest-memtest86-3.2
new file mode 100644
index 000000000000..7174d58c9383
--- /dev/null
+++ b/sys-apps/memtest86/files/digest-memtest86-3.2
@@ -0,0 +1 @@
+MD5 46028d276c39c2eebe7759ba813f97df memtest86-3.2.tar.gz 131309
diff --git a/sys-apps/memtest86/files/memtest86-3.0.patch b/sys-apps/memtest86/files/memtest86-3.0.patch
deleted file mode 100644
index 5b2cb66fba74..000000000000
--- a/sys-apps/memtest86/files/memtest86-3.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur memtest86-3.0-orig/memsize.c memtest86-3.0/memsize.c
---- memtest86-3.0-orig/memsize.c	2002-05-21 23:07:01.000000000 +0200
-+++ memtest86-3.0/memsize.c	2004-02-01 20:19:08.779217664 +0100
-@@ -18,6 +18,7 @@
- 
- extern ulong p1, p2;
- extern volatile ulong *p;
-+extern struct vars * const v;
- 
- static void sort_pmap(void);
- static int check_ram(void);
-diff -Naur memtest86-3.0-orig/test.h memtest86-3.0/test.h
---- memtest86-3.0-orig/test.h	2002-05-21 23:06:16.000000000 +0200
-+++ memtest86-3.0/test.h	2004-02-01 20:19:00.885417704 +0100
-@@ -277,7 +277,6 @@
- #define FIRMWARE_PCBIOS    1
- #define FIRMWARE_LINUXBIOS 2
- 
--extern struct vars * const v;
- extern unsigned char _start[], _end[], startup_32[];
- extern unsigned char _size, _pages;
- 
diff --git a/sys-apps/memtest86/files/memtest86-3.2-test-pic.patch b/sys-apps/memtest86/files/memtest86-3.2-test-pic.patch
new file mode 100644
index 000000000000..aae58b26974e
--- /dev/null
+++ b/sys-apps/memtest86/files/memtest86-3.2-test-pic.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	2004-11-12 12:16:25.000000000 +0000
++++ Makefile	2005-01-02 18:52:28.013459832 +0000
+@@ -12,7 +12,7 @@
+ #
+ # gcc compiler options, these settings should suffice
+ #
+-CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding
++CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
+ 
+ AS=as -32
+ 
+@@ -24,7 +24,7 @@
+ 	$(CC) -c -m32 -fPIC -Wall -O -fno-strict-aliasing reloc.c
+ 
+ test.o: test.c test.h defs.h config.h
+-	$(CC) -c $(CCFLAGS) test.c
++	$(CC) -c $(CCFLAGS) -fno-PIC test.c
+ 
+ main.o: main.c test.h defs.h
+ 	$(CC) -c $(CCFLAGS) -fPIC main.c
diff --git a/sys-apps/memtest86/memtest86-3.1a.ebuild b/sys-apps/memtest86/memtest86-3.1a.ebuild
index 0f5a49e13c6c..e7342b2d0c9b 100644
--- a/sys-apps/memtest86/memtest86-3.1a.ebuild
+++ b/sys-apps/memtest86/memtest86-3.1a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.1a.ebuild,v 1.2 2004/12/07 15:10:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.1a.ebuild,v 1.3 2005/01/02 19:15:26 chainsaw Exp $
 
 inherit mount-boot eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.memtest86.com/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="serial"
 
 DEPEND="virtual/libc"
@@ -20,7 +20,7 @@ src_unpack() {
 	cd ${S}
 
 	# bug 66630
-	epatch ${FILESDIR}/memtest86-3.1a-test-pic.patch
+	epatch ${FILESDIR}/${P}-test-pic.patch
 
 	sed -i -e '/DISCARD/d' memtest_shared.lds
 
diff --git a/sys-apps/memtest86/memtest86-3.0-r2.ebuild b/sys-apps/memtest86/memtest86-3.2.ebuild
index 0b86492d6ef6..0806d8e35a41 100644
--- a/sys-apps/memtest86/memtest86-3.0-r2.ebuild
+++ b/sys-apps/memtest86/memtest86-3.2.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.0-r2.ebuild,v 1.8 2004/09/25 03:12:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.2.ebuild,v 1.1 2005/01/02 19:15:26 chainsaw Exp $
 
 inherit mount-boot eutils
 
-IUSE="serial"
 DESCRIPTION="A stand alone memory test for x86 computers"
-SRC_URI="http://www.memtest86.com/${P}.tar.gz"
 HOMEPAGE="http://www.memtest86.com/"
-KEYWORDS="-* x86"
+SRC_URI="http://www.memtest86.com/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="serial"
 
 DEPEND="virtual/libc"
 
@@ -18,12 +19,16 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# a little fix to make gcc-3.3.x happy
-	epatch ${FILESDIR}/memtest86-3.0.patch
-	sed -e '/DISCARD/d' -i memtest_shared.lds
+	# bug 66630
+	epatch ${FILESDIR}/${P}-test-pic.patch
+
+	sed -i -e '/DISCARD/d' memtest_shared.lds
 
 	if use serial ; then
-		sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
+		sed -i \
+			-e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' \
+			config.h \
+			|| die
 	fi
 }
 
@@ -32,9 +37,8 @@ src_compile() {
 }
 
 src_install() {
-
-	dodir /boot/memtest86
-	cp memtest.bin ${D}/boot/memtest86/memtest.bin
+	insinto /boot/memtest86
+	doins memtest.bin || die
 	dodoc README README.build-process
 }