Fix from upstream for output with -v and -q #133217 by lou.

Package-Manager: portage-2.1_pre10-r5

1 files changed, 79 insertions, 0 deletions

diff --git a/net-misc/rsync/rsync-2.6.8-r2.ebuild b/net-misc/rsync/rsync-2.6.8-r2.ebuild
new file mode 100644
index 000000000000..dffe9f9908a5
--- /dev/null
+++ b/net-misc/rsync/rsync-2.6.8-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.8-r2.ebuild,v 1.1 2006/05/14 05:42:57 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ~ppc-macos ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="acl build ipv6 static xinetd"
+
+RDEPEND="!build? ( >=dev-libs/popt-1.5 )
+	acl? ( kernel_linux? ( sys-apps/acl ) )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+
+S=${WORKDIR}/${P/_/}
+
+src_unpack() {
+	unpack ${P/_/}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-deferred-msgs.patch #133054
+	epatch "${FILESDIR}"/${P}-verbose-quiet-output.patch #133217
+	if use acl ; then
+		epatch patches/{acls,xattrs}.diff
+		./prepare-source || die
+	fi
+}
+
+src_compile() {
+	[[ $(gcc-version) == "2.95" ]] && append-ldflags -lpthread
+	use static && append-ldflags -static
+
+	econf \
+		$(use_with build included-popt) \
+		$(use_enable acl acl-support) \
+		$(use_enable acl xattr-support) \
+		$(use_enable ipv6) \
+		--with-rsyncd-conf=/etc/rsyncd.conf \
+		|| die
+	emake || die "emake failed"
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/etc/rsync/rsyncd.conf ]] && [[ ! -e ${ROOT}/etc/rsyncd.conf ]] ; then
+		mv "${ROOT}"/etc/rsync/rsyncd.conf "${ROOT}"/etc/rsyncd.conf
+		rm -f "${ROOT}"/etc/rsync/.keep
+		rmdir "${ROOT}"/etc/rsync >& /dev/null
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d rsyncd
+	if ! use build ; then
+		dodoc NEWS OLDNEWS README TODO tech_report.tex
+		insinto /etc
+		doins "${FILESDIR}"/rsyncd.conf
+		if use xinetd ; then
+			insinto /etc/xinetd.d
+			newins "${FILESDIR}"/rsyncd.xinetd rsyncd
+		fi
+	else
+		rm -r "${D}"/usr/share
+	fi
+}
+
+pkg_postinst() {
+	ewarn "The rsyncd.conf file has been moved for you to /etc/rsyncd.conf"
+	echo
+	ewarn "Please make sure you do NOT disable the rsync server running"
+	ewarn "in a chroot.  Please check /etc/rsyncd.conf and make sure"
+	ewarn "it says: use chroot = yes"
+}