summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2008-10-18 17:25:16 +0000
committerMichael Januszewski <spock@gentoo.org>2008-10-18 17:25:16 +0000
commit697a9c6e1ff2f1b4976175994c468f770c78d1bf (patch)
tree9e445b5e0aa8cce0a24840b6f0bdff373972c45f /sys-apps/memtest86+
parentFix download of templates packages, see bug #242494 (diff)
downloadgentoo-2-697a9c6e1ff2f1b4976175994c468f770c78d1bf.tar.gz
gentoo-2-697a9c6e1ff2f1b4976175994c468f770c78d1bf.tar.bz2
gentoo-2-697a9c6e1ff2f1b4976175994c468f770c78d1bf.zip
Remove old ebuilds.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27 x86_64)
Diffstat (limited to 'sys-apps/memtest86+')
-rw-r--r--sys-apps/memtest86+/ChangeLog9
-rw-r--r--sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch24
-rw-r--r--sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch61
-rw-r--r--sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch29
-rw-r--r--sys-apps/memtest86+/memtest86+-1.65.ebuild67
-rw-r--r--sys-apps/memtest86+/memtest86+-1.70.ebuild68
-rw-r--r--sys-apps/memtest86+/memtest86+-2.00.ebuild69
7 files changed, 8 insertions, 319 deletions
diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog
index 0ebd746aec57..3a688c786264 100644
--- a/sys-apps/memtest86+/ChangeLog
+++ b/sys-apps/memtest86+/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/memtest86+
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.43 2008/10/04 14:18:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.44 2008/10/18 17:25:16 spock Exp $
+
+ 18 Oct 2008; Michał Januszewski <spock@gentoo.org>
+ -files/memtest86+-1.50-hardened.patch,
+ -files/memtest86+-1.70-hardcoded_cc.patch,
+ -files/memtest86+-2.00-hardcoded_cc.patch, -memtest86+-1.65.ebuild,
+ -memtest86+-1.70.ebuild, -memtest86+-2.00.ebuild:
+ Remove old ebuilds.
04 Oct 2008; Markus Meier <maekke@gentoo.org> memtest86+-2.01.ebuild:
amd64/x86 stable, bug #239307
diff --git a/sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch b/sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch
deleted file mode 100644
index 3501a7cfa6f6..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-1.50-hardened.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig 2005-01-23 10:17:43.000000000 -0500
-+++ Makefile 2005-01-23 10:18:07.000000000 -0500
-@@ -12,7 +12,7 @@
- #
- # gcc compiler options, these settings should suffice
- #
--CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding
-+CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
-
- AS=as -32
-
-@@ -21,10 +21,10 @@
- all: memtest.bin memtest
-
- reloc.o: reloc.c
-- $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c
-+ $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c -fno-stack-protector
-
- 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+/files/memtest86+-1.70-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch
deleted file mode 100644
index aa6c9c373c9f..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-1.70-hardcoded_cc.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naurp memtest86+-1.70-orig/Makefile memtest86+-1.70/Makefile
---- memtest86+-1.70-orig/Makefile 2007-01-27 15:17:59.000000000 +0100
-+++ memtest86+-1.70/Makefile 2007-01-27 15:31:43.000000000 +0100
-@@ -8,23 +8,21 @@
- #
- FDISK=/dev/fd0
-
--CC=gcc
- #
- # gcc compiler options, these settings should suffice
- #
--CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding
--
--AS=as -32
-+CCFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector
-+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 extra.o random.o dmi.o
-
- all: memtest.bin memtest
-
- reloc.o: reloc.c
-- $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing reloc.c
-+ $(CC) -c -m32 -march=i486 -fPIC -Wall -g -O2 -fno-strict-aliasing -fno-stack-protector 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
-@@ -69,9 +67,9 @@ head.s: head.S
- $(CC) -E -m32 -traditional $< -o $@
-
- head.o: head.s
-- $(AS) -o $@ $<
-+ $(AS) $(ASFLAGS) -o $@ $<
- dmi.o: dmi.c test.h
-- $(CC) -c $(CCFLAGS) -fPIC dmi.c
-+ $(CC) -c $(CCFLAGS) -fPIC dmi.c
-
- makedefs: makedefs.c defs.h
- $(CC) $(CCFLAGS) makedefs.c -o $@
-@@ -94,7 +92,7 @@ bootsect.s: bootsect.S defs.h
- $(CC) -E -traditional $< -o $@
-
- bootsect.o: bootsect.s
-- $(AS) -o $@ $<
-+ $(AS) $(ASFLAGS) -o $@ $<
-
- bootsect: bootsect.o
- $(LD) -Ttext 0x00 -s --oformat binary -e _main --just-symbols=memtest_shared.o -o $@ $<
-@@ -103,7 +101,7 @@ setup.s: setup.S config.h defs.h
- $(CC) -E -traditional $< -o $@
-
- setup.o: setup.s
-- $(AS) -o $@ $<
-+ $(AS) $(ASFLAGS) -o $@ $<
-
-
- memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
diff --git a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch
deleted file mode 100644
index 98b8f692a893..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-2.00-hardcoded_cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naurp memtest86+-2.00-orig/Makefile memtest86+-2.00/Makefile
---- memtest86+-2.00-orig/Makefile 2008-02-14 15:01:14.000000000 +0100
-+++ memtest86+-2.00/Makefile 2008-02-14 15:03:00.000000000 +0100
-@@ -8,9 +8,9 @@
- #
- FDISK=/dev/fd0
-
--CC=gcc
--
--CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -m32 -march=i486 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+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 extra.o \
-@@ -37,10 +37,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 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
-
- clean:
- rm -f *.o memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86+/memtest86+-1.65.ebuild b/sys-apps/memtest86+/memtest86+-1.65.ebuild
deleted file mode 100644
index cf9edf69a1c8..000000000000
--- a/sys-apps/memtest86+/memtest86+-1.65.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.65.ebuild,v 1.3 2006/04/30 12:14:50 blubb Exp $
-
-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="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PN}-1.50-hardened.patch
- if use serial ; then
- sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
- fi
-}
-
-src_compile() {
- emake || die
-}
-
-src_install() {
- insinto /boot/memtest86plus
- doins memtest.bin || die
- dodoc README README.build-process
-}
-
-pkg_postinst() {
- einfo
- einfo "memtest.bin has been installed in /boot/memtest86plus/"
- einfo "You may wish to update your bootloader configs"
- einfo "by adding these lines:"
-
- # a little magic to make users' life as easy as possible ;)
- local fstab=${ROOT}/etc/fstab
- local root="(hd0,0)"
- local res=$(awk '$2 == "/boot" {print $1}' "${fstab}")
- if [[ -z ${res} ]] ; then
- res=$(awk '$2 == "/" {print $1}' "${fstab}")
- fi
- if [[ -n ${res} ]] ; then
- # transform /dev/hd* magic into grub naming ...
- # /dev/hda1 -> a1 -> 01
- root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789)
- root="(hd${root:0:1},$((${root:1:1}-1)))"
- fi
- einfo " - For grub:"
- einfo " > title=Memtest86Plus"
- einfo " > root ${root}"
- einfo " > kernel /boot/memtest86plus/memtest.bin"
-
- einfo " - For lilo:"
- einfo " > image = /boot/memtest86plus/memtest.bin"
- einfo " > label = Memtest86Plus"
- einfo
-}
diff --git a/sys-apps/memtest86+/memtest86+-1.70.ebuild b/sys-apps/memtest86+/memtest86+-1.70.ebuild
deleted file mode 100644
index f0ac7e5d8f22..000000000000
--- a/sys-apps/memtest86+/memtest86+-1.70.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-1.70.ebuild,v 1.4 2007/03/17 12:52:53 beandog Exp $
-
-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="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PN}-1.70-hardcoded_cc.patch
- epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
- if use serial ; then
- sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
- fi
-}
-
-src_compile() {
- emake || die
-}
-
-src_install() {
- insinto /boot/memtest86plus
- doins memtest.bin || die
- dodoc README README.build-process
-}
-
-pkg_postinst() {
- einfo
- einfo "memtest.bin has been installed in /boot/memtest86plus/"
- einfo "You may wish to update your bootloader configs"
- einfo "by adding these lines:"
-
- # a little magic to make users' life as easy as possible ;)
- local fstab=${ROOT}/etc/fstab
- local root="(hd0,0)"
- local res=$(awk '$2 == "/boot" {print $1}' "${fstab}")
- if [[ -z ${res} ]] ; then
- res=$(awk '$2 == "/" {print $1}' "${fstab}")
- fi
- if [[ -n ${res} ]] ; then
- # transform /dev/hd* magic into grub naming ...
- # /dev/hda1 -> a1 -> 01
- root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789)
- root="(hd${root:0:1},$((${root:1:1}-1)))"
- fi
- einfo " - For grub:"
- einfo " > title=Memtest86Plus"
- einfo " > root ${root}"
- einfo " > kernel /boot/memtest86plus/memtest.bin"
-
- einfo " - For lilo:"
- einfo " > image = /boot/memtest86plus/memtest.bin"
- einfo " > label = Memtest86Plus"
- einfo
-}
diff --git a/sys-apps/memtest86+/memtest86+-2.00.ebuild b/sys-apps/memtest86+/memtest86+-2.00.ebuild
deleted file mode 100644
index 129aee2b29bc..000000000000
--- a/sys-apps/memtest86+/memtest86+-2.00.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-2.00.ebuild,v 1.1 2008/02/10 19:18:53 spock Exp $
-
-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="serial"
-RESTRICT="test"
-
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-hardcoded_cc.patch
- epatch "${FILESDIR}"/${PN}-1.70-gnu_hash.patch
-
- if use serial ; then
- sed -e 's/#define SERIAL_CONSOLE_DEFAULT 0/#define SERIAL_CONSOLE_DEFAULT 1/' -i config.h
- fi
-}
-
-src_compile() {
- emake || die
-}
-
-src_install() {
- insinto /boot/memtest86plus
- doins memtest.bin || die
- dodoc README README.build-process
-}
-
-pkg_postinst() {
- einfo
- einfo "memtest.bin has been installed in /boot/memtest86plus/"
- einfo "You may wish to update your bootloader configs"
- einfo "by adding these lines:"
-
- # a little magic to make users' life as easy as possible ;)
- local fstab=${ROOT}/etc/fstab
- local root="(hd0,0)"
- local res=$(awk '$2 == "/boot" {print $1}' "${fstab}")
- if [[ -z ${res} ]] ; then
- res=$(awk '$2 == "/" {print $1}' "${fstab}")
- fi
- if [[ -n ${res} ]] ; then
- # transform /dev/hd* magic into grub naming ...
- # /dev/hda1 -> a1 -> 01
- root=$(echo "${res}" | grep -o '[a-z][0-9]' | tr -t a-z 0123456789)
- root="(hd${root:0:1},$((${root:1:1}-1)))"
- fi
- einfo " - For grub:"
- einfo " > title=Memtest86Plus"
- einfo " > root ${root}"
- einfo " > kernel /boot/memtest86plus/memtest.bin"
-
- einfo " - For lilo:"
- einfo " > image = /boot/memtest86plus/memtest.bin"
- einfo " > label = Memtest86Plus"
- einfo
-}