4 files changed, 9 insertions, 53 deletions
diff --git a/sys-fs/raidtools/ChangeLog b/sys-fs/raidtools/ChangeLog
index 0139c6ade0bb..e69615e56a84 100644
--- a/sys-fs/raidtools/ChangeLog
+++ b/sys-fs/raidtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/raidtools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/ChangeLog,v 1.13 2004/09/06 02:28:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/ChangeLog,v 1.14 2004/09/06 15:56:39 dsd Exp $
+
+  06 Sep 2004; Daniel Drake <dsd@gentoo.org> raidtools-1.00.3-r1.ebuild,
+  raidtools-1.00.3-r2.ebuild:
+  1.00.3-r2 stable on same archs as -r1. Remove -r1 due to segfault problems.
 
   06 Sep 2004; Sven Wegener <swegener@gentoo.org> raidtools-1.00.3-r2.ebuild:
   Added patch from 1.00.3-r1 to 1.00.3-r2 that fixes compile errors with
diff --git a/sys-fs/raidtools/files/digest-raidtools-1.00.3-r1 b/sys-fs/raidtools/files/digest-raidtools-1.00.3-r1
deleted file mode 100644
index 8b9f5451a2c5..000000000000
--- a/sys-fs/raidtools/files/digest-raidtools-1.00.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cb41f8093cd7381ee07adb2951cc53fa raidtools-1.00.3.tar.gz 167779
diff --git a/sys-fs/raidtools/raidtools-1.00.3-r1.ebuild b/sys-fs/raidtools/raidtools-1.00.3-r1.ebuild
deleted file mode 100644
index 48078c61eca1..000000000000
--- a/sys-fs/raidtools/raidtools-1.00.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/raidtools-1.00.3-r1.ebuild,v 1.12 2004/08/19 02:38:42 agriffis Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Linux RAID 0/1/4/5 utilities"
-SRC_URI="http://people.redhat.com/mingo/raidtools/${P}.tar.gz"
-HOMEPAGE="http://people.redhat.com/mingo/raidtools/"
-
-KEYWORDS="x86 amd64 ppc sparc hppa alpha ia64 ppc64"
-IUSE="build"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/libc
-	dev-libs/popt"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/mkraid.c-gcc33.patch
-	epatch ${FILESDIR}/${P}-2.6.Headers.patch
-}
-
-src_compile() {
-	#Bug: 34712 (Nov 29 2003 -solar)
-	filter-flags -fPIC
-	econf || die
-	make CFLAGS="${CFLAGS} -DMD_VERSION=\\\"${P}\\\"" || die
-}
-
-src_install() {
-	make install ROOTDIR=${D} || die
-	rm -rf ${D}/dev
-
-	if ! use build
-	then
-		doman *.8 *.5
-		dodoc README *raidtab raidreconf-HOWTO reconf.notes retry summary
-		dodoc Software-RAID.HOWTO/Software-RAID.HOWTO.txt
-		dohtml Software-RAID.HOWTO/Software-RAID.HOWTO.html
-		dohtml Software-RAID.HOWTO/Software-RAID.HOWTO.sgml
-		docinto config
-		dodoc *.sample
-	fi
-}
diff --git a/sys-fs/raidtools/raidtools-1.00.3-r2.ebuild b/sys-fs/raidtools/raidtools-1.00.3-r2.ebuild
index 06d265589e22..8bcd641e2293 100644
--- a/sys-fs/raidtools/raidtools-1.00.3-r2.ebuild
+++ b/sys-fs/raidtools/raidtools-1.00.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/raidtools-1.00.3-r2.ebuild,v 1.4 2004/09/06 02:28:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/raidtools/raidtools-1.00.3-r2.ebuild,v 1.5 2004/09/06 15:56:39 dsd Exp $
 
 inherit flag-o-matic eutils
 
@@ -8,13 +8,14 @@ DESCRIPTION="Linux RAID 0/1/4/5 utilities"
 SRC_URI="http://people.redhat.com/mingo/raidtools/${P}.tar.gz"
 HOMEPAGE="http://people.redhat.com/mingo/raidtools/"
 
-KEYWORDS="~x86 ~amd64 ppc ~sparc ~hppa ~alpha ~ia64 ~ppc64"
+KEYWORDS="x86 amd64 ppc sparc hppa alpha ia64 ppc64"
 IUSE="build"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="virtual/libc
-	dev-libs/popt"
+	dev-libs/popt
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}