clean up

9 files changed, 9 insertions, 231 deletions

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 39cfd509dca3..fcfa5a28ea16 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -2,25 +2,19 @@
 Hash: SHA1
 
 MD5 50ebc04b156e05733d01facaeb3baa32 ChangeLog 9420
-MD5 3e94bef4f67895c0a7df54232b707392 rsync-2.6.0-r3.ebuild 2585
-MD5 fbb34d0dcadfb4e50337afd5b0068263 rsync-2.6.3_pre2.ebuild 1955
-MD5 afcecb1b239a329a912a20e9906756b0 rsync-2.6.2-r4.ebuild 2085
-MD5 8dc8eb92ba59d02a195694a71ba8d4fc rsync-2.6.3.ebuild 1942
-MD5 32c330f99aeedd4c391e279e88039e5f rsync-2.6.1.ebuild 1939
+MD5 407a75f49fe2d2d9ec0dc8d7c7767cc1 rsync-2.6.0-r3.ebuild 2585
+MD5 b035a02debed67036028015028d7a0b7 rsync-2.6.3.ebuild 1942
 MD5 9118ed78f07b5bae1f8daa09226771b0 files/2.6.0-sanitize.patch 5842
 MD5 c27421f44de2c0fa58f6d01a9cbdeeb5 files/rsyncd.conf 405
 MD5 39b5aab74752c74d7d600265dd32de05 files/rsyncd.conf.d 348
 MD5 f7c02cef440a3407d84edd23fff2d379 files/rsyncd.init.d 416
 MD5 e04533ca371c57d742250cc0622c005e files/digest-rsync-2.6.0-r3 204
-MD5 03650d7b315c85d16c69d71798dd5264 files/digest-rsync-2.6.3_pre2 67
-MD5 23ad40bb15faf7e2d3846ffb6d6eaee9 files/digest-rsync-2.6.2-r4 131
 MD5 62972fab38bf033135efad0bd025f65b files/digest-rsync-2.6.3 63
-MD5 1b3c307f2cb9db6757a7b7a4aa8f345a files/digest-rsync-2.6.1 131
 MD5 93a1334931329a901f4aa47d63a7ce70 files/rsync-pathsanitize.patch 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBX4HhHTu7gpaalycRAuh+AKDR3dAlf1eKpxK9Y58k7mr1IhKqtQCfc/EV
-hGl44BGD2pYkABjNO+8iG/Y=
-=W3jQ
+iD8DBQFBX4JsHTu7gpaalycRAoLQAKC+scysE+IiyBamgcmEJQ/vE1xLCgCgrzAo
+/1TBrDLOrOE54xi1tKHRNMM=
+=+VIR
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rsync/files/digest-rsync-2.6.1 b/net-misc/rsync/files/digest-rsync-2.6.1
deleted file mode 100644
index 7b09f6f1cc94..000000000000
--- a/net-misc/rsync/files/digest-rsync-2.6.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6b1ee6a5878569215204f322ad128775 rsync-2.6.1.tar.gz 511395
-MD5 5b33440e8a22a85b6d00aa86bc4ee508 rsync-2.6.2-acl.diff.bz2 30505
diff --git a/net-misc/rsync/files/digest-rsync-2.6.2-r4 b/net-misc/rsync/files/digest-rsync-2.6.2-r4
deleted file mode 100644
index c6e03ea0dd43..000000000000
--- a/net-misc/rsync/files/digest-rsync-2.6.2-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bcacd9a9108a9e4760832212ec3d658d rsync-2.6.2.tar.gz 515402
-MD5 5b33440e8a22a85b6d00aa86bc4ee508 rsync-2.6.2-acl.diff.bz2 30505
diff --git a/net-misc/rsync/files/digest-rsync-2.6.3_pre2 b/net-misc/rsync/files/digest-rsync-2.6.3_pre2
deleted file mode 100644
index 830c2659b2c8..000000000000
--- a/net-misc/rsync/files/digest-rsync-2.6.3_pre2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 268721d91e22bfeafa31a3a753281c89 rsync-2.6.3pre2.tar.gz 578056
diff --git a/net-misc/rsync/rsync-2.6.0-r3.ebuild b/net-misc/rsync/rsync-2.6.0-r3.ebuild
index 8e83a5f2a280..e006bab858de 100644
--- a/net-misc/rsync/rsync-2.6.0-r3.ebuild
+++ b/net-misc/rsync/rsync-2.6.0-r3.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/net-misc/rsync/rsync-2.6.0-r3.ebuild,v 1.6 2004/09/23 03:43:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.0-r3.ebuild,v 1.7 2004/10/03 04:38:58 vapier Exp $
 
 inherit eutils flag-o-matic gcc gnuconfig
 
@@ -12,7 +12,7 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/old-versions/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="build static acl"
 
 RDEPEND="virtual/libc
diff --git a/net-misc/rsync/rsync-2.6.1.ebuild b/net-misc/rsync/rsync-2.6.1.ebuild
deleted file mode 100644
index 36cde3309612..000000000000
--- a/net-misc/rsync/rsync-2.6.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.1.ebuild,v 1.4 2004/07/15 03:28:43 agriffis Exp $
-
-inherit eutils flag-o-matic gcc
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="http://rsync.samba.org/"
-SRC_URI="http://rsync.samba.org/ftp/rsync/old-versions/${P}.tar.gz
-	acl? ( http://www.saout.de/misc/rsync-2.6.2-acl.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~hppa ~amd64 ~ia64 ~ppc64 s390"
-IUSE="acl build ipv6 static"
-
-RDEPEND="virtual/libc
-	!build? ( >=dev-libs/popt-1.5 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	acl? ( sys-apps/acl )"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd ${S}
-	use acl && epatch ${DISTDIR}/rsync-2.6.2-acl.diff.bz2
-
-	# yes, updating the man page is very important.
-	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) \
-		$(use_with acl acl-support) \
-		$(use_enable ipv6) \
-		--with-rsyncd-conf=/etc/rsync/rsyncd.conf \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	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 NEWS OLDNEWS README TODO tech_report.tex
-		if [ ! -e ${ROOT}/etc/rsync/rsyncd.conf ] ; then
-			insinto /etc/rsync
-			doins "${FILESDIR}/rsyncd.conf"
-		fi
-	else
-		rm -rf "${D}/usr/share"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Please make sure you do NOT disable the rsync server running"
-	ewarn "in a chroot.  Please check /etc/rsync/rsyncd.conf and make sure"
-	ewarn "it says: use chroot = yes"
-}
diff --git a/net-misc/rsync/rsync-2.6.2-r4.ebuild b/net-misc/rsync/rsync-2.6.2-r4.ebuild
deleted file mode 100644
index 585c34506649..000000000000
--- a/net-misc/rsync/rsync-2.6.2-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.2-r4.ebuild,v 1.1 2004/08/14 15:32:34 squinky86 Exp $
-
-inherit eutils flag-o-matic gcc
-
-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
-	acl? ( http://www.saout.de/misc/${P}-acl.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="build static acl ipv6"
-
-RDEPEND="virtual/libc
-	!build? ( >=dev-libs/popt-1.5 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	acl? ( sys-apps/acl )"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd ${S}
-	use acl && epatch ${DISTDIR}/${P}-acl.diff.bz2
-
-	# change confdir to /etc/rsync rather than just /etc (the --sysconfdir
-	# yes, updating the man page is very important.
-	sed -i \
-		-e 's|/etc/rsyncd|/etc/rsync/rsyncd|g' \
-		rsyncd.conf.5 \
-		|| die "sed rsyncd.conf.5 failed"
-
-	# apply security patch from bug #60309
-	epatch ${FILESDIR}/${PN}-pathsanitize.patch
-}
-
-src_compile() {
-	[ "`gcc-version`" == "2.95" ] && append-ldflags -lpthread
-	use static && append-ldflags -static
-	export LDFLAGS
-
-	econf \
-		$(use_with build included-popt) \
-		$(use_with acl acl-support) \
-		$(use_enable ipv6) \
-		--with-rsyncd-conf=/etc/rsync/rsyncd.conf \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	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 NEWS OLDNEWS README TODO tech_report.tex
-		if [ ! -e /etc/rsync/rsyncd.conf ] ; then
-			insinto /etc/rsync
-			doins "${FILESDIR}/rsyncd.conf"
-		fi
-	else
-		rm -rf "${D}/usr/share"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Please make sure you do NOT disable the rsync server running"
-	ewarn "in a chroot.  Please check /etc/rsync/rsyncd.conf and make sure"
-	ewarn "it says: use chroot = yes"
-}
diff --git a/net-misc/rsync/rsync-2.6.3.ebuild b/net-misc/rsync/rsync-2.6.3.ebuild
index eacb2860d2e3..b1af889ff4f1 100644
--- a/net-misc/rsync/rsync-2.6.3.ebuild
+++ b/net-misc/rsync/rsync-2.6.3.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/net-misc/rsync/rsync-2.6.3.ebuild,v 1.1 2004/10/03 04:36:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.3.ebuild,v 1.2 2004/10/03 04:38:58 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -10,7 +10,7 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/${P/_/}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="build static acl ipv6"
 
 RDEPEND="virtual/libc
diff --git a/net-misc/rsync/rsync-2.6.3_pre2.ebuild b/net-misc/rsync/rsync-2.6.3_pre2.ebuild
deleted file mode 100644
index 691bc8d5708c..000000000000
--- a/net-misc/rsync/rsync-2.6.3_pre2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rsync/rsync-2.6.3_pre2.ebuild,v 1.1 2004/09/25 06:52:04 vapier Exp $
-
-inherit eutils flag-o-matic gcc
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="http://rsync.samba.org/"
-SRC_URI="http://rsync.samba.org/ftp/rsync/preview/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
-IUSE="build static acl ipv6"
-
-RDEPEND="virtual/libc
-	!build? ( >=dev-libs/popt-1.5 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	acl? ( sys-apps/acl )"
-
-S="${WORKDIR}/${P/_/}"
-
-src_unpack() {
-	unpack "${P/_/}.tar.gz"
-	cd ${S}
-	use acl && epatch patches/acl.diff
-
-	# change confdir to /etc/rsync rather than just /etc (the --sysconfdir
-	# yes, updating the man page is very important.
-	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) \
-		$(use_with acl acl-support) \
-		$(use_enable ipv6) \
-		--with-rsyncd-conf=/etc/rsync/rsyncd.conf \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	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 NEWS OLDNEWS README TODO tech_report.tex
-		if [ ! -e /etc/rsync/rsyncd.conf ] ; then
-			insinto /etc/rsync
-			doins "${FILESDIR}/rsyncd.conf"
-		fi
-	else
-		rm -rf "${D}/usr/share"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Please make sure you do NOT disable the rsync server running"
-	ewarn "in a chroot.  Please check /etc/rsync/rsyncd.conf and make sure"
-	ewarn "it says: use chroot = yes"
-}