7 files changed, 89 insertions, 65 deletions
diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 5ac90f5ead28..a325a17271e8 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2003/02/22 07:27:44 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.20 2003/02/22 22:41:09 vapier Exp $
+
+*rsync-2.5.6-r1 (22 Feb 2003)
+
+  22 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add init.d and conf.d files
+
+*rsync-2.5.6 (28 Jan 2003)
 
   21 Feb 2003; Zach Welch <zwelch@gentoo.org> :
   Added arm to keywords.
@@ -8,8 +15,6 @@
   09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
   Added hppa to keywords.
 
-*rsync-2.5.6 (28 Jan 2003)
-
   28 Jan 2003; Arcady Genkin <agenkin@gentoo.org> :
   Updated to the official 2.5.6.
 	
diff --git a/net-misc/rsync/files/digest-rsync-2.5.6-r1 b/net-misc/rsync/files/digest-rsync-2.5.6-r1
new file mode 100644
index 000000000000..e15009102ca5
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.5.6-r1
@@ -0,0 +1 @@
+MD5 ec39fcea433df4d6a3a4e0896c655535 rsync-2.5.6.tar.gz 584678
diff --git a/net-misc/rsync/files/digest-rsync-2.5.6_pre20021105 b/net-misc/rsync/files/digest-rsync-2.5.6_pre20021105
deleted file mode 100644
index f1e52f8ae562..000000000000
--- a/net-misc/rsync/files/digest-rsync-2.5.6_pre20021105
+++ /dev/null
@@ -1 +0,0 @@
-MD5 113d4b942000e46946a3bdba27e069a3 rsync-2.5.6_pre20021105.tar.bz2 368755
diff --git a/net-misc/rsync/files/rsyncd.conf.d b/net-misc/rsync/files/rsyncd.conf.d
new file mode 100644
index 000000000000..705fea473530
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.conf.d
@@ -0,0 +1,9 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.conf.d,v 1.1 2003/02/22 22:41:09 vapier Exp $
+
+# Config file for /etc/init.d/rsyncd
+
+# see man pages for rsync or run `rsync --help`
+# for valid cmdline options
+#RSYNC_OPTS=""
diff --git a/net-misc/rsync/files/rsyncd.init.d b/net-misc/rsync/files/rsyncd.init.d
new file mode 100644
index 000000000000..4ec480125e2a
--- /dev/null
+++ b/net-misc/rsync/files/rsyncd.init.d
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/files/rsyncd.init.d,v 1.1 2003/02/22 22:41:09 vapier Exp $
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting rsyncd"
+	rsync --daemon ${RSYNC_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rsyncd"
+	kill `cat /var/run/rsyncd.pid`
+	eend $?
+}
diff --git a/net-misc/rsync/rsync-2.5.6-r1.ebuild b/net-misc/rsync/rsync-2.5.6-r1.ebuild
new file mode 100644
index 000000000000..705aa89fe78b
--- /dev/null
+++ b/net-misc/rsync/rsync-2.5.6-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.5.6-r1.ebuild,v 1.1 2003/02/22 22:41:09 vapier Exp $
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="http://rsync.samba.org/"
+SRC_URI="http://rsync.samba.org/ftp/rsync/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="x86 ~hppa arm"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# change confdir to /etc/rsync rather than just /etc (the --sysconfdir
+	# configure option doesn't work
+	mv rsync.h rsync.h.orig
+	sed <rsync.h.orig >rsync.h \
+		-e 's|/etc/rsyncd.conf|/etc/rsync/rsyncd.conf|g'
+
+	# yes, updating the man page is very important.
+	mv rsyncd.conf.5 rsyncd.conf.5.orig
+	sed <rsyncd.conf.5.orig >rsyncd.conf.5 \
+		-e 's|/etc/rsyncd|/etc/rsync/rsyncd|g'
+} 
+
+src_compile() {
+	[ -n "$(use build)" ] \
+		&& POPTSETTING="--with-included-popt" \
+		|| POPTSETTING=""
+	econf ${POPTSETTING} || die
+	use static && export LDFLAGS="${LDFLAGS} -static"
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	insinto /etc/conf.d && newins ${FILESDIR}/rsyncd.conf.d rsyncd
+	exeinto /etc/init.d && newexe ${FILESDIR}/rsyncd.init.d rsyncd
+	keepdir /etc/rsync
+	if [ -z "`use build`" ] ; then
+		dodir /etc/rsync
+		dodoc COPYING NEWS OLDNEWS README TODO tech_report.tex
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
diff --git a/net-misc/rsync/rsync-2.5.6_pre20021105.ebuild b/net-misc/rsync/rsync-2.5.6_pre20021105.ebuild
deleted file mode 100644
index 4006cbd1a86b..000000000000
--- a/net-misc/rsync/rsync-2.5.6_pre20021105.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.5.6_pre20021105.ebuild,v 1.5 2003/02/13 15:06:28 vapier Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="File transfer program to keep remote files into sync"
-SRC_URI="http://cvs.gentoo.org/~blizzy/${PF}.tar.bz2"
-HOMEPAGE="http://rsync.samba.org"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# change confdir to /etc/rsync rather than just /etc (the --sysconfdir 
-	# configure option doesn't work
-	cp rsync.h rsync.h.orig
-	sed -e 's:RSYNCD_CONF "/etc/rsyncd.conf":RSYNCD_CONF "/etc/rsync/rsyncd.conf":g' rsync.h.orig > rsync.h
-
-	# yes, updating the man page is very important.
-	cp rsyncd.conf.5 rsyncd.conf.5.orig
-	sed -e 's:/etc/rsyncd:/etc/rsync/rsyncd:g' rsyncd.conf.5.orig > rsyncd.conf.5
-} 
-
-src_compile() {
-	if [ -n "$(use build)" ]; then
-		POPTSETTING="--with-included-popt"
-	else
-		POPTSETTING=""
-	fi
-	./configure --prefix=/usr --host=${CHOST} ${POPTSETTING} || die
-	if [ "`use static`" ] ; then
-		emake LDFLAGS="-static" || die
-	else
-		emake || die
-	fi
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install  || die
-	if [ -z "`use build`" ]
-	then
-		dodir /etc/rsync
-		dodoc COPYING NEWS OLDNEWS README TODO tech_report.tex
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
-
-pkg_postinst() {
-	if [ ! -d /etc/rsync ]
-	then
-		mkdir /etc/rsync
-	fi
-}