clean out old cruft

(Portage version: 2.1.8.3/cvs/Linux i686)

13 files changed, 11 insertions, 995 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 0611d29cfbd5..8784d7ed09fe 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.124 2010/03/18 19:52:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.125 2010/07/20 17:07:25 mr_bones_ Exp $
+
+  20 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/vsftpd-2.0.3-gentoo.patch, -files/vsftpd-2.0.6-caps.patch,
+  -files/vsftpd-2.0.6-libcap1.patch, -vsftpd-2.0.7-r1.ebuild,
+  -files/vsftpd-2.0.7-uclibc.patch, -vsftpd-2.1.0-r1.ebuild,
+  -files/vsftpd-2.1.0-dont-link-caps.patch,
+  -files/vsftpd-2.1.0-gentoo.patch, -vsftpd-2.1.2.ebuild,
+  -files/vsftpd-2.1.2-dont-link-caps.patch, -vsftpd-2.2.0.ebuild,
+  -vsftpd-2.2.1.ebuild:
+  clean out old cruft
 
   18 Mar 2010; Raúl Porcel <armin76@gentoo.org> vsftpd-2.2.2.ebuild:
   alpha/arm/ia64/s390/sh/sparc/x86 stable wrt #307817
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.patch
deleted file mode 100644
index eaf913c1651f..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff --unified defs.h defs.h
---- defs.h	2004-06-04 16:37:29.000000000 +0200
-+++ defs.h	2004-09-24 11:36:16.443227600 +0200
-@@ -1,7 +1,7 @@
- #ifndef VSF_DEFS_H
- #define VSF_DEFS_H
- 
--#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd.conf"
-+#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd/vsftpd.conf"
- 
- #define VSFTP_COMMAND_FD        0
- 
---- tunables.c.orig	2005-06-08 11:29:01.261176985 +0100
-+++ tunables.c	2005-06-08 11:30:33.521084952 +0100
-@@ -89,7 +89,7 @@
- unsigned int tunable_max_per_ip = 0;
- unsigned int tunable_trans_chunk_size = 0;
- 
--const char* tunable_secure_chroot_dir = "/usr/share/empty";
-+const char* tunable_secure_chroot_dir = "/usr/share/vsftpd/empty";
- const char* tunable_ftp_username = "ftp";
- const char* tunable_chown_username = "root";
- const char* tunable_xferlog_file = "/var/log/xferlog";
-@@ -97,11 +97,11 @@
- const char* tunable_message_file = ".message";
- const char* tunable_nopriv_user = "nobody";
- const char* tunable_ftpd_banner = 0;
--const char* tunable_banned_email_file = "/etc/vsftpd.banned_emails";
--const char* tunable_chroot_list_file = "/etc/vsftpd.chroot_list";
-+const char* tunable_banned_email_file = "/etc/vsftpd/banned_emails";
-+const char* tunable_chroot_list_file = "/etc/vsftpd/chroot_list";
- const char* tunable_pam_service_name = "ftp";
- const char* tunable_guest_username = "ftp";
--const char* tunable_userlist_file = "/etc/vsftpd.user_list";
-+const char* tunable_userlist_file = "/etc/vsftpd/user_list";
- const char* tunable_anon_root = 0;
- const char* tunable_local_root = 0;
- const char* tunable_banner_file = 0;
-@@ -113,7 +113,7 @@
- const char* tunable_hide_file = 0;
- const char* tunable_deny_file = 0;
- const char* tunable_user_sub_token = 0;
--const char* tunable_email_password_file = "/etc/vsftpd.email_passwords";
-+const char* tunable_email_password_file = "/etc/vsftpd/email_passwords";
- const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem";
- const char* tunable_dsa_cert_file = 0;
- const char* tunable_ssl_ciphers = "DES-CBC3-SHA";
---- vsftpd.8.orig	2005-06-08 12:12:51.753585388 +0100
-+++ vsftpd.8	2005-06-08 12:13:21.411085181 +0100
-@@ -21,7 +21,7 @@
- recommended. It is activated by setting
- .Pa listen=YES
- in
--.Pa /etc/vsftpd.conf .
-+.Pa /etc/vsftpd/vsftpd.conf .
- Direct execution of the
- .Nm vsftpd
- binary will then launch the FTP service ready for immediate client connections.
-@@ -29,6 +29,6 @@
- An optional
- .Op configuration file
- may be given on the command line.  The default configuration file is
--.Pa /etc/vsftpd.conf .
-+.Pa /etc/vsftpd/vsftpd.conf .
- .Sh SEE ALSO
- .Xr vsftpd.conf 5
---- vsftpd.conf.5.orig	2005-06-08 12:13:29.831523597 +0100
-+++ vsftpd.conf.5	2005-06-08 12:15:04.012059074 +0100
-@@ -4,7 +4,7 @@
- .SH DESCRIPTION
- vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
- default, vsftpd looks for this file at the location
--.BR /etc/vsftpd.conf .
-+.BR /etc/vsftpd/vsftpd.conf .
- However, you may override this by specifying a command line argument to
- vsftpd. The command line argument is the pathname of the configuration file
- for vsftpd. This behaviour is useful because you may wish to use an advanced
-@@ -136,7 +136,7 @@
- different if chroot_local_user is set to YES. In this case, the list becomes
- a list of users which are NOT to be placed in a chroot() jail.
- By default, the file containing this list is
--/etc/vsftpd.chroot_list, but you may override this with the
-+/etc/vsftpd/chroot_list, but you may override this with the
- .BR chroot_list_file
- setting.
- 
-@@ -164,7 +164,7 @@
- .B deny_email_enable
- If activated, you may provide a list of anonymous password e-mail responses
- which cause login to be denied. By default, the file containing this list is
--/etc/vsftpd.banned_emails, but you may override this with the
-+/etc/vsftpd/banned_emails, but you may override this with the
- .BR banned_email_file
- setting.
- 
-@@ -371,7 +371,7 @@
- file specified by the
- .BR email_password_file
- setting. The file format is one password per line, no extra whitespace. The
--default filename is /etc/vsftpd.email_passwords.
-+default filename is /etc/vsftpd/email_passwords.
- 
- Default: NO
- .TP
-@@ -651,7 +651,7 @@
- .BR deny_email_enable
- is enabled.
- 
--Default: /etc/vsftpd.banned_emails
-+Default: /etc/vsftpd/banned_emails
- .TP
- .B banner_file
- This option is the name of a file containing text to display when someone
-@@ -680,7 +680,7 @@
- is enabled, then the list file becomes a list of users to NOT place in a
- chroot() jail.
- 
--Default: /etc/vsftpd.chroot_list
-+Default: /etc/vsftpd/chroot_list
- .TP
- .B cmds_allowed
- This options specifies a comma separated list of allowed FTP commands (post
-@@ -732,7 +732,7 @@
- .BR secure_email_list_enable
- setting.
- 
--Default: /etc/vsftpd.email_passwords
-+Default: /etc/vsftpd/email_passwords
- .TP
- .B ftp_username
- This is the name of the user we use for handling anonymous FTP. The home
-@@ -852,10 +852,10 @@
- with an example. If you set
- .BR user_config_dir
- to be
--.BR /etc/vsftpd_user_conf
-+.BR /etc/vsftpd/user_conf
- and then log on as the user "chris", then vsftpd will apply the settings in
- the file
--.BR /etc/vsftpd_user_conf/chris
-+.BR /etc/vsftpd/user_conf/chris
- for the duration of the session. The format of this file is as detailed in
- this manual page! PLEASE NOTE that not all settings are effective on a
- per-user basis. For example, many settings only prior to the user's session
-@@ -891,7 +891,7 @@
- .BR userlist_enable
- option is active.
- 
--Default: /etc/vsftpd.user_list
-+Default: /etc/vsftpd/user_list
- .TP
- .B vsftpd_log_file
- This option is the name of the file to which we write the vsftpd style
---- vsftpd.conf.orig	2005-10-20 07:53:27.857892494 +0100
-+++ vsftpd.conf	2005-10-20 09:44:04.631292771 +0100
-@@ -1,4 +1,4 @@
--# Example config file /etc/vsftpd.conf
-+# Example config file /etc/vsftpd/vsftpd.conf
- #
- # The default compiled in settings are fairly paranoid. This sample file
- # loosens things up a bit, to make the ftp daemon more usable.
-@@ -8,6 +8,10 @@
- # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
- # capabilities.
- #
-+# Listen on IPv4. xinet users must set NO or comment out
-+# otherwise it must be set YES
-+listen=YES
-+#
- # Allow anonymous FTP? (Beware - allowed by default if you comment this out).
- anonymous_enable=YES
- #
-@@ -88,18 +92,17 @@
- # useful for combatting certain DoS attacks.
- #deny_email_enable=YES
- # (default follows)
--#banned_email_file=/etc/vsftpd.banned_emails
-+#banned_email_file=/etc/vsftpd/banned_emails
- #
- # You may specify an explicit list of local users to chroot() to their home
- # directory. If chroot_local_user is YES, then this list becomes a list of
- # users to NOT chroot().
- #chroot_list_enable=YES
- # (default follows)
--#chroot_list_file=/etc/vsftpd.chroot_list
-+#chroot_list_file=/etc/vsftpd/chroot_list
- #
- # You may activate the "-R" option to the builtin ls. This is disabled by
- # default to avoid remote users being able to cause excessive I/O on large
- # sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
- # the presence of the "-R" option, so there is a strong case for enabling it.
- #ls_recurse_enable=YES
--
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch
deleted file mode 100644
index fed9f8a3809b..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
---- vsftpd-2.0.5.orig/sysdeputil.c	2007-01-05 17:58:28.000000000 +0000
-+++ vsftpd-2.0.5/sysdeputil.c	2007-01-05 17:55:30.000000000 +0000
-@@ -154,11 +154,8 @@
- #include <sys/capability.h>
- 
- #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)
--#include <linux/unistd.h>
- #include <linux/capability.h>
--#include <errno.h>
--#include <syscall.h>
--_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data)
-+#include <sys/syscall.h>
- /* Gross HACK to avoid warnings - linux headers overlap glibc headers */
- #undef __NFDBITS
- #undef __FDMASK
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch
deleted file mode 100644
index 467a7fb01220..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c
---- vsftpd-2.0.5.orig/sysdeputil.c	2007-01-05 17:58:28.000000000 +0000
-+++ vsftpd-2.0.5/sysdeputil.c	2007-01-05 17:55:30.000000000 +0000
-@@ -508,6 +505,18 @@
- }
-   
-   #ifndef VSF_SYSDEP_HAVE_LIBCAP
-+
-+static int
-+capset(struct __user_cap_header_struct *header,
-+       const struct __user_cap_data_struct *data);
-+
-+static int
-+capset(struct __user_cap_header_struct *header,
-+       const struct __user_cap_data_struct *data)
-+{
-+  return syscall(__NR_capset, header, data);
-+}
-+
- static int
- do_checkcap(void)
- {
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch b/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch
deleted file mode 100644
index f59b39573711..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sysutil.c.orig	2008-10-13 10:07:34.000000000 +0200
-+++ sysutil.c	2008-10-13 10:08:00.000000000 +0200
-@@ -601,7 +601,7 @@
- vsf_sysutil_wait_exited_normally(
-   const struct vsf_sysutil_wait_retval* p_waitret)
- {
--  return WIFEXITED(p_waitret->exit_status);
-+  return WIFEXITED((struct vsf_sysutil_wait_retval *)p_waitret->exit_status);
- }
- 
- int
-@@ -611,7 +611,7 @@
-   {
-     bug("not a normal exit in vsf_sysutil_wait_get_exitcode");
-   }
--  return WEXITSTATUS(p_waitret->exit_status);
-+  return WEXITSTATUS((struct vsf_sysutil_wait_retval *)p_waitret->exit_status);
- }
- 
- void
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-dont-link-caps.patch
deleted file mode 100644
index 41ebba6ee3ff..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.1.0-dont-link-caps.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur vsftpd-2.1.0.orig/vsf_findlibs.sh vsftpd-2.1.0/vsf_findlibs.sh
---- vsftpd-2.1.0.orig/vsf_findlibs.sh	2009-02-23 18:32:17.000000000 +0100
-+++ vsftpd-2.1.0/vsf_findlibs.sh	2009-02-23 18:32:23.000000000 +0100
-@@ -42,14 +42,6 @@
- # For older HP-UX...
- locate_library /usr/lib/libsec.sl && echo "-lsec";
- 
--# Look for libcap (capabilities)
--if locate_library /lib/libcap.so.1; then
--  echo "/lib/libcap.so.1";
--else
--  locate_library /usr/lib/libcap.so && echo "-lcap";
--  locate_library /lib/libcap.so && echo "-lcap";
--fi
--
- # Solaris needs this for nanosleep()..
- locate_library /lib/libposix4.so && echo "-lposix4";
- locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
deleted file mode 100644
index b3589920721d..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -ur vsftpd-2.1.0.orig/defs.h vsftpd-2.1.0/defs.h
---- vsftpd-2.1.0.orig/defs.h	2009-02-23 17:57:17.000000000 +0100
-+++ vsftpd-2.1.0/defs.h	2009-02-23 17:57:29.000000000 +0100
-@@ -1,7 +1,7 @@
- #ifndef VSF_DEFS_H
- #define VSF_DEFS_H
- 
--#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd.conf"
-+#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd/vsftpd.conf"
- 
- #define VSFTP_COMMAND_FD        0
- 
-diff -ur vsftpd-2.1.0.orig/tunables.c vsftpd-2.1.0/tunables.c
---- vsftpd-2.1.0.orig/tunables.c	2009-02-23 17:57:17.000000000 +0100
-+++ vsftpd-2.1.0/tunables.c	2009-02-23 17:59:12.000000000 +0100
-@@ -242,7 +242,7 @@
-   /* -rw------- */
-   tunable_chown_upload_mode = 0600;
- 
--  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
-+  install_str_setting("/usr/share/vsftpd/empty", &tunable_secure_chroot_dir);
-   install_str_setting("ftp", &tunable_ftp_username);
-   install_str_setting("root", &tunable_chown_username);
-   install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
-@@ -250,11 +250,11 @@
-   install_str_setting(".message", &tunable_message_file);
-   install_str_setting("nobody", &tunable_nopriv_user);
-   install_str_setting(0, &tunable_ftpd_banner);
--  install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file);
--  install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file);
-+  install_str_setting("/etc/vsftpd/banned_emails", &tunable_banned_email_file);
-+  install_str_setting("/etc/vsftpd/chroot_list", &tunable_chroot_list_file);
-   install_str_setting("ftp", &tunable_pam_service_name);
-   install_str_setting("ftp", &tunable_guest_username);
--  install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file);
-+  install_str_setting("/etc/vsftpd/user_list", &tunable_userlist_file);
-   install_str_setting(0, &tunable_anon_root);
-   install_str_setting(0, &tunable_local_root);
-   install_str_setting(0, &tunable_banner_file);
-@@ -267,7 +267,7 @@
-   install_str_setting(0, &tunable_hide_file);
-   install_str_setting(0, &tunable_deny_file);
-   install_str_setting(0, &tunable_user_sub_token);
--  install_str_setting("/etc/vsftpd.email_passwords",
-+  install_str_setting("/etc/vsftpd/email_passwords",
-                       &tunable_email_password_file);
-   install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
-                       &tunable_rsa_cert_file);
-diff -ur vsftpd-2.1.0.orig/vsftpd.8 vsftpd-2.1.0/vsftpd.8
---- vsftpd-2.1.0.orig/vsftpd.8	2009-02-23 17:57:17.000000000 +0100
-+++ vsftpd-2.1.0/vsftpd.8	2009-02-23 18:00:03.000000000 +0100
-@@ -21,7 +21,7 @@
- recommended. It is activated by setting
- .Pa listen=YES
- in
--.Pa /etc/vsftpd.conf .
-+.Pa /etc/vsftpd/vsftpd.conf .
- Direct execution of the
- .Nm vsftpd
- binary will then launch the FTP service ready for immediate client connections.
-@@ -30,6 +30,6 @@
- .Op configuration file
- may be given on the command line. This file must be owned as root if running as
- root. The default configuration file is
--.Pa /etc/vsftpd.conf .
-+.Pa /etc/vsftpd/vsftpd.conf .
- .Sh SEE ALSO
- .Xr vsftpd.conf 5
-diff -ur vsftpd-2.1.0.orig/vsftpd.conf vsftpd-2.1.0/vsftpd.conf
---- vsftpd-2.1.0.orig/vsftpd.conf	2009-02-23 17:57:17.000000000 +0100
-+++ vsftpd-2.1.0/vsftpd.conf	2009-02-23 18:00:56.000000000 +0100
-@@ -1,4 +1,4 @@
--# Example config file /etc/vsftpd.conf
-+# Example config file /etc/vsftpd/vsftpd.conf
- #
- # The default compiled in settings are fairly paranoid. This sample file
- # loosens things up a bit, to make the ftp daemon more usable.
-@@ -87,14 +91,14 @@
- # useful for combatting certain DoS attacks.
- #deny_email_enable=YES
- # (default follows)
--#banned_email_file=/etc/vsftpd.banned_emails
-+#banned_email_file=/etc/vsftpd/banned_emails
- #
- # You may specify an explicit list of local users to chroot() to their home
- # directory. If chroot_local_user is YES, then this list becomes a list of
- # users to NOT chroot().
- #chroot_list_enable=YES
- # (default follows)
--#chroot_list_file=/etc/vsftpd.chroot_list
-+#chroot_list_file=/etc/vsftpd/chroot_list
- #
- # You may activate the "-R" option to the builtin ls. This is disabled by
- # default to avoid remote users being able to cause excessive I/O on large
-diff -ur vsftpd-2.1.0.orig/vsftpd.conf.5 vsftpd-2.1.0/vsftpd.conf.5
---- vsftpd-2.1.0.orig/vsftpd.conf.5	2009-02-23 17:57:17.000000000 +0100
-+++ vsftpd-2.1.0/vsftpd.conf.5	2009-02-23 17:57:29.000000000 +0100
-@@ -4,7 +4,7 @@
- .SH DESCRIPTION
- vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
- default, vsftpd looks for this file at the location
--.BR /etc/vsftpd.conf .
-+.BR /etc/vsftpd/vsftpd.conf .
- However, you may override this by specifying a command line argument to
- vsftpd. The command line argument is the pathname of the configuration file
- for vsftpd. This behaviour is useful because you may wish to use an advanced
-@@ -138,7 +138,7 @@
- different if chroot_local_user is set to YES. In this case, the list becomes
- a list of users which are NOT to be placed in a chroot() jail.
- By default, the file containing this list is
--/etc/vsftpd.chroot_list, but you may override this with the
-+/etc/vsftpd/chroot_list, but you may override this with the
- .BR chroot_list_file
- setting.
- 
-@@ -177,7 +177,7 @@
- .B deny_email_enable
- If activated, you may provide a list of anonymous password e-mail responses
- which cause login to be denied. By default, the file containing this list is
--/etc/vsftpd.banned_emails, but you may override this with the
-+/etc/vsftpd/banned_emails, but you may override this with the
- .BR banned_email_file
- setting.
- 
-@@ -430,7 +430,7 @@
- file specified by the
- .BR email_password_file
- setting. The file format is one password per line, no extra whitespace. The
--default filename is /etc/vsftpd.email_passwords.
-+default filename is /etc/vsftpd/email_passwords.
- 
- Default: NO
- .TP
-@@ -761,7 +761,7 @@
- .BR deny_email_enable
- is enabled.
- 
--Default: /etc/vsftpd.banned_emails
-+Default: /etc/vsftpd/banned_emails
- .TP
- .B banner_file
- This option is the name of a file containing text to display when someone
-@@ -798,7 +798,7 @@
- is enabled, then the list file becomes a list of users to NOT place in a
- chroot() jail.
- 
--Default: /etc/vsftpd.chroot_list
-+Default: /etc/vsftpd/chroot_list
- .TP
- .B cmds_allowed
- This options specifies a comma separated list of allowed FTP commands (post
-@@ -859,7 +859,7 @@
- .BR secure_email_list_enable
- setting.
- 
--Default: /etc/vsftpd.email_passwords
-+Default: /etc/vsftpd/email_passwords
- .TP
- .B ftp_username
- This is the name of the user we use for handling anonymous FTP. The home
-@@ -982,10 +982,10 @@
- with an example. If you set
- .BR user_config_dir
- to be
--.BR /etc/vsftpd_user_conf
-+.BR /etc/vsftpd/user_conf
- and then log on as the user "chris", then vsftpd will apply the settings in
- the file
--.BR /etc/vsftpd_user_conf/chris
-+.BR /etc/vsftpd/user_conf/chris
- for the duration of the session. The format of this file is as detailed in
- this manual page! PLEASE NOTE that not all settings are effective on a
- per-user basis. For example, many settings only prior to the user's session
-@@ -1021,7 +1021,7 @@
- .BR userlist_enable
- option is active.
- 
--Default: /etc/vsftpd.user_list
-+Default: /etc/vsftpd/user_list
- .TP
- .B vsftpd_log_file
- This option is the name of the file to which we write the vsftpd style
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch
deleted file mode 100644
index d36fa37ffe40..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur vsftpd-2.1.2.orig/vsf_findlibs.sh vsftpd-2.1.2/vsf_findlibs.sh
---- vsftpd-2.1.2.orig/vsf_findlibs.sh	2009-05-30 12:43:33.000000000 +0200
-+++ vsftpd-2.1.2/vsf_findlibs.sh	2009-05-30 12:44:41.000000000 +0200
-@@ -42,16 +42,6 @@
- # For older HP-UX...
- locate_library /usr/lib/libsec.sl && echo "-lsec";
- 
--# Look for libcap (capabilities)
--if locate_library /lib/libcap.so.1; then
--  echo "/lib/libcap.so.1";
--elif locate_library /lib/libcap.so.2; then
--  echo "/lib/libcap.so.2";
--else
--  locate_library /usr/lib/libcap.so && echo "-lcap";
--  locate_library /lib/libcap.so && echo "-lcap";
--fi
--
- # Solaris needs this for nanosleep()..
- locate_library /lib/libposix4.so && echo "-lposix4";
- locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
deleted file mode 100644
index 3735242f8366..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild,v 1.9 2009/02/24 15:24:27 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( sys-libs/libcap )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
-	# uclibc fix, from Debian
-	epatch "${FILESDIR}"/${PN}-2.0.7-uclibc.patch
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
-	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		sed -i '/libcap/ d' vsf_findlibs.sh
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8
-	dosbin vsftpd || die
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc vsftpd.conf vsftpd.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we comment out listen=YES
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i '/\listen=YES/s/^/#/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild
deleted file mode 100644
index 0967ad4d4367..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild,v 1.1 2009/05/30 11:28:41 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.1.0-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${PN}-2.1.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8
-	dosbin vsftpd || die
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc vsftpd.conf vsftpd.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.1.2.ebuild b/net-ftp/vsftpd/vsftpd-2.1.2.ebuild
deleted file mode 100644
index 4f933f49e1f5..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.1.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.2.ebuild,v 1.1 2009/05/30 11:28:41 armin76 Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.1.0-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${PN}-2.1.2-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8
-	dosbin vsftpd || die
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc vsftpd.conf vsftpd.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.2.0.ebuild b/net-ftp/vsftpd/vsftpd-2.2.0.ebuild
deleted file mode 100644
index 12ab4b9b98e9..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.2.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.0.ebuild,v 1.2 2009/08/24 05:37:00 wormo Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${P}-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8
-	dosbin vsftpd || die
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc vsftpd.conf vsftpd.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.2.1.ebuild b/net-ftp/vsftpd/vsftpd-2.2.1.ebuild
deleted file mode 100644
index b884ca69ef95..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.2.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.1.ebuild,v 1.1 2009/10/29 09:38:04 voyageur Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="caps pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	into /usr
-	doman vsftpd.conf.5 vsftpd.8
-	dosbin vsftpd || die
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING
-	newdoc vsftpd.conf vsftpd.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd
-
-	keepdir /usr/share/vsftpd/empty
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}