depend on sed-4; error check sed; tidy install

3 files changed, 18 insertions, 29 deletions

diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index fea82a8b9109..447b720ea20b 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/eject
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.25 2004/06/24 22:04:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.26 2004/06/29 21:00:59 mr_bones_ Exp $
+
+  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> eject-2.0.13.ebuild:
+  depend on sed-4; error check sed; tidy install
 
   13 May 2004; Stephen P. Becker <geoman@gentoo.org> eject-2.0.13.ebuild:
   Stable on mips.
diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest
index c9f31bb02c09..fa2d7d7c4bb7 100644
--- a/sys-apps/eject/Manifest
+++ b/sys-apps/eject/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 bcf2b8146d46942dc657cf9aa2508f9d ChangeLog 3534
+MD5 6bea7533e42ba6e936928ddc9eaca116 ChangeLog 3661
 MD5 47b74d6a191a3f826124cff42b4f3f62 eject-2.0.12-r1.ebuild 1109
-MD5 2bc1f76e8be1bf77d725092619d2c89d eject-2.0.13.ebuild 1201
+MD5 f5bc8b8fbe8a642c5a348e6cd8c498a2 eject-2.0.13.ebuild 1088
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 82c97e826738221130b24eebca6fbb65 files/digest-eject-2.0.12-r1 63
-MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13 63
 MD5 b84674293450f0dab61ed0af08dac6bb files/eject-2.0.12-gentoo.security.patch 406
 MD5 2ea43f67de2a8c93ca5594396045248c files/eject-2.0.12-kernel25-support.patch 447
+MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13 63
 MD5 c948ce559d97f8710824e40ffffb606e files/eject-2.0.13-kernel25-support.patch 447
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4EHnHTu7gpaalycRAs47AJ97YMjKr+wst9MUHAxVpKvnzphAlQCcD+d2
-Wf1P7JDjDs7Nak38PR8cFGk=
-=vYeY
------END PGP SIGNATURE-----
diff --git a/sys-apps/eject/eject-2.0.13.ebuild b/sys-apps/eject/eject-2.0.13.ebuild
index 493ec1cd3060..820d901722fc 100644
--- a/sys-apps/eject/eject-2.0.13.ebuild
+++ b/sys-apps/eject/eject-2.0.13.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-apps/eject/eject-2.0.13.ebuild,v 1.12 2004/06/28 16:05:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13.ebuild,v 1.13 2004/06/29 21:00:59 mr_bones_ Exp $
 
 inherit eutils
 
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="x86 ~ppc sparc mips alpha hppa amd64 ia64 ppc64"
 IUSE=""
 
-DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
@@ -22,22 +24,16 @@ src_unpack() {
 
 	# Get this puppy working with kernel 2.5.x
 	# <azarah@gentoo.org> (06 March 2003)
-	epatch ${FILESDIR}/${P}-kernel25-support.patch || die
+	epatch "${FILESDIR}/${P}-kernel25-support.patch"
 
 	# Fix stupid includes (bug #41856)
-	sed -i -e 's|-I/usr/src/linux -I/usr/src/linux|-I/usr/include|' \
-		${S}/Makefile.in
+	sed -i \
+		-e 's|-I/usr/src/linux -I/usr/src/linux|-I/usr/include|' \
+		${S}/Makefile.in \
+		|| die "sed Makefile.in failed"
 }
 
 src_install() {
-	dodir /usr/bin /usr/share/man/man1
-
-# Full install breaks sandbox, and I'm too lazy to figure out how, so:
-
-	make DESTDIR=${D} install-binPROGRAMS || die
-	make DESTDIR=${D} install-man1 || die
-	make DESTDIR=${D} install-man || die
-
-	dodoc ChangeLog COPYING README PORTING TODO
-	dodoc AUTHORS NEWS PROBLEMS
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
 }