Tidy up ebuilds.

5 files changed, 33 insertions, 40 deletions

diff --git a/app-admin/tmpwatch/ChangeLog b/app-admin/tmpwatch/ChangeLog
index 0f8a7ffcdf86..165327df028a 100644
--- a/app-admin/tmpwatch/ChangeLog
+++ b/app-admin/tmpwatch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/tmpwatch
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.23 2004/12/18 18:39:57 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.24 2004/12/28 11:46:55 ka0ttic Exp $
+
+  28 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> tmpwatch-2.8.4.ebuild,
+  tmpwatch-2.9.0.ebuild, tmpwatch-2.9.1.1.ebuild:
+  Tidy up ebuilds.
 
   18 Dec 2004; Simon Stelling <blubb@gentoo.org> tmpwatch-2.9.1.1.ebuild:
   was testing for over 3 months, marking stable on amd64
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index 5e051c7f46f5..cf4dbf572692 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,9 +1,9 @@
-MD5 201d4551ddf69b47bc87de2b094c1f77 ChangeLog 2845
+MD5 ff10718470d26564edaaf7806b981bd0 tmpwatch-2.9.0.ebuild 1224
+MD5 a4d11c1d0b51ca5aa22a16fc600aab29 tmpwatch-2.9.1.1.ebuild 1365
+MD5 dea7cd8c1c6df4c682e29703a8ddd927 tmpwatch-2.8.4.ebuild 1007
+MD5 99329c711038d3bbf4c40e8240577f2c ChangeLog 2987
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 38a56d9528b0af6d2020a597335777ed tmpwatch-2.8.4.ebuild 939
-MD5 7e82f948ef09fea97bd1177161a23f96 tmpwatch-2.9.0.ebuild 1073
-MD5 129c8c80a045c769034f5ceb6b5b1b3c tmpwatch-2.9.1.1.ebuild 1363
-MD5 dda6f902f6f95e2696dadeecd0bfeb64 files/digest-tmpwatch-2.8.4 68
-MD5 185828eaf60e27de261fa50a676a47b6 files/digest-tmpwatch-2.9.0 68
 MD5 b070831994ddfe3b392417b547670687 files/digest-tmpwatch-2.9.1.1 68
 MD5 c2b96ff8dc2c589482deaa38b4a03016 files/tmpwatch.cron 1365
+MD5 dda6f902f6f95e2696dadeecd0bfeb64 files/digest-tmpwatch-2.8.4 68
+MD5 185828eaf60e27de261fa50a676a47b6 files/digest-tmpwatch-2.9.0 68
diff --git a/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild b/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild
index 5d37feb38325..363156f690ca 100644
--- a/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.8.4.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/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild,v 1.10 2004/10/05 02:58:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.8.4.ebuild,v 1.11 2004/12/28 11:46:55 ka0ttic Exp $
 
 RPM_V="4"
 
@@ -18,21 +18,16 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${P}-${RPM_V}.src.rpm
-	tar zxf ${P}-${RPM_V}.src.tar.gz
-	tar zxf ${P}.tar.gz
+	rpm2targz ${DISTDIR}/${P}-${RPM_V}.src.rpm || die "rpm2targz failed"
+	tar zxf ${P}-${RPM_V}.src.tar.gz || die
+	tar zxf ${P}.tar.gz || die
 
 	cd ${S}
-	sed -i "s:..RPM_OPT_FLAGS.:${CFLAGS}:" \
-		Makefile
-}
-
-src_compile() {
-	emake || die
+	sed -i "s:..RPM_OPT_FLAGS.:${CFLAGS}:" Makefile || die "sed failed"
 }
 
 src_install() {
 	preplib /usr
-	dosbin tmpwatch
-	doman tmpwatch.8
+	dosbin tmpwatch || die "dosbin failed"
+	doman tmpwatch.8 || die "doman failed"
 }
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild
index 16aaa3d27500..c481218957c3 100644
--- a/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.9.0.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/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild,v 1.10 2004/09/18 19:47:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild,v 1.11 2004/12/28 11:46:55 ka0ttic Exp $
 
 RPM_V="2"
 
@@ -18,22 +18,20 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${P}-${RPM_V}.src.rpm
-	tar zxf ${P}-${RPM_V}.src.tar.gz
-	tar zxf ${P}.tar.gz
+	rpm2targz ${DISTDIR}/${P}-${RPM_V}.src.rpm || die "rpm2targz failed"
+	tar zxf ${P}-${RPM_V}.src.tar.gz || die
+	tar zxf ${P}.tar.gz || die
 
 	cd ${S}
-	sed -i "s:..RPM_OPT_FLAGS.:${CFLAGS}:" Makefile
-	sed -i 's|/sbin/fuser|/bin/fuser|' tmpwatch.c
-	sed -i 's|/sbin|/bin|' tmpwatch.8
-}
-
-src_compile() {
-	emake || die
+	sed -i "s:..RPM_OPT_FLAGS.:${CFLAGS}:" Makefile \
+		|| die "sed Makefile failed"
+	sed -i 's|/sbin/fuser|/bin/fuser|' tmpwatch.c \
+		|| die "sed tmpwatch.c failed"
+	sed -i 's|/sbin|/bin|' tmpwatch.8 || die "sed tmpwatch.8 failed"
 }
 
 src_install() {
 	preplib /usr
-	dosbin tmpwatch
-	doman tmpwatch.8
+	dosbin tmpwatch || die "dosbin failed"
+	doman tmpwatch.8 || die "doman failed"
 }
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild
index e37cedec9e28..8df097e78e42 100644
--- a/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.9.1.1.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/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild,v 1.7 2004/12/18 18:39:57 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild,v 1.8 2004/12/28 11:46:55 ka0ttic Exp $
 
 inherit versionator
 
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	cd "${WORKDIR}"
-	rpm2targz "${DISTDIR}/${MY_P}-0.src.rpm" || die
+	rpm2targz "${DISTDIR}/${MY_P}-0.src.rpm" || die "rpm2targz failed"
 	tar zxf "${MY_P}-0.src.tar.gz" || die
 	tar zxf "${MY_P}.tar.gz" || die
 
@@ -36,14 +36,10 @@ src_unpack() {
 	sed -i 's|/sbin|/bin|' tmpwatch.8 || die "sed tmpwatch.8 failed"
 }
 
-src_compile() {
-	emake || die "emake failed"
-}
-
 src_install() {
 	preplib
-	dosbin tmpwatch || die
-	doman tmpwatch.8 || die
+	dosbin tmpwatch || die "dosbin failed"
+	doman tmpwatch.8 || die "doman failed"
 
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}/${PN}.cron" "${PN}" || die