Fix for libpopt.so dependency in build-images

3 files changed, 66 insertions, 2 deletions

diff --git a/net-misc/rsync/ChangeLog b/net-misc/rsync/ChangeLog
index 2dbb79414271..b67c49a8a654 100644
--- a/net-misc/rsync/ChangeLog
+++ b/net-misc/rsync/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for net-misc/rsync
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.5 2002/05/02 21:21:24 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/ChangeLog,v 1.6 2002/05/08 05:03:10 kain Exp $
+
+*rsync-2.5.5-r1 (07 May 2002)
+
+  07 May 2002; Kain <kain@kain.org> rsync-2.5.5-r1.ebuild : Fix dependency to
+  libpopt again so that build images not made from a virgin install will work.
 
 *rsync-2.5.5 (02 May 2002)
 
-  20 May 2002; Daniel Robbins <drobbins@gentoo.org>: new ebuild to hopefully
+  02 May 2002; Daniel Robbins <drobbins@gentoo.org>: new ebuild to hopefully
   fix some "dead rsync --daemon" processes... the problem that just won't go
   away.
 
diff --git a/net-misc/rsync/files/digest-rsync-2.5.5-r1 b/net-misc/rsync/files/digest-rsync-2.5.5-r1
new file mode 100644
index 000000000000..c93b80c18c14
--- /dev/null
+++ b/net-misc/rsync/files/digest-rsync-2.5.5-r1
@@ -0,0 +1 @@
+MD5 b34b5a5eed243fe18b667e2c1d34b3b6 rsync-2.5.5.tar.gz 398257
diff --git a/net-misc/rsync/rsync-2.5.5-r1.ebuild b/net-misc/rsync/rsync-2.5.5-r1.ebuild
new file mode 100644
index 000000000000..c16940620289
--- /dev/null
+++ b/net-misc/rsync/rsync-2.5.5-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.5.5-r1.ebuild,v 1.1 2002/05/08 05:03:10 kain Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="File transfer program to keep remote files into sync"
+SRC_URI="http://rsync.samba.org/ftp/rsync/${P}.tar.gz"
+HOMEPAGE="http://rsync.samba.org"
+
+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
+}