add IUSE (bug #47358); don't rdepend on sed; error check sed; tidy

3 files changed, 32 insertions, 23 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index a3f1daffefef..75c274f44915 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/rsync
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.36 2004/01/03 18:00:58 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.37 2004/04/12 00:07:05 mr_bones_ Exp $
+
+  11 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> rsync-2.6.0.ebuild:
+  add IUSE (bug #47358); don't rdepend on sed; error check sed; tidy
 
 *rsync-2.6.0 (03 Jan 2004)
 
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 7b32122f45d4..b673b0637ba3 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,8 +1,8 @@
+MD5 416a00750a3415d7d889c1f5ce01cbcc ChangeLog 5336
+MD5 65a397cb79c72be67ed34c5e84a6a9c7 rsync-2.6.0.ebuild 2246
+MD5 b63ae1f7cafa826ca51ad2d9095522a1 rsync-2.5.7.ebuild 2229
+MD5 2b5cd2c75632c28fb6d8a311e8548fa9 files/digest-rsync-2.6.0 136
 MD5 65fa0a7432ef5585d43f6c437bbe117a files/digest-rsync-2.5.7 136
 MD5 20418c507f2e4a8ab2dae4acb26053ec files/rsyncd.conf 188
 MD5 38f45eaed761df27cfa731ce65763e98 files/rsyncd.conf.d 355
 MD5 b87d68fcfff9eb9ae5cdbea3796693c5 files/rsyncd.init.d 423
-MD5 2b5cd2c75632c28fb6d8a311e8548fa9 files/digest-rsync-2.6.0 136
-MD5 ce49a009e48cf4a24c3eeea10e8cbeb5 ChangeLog 5188
-MD5 b63ae1f7cafa826ca51ad2d9095522a1 rsync-2.5.7.ebuild 2229
-MD5 b76d6bb27a6907694e3689d1f58a7f30 rsync-2.6.0.ebuild 2076
diff --git a/net-misc/rsync/rsync-2.6.0.ebuild b/net-misc/rsync/rsync-2.6.0.ebuild
index 6d7fdb58146e..ffca598d8631 100644
--- a/net-misc/rsync/rsync-2.6.0.ebuild
+++ b/net-misc/rsync/rsync-2.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.0.ebuild,v 1.3 2004/03/02 16:44:52 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.0.ebuild,v 1.4 2004/04/12 00:07:05 mr_bones_ Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -12,43 +12,49 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64 ppc64 s390"
+IUSE="build static"
 
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4
+RDEPEND="virtual/glibc
 	!build? ( >=dev-libs/popt-1.5 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack "${P}.tar.gz"
 	cd ${S}
-	epatch ${DISTDIR}/${PN}-2.5.6-proxy-auth-1.patch
+	epatch "${DISTDIR}/${PN}-2.5.6-proxy-auth-1.patch"
 
 	# change confdir to /etc/rsync rather than just /etc (the --sysconfdir
 	# configure option doesn't work
-	sed	-i 's|/etc/rsyncd.conf|/etc/rsync/rsyncd.conf|g' rsync.h
+	sed	-i \
+		-e 's|/etc/rsyncd.conf|/etc/rsync/rsyncd.conf|g' rsync.h \
+			|| die "sed rsync.h failed"
 	# yes, updating the man page is very important.
-	sed -i 's|/etc/rsyncd|/etc/rsync/rsyncd|g' rsyncd.conf.5
+	sed -i \
+		-e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' rsyncd.conf.5 \
+			|| die "sed rsyncd.conf.5 failed"
 }
 
 src_compile() {
 	[ "`gcc-version`" == "2.95" ] && append-ldflags -lpthread
 	use static && append-ldflags -static
-	econf `use_with build included-popt` || die
-	emake || die
+	econf $(use_with build included-popt) || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
-	insinto /etc/conf.d && newins ${FILESDIR}/rsyncd.conf.d rsyncd
-	exeinto /etc/init.d && newexe ${FILESDIR}/rsyncd.init.d rsyncd
-	if [ ! `use build` ] ; then
+	make DESTDIR="${D}" install || die "make install failed"
+	insinto /etc/conf.d && newins "${FILESDIR}/rsyncd.conf.d" rsyncd
+	exeinto /etc/init.d && newexe "${FILESDIR}/rsyncd.init.d" rsyncd
+	if ! use build ; then
 		dodir /etc/rsync
-		dodoc COPYING NEWS OLDNEWS README TODO tech_report.tex
+		dodoc NEWS OLDNEWS README TODO tech_report.tex
 		if [ ! -e /etc/rsync/rsyncd.conf ] ; then
 			insinto /etc/rsync
-			doins ${FILESDIR}/rsyncd.conf
+			doins "${FILESDIR}/rsyncd.conf"
 		fi
 	else
-		rm -rf ${D}/usr/share
+		rm -rf "${D}/usr/share"
 	fi
 }