don't assign default to S; use sed -i; use flag fixup; use emake; tidy

3 files changed, 24 insertions, 20 deletions

diff --git a/sys-apps/mdadm/ChangeLog b/sys-apps/mdadm/ChangeLog
index c75c173f67f5..e25a26c0a7f5 100644
--- a/sys-apps/mdadm/ChangeLog
+++ b/sys-apps/mdadm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/mdadm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/ChangeLog,v 1.8 2004/01/30 04:35:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/ChangeLog,v 1.9 2004/05/11 00:23:28 mr_bones_ Exp $
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org> mdadm-1.5.0.ebuild:
+  don't assign default to S; use sed -i; use flag fixup; use emake; tidy
 
 *mdadm-1.5.0 (29 Jan 2004)
 
diff --git a/sys-apps/mdadm/Manifest b/sys-apps/mdadm/Manifest
index abb283807044..68015c2d6f92 100644
--- a/sys-apps/mdadm/Manifest
+++ b/sys-apps/mdadm/Manifest
@@ -1,10 +1,10 @@
-MD5 6e85a2023eaee521c817315c7b7f980b files/digest-mdadm-1.0.1 59
-MD5 014cee9c27c5693a1d551858f4d93d27 files/digest-mdadm-1.2.0 59
-MD5 bcca26754997a730fffd10a52023dfa9 files/digest-mdadm-1.4.0 59
-MD5 8b84218cb903c00be73bd721bb10051f files/digest-mdadm-1.5.0 59
-MD5 30c0293b17fea30ac20687e299218524 ChangeLog 1009
+MD5 64d2128fe19fc5aa433c7d09edcca106 ChangeLog 1160
 MD5 521b22a836be669e8f67567f56106d19 mdadm-1.0.1.ebuild 1042
 MD5 5f5e78044ac45a2342c27271d30460fb mdadm-1.2.0.ebuild 1048
 MD5 a445eb6bb131df76fb1b2687e81c4ebb mdadm-1.4.0.ebuild 931
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 701dd5f0e10f511bc557c78cbdfa917d mdadm-1.5.0.ebuild 934
+MD5 e83e42b4832512a21dc2cc15067b6b88 mdadm-1.5.0.ebuild 1000
+MD5 6e85a2023eaee521c817315c7b7f980b files/digest-mdadm-1.0.1 59
+MD5 014cee9c27c5693a1d551858f4d93d27 files/digest-mdadm-1.2.0 59
+MD5 bcca26754997a730fffd10a52023dfa9 files/digest-mdadm-1.4.0 59
+MD5 8b84218cb903c00be73bd721bb10051f files/digest-mdadm-1.5.0 59
diff --git a/sys-apps/mdadm/mdadm-1.5.0.ebuild b/sys-apps/mdadm/mdadm-1.5.0.ebuild
index 0e750ab8b410..4750886842e8 100644
--- a/sys-apps/mdadm/mdadm-1.5.0.ebuild
+++ b/sys-apps/mdadm/mdadm-1.5.0.ebuild
@@ -1,38 +1,39 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.5.0.ebuild,v 1.1 2004/01/30 04:35:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mdadm/mdadm-1.5.0.ebuild,v 1.2 2004/05/11 00:23:28 mr_bones_ Exp $
 
-DESCRIPTION="An extremely useful tool for running RAID systems - it can be used as a replacement for the raidtools, or as a supplement."
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools, or as a supplement."
 HOMEPAGE="http://www.cse.unsw.edu.au/~neilb/source"
 SRC_URI="http://www.cse.unsw.edu.au/~neilb/source/${PN}/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~alpha"
 IUSE="static"
-DEPEND=""
-RDEPEND=""
-S="${WORKDIR}/${P}"
+
+RDEPEND="virtual/glibc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	if [ `use static` ]; then
-		sed \
+	if use static ; then
+		sed -i \
 			-e "44s:^# ::" \
-			-e "45s:^# ::" \
-			Makefile.orig > Makefile
+			-e "45s:^# ::" Makefile \
+				|| die "sed Makefile failed"
 	fi
 }
 
 src_compile() {
-	make CXFLAGS="${CFLAGS}" || die
+	emake CXFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install
-
-	dodoc INSTALL COPYING TODO ANNOUNCE-${PV}
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc INSTALL TODO "ANNOUNCE-${PV}"
 
 	insinto /etc
 	newins mdadm.conf-example mdadm.conf