don't assign default to S; error check sed; tidy

4 files changed, 23 insertions, 18 deletions

diff --git a/app-arch/sharutils/ChangeLog b/app-arch/sharutils/ChangeLog
index db6038c88cb8..21bf6f92798f 100644
--- a/app-arch/sharutils/ChangeLog
+++ b/app-arch/sharutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/sharutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.7 2004/04/08 14:36:40 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/ChangeLog,v 1.8 2004/04/10 07:20:17 mr_bones_ Exp $
+
+  10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  sharutils-4.2.1-r6.ebuild, sharutils-4.2.1-r7.ebuild,
+  sharutils-4.2.1-r8.ebuild:
+  don't assign default to S; error check sed; tidy
 
   08 Apr 2004; Jon Portnoy <avenj@gentoo.org> sharutils-4.2.1-r8.ebuild :
   Stable on AMD64
diff --git a/app-arch/sharutils/sharutils-4.2.1-r6.ebuild b/app-arch/sharutils/sharutils-4.2.1-r6.ebuild
index 46e07ac8b131..2a052a38d4f4 100644
--- a/app-arch/sharutils/sharutils-4.2.1-r6.ebuild
+++ b/app-arch/sharutils/sharutils-4.2.1-r6.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r6.ebuild,v 1.4 2004/02/29 20:03:23 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r6.ebuild,v 1.5 2004/04/10 07:20:17 mr_bones_ Exp $
 
 inherit eutils
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Tools to deal with shar archives"
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gnu/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc alpha hppa ia64 ppc64"
+IUSE="nls"
 
 DEPEND="sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/app-arch/sharutils/sharutils-4.2.1-r7.ebuild b/app-arch/sharutils/sharutils-4.2.1-r7.ebuild
index 47385a6bfbe1..d245fd0db16e 100644
--- a/app-arch/sharutils/sharutils-4.2.1-r7.ebuild
+++ b/app-arch/sharutils/sharutils-4.2.1-r7.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r7.ebuild,v 1.3 2004/03/02 16:57:35 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r7.ebuild,v 1.4 2004/04/10 07:20:17 mr_bones_ Exp $
 
 inherit eutils
 
-IUSE="nls"
-
-S="${WORKDIR}/${P}"
 DESCRIPTION="Tools to deal with shar archives"
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
 SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gnu/${PN}/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~ia64 ~ppc64 s390"
+IUSE="nls"
 
 DEPEND="sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/app-arch/sharutils/sharutils-4.2.1-r8.ebuild b/app-arch/sharutils/sharutils-4.2.1-r8.ebuild
index 85e0096f48ca..36403dab113e 100644
--- a/app-arch/sharutils/sharutils-4.2.1-r8.ebuild
+++ b/app-arch/sharutils/sharutils-4.2.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r8.ebuild,v 1.5 2004/04/08 14:36:40 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/sharutils/sharutils-4.2.1-r8.ebuild,v 1.6 2004/04/10 07:20:17 mr_bones_ Exp $
 
 inherit eutils
 
@@ -14,8 +14,10 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc sparc alpha hppa ia64 ~ppc64 s390 mips"
 IUSE="nls"
 
-DEPEND="sys-apps/texinfo
+RDEPEND="sys-apps/texinfo
 	nls? ( >=sys-devel/gettext-0.10.35 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
@@ -26,13 +28,17 @@ src_unpack() {
 	cd ${S}/po
 	cp ja_JP.EUC.po ja.po
 	cp ja_JP.EUC.gmo ja.gmo
-	sed -i -e 's/aangemaakt/aangemaakt\\n/' nl.po
-	sed -i -e 's/de %dk/de %dk\\n/' pt.po
+	sed -i \
+		-e 's/aangemaakt/aangemaakt\\n/' nl.po \
+			|| die "sed nl.po failed"
+	sed -i \
+		-e 's/de %dk/de %dk\\n/' pt.po \
+			|| die "sed pt.po failed"
 }
 
 src_compile() {
 	econf `use_enable nls` || die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {