old

13 files changed, 0 insertions, 678 deletions

diff --git a/net-misc/rsync/files/digest-rsync-2.6.0-r6 b/net-misc/rsync/files/digest-rsync-2.6.0-r6
deleted file mode 100644
index d07dbe55f315..000000000000
--- a/net-misc/rsync/files/digest-rsync-2.6.0-r6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a399e227a18ea3f2eb5aa2b401006d2d rsync-2.5.6-proxy-auth-1.patch 4353
-RMD160 e9c5b2796af34b5aae0fd0019fe6c6b6507ddf3f rsync-2.5.6-proxy-auth-1.patch 4353
-SHA256 d7b00e561d388cf9b033a406e899b0ed33444a62562be35793477c9db3604ec1 rsync-2.5.6-proxy-auth-1.patch 4353
-MD5 16cbffdcd9c6c318761c6c0d86400197 rsync-2.6.0-acl.diff.bz2 60721
-RMD160 c425739d8bb99096dc4f2a52f0b835d129c1cfe0 rsync-2.6.0-acl.diff.bz2 60721
-SHA256 fb6302ccebda9d527578f5647a76565268cc271926c1a21cfd87a1d5aab041bc rsync-2.6.0-acl.diff.bz2 60721
-MD5 3f24bf31aec0a657eb3b6844c3f09f21 rsync-2.6.0.tar.gz 464920
-RMD160 7dbccb64bd6a10db421b9a973429c95f9db30d14 rsync-2.6.0.tar.gz 464920
-SHA256 af5f98e4d8dd42d20fdb6c67e8a7c75b1ea5aaa9f4a7f1bcd7501016590ed5d1 rsync-2.6.0.tar.gz 464920
diff --git a/net-misc/rsync/files/digest-rsync-2.6.8-r2 b/net-misc/rsync/files/digest-rsync-2.6.8-r2
deleted file mode 100644
index 4789a4ea15b8..000000000000
--- a/net-misc/rsync/files/digest-rsync-2.6.8-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 082a9dba1f741e6591e5cd748a1233de rsync-2.6.8.tar.gz 772314
-RMD160 f01bd6c6d28f7cf888be640c4d3b2406bba28385 rsync-2.6.8.tar.gz 772314
-SHA256 784782de0efee0b4624bdd1d75d524ef95d16354cb13cbb5449d990b61e607a6 rsync-2.6.8.tar.gz 772314
diff --git a/net-misc/rsync/files/digest-rsync-2.6.9 b/net-misc/rsync/files/digest-rsync-2.6.9
deleted file mode 100644
index fca949e58851..000000000000
--- a/net-misc/rsync/files/digest-rsync-2.6.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 996d8d8831dbca17910094e56dcb5942 rsync-2.6.9.tar.gz 811841
-RMD160 36d270d9f01e9a8e808f426196796001bdd3d5d2 rsync-2.6.9.tar.gz 811841
-SHA256 ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9 rsync-2.6.9.tar.gz 811841
diff --git a/net-misc/rsync/files/rsync-2.6.0-cvsignore.patch b/net-misc/rsync/files/rsync-2.6.0-cvsignore.patch
deleted file mode 100644
index 5e5b2552684e..000000000000
--- a/net-misc/rsync/files/rsync-2.6.0-cvsignore.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From upstream CVS. This was fixed in 2.6.1.
-
-Log entry:
-
-  "Items read from a per-directory .cvsignore file should be added to the
-   local_exclude_list, not the exclude_list."
-
-Index: flist.c
-===================================================================
-RCS file: /cvsroot/rsync/flist.c,v
-retrieving revision 1.164
-retrieving revision 1.165
-diff -u -r1.164 -r1.165
---- flist.c	13 Jan 2004 06:27:30 -0000	1.164
-+++ flist.c	17 Jan 2004 01:16:49 -0000	1.165
-@@ -942,7 +942,7 @@
- 	if (cvs_exclude) {
- 		if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) {
- 			strcpy(p, ".cvsignore");
--			add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
-+			add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
- 		} else {
- 			io_error |= IOERR_GENERAL;
- 			rprintf(FINFO,
diff --git a/net-misc/rsync/files/rsync-2.6.0-livecd-sigmask.patch b/net-misc/rsync/files/rsync-2.6.0-livecd-sigmask.patch
deleted file mode 100644
index c96bdaeb7003..000000000000
--- a/net-misc/rsync/files/rsync-2.6.0-livecd-sigmask.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -au rsync-2.6.0/Makefile.in rsync-2.6.0.new/Makefile.in
---- rsync-2.6.0/Makefile.in	2003-07-30 01:12:25.000000000 -0500
-+++ rsync-2.6.0.new/Makefile.in	2005-04-22 11:44:18.660090168 -0500
-@@ -6,7 +6,7 @@
- bindir=@bindir@
- mandir=@mandir@
- 
--LIBS=@LIBS@
-+LIBS=@LIBS@ -lpthread
- CC=@CC@
- CFLAGS=@CFLAGS@
- CPPFLAGS=@CPPFLAGS@
-Common subdirectories: rsync-2.6.0/doc and rsync-2.6.0.new/doc
-Common subdirectories: rsync-2.6.0/lib and rsync-2.6.0.new/lib
-diff -au rsync-2.6.0/main.c rsync-2.6.0.new/main.c
---- rsync-2.6.0/main.c	2003-12-20 10:57:24.000000000 -0600
-+++ rsync-2.6.0.new/main.c	2005-04-22 11:43:44.896223056 -0500
-@@ -978,10 +978,15 @@
- 	extern int write_batch;
- 	int orig_argc;
- 	char **orig_argv;
-+	sigset_t set, old_set;
- 
- 	orig_argc = argc;
- 	orig_argv = argv;
- 
-+	// Added to defensively set sigmask
-+	sigfillset(&set);
-+	pthread_sigmask(SIG_UNBLOCK, &set, &old_set);
-+
- 	signal(SIGUSR1, sigusr1_handler);
- 	signal(SIGUSR2, sigusr2_handler);
- 	signal(SIGCHLD, sigchld_handler);
-Common subdirectories: rsync-2.6.0/packaging and rsync-2.6.0.new/packaging
-Common subdirectories: rsync-2.6.0/patches and rsync-2.6.0.new/patches
-Common subdirectories: rsync-2.6.0/popt and rsync-2.6.0.new/popt
-diff -au rsync-2.6.0/rsync.h rsync-2.6.0.new/rsync.h
---- rsync-2.6.0/rsync.h	2003-12-16 17:04:59.000000000 -0600
-+++ rsync-2.6.0.new/rsync.h	2005-04-22 11:43:44.897222904 -0500
-@@ -686,3 +686,7 @@
- #define UNUSED(x) x __attribute__((__unused__))
- 
- extern const char *io_write_phase, *io_read_phase;
-+
-+// Added to defensively set the sigmask
-+#include <pthread.h>
-+#include <signal.h>
-Common subdirectories: rsync-2.6.0/testhelp and rsync-2.6.0.new/testhelp
-Common subdirectories: rsync-2.6.0/testsuite and rsync-2.6.0.new/testsuite
-Common subdirectories: rsync-2.6.0/zlib and rsync-2.6.0.new/zlib
diff --git a/net-misc/rsync/files/rsync-2.6.0-sanitize.patch b/net-misc/rsync/files/rsync-2.6.0-sanitize.patch
deleted file mode 100644
index cfd9d50f4907..000000000000
--- a/net-misc/rsync/files/rsync-2.6.0-sanitize.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-Fix a security issue with rsyncd not properly sanitizing paths.
-
-Ripped from upstream cvs.
-
-Index: options.c
-===================================================================
-RCS file: /cvsroot/rsync/options.c,v
-retrieving revision 1.139
-retrieving revision 1.141
-diff -u -b -B -r1.139 -r1.141
---- options.c
-+++ options.c
-@@ -21,6 +21,8 @@
- #include "rsync.h"
- #include "popt.h"
- 
-+extern int sanitize_paths;
-+extern char curr_dir[MAXPATHLEN];
- extern struct exclude_struct **exclude_list;
- 
- int make_backups = 0;
-@@ -359,7 +361,7 @@
-   {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
-   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-   {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
--  {"link-dest",        0,  POPT_ARG_STRING, 0,              OPT_LINK_DEST, 0, 0 },
-+  {"link-dest",        0,  POPT_ARG_STRING, &compare_dest,  OPT_LINK_DEST, 0, 0 },
-   /* TODO: Should this take an optional int giving the compression level? */
-   {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-   {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
-@@ -469,6 +471,7 @@
- {
- 	int opt;
- 	char *ref = lp_refuse_options(module_id);
-+	const char *arg;
- 	poptContext pc;
- 
- 	if (ref && *ref)
-@@ -517,12 +520,18 @@
- 			break;
- 
- 		case OPT_EXCLUDE_FROM:
--			add_exclude_file(&exclude_list, poptGetOptArg(pc),
-+			arg = poptGetOptArg(pc);
-+			if (sanitize_paths)
-+				arg = alloc_sanitize_path(arg, curr_dir);
-+			add_exclude_file(&exclude_list, arg,
- 					 MISSING_FATAL, ADD_EXCLUDE);
- 			break;
- 
- 		case OPT_INCLUDE_FROM:
--			add_exclude_file(&exclude_list, poptGetOptArg(pc),
-+			arg = poptGetOptArg(pc);
-+			if (sanitize_paths)
-+				arg = alloc_sanitize_path(arg, curr_dir);
-+			add_exclude_file(&exclude_list, arg,
- 					 MISSING_FATAL, ADD_INCLUDE);
- 			break;
- 
-@@ -566,7 +575,6 @@
- 
- 		case OPT_LINK_DEST:
- #if HAVE_LINK
--			compare_dest = (char *)poptGetOptArg(pc);
- 			link_dest = 1;
- 			break;
- #else
-@@ -660,6 +668,26 @@
- 	if (relative_paths < 0)
- 		relative_paths = files_from? 1 : 0;
- 
-+	*argv = poptGetArgs(pc);
-+	if (*argv)
-+		*argc = count_args(*argv);
-+	else
-+		*argc = 0;
-+
-+	if (sanitize_paths) {
-+		int i;
-+		for (i = *argc; i-- > 0; )
-+			(*argv)[i] = alloc_sanitize_path((*argv)[i], NULL);
-+		if (tmpdir)
-+			tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
-+		if (compare_dest)
-+			compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
-+		if (backup_dir)
-+			backup_dir = alloc_sanitize_path(backup_dir, curr_dir);
-+		if (files_from)
-+			files_from = alloc_sanitize_path(files_from, curr_dir);
-+	}
-+
- 	if (!backup_suffix)
- 		backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
- 	backup_suffix_len = strlen(backup_suffix);
-@@ -690,12 +718,6 @@
- 	if (do_progress && !verbose)
- 		verbose = 1;
- 
--	*argv = poptGetArgs(pc);
--	if (*argv)
--		*argc = count_args(*argv);
--	else
--		*argc = 0;
--
- 	if (files_from) {
- 		char *colon;
- 		if (*argc != 2) {
-@@ -718,9 +740,6 @@
- 				exit_cleanup(RERR_SYNTAX);
- 			}
- 		} else {
--			extern int sanitize_paths;
--			if (sanitize_paths)
--				sanitize_path(strdup(files_from), NULL);
- 			filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);
- 			if (filesfrom_fd < 0) {
- 				rsyserr(FERROR, errno,
-Index: clientserver.c
-===================================================================
-RCS file: /cvsroot/rsync/clientserver.c,v
-retrieving revision 1.118
-retrieving revision 1.117
-diff -u -b -B -r1.118 -r1.117
---- clientserver.c
-+++ clientserver.c
-@@ -423,19 +423,6 @@
- 		}
- 	}
- 
--	if (sanitize_paths) {
--		/*
--		 * Note that this is applied to all parameters, whether or not
--		 *    they are filenames, but no other legal parameters contain
--		 *    the forms that need to be sanitized so it doesn't hurt;
--		 *    it is not known at this point which parameters are files
--		 *    and which aren't.
--		 */
--		for (i = 1; i < argc; i++) {
--			sanitize_path(argv[i], NULL);
--		}
--	}
--
- 	argp = argv;
- 	ret = parse_arguments(&argc, (const char ***) &argp, 0);
- 
-Index: proto.h
-===================================================================
-RCS file: /cvsroot/rsync/proto.h,v
-retrieving revision 1.184
-retrieving revision 1.185
-diff -u -b -B -r1.184 -r1.185
---- proto.h
-+++ proto.h
-@@ -260,6 +260,7 @@
- void strlower(char *s);
- void clean_fname(char *name);
- void sanitize_path(char *p, char *reldir);
-+char *alloc_sanitize_path(const char *path, const char *rootdir);
- char *push_dir(char *dir, int save);
- int pop_dir(char *dir);
- char *full_fname(char *fn);
-Index: util.c
-===================================================================
-RCS file: /cvsroot/rsync/util.c,v
-retrieving revision 1.132
-retrieving revision 1.133
-diff -u -b -B -r1.132 -r1.133
---- util.c
-+++ util.c
-@@ -775,6 +775,34 @@
- 	*sanp = '\0';
- }
- 
-+/* Works much like sanitize_path(), with these differences:  (1) a new buffer
-+ * is allocated for the sanitized path rather than modifying it in-place; (2)
-+ * a leading slash gets transformed into the rootdir value (which can be empty
-+ * or NULL if you just want the slash to get dropped); (3) no "reldir" can be
-+ * specified. */
-+char *alloc_sanitize_path(const char *path, const char *rootdir)
-+{
-+	char *buf;
-+	int rlen, plen = strlen(path);
-+
-+	if (*path == '/' && rootdir)
-+		rlen = strlen(rootdir);
-+	else
-+		rlen = 0;
-+	if (!(buf = new_array(char, rlen + plen + 1)))
-+		out_of_memory("alloc_sanitize_path");
-+	if (rlen)
-+		memcpy(buf, rootdir, rlen);
-+	memcpy(buf + rlen, path, plen + 1);
-+
-+	if (rlen)
-+		rlen++;
-+	sanitize_path(buf + rlen, NULL);
-+	if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0')
-+		buf[rlen-1] = '\0';
-+
-+	return buf;
-+}
- 
- char curr_dir[MAXPATHLEN];
- unsigned int curr_dir_len;
diff --git a/net-misc/rsync/files/rsync-2.6.6-acls.patch b/net-misc/rsync/files/rsync-2.6.6-acls.patch
deleted file mode 100644
index 02a90e968997..000000000000
--- a/net-misc/rsync/files/rsync-2.6.6-acls.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix from upstream
-
-This revealed that the acls patch was not properly reporting what files
-were being updated when acls were not being preserved.  The attached
-patch should fix this.
-
-http://lists.samba.org/archive/rsync/2005-July/013169.html
-http://lists.samba.org/archive/rsync/2005-July/013174.html
-
---- rsync-2.6.6/acls.c
-+++ rsync-2.6.6/acls.c
-@@ -845,7 +845,7 @@
- 		types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
- 	int ret = 0;
- 	if (!preserve_acls)
--		return 0;
-+		return 1;
- 	for (type = &types[0];
- 	     type < &types[0] + sizeof types / sizeof types[0]
- 		 && (*type == SMB_ACL_TYPE_ACCESS || S_ISDIR(mode));
-@@ -962,7 +962,7 @@
- 		}
- 		return ret;
- 	}
--	return 0;
-+	return 1;
- }
- 
- void cleanup_keep_backup_acl()
-@@ -992,7 +992,7 @@
- 	SMB_ACL_TYPE_T *type,
- 		types[] = {SMB_ACL_TYPE_ACCESS, SMB_ACL_TYPE_DEFAULT};
- 	if (dry_run || !preserve_acls || S_ISLNK(file->mode))
--		return 0;
-+		return 1;
- 	if (file == backup_orig_file) {
- 		if (!strcmp(fname, backup_dest_fname))
- 			return set_keep_backup_acl();
---- rsync-2.6.6/rsync.h
-+++ rsync-2.6.6/rsync.h
-@@ -667,12 +667,12 @@
- #define SEND_ACL(file, f)
- #define RECEIVE_ACL(file, f)
- #define SORT_FILE_ACL_INDEX_LISTS()
--#define SET_ACL(fname, file)			0 /* checked return value */
-+#define SET_ACL(fname, file)			1 /* checked return value */
- #define NEXT_ACL_UID()	
- #define ACL_UID_MAP(uid)
- #define PUSH_KEEP_BACKUP_ACL(file, orig, dest)
- #define CLEANUP_KEEP_BACKUP_ACL()
--#define DUP_ACL(src, orig, mode)		0 /* checked return value */
-+#define DUP_ACL(src, orig, mode)		1 /* checked return value */
- #endif /* SUPPORT_ACLS */
- #include "smb_acls.h"
- 
diff --git a/net-misc/rsync/files/rsync-2.6.8-fix-deferred-msgs.patch b/net-misc/rsync/files/rsync-2.6.8-fix-deferred-msgs.patch
deleted file mode 100644
index 6d2a464d6950..000000000000
--- a/net-misc/rsync/files/rsync-2.6.8-fix-deferred-msgs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix from upstream for:
-http://bugs.gentoo.org/133054
-
-Index: io.c
-===================================================================
-RCS file: /cvsroot/rsync/io.c,v
-retrieving revision 1.193
-retrieving revision 1.194
-diff -u -p -r1.193 -r1.194
---- io.c	25 Apr 2006 23:51:15 -0000	1.193
-+++ io.c	3 May 2006 05:19:01 -0000	1.194
-@@ -294,6 +294,7 @@ static void read_msg_fd(void)
- 			exit_cleanup(RERR_STREAMIO);
- 		}
- 		close_multiplexing_out();
-+		defer_forwarding_messages = 0;
- 		/* FALL THROUGH */
- 	case MSG_INFO:
- 	case MSG_ERROR:
-@@ -303,7 +304,8 @@ static void read_msg_fd(void)
- 			if (n >= sizeof buf)
- 				n = sizeof buf - 1;
- 			read_loop(fd, buf, n);
--			if (am_generator && am_server && defer_forwarding_messages)
-+			if (am_generator && am_server
-+			 && defer_forwarding_messages && tag != MSG_LOG)
- 				msg_list_add(&msg2sndr, tag, buf, n);
- 			else
- 				rwrite((enum logcode)tag, buf, n);
-@@ -1134,11 +1136,20 @@ static void msg2sndr_flush(void)
- 
- 	while (msg2sndr.head && io_multiplexing_out) {
- 		struct msg_list_item *m = msg2sndr.head;
-+		int tag = (IVAL(m->buf, 0) >> 24) - MPLEX_BASE;
- 		if (!(msg2sndr.head = m->next))
- 			msg2sndr.tail = NULL;
--		stats.total_written += m->len;
- 		defer_forwarding_messages = 1;
--		writefd_unbuffered(sock_f_out, m->buf, m->len);
-+		switch (tag) {
-+		case MSG_INFO:
-+		case MSG_ERROR:
-+			rwrite((enum logcode)tag, m->buf + 4, m->len - 4);
-+			break;
-+		default:
-+			stats.total_written += m->len;
-+			writefd_unbuffered(sock_f_out, m->buf, m->len);
-+			break;
-+		}
- 		defer_forwarding_messages = 0;
- 		free(m);
- 	}
diff --git a/net-misc/rsync/files/rsync-2.6.8-verbose-quiet-output.patch b/net-misc/rsync/files/rsync-2.6.8-verbose-quiet-output.patch
deleted file mode 100644
index d13f871963dd..000000000000
--- a/net-misc/rsync/files/rsync-2.6.8-verbose-quiet-output.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/133217
-
-Index: log.c
-===================================================================
-RCS file: /cvsroot/rsync/log.c,v
-retrieving revision 1.150
-retrieving revision 1.151
-diff -u -p -r1.150 -r1.151
---- log.c	9 May 2006 18:31:10 -0000	1.150
-+++ log.c	14 May 2006 00:27:33 -0000	1.151
-@@ -224,9 +224,6 @@ void rwrite(enum logcode code, char *buf
- 	if (len < 0)
- 		exit_cleanup(RERR_MESSAGEIO);
- 
--	if (quiet && code == FINFO)
--		return;
--
- 	if (am_server && msg_fd_out >= 0) {
- 		/* Pass the message to our sibling. */
- 		send_msg((enum msgcode)code, buf, len);
-@@ -258,6 +255,9 @@ void rwrite(enum logcode code, char *buf
- 	} else if (code == FLOG)
- 		return;
- 
-+	if (quiet && code != FERROR)
-+		return;
-+
- 	if (am_server) {
- 		/* Pass the message to the non-server side. */
- 		if (send_msg((enum msgcode)code, buf, len))
diff --git a/net-misc/rsync/files/rsync-pathsanitize.patch b/net-misc/rsync/files/rsync-pathsanitize.patch
deleted file mode 100644
index de2a8e493a3c..000000000000
--- a/net-misc/rsync/files/rsync-pathsanitize.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/60309
-
---- util.c
-+++ util.c
-@@ -743,7 +743,7 @@
- 				allowdotdot = 1;
- 			} else {
- 				p += 2;
--				if (*p == '/')
-+				while (*p == '/')
- 					p++;
- 				if (sanp != start) {
- 					/* back up sanp one level */
diff --git a/net-misc/rsync/rsync-2.6.0-r6.ebuild b/net-misc/rsync/rsync-2.6.0-r6.ebuild
deleted file mode 100644
index f07d21f4cca9..000000000000
--- a/net-misc/rsync/rsync-2.6.0-r6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.0-r6.ebuild,v 1.2 2006/01/02 18:56:09 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/old-versions/${P}.tar.gz
-	http://www.imada.sdu.dk/~bardur/personal/40-patches/rsync-proxy-auth/rsync-2.5.6-proxy-auth-1.patch
-	acl? ( http://www.saout.de/misc/${P}-acl.diff.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="acl build livecd static xinetd"
-
-RDEPEND="!build? ( >=dev-libs/popt-1.5 )
-	acl? ( sys-apps/acl )"
-DEPEND="${RDEPEND}
-	>=sys-apps/portage-2.0.51"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sanitize.patch
-	epatch "${DISTDIR}"/${PN}-2.5.6-proxy-auth-1.patch
-	epatch "${FILESDIR}"/${P}-cvsignore.patch
-	use acl && epatch "${DISTDIR}"/${P}-acl.diff.bz2
-	use livecd && epatch ${FILESDIR}/${P}-livecd-sigmask.patch
-
-	# 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) \
-		|| 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"
-	echo
-	einfo 'This patch enables usage of user:pass@proxy.foo:port'
-	einfo 'in the RSYNC_PROXY environment variable to support'
-	einfo 'the "Basic" proxy authentication scheme if you are'
-	einfo 'behind a password protected HTTP proxy.'
-}
diff --git a/net-misc/rsync/rsync-2.6.8-r2.ebuild b/net-misc/rsync/rsync-2.6.8-r2.ebuild
deleted file mode 100644
index e0e12f8142ec..000000000000
--- a/net-misc/rsync/rsync-2.6.8-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.5 2006/12/13 08:53:58 grobian 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 ppc64 s390 sh sparc ~sparc-fbsd 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"
-}
diff --git a/net-misc/rsync/rsync-2.6.9.ebuild b/net-misc/rsync/rsync-2.6.9.ebuild
deleted file mode 100644
index da5c85fe57f0..000000000000
--- a/net-misc/rsync/rsync-2.6.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.9.ebuild,v 1.10 2006/12/14 16:11:42 eroyf 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 ppc64 s390 sh sparc ~sparc-fbsd 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}"
-	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() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d rsyncd
-	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
-}
-
-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"
-}