Drop vulnerable versions, security bug #343389

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

16 files changed, 13 insertions, 1736 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 40e82f4caa41..ec5fd5e91e18 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.248 2010/11/14 17:28:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.249 2010/11/16 12:54:15 voyageur Exp $
+
+  16 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/proftpd-1.3.2-mysql-include.patch,
+  -files/proftpd-1.3.2-parallel-build.patch,
+  -files/proftpd-1.3.2-system-libltdl.patch, -proftpd-1.3.2d.ebuild,
+  -proftpd-1.3.2e.ebuild, -proftpd-1.3.3.ebuild, -proftpd-1.3.3-r1.ebuild,
+  -files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch,
+  -proftpd-1.3.3a.ebuild, -proftpd-1.3.3b.ebuild, -files/proftpd.conf,
+  -files/proftpd.rc6, -files/proftpd.rc7, metadata.xml:
+  Drop vulnerable versions, security bug #343389
 
   14 Nov 2010; Raúl Porcel <armin76@gentoo.org> proftpd-1.3.3c.ebuild:
   alpha/sparc stable wrt #343389
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 0e02d1c5a5ed..cd804dd7eb59 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,35 +1,12 @@
-AUX proftpd-1.3.2-mysql-include.patch 363 RMD160 4406e4ff522580962662f9aa00310a75f4984cbd SHA1 979f0c1272c25e34fe489ac4227f2dce2db35804 SHA256 5be06884923c23ff4e44e5e9e87d27a88aaee2d10bc341daba6cd21d26543330
-AUX proftpd-1.3.2-parallel-build.patch 786 RMD160 ff9df4ca01c5d95664bc00650996896300ada1d7 SHA1 c0d6d23c8da22cf6b9b882d01ab6e562d51dd1b3 SHA256 a429b3f7c79d46a279d77357481208f962b6e93fcea5424b2b030e366fe3c662
-AUX proftpd-1.3.2-system-libltdl.patch 1932 RMD160 135045db34d87dfdb62ff643864778c3884fa013 SHA1 6e1fe98fd9e3b92aaa2886536646b7bb58765c89 SHA256 74bcb197a66b7767d8b5d327e955d979d5676be6bc3d17794be8ddc09879f2b4
-AUX proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch 581 RMD160 82170fc75ffd9a41bea7cec2e157ed50f63c2745 SHA1 12b4507c43c45c8448f37d76359bf59e327879f2 SHA256 2bdc2a215242f440902995bc9533ff9d42972535550d0cedaf25b7594f39ac19
-AUX proftpd.conf 1968 RMD160 10394bf0fcaa201c59873c1a518a75f7f9d7b53c SHA1 6d3c932efa5a16c3772b49d68bc46e0239472b0b SHA256 82ebf842526eb5b1e6ac2126511063b8242ad66a271095b2ab5d1f18f908c192
 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
 AUX proftpd.initd 1628 RMD160 944b3e8e4ffd008d7fef55a09e8d374f5ca74597 SHA1 fa39e5a2a06bbf3fdf5c50be55c8d3c7f87a23f2 SHA256 167fac1a864179a53e4ea26377ec2fe9b5e60d9ba564f37f5b86474b18c2fd43
-AUX proftpd.rc6 1192 RMD160 09e2e7b9429b123da51331c5cb29b7f79fe03989 SHA1 b7605beebe10749e1adc3204f7a48e45f653690a SHA256 674d614bfaaea90cf9444d84688b8c77e9af482b148bf460919783627ad17918
-AUX proftpd.rc7 1398 RMD160 e3b0f22e40aec815e9e307c49b343689322c1b5b SHA1 497faab41e2966f731ec2a68e45948008f7984b9 SHA256 1c8f8cbbdb1982a1a6ec2d74b00bc40c7a198f9b64f5bc53baa49f41d7a0d0dd
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
 DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726b8 SHA1 26fa4a8106fbb3266e7c94f50f12ed74fb2f3fec SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
-DIST mod_gss-1.3.2.tar.gz 114142 RMD160 5dba4a716fd2abd99a83a7b263f53c07062ada9d SHA1 9f1c4530ba8ce9d96141bcb18cc123adbc04e505 SHA256 e66ee593628880e38bd0694ab256244c40fe80baa6663ea96003ce73b94e1336
 DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e
-DIST proftpd-1.3.2d.tar.bz2 2545428 RMD160 878f830b3dc1af9f630a8c527c8d132252daa592 SHA1 b02dacf74e3b5d4e510df67ea26063278176a690 SHA256 64be10d5190d3b596c04c04fa5764fd79ce212628b58e64a1ecbee743d17531f
-DIST proftpd-1.3.2e.tar.bz2 2545499 RMD160 31e814b7d009251bfa1a459066574c741309da4c SHA1 6e9bcb9d413e8c59c15de230346eada63399b2a3 SHA256 23fbb10b0f85a6141987dfd52010f7efdd723b84068964cb085cdfb97c0effdf
-DIST proftpd-1.3.3.tar.bz2 4132650 RMD160 01c9226f694129561dd35a03631c6a2b8bd593dc SHA1 ce7c1f96648f94e32d5d104cd1405e6778aae045 SHA256 793f2bde2ab5aeb86a68349118d87bb151ba1278987612b7a12872110f9d759c
-DIST proftpd-1.3.3a.tar.bz2 4157983 RMD160 a900502b02518fcad7595d19bb14bbd74c6690ba SHA1 89b6f42b6d14b53b1e35f365ed60aa3f06d116b8 SHA256 c1f73e7b189c22fe2f33a0cd6f9d3f3ad10ee73c23a1347cd13daf87fea729f7
-DIST proftpd-1.3.3b.tar.bz2 4162969 RMD160 643a154af5f7bdc3325256065dc2d6bc3d703109 SHA1 5ecc934389d5022d3f7e1246b53c0f6bf09e642c SHA256 28d235cf312df19d03762ef106ba9371741646f0fc36127db0482a8861d46794
 DIST proftpd-1.3.3c.tar.bz2 4166609 RMD160 08a6fac94aa3449192e92848c6271cca33ea26cc SHA1 167d2f5f22f2bf8a5365b18adfd18a5fc750b07f SHA256 ea7f02e21f81e6ce79ebde8bbbd334bd269a039ac9137196a35309f791b24db1
-DIST proftpd-mod-case-0.3.tar.gz 4781 RMD160 99f46a2cfb88ec2f3070d632dbc17d89d12ec30b SHA1 c8ea2c4604ab2ffa5853284d0696b1dfe518ae84 SHA256 a9affd47558020b2b3f369c9a945ac91d22b45368734d839404b76e0fbdaaf7c
 DIST proftpd-mod-case-0.4.tar.gz 4849 RMD160 fdf579587461c0ad2136f6cc1e3064efe31f2eb6 SHA1 01631d4545d9a4995d452278caa2ef94b84e6a1f SHA256 5c724a2a57a00048529bfab6c5672e16c7c0ecb2eb4e2bedd05bb3a1a5bf97fa
-DIST proftpd-mod-deflate-0.4.tar.gz 2779844 RMD160 e6c7689b281ef015ceefa1d2939f5cf0a6fffc72 SHA1 2f42c3761445657e032739ea67c1cf359e527a98 SHA256 4451d9af02900aabe769f0d8a5efa80bdf2973efc4db2d138623b01b3ef72b69
 DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
-DIST proftpd-mod-shaper-0.6.5.tar.gz 19175 RMD160 233f399c08c18514b0f23dcc3b0fd0d0670dca42 SHA1 7c841543e7ac3005c914b0f77670c94dc7a8d51f SHA256 dc69e352b0ffd7d76f4d08cad631b6401ed9a67447995f3ce47752e4fc69e935
-DIST proftpd-mod-vroot-0.8.3.tar.gz 6999 RMD160 7a8d5a29e7c2754b774cebe649f8a28fc4bf9f85 SHA1 c5448ca0a7c2f1a73093ae6834f6516092cd1508 SHA256 ed3031d8330467e4c1ccb7a395b41a1d5628a89f4fcde80e3bb7ed62e987d85a
 DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4
-EBUILD proftpd-1.3.2d.ebuild 8239 RMD160 41eda9307fe524840dafd90c876f0449005a03bd SHA1 48d13209cb678e29cdea67205ed8ea9e448ca389 SHA256 385a553eff793307305a4f10ecaf4b508341e47688d1a27b86d147e7c227da78
-EBUILD proftpd-1.3.2e.ebuild 8246 RMD160 3e5d405db4d2da8daeed31e7853abda8a03dc032 SHA1 2781c8dec53c45ff47bb57e8172ead1352260725 SHA256 5830695bda8d099cf0e5d6984124b131eecb1fe49991af6561caee6bca7485e4
-EBUILD proftpd-1.3.3-r1.ebuild 7276 RMD160 d8a9357e896df752923fcf8d637f10632c510e94 SHA1 35f2ed96824739a475ea6690f6b31f0508d75ad8 SHA256 adc301d288ea9ce7a4c4960598f5fdd2e915fb6eea674a53a4755210721c0bfd
-EBUILD proftpd-1.3.3.ebuild 7087 RMD160 1f93876a995e5caf2145f8a03047de839ba8b507 SHA1 d03bf525d997c485226186f3a4cb901165c73723 SHA256 54eb92d72aaea49232ce31da936c14cd80cdec8de64201fe03b671b7478f93d8
-EBUILD proftpd-1.3.3a.ebuild 7176 RMD160 63ca14d5336dfe09cf6ce5cf39614445e30c516c SHA1 f6e03cb666697df4bbb37a22234a55bfb2e94aaf SHA256 bf809fbf5d848224377b77d3dd3c56380fbf82ecebd00a8b706513b01dc1b396
-EBUILD proftpd-1.3.3b.ebuild 7185 RMD160 5df871f80938efee49ee42f1e93cc3e1291bdb89 SHA1 48ed5607609cd6a1c9ee6797e886dcb5dff8c982 SHA256 2cc45e574d5f9cddd66f6d9c2b771cb1b6895f74115f467aa8d82e45845a1917
 EBUILD proftpd-1.3.3c.ebuild 7180 RMD160 0224857289f16e1a9a9115b6640754f07a3fb35c SHA1 0b66f216073618128dd4f5cc04701178db963083 SHA256 581675c43c65aeb100a6abe8427bce2af571df256ec2d93a1746bf49a3311bc9
-MISC ChangeLog 41362 RMD160 c178c84e3736a14bb3b44c9e79f4d3717449f985 SHA1 55fb469d693ef3a78c7d1e7fe676214cca87b25e SHA256 0c0b43407965fb1443704633d00c8a4b92d4ca8851230a1296080b5f4ccaf7ea
-MISC metadata.xml 1812 RMD160 79f9109e0364ddcff30da3f86af3c889f4ea1cee SHA1 dacd8d433d5f42e4dd7b6cb33ec9131f07abd98b SHA256 313c3786f11cc6311966be048d4290cf363e46c5e7dc31b5ed6890c7071efdbf
+MISC ChangeLog 41883 RMD160 1e2c52f6cb05a2d948210d7bb7a18024d7d2ec31 SHA1 082ad4b5b69544a3df698066195f21e0cca4803d SHA256 2b1d9d23157ad0dd0073254939e4c181cf622059a8c8cf5d8a660c9f2196a2f5
+MISC metadata.xml 1671 RMD160 7ab8bc2be652f3358f83238dd526d271eaf27cf2 SHA1 9818b3a7957e30b8aa739708e614000108e863f7 SHA256 3d51a9f6b7f3cc3833c09e8a25cdacd3f25723c522f1bf6766277aee490d048e
diff --git a/net-ftp/proftpd/files/proftpd-1.3.2-mysql-include.patch b/net-ftp/proftpd/files/proftpd-1.3.2-mysql-include.patch
deleted file mode 100644
index d6699d8ddda1..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.2-mysql-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- proftpd-1.3.2/contrib/mod_sql_mysql.c.orig	2009-02-05 19:53:54.000000000 +0100
-+++ proftpd-1.3.2/contrib/mod_sql_mysql.c	2009-02-19 18:39:07.000000000 +0100
-@@ -135,7 +135,7 @@
- #include "conf.h"
- #include "../contrib/mod_sql.h"
- 
--#include <mysql.h>
-+#include <mysql/mysql.h>
- 
- /* 
-  * timer-handling code adds the need for a couple of forward declarations
diff --git a/net-ftp/proftpd/files/proftpd-1.3.2-parallel-build.patch b/net-ftp/proftpd/files/proftpd-1.3.2-parallel-build.patch
deleted file mode 100644
index cea1c4009aa5..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.2-parallel-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru proftpd-1.3.2-orig/Makefile.in proftpd-1.3.2/Makefile.in
---- proftpd-1.3.2-orig/Makefile.in	2008-11-19 04:51:38.000000000 +0100
-+++ proftpd-1.3.2/Makefile.in	2009-02-16 14:28:43.000000000 +0100
-@@ -54,13 +54,13 @@
- proftpd$(EXEEXT): lib src modules dirs locale
- 	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(MAIN_LDFLAGS) -o $@ $(BUILD_PROFTPD_OBJS) $(BUILD_PROFTPD_ARCHIVES) $(LIBS) $(MAIN_LIBS)
- 
--ftpcount$(EXEEXT): utils
-+ftpcount$(EXEEXT): lib utils
- 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
- 
--ftpdctl$(EXEEXT): src
-+ftpdctl$(EXEEXT): lib src
- 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
- 
--ftpshut$(EXEEXT): utils
-+ftpshut$(EXEEXT): lib utils
- 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
- 
- ftptop$(EXEEXT): lib utils
diff --git a/net-ftp/proftpd/files/proftpd-1.3.2-system-libltdl.patch b/net-ftp/proftpd/files/proftpd-1.3.2-system-libltdl.patch
deleted file mode 100644
index 5a1c175ef4ec..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.2-system-libltdl.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.in.orig	2009-02-24 21:58:08.000000000 +0100
-+++ configure.in	2009-02-24 22:21:20.000000000 +0100
-@@ -54,8 +54,8 @@
- 
- dnl AC_PROG_LIBTOOL relies on this variable
- top_builddir=.
--AC_LIBTOOL_DLOPEN([lib/libltdl])
--AC_LIBLTDL_CONVENIENCE([lib/libltdl])
-+AC_LIBTOOL_DLOPEN
-+AC_WITH_LTDL
- 
- dnl Checks for programs.
- AC_PROG_CC
-@@ -485,18 +485,12 @@
-       ac_core_modules="$ac_core_modules mod_dso.o"
-       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
- 
--      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
-+      MAIN_LDFLAGS="-dlopen self -export-dynamic"
-       MAIN_LIBS="\$(LIBLTDL)"
- 
-       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"
- 
--      INSTALL_DEPS="install-libltdl"
--      LIB_DEPS="libltdl"
--      MODULE_DEPS="libltdl"
-       AC_DEFINE(PR_USE_DSO, 1, [Define if using DSO support.])
--
--      dnl Run configure scripts in subdirectories
--      AC_CONFIG_SUBDIRS(lib/libltdl)
-     fi
-   ])
- 
---- modules/Makefile.in.orig	2009-02-24 22:34:00.000000000 +0100
-+++ modules/Makefile.in	2009-02-24 22:34:13.000000000 +0100
-@@ -229,7 +229,6 @@
- mod_dso.o: ../include/trace.h ../include/encode.h ../include/compat.h
- mod_dso.o: ../include/proctitle.h ../include/pidfile.h ../include/env.h
- mod_dso.o: ../include/pr-syslog.h ../include/mod_ctrls.h
--mod_dso.o: ../lib/libltdl/ltdl.h
- mod_facl.o: ../include/conf.h ../include/version.h ../config.h
- mod_facl.o: ../include/default_paths.h ../include/options.h ../include/pool.h
- mod_facl.o: ../include/str.h ../include/regexp.h ../include/table.h
---- modules/mod_dso.c.orig	2009-02-24 22:32:50.000000000 +0100
-+++ modules/mod_dso.c	2009-02-24 22:33:03.000000000 +0100
-@@ -31,8 +31,7 @@
- #include "conf.h"
- #include "mod_ctrls.h"
- 
--/* Make sure we use the libltdl shipped with proftpd, not the system libltdl. */
--#include "lib/libltdl/ltdl.h"
-+#include <ltdl.h>
- 
- #define MOD_DSO_VERSION		"mod_dso/0.4"
- 
diff --git a/net-ftp/proftpd/files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch b/net-ftp/proftpd/files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch
deleted file mode 100644
index 417bf82df448..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.3_rc3-tls-shmcache-bug3359.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: contrib/mod_tls_shmcache.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls_shmcache.c,v
-retrieving revision 1.5
-diff -u -r1.5 mod_tls_shmcache.c
---- contrib/mod_tls_shmcache.c	7 Nov 2009 20:11:41 -0000	1.5
-+++ contrib/mod_tls_shmcache.c	18 Dec 2009 17:34:47 -0000
-@@ -1240,6 +1240,10 @@
-   struct shmid_ds ds;
-   const char *cache_file;
- 
-+  if (shmcache_fh == NULL) {
-+    return 0;
-+  }
-+
-   pr_trace_msg(trace_channel, 9, "removing shmcache cache %p", cache); 
- 
-   cache_file = shmcache_fh->fh_path;
diff --git a/net-ftp/proftpd/files/proftpd.conf b/net-ftp/proftpd/files/proftpd.conf
deleted file mode 100644
index 23b8542cdec2..000000000000
--- a/net-ftp/proftpd/files/proftpd.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-# This is a basic ProFTPD configuration file (rename it to 
-# 'proftpd.conf' for actual use.  It establishes a single server
-# and a single anonymous login.  It assumes that you have a user/group
-# "proftpd" and "ftp" for normal operation and anon.
-
-ServerName			"ProFTPD Default Installation"
-ServerType			standalone
-DefaultServer		on
-RequireValidShell	off
-AuthPAM				off
-AuthPAMConfig		ftp
-
-# Port 21 is the standard FTP port.
-Port				21
-
-# Don't use IPv6 support by default.
-UseIPv6				off
-
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask				022
-
-# To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
-# at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
-# that allows you to limit maximum number of processes per service
-# (such as xinetd).
-MaxInstances			30
-
-# Set the user and group under which the server will run.
-User				proftpd
-Group				proftpd
-
-# To cause every FTP user to be "jailed" (chrooted) into their home
-# directory, uncomment this line.
-#DefaultRoot ~
-
-# Normally, we want files to be overwriteable.
-AllowOverwrite		on
-
-# Bar use of SITE CHMOD by default
-<Limit SITE_CHMOD>
-  DenyAll
-</Limit>
-
-# A basic anonymous configuration, no upload directories.  If you do not
-# want anonymous users, simply delete this entire <Anonymous> section.
-<Anonymous ~ftp>
-  User				ftp
-  Group				ftp
-
-  # We want clients to be able to login with "anonymous" as well as "ftp"
-  UserAlias			anonymous ftp
-
-  # Limit the maximum number of anonymous logins
-  MaxClients			10
-
-  # We want 'welcome.msg' displayed at login, and '.message' displayed
-  # in each newly chdired directory.
-  DisplayLogin			welcome.msg
-  DisplayChdir			.message
-
-  # Limit WRITE everywhere in the anonymous chroot
-  <Limit WRITE>
-    DenyAll
-  </Limit>
-</Anonymous>
diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
deleted file mode 100644
index 1a2645460a7a..000000000000
--- a/net-ftp/proftpd/files/proftpd.rc6
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.13 2009/02/17 22:05:07 voyageur Exp $
-
-opts="${opts} reload"
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -e /etc/proftpd/proftpd.conf ] ; then
-		eerror "You need an /etc/proftpd/proftpd.conf file first!"
-		eerror "There is a sample file in /etc/proftpd."
-		return 1
-	fi
-	ebegin "Checking proftpd configuration"
-	/usr/sbin/proftpd -t -c /etc/proftpd/proftpd.conf
-	eend $? "Configuration error: please fix your configuration file (/etc/proftpd/proftpd.conf)."
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting proftpd"
-	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/proftpd.pid --exec /usr/sbin/proftpd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping proftpd"
-	start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/proftpd.pid
-	eend $?
-}
-
-reload() {
-	if [ ! -f /var/run/proftpd.pid ] ; then
-		eerror "proftpd isn't running!"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading proftpd"
-	kill -HUP `cat /var/run/proftpd.pid` &>/dev/null
-	eend $?
-}
diff --git a/net-ftp/proftpd/files/proftpd.rc7 b/net-ftp/proftpd/files/proftpd.rc7
deleted file mode 100644
index ae8978fe9cda..000000000000
--- a/net-ftp/proftpd/files/proftpd.rc7
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc7,v 1.1 2009/09/08 16:27:22 voyageur Exp $
-
-opts="reload"
-
-depend() {
-	need net
-	use dns
-}
-
-check_configuration() {
-	if [ ! -e /etc/proftpd/proftpd.conf ] ; then
-		eerror "To execute the ProFTPD server you need a /etc/proftpd/proftpd.conf configuration"
-		eerror "file. In /etc/proftpd you can find a sample configuration."
-		return 1
-	fi
-	ebegin "Checking ProFTPD configuration"
-	/usr/sbin/proftpd -t -c /etc/proftpd/proftpd.conf
-	eend $? "A configuration error was found. You have to fix your configuration file."
-}
-
-start() {
-	if [ "${RC_CMD}" != "restart" ] ; then
-		check_configuration || return 1
-	fi
-	ebegin "Starting ProFTPD"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/proftpd \
-		--pidfile /var/run/proftpd/proftpd.pid
-	eend $?
-}
-
-stop() {
-	if [ "${RC_CMD}" = "restart" ] ; then
-		check_configuration || return 1
-	fi
-	ebegin "Stopping ProFTPD"
-	start-stop-daemon --stop --quiet --retry 20 \
-		--pidfile /var/run/proftpd/proftpd.pid
-	eend $?
-}
-
-reload() {
-	if [ ! -f /var/run/proftpd/proftpd.pid ] ; then
-		eerror "ProFTPD is not running."
-		return 1
-	fi
-	check_configuration || return 1
-	ebegin "Reloading ProFTPD"
-	kill -HUP `cat /var/run/proftpd/proftpd.pid` &>/dev/null
-	eend $?
-}
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 5ab9d43d1052..aee1b7efaf29 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -14,8 +14,6 @@ server.</longdescription>
 	<flag name='exec'>Enable support for the mod_exec module. WARNING: this could be a security risk</flag>
 	<flag name='ident'>Enable support for the mod_ident module</flag>
 	<flag name='ifsession'>Enable support for the ifsession module</flag>
-	<flag name='noauthunix'>Disable support for the auth-unix module</flag>
-	<flag name='opensslcrypt'>Enable support for OpenSSL crypto</flag>
 	<flag name='ratio'>Enable support for the mod_ratio module</flag>
 	<flag name='readme'>Enable support for the mod_readme module</flag>
 	<flag name='rewrite'>Enable support for the rewrite module</flag>
diff --git a/net-ftp/proftpd/proftpd-1.3.2d.ebuild b/net-ftp/proftpd/proftpd-1.3.2d.ebuild
deleted file mode 100644
index e9ae0e367616..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.2d.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2d.ebuild,v 1.8 2010/06/17 20:46:33 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs autotools
-
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-
-IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 kerberos ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
-
-CASE_VER="0.3"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.4"
-MODGSS_VER="1.3.2"
-SHAPER_VER="0.6.5"
-VROOT_VER="0.8.3"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-		case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-		clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-		deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-		kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MODGSS_VER}.tar.gz )
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
-		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-
-HOMEPAGE="http://www.proftpd.org/
-		http://www.castaglia.org/proftpd/
-		http://www.thrallingpenguin.com/resources/mod_clamav.htm
-		http://gssmod.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-		clamav? ( app-antivirus/clamav )
-		kerberos? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		ncurses? ( sys-libs/ncurses )
-		opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		ssl? ( >=dev-libs/openssl-0.9.6f )
-		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-		xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-S="${WORKDIR}/${P/_/}"
-
-pkg_setup() {
-	# Add the proftpd user to make the default config
-	# work out-of-the-box
-	enewgroup proftpd
-	enewuser proftpd -1 -1 -1 proftpd
-}
-
-src_unpack() {
-	unpack ${P/_/}.tar.bz2
-	cd "${S}"
-
-	# Fix parallel build (committed upstream in 1.3.3rc1)
-	epatch "${FILESDIR}"/${PN}-1.3.2-parallel-build.patch
-	# Fix mysql include when both backends are enabled
-	epatch "${FILESDIR}"/${PN}-1.3.2-mysql-include.patch
-	# Do not use bundled libltdl when compiling mod_dso
-	epatch "${FILESDIR}"/${PN}-1.3.2-system-libltdl.patch
-
-	# Fix stripping of files
-	sed -e "s| @INSTALL_STRIP@||g" -i Make*
-
-	if use case ; then
-		unpack ${PN}-mod-case-${CASE_VER}.tar.gz
-		cp -f mod_case/mod_case.c contrib/
-		cp -f mod_case/mod_case.html doc/
-	fi
-
-	if use clamav ; then
-		unpack mod_clamav-${CLAMAV_VER}.tar.gz
-		cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/
-		epatch mod_clamav-${CLAMAV_VER}/${PN}.patch
-	fi
-
-	if use deflate ; then
-		unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz
-		cp -f mod_deflate/mod_deflate.c contrib/
-		cp -f mod_deflate/mod_deflate.html doc/
-	fi
-
-	if use kerberos ; then
-		unpack mod_gss-${MODGSS_VER}.tar.gz
-	fi
-
-	if use shaper ; then
-		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
-		cp -f mod_shaper/mod_shaper.c contrib/
-		cp -f mod_shaper/mod_shaper.html doc/
-	fi
-
-	if use vroot ; then
-		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
-		cp -f mod_vroot/mod_vroot.c contrib/
-		cp -f mod_vroot/mod_vroot.html doc/
-	fi
-
-	# Fix bug #221275
-	# extract custom PR_ macros from aclocal.m4 to acinclude.m4
-	# and delete the provided aclocal.m4 before running autoreconf
-	einfo "Extract custom m4 macros from aclocal.m4 ..."
-	sed -e '/libtool\.m4/q' aclocal.m4 > acinclude.m4
-	rm -f aclocal.m4
-
-	eautoreconf
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf mylibs
-
-	modules="mod_ratio:mod_readme:mod_ctrls_admin"
-	use acl && modules="${modules}:mod_facl"
-	use ban && modules="${modules}:mod_ban"
-	use case && modules="${modules}:mod_case"
-	use clamav && modules="${modules}:mod_clamav"
-	use deflate && modules="${modules}:mod_deflate"
-	use pam && modules="${modules}:mod_auth_pam"
-	use radius && modules="${modules}:mod_radius"
-	use rewrite && modules="${modules}:mod_rewrite"
-	use shaper && modules="${modules}:mod_shaper"
-	use sitemisc && modules="${modules}:mod_site_misc"
-	use ssl && modules="${modules}:mod_tls"
-	use tcpd && modules="${modules}:mod_wrap"
-	use vroot && modules="${modules}:mod_vroot"
-
-	# pam needs to be explicitely disabled
-	use pam || myconf="${myconf} --enable-auth-pam=no"
-
-	if use ldap ; then
-		modules="${modules}:mod_ldap"
-		mylibs="${mylibs} -lresolv"
-		use ssl && CFLAGS="${CFLAGS} -DUSE_LDAP_TLS"
-	fi
-
-	if use opensslcrypt ; then
-		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
-		mylibs="${mylibs} -lcrypto"
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-	fi
-
-	use nls && myconf="${myconf} --enable-nls"
-
-	if use mysql || use postgres ; then
-		modules="${modules}:mod_sql"
-		if use mysql ; then
-			modules="${modules}:mod_sql_mysql"
-			myconf="${myconf} --with-includes=/usr/include/mysql"
-		fi
-		if use postgres ; then
-			modules="${modules}:mod_sql_postgres"
-			myconf="${myconf} --with-includes=/usr/include/postgresql"
-		fi
-	fi
-
-	if use softquota ; then
-		modules="${modules}:mod_quotatab"
-		if use mysql || use postgres ; then
-			modules="${modules}:mod_quotatab_sql"
-		fi
-		if use radius ; then
-			modules="${modules}:mod_quotatab_radius"
-		fi
-		if use ldap ; then
-			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
-		else
-			modules="${modules}:mod_quotatab_file"
-		fi
-	fi
-
-	# mod_ifsession should be the last module in the --with-modules list
-	# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
-	use ifsession && modules="${modules}:mod_ifsession"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	gcc-specs-pie && echo > lib/libcap/cap_sys.c
-
-	if use noauthunix ; then
-		myconf="${myconf} --disable-auth-unix"
-	else
-		myconf="${myconf} --enable-auth-unix"
-	fi
-
-	if use kerberos ; then
-		cd "${S}"/mod_gss-${MODGSS_VER}
-		# Generate source files for installed virtual/krb5 provider
-		if has_version app-crypt/mit-krb5; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		cd "${S}"
-		# copy the generated files
-		cp -f mod_gss-${MODGSS_VER}/mod_gss.c contrib/
-		cp -f mod_gss-${MODGSS_VER}/mod_gss.h include/
-		cp -f mod_gss-${MODGSS_VER}/mod_auth_gss.c contrib/
-
-		myconf="${myconf} --enable-dso  --with-shared=mod_gss:mod_auth_gss"
-	fi
-
-	LIBS="${mylibs}" econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--enable-autoshadow \
-		--enable-ctrls \
-		--with-modules=${modules} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	keepdir /var/run/proftpd
-
-	dodoc "${FILESDIR}/proftpd.conf" \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/license.txt
-	dohtml doc/*.html
-	dohtml doc/howto/*.html
-
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib"
-
-	insinto /etc/proftpd
-	newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/proftpd.xinetd" proftpd
-	fi
-
-	newinitd "${FILESDIR}/proftpd.rc6" proftpd
-}
-
-pkg_postinst() {
-	elog
-	elog "You can find the config files in /etc/proftpd"
-	elog
-	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
-	ewarn "Remember to change that in the configuration file."
-	ewarn
-	if use mysql && use postgres ; then
-		ewarn "ProFTPD has been build with the MySQL and PostgreSQL modules."
-		ewarn "You can use the 'SQLBackend' directive to specify the used SQL"
-		ewarn "backend. Without this directive the default backend is MySQL."
-		ewarn
-	fi
-	if use clamav ; then
-		ewarn "mod_clamav was updated to a new version, which uses Clamd"
-		ewarn "only for virus scanning, so you'll have to set Clamd up"
-		ewarn "and start it, also re-check the mod_clamav docs."
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.2e.ebuild b/net-ftp/proftpd/proftpd-1.3.2e.ebuild
deleted file mode 100644
index 0b5f2cf582fb..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.2e.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2e.ebuild,v 1.2 2010/06/17 20:46:33 patrick Exp $
-
-inherit eutils flag-o-matic toolchain-funcs autotools
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 kerberos ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
-
-CASE_VER="0.3"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.4"
-MODGSS_VER="1.3.2"
-SHAPER_VER="0.6.5"
-VROOT_VER="0.8.3"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-		case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-		clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-		deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-		kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MODGSS_VER}.tar.gz )
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
-		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-
-HOMEPAGE="http://www.proftpd.org/
-		http://www.castaglia.org/proftpd/
-		http://www.thrallingpenguin.com/resources/mod_clamav.htm
-		http://gssmod.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-		clamav? ( app-antivirus/clamav )
-		kerberos? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) )
-		ldap? ( >=net-nds/openldap-1.2.11 )
-		mysql? ( virtual/mysql )
-		ncurses? ( sys-libs/ncurses )
-		opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		ssl? ( >=dev-libs/openssl-0.9.6f )
-		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-		xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-S="${WORKDIR}/${P/_/}"
-
-pkg_setup() {
-	# Add the proftpd user to make the default config
-	# work out-of-the-box
-	enewgroup proftpd
-	enewuser proftpd -1 -1 -1 proftpd
-}
-
-src_unpack() {
-	unpack ${P/_/}.tar.bz2
-	cd "${S}"
-
-	# Fix parallel build (committed upstream in 1.3.3rc1)
-	epatch "${FILESDIR}"/${PN}-1.3.2-parallel-build.patch
-	# Fix mysql include when both backends are enabled
-	epatch "${FILESDIR}"/${PN}-1.3.2-mysql-include.patch
-	# Do not use bundled libltdl when compiling mod_dso
-	epatch "${FILESDIR}"/${PN}-1.3.2-system-libltdl.patch
-
-	# Fix stripping of files
-	sed -e "s| @INSTALL_STRIP@||g" -i Make*
-
-	if use case ; then
-		unpack ${PN}-mod-case-${CASE_VER}.tar.gz
-		cp -f mod_case/mod_case.c contrib/
-		cp -f mod_case/mod_case.html doc/
-	fi
-
-	if use clamav ; then
-		unpack mod_clamav-${CLAMAV_VER}.tar.gz
-		cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/
-		epatch mod_clamav-${CLAMAV_VER}/${PN}.patch
-	fi
-
-	if use deflate ; then
-		unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz
-		cp -f mod_deflate/mod_deflate.c contrib/
-		cp -f mod_deflate/mod_deflate.html doc/
-	fi
-
-	if use kerberos ; then
-		unpack mod_gss-${MODGSS_VER}.tar.gz
-	fi
-
-	if use shaper ; then
-		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
-		cp -f mod_shaper/mod_shaper.c contrib/
-		cp -f mod_shaper/mod_shaper.html doc/
-	fi
-
-	if use vroot ; then
-		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
-		cp -f mod_vroot/mod_vroot.c contrib/
-		cp -f mod_vroot/mod_vroot.html doc/
-	fi
-
-	# Fix bug #221275
-	# extract custom PR_ macros from aclocal.m4 to acinclude.m4
-	# and delete the provided aclocal.m4 before running autoreconf
-	einfo "Extract custom m4 macros from aclocal.m4 ..."
-	sed -e '/libtool\.m4/q' aclocal.m4 > acinclude.m4
-	rm -f aclocal.m4
-
-	eautoreconf
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf mylibs
-
-	modules="mod_ratio:mod_readme:mod_ctrls_admin"
-	use acl && modules="${modules}:mod_facl"
-	use ban && modules="${modules}:mod_ban"
-	use case && modules="${modules}:mod_case"
-	use clamav && modules="${modules}:mod_clamav"
-	use deflate && modules="${modules}:mod_deflate"
-	use pam && modules="${modules}:mod_auth_pam"
-	use radius && modules="${modules}:mod_radius"
-	use rewrite && modules="${modules}:mod_rewrite"
-	use shaper && modules="${modules}:mod_shaper"
-	use sitemisc && modules="${modules}:mod_site_misc"
-	use ssl && modules="${modules}:mod_tls"
-	use tcpd && modules="${modules}:mod_wrap"
-	use vroot && modules="${modules}:mod_vroot"
-
-	# pam needs to be explicitely disabled
-	use pam || myconf="${myconf} --enable-auth-pam=no"
-
-	if use ldap ; then
-		modules="${modules}:mod_ldap"
-		mylibs="${mylibs} -lresolv"
-		use ssl && CFLAGS="${CFLAGS} -DUSE_LDAP_TLS"
-	fi
-
-	if use opensslcrypt ; then
-		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
-		mylibs="${mylibs} -lcrypto"
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-	fi
-
-	use nls && myconf="${myconf} --enable-nls"
-
-	if use mysql || use postgres ; then
-		modules="${modules}:mod_sql"
-		if use mysql ; then
-			modules="${modules}:mod_sql_mysql"
-			myconf="${myconf} --with-includes=/usr/include/mysql"
-		fi
-		if use postgres ; then
-			modules="${modules}:mod_sql_postgres"
-			myconf="${myconf} --with-includes=/usr/include/postgresql"
-		fi
-	fi
-
-	if use softquota ; then
-		modules="${modules}:mod_quotatab"
-		if use mysql || use postgres ; then
-			modules="${modules}:mod_quotatab_sql"
-		fi
-		if use radius ; then
-			modules="${modules}:mod_quotatab_radius"
-		fi
-		if use ldap ; then
-			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
-		else
-			modules="${modules}:mod_quotatab_file"
-		fi
-	fi
-
-	# mod_ifsession should be the last module in the --with-modules list
-	# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
-	use ifsession && modules="${modules}:mod_ifsession"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	gcc-specs-pie && echo > lib/libcap/cap_sys.c
-
-	if use noauthunix ; then
-		myconf="${myconf} --disable-auth-unix"
-	else
-		myconf="${myconf} --enable-auth-unix"
-	fi
-
-	if use kerberos ; then
-		cd "${S}"/mod_gss-${MODGSS_VER}
-		# Generate source files for installed virtual/krb5 provider
-		if has_version app-crypt/mit-krb5; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		cd "${S}"
-		# copy the generated files
-		cp -f mod_gss-${MODGSS_VER}/mod_gss.c contrib/
-		cp -f mod_gss-${MODGSS_VER}/mod_gss.h include/
-		cp -f mod_gss-${MODGSS_VER}/mod_auth_gss.c contrib/
-
-		myconf="${myconf} --enable-dso  --with-shared=mod_gss:mod_auth_gss"
-	fi
-
-	LIBS="${mylibs}" econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--enable-autoshadow \
-		--enable-ctrls \
-		--with-modules=${modules} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	keepdir /var/run/proftpd
-
-	dodoc "${FILESDIR}/proftpd.conf" \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/license.txt
-	dohtml doc/*.html
-	dohtml doc/howto/*.html
-
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib"
-
-	insinto /etc/proftpd
-	newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/proftpd.xinetd" proftpd
-	fi
-
-	newinitd "${FILESDIR}/proftpd.rc6" proftpd
-}
-
-pkg_postinst() {
-	elog
-	elog "You can find the config files in /etc/proftpd"
-	elog
-	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
-	ewarn "Remember to change that in the configuration file."
-	ewarn
-	if use mysql && use postgres ; then
-		ewarn "ProFTPD has been build with the MySQL and PostgreSQL modules."
-		ewarn "You can use the 'SQLBackend' directive to specify the used SQL"
-		ewarn "backend. Without this directive the default backend is MySQL."
-		ewarn
-	fi
-	if use clamav ; then
-		ewarn "mod_clamav was updated to a new version, which uses Clamd"
-		ewarn "only for virus scanning, so you'll have to set Clamd up"
-		ewarn "and start it, also re-check the mod_clamav docs."
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild
deleted file mode 100644
index 9ffcba528854..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild,v 1.1 2010/06/23 13:37:01 voyageur Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-CASE_VER="0.3"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.5.4"
-GSS_VER="1.3.3"
-VROOT_VER="0.8.5"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-	deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xinetd? ( virtual/inetd )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-pkg_setup() {
-	if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then
-		eerror "Your ProFTPD server is running. In order to install this update"
-		eerror "you have to stop the running server. If you are using ProFTPD in"
-		eerror "the standalone mode you can stop the server by executing:"
-		eerror "  /etc/init.d/proftpd stop"
-		eerror "If you are sure that ProFTPD is not running anymore you have to"
-		eerror "delete the /var/run/proftpd.pid file."
-		die "This update requires to stop the ProFTPD server!"
-	fi
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER}
-	fi
-	use deflate && __prepare_module mod_deflate
-	use vroot && __prepare_module mod_vroot
-
-	# Fix MySQL includes
-	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
-
-	# Manipulate build system
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-	sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in
-
-	# Fix Gentoo Bug #284853, support newer mit-krb5
-	if use kerberos; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}/ || die "mod_gss cd failed"
-		sed -i -e "s/krb5_principal2principalname/_\0/" \
-			mod_auth_gss.c.in || die "mod_auth_gss.c.in sed failed"
-		sed -i -e '/ac_gss_libs/s/\-ldes425\ //' \
-			configure.in || die "configure.in sed failed"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myc myl mym
-
-	use acl && mym="${mym}:mod_facl"
-	use ban && mym="${mym}:mod_ban"
-	use case && mym="${mym}:mod_case"
-	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use shaper ; then
-		myc="${myc} --enable-ctrls"
-		mym="${mym}:mod_ctrls_admin"
-	fi
-	use deflate && mym="${mym}:mod_deflate"
-	use exec && mym="${mym}:mod_exec"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_gss-${GSS_VER}
-		mym="${mym}:mod_gss:mod_auth_gss"
-	fi
-	if use ldap ; then
-		myl="${myl} -lresolv"
-		mym="${mym}:mod_ldap"
-	fi
-	if use mysql || use postgres ; then
-		mym="${mym}:mod_sql:mod_sql_passwd"
-		if use mysql ; then
-			myc="${myc} --with-includes=/usr/include/mysql"
-			mym="${mym}:mod_sql_mysql"
-		fi
-		if use postgres ; then
-			myc="${myc} --with-includes=/usr/include/postgresql"
-			mym="${mym}:mod_sql_postgres"
-		fi
-	fi
-	if use sftp || use ssl ; then
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-		myc="${myc} --enable-openssl --with-includes=/usr/include/openssl"
-		myl="${myl} -lcrypto"
-	fi
-	use radius && mym="${mym}:mod_radius"
-	use ratio && mym="${mym}:mod_ratio"
-	use readme && mym="${mym}:mod_readme"
-	use rewrite && mym="${mym}:mod_rewrite"
-	if use sftp ; then
-		mym="${mym}:mod_sftp"
-		use pam && mym="${mym}:mod_sftp_pam"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_sftp_sql"
-		fi
-	fi
-	use shaper && mym="${mym}:mod_shaper"
-	use sitemisc && mym="${mym}:mod_site_misc"
-	if use softquota ; then
-		mym="${mym}:mod_quotatab:mod_quotatab_file"
-		use ldap && mym="${mym}:mod_quotatab_ldap"
-		use radius && mym="${mym}:mod_quotatab_radius"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_quotatab_sql"
-		fi
-	fi
-	use ssl && mym="${mym}:mod_tls:mod_tls_shmcache"
-	use tcpd && mym="${mym}:mod_wrap"
-	use vroot && mym="${mym}:mod_vroot"
-	# mod_ifsession needs to be the last module in the mym list.
-	use ifsession && mym="${mym}:mod_ifsession"
-
-	[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}"
-	LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable trace) \
-		$(use_enable pam auth-pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-	keepdir /var/run/proftpd
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use mysql && use postgres ; then
-		elog
-		elog "ProFTPD has been built with the MySQL and PostgreSQL modules."
-		elog "You can use the 'SQLBackend' directive to specify the used SQL"
-		elog "backend. Without this directive the default backend is MySQL."
-		elog
-	fi
-	if use exec ; then
-		ewarn
-		ewarn "ProFTPD has been built with the mod_exec module. This module"
-		ewarn "can be a security risk for your server as it executes external"
-		ewarn "programs. Vulnerables in these external programs may disclose"
-		ewarn "information or even compromise your server."
-		ewarn "You have been warned! Use this module at your own risk!"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.3.ebuild b/net-ftp/proftpd/proftpd-1.3.3.ebuild
deleted file mode 100644
index 33a155231901..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3.ebuild,v 1.2 2010/06/17 20:46:33 patrick Exp $
-
-EAPI="2"
-inherit eutils
-
-CASE_VER="0.3"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.5.4"
-GSS_VER="1.3.3"
-VROOT_VER="0.8.5"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-	deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xinetd? ( virtual/inetd )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-pkg_setup() {
-	if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then
-		eerror "Your ProFTPD server is running. In order to install this update"
-		eerror "you have to stop the running server. If you are using ProFTPD in"
-		eerror "the standalone mode you can stop the server by executing:"
-		eerror "  /etc/init.d/proftpd stop"
-		eerror "If you are sure that ProFTPD is not running anymore you have to"
-		eerror "delete the /var/run/proftpd.pid file."
-		die "This update requires to stop the ProFTPD server!"
-	fi
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER}
-	fi
-	use deflate && __prepare_module mod_deflate
-	use vroot && __prepare_module mod_vroot
-
-	# Fix MySQL includes
-	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
-
-	# Fix Gentoo Bug #284853
-	use kerberos && sed -i -e "s/krb5_principal2principalname/_\0/" \
-		"${WORKDIR}"/mod_gss-${GSS_VER}/mod_auth_gss.c.in
-
-	# Manipulate build system
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-	sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in
-}
-
-src_configure() {
-	local myc myl mym
-
-	use acl && mym="${mym}:mod_facl"
-	use ban && mym="${mym}:mod_ban"
-	use case && mym="${mym}:mod_case"
-	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use shaper ; then
-		myc="${myc} --enable-ctrls"
-		mym="${mym}:mod_ctrls_admin"
-	fi
-	use deflate && mym="${mym}:mod_deflate"
-	use exec && mym="${mym}:mod_exec"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		if has_version <app-crypt/mit-krb5-1.7 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_gss-${GSS_VER}
-		mym="${mym}:mod_gss:mod_auth_gss"
-	fi
-	if use ldap ; then
-		myl="${myl} -lresolv"
-		mym="${mym}:mod_ldap"
-	fi
-	if use mysql || use postgres ; then
-		mym="${mym}:mod_sql:mod_sql_passwd"
-		if use mysql ; then
-			myc="${myc} --with-includes=/usr/include/mysql"
-			mym="${mym}:mod_sql_mysql"
-		fi
-		if use postgres ; then
-			myc="${myc} --with-includes=/usr/include/postgresql"
-			mym="${mym}:mod_sql_postgres"
-		fi
-	fi
-	if use sftp || use ssl ; then
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-		myc="${myc} --enable-openssl --with-includes=/usr/include/openssl"
-		myl="${myl} -lcrypto"
-	fi
-	use radius && mym="${mym}:mod_radius"
-	use ratio && mym="${mym}:mod_ratio"
-	use readme && mym="${mym}:mod_readme"
-	use rewrite && mym="${mym}:mod_rewrite"
-	if use sftp ; then
-		mym="${mym}:mod_sftp"
-		use pam && mym="${mym}:mod_sftp_pam"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_sftp_sql"
-		fi
-	fi
-	use shaper && mym="${mym}:mod_shaper"
-	use sitemisc && mym="${mym}:mod_site_misc"
-	if use softquota ; then
-		mym="${mym}:mod_quotatab:mod_quotatab_file"
-		use ldap && mym="${mym}:mod_quotatab_ldap"
-		use radius && mym="${mym}:mod_quotatab_radius"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_quotatab_sql"
-		fi
-	fi
-	use ssl && mym="${mym}:mod_tls:mod_tls_shmcache"
-	use tcpd && mym="${mym}:mod_wrap"
-	use vroot && mym="${mym}:mod_vroot"
-	# mod_ifsession needs to be the last module in the mym list.
-	use ifsession && mym="${mym}:mod_ifsession"
-
-	[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}"
-	LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable trace) \
-		$(use_enable pam auth-pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-	keepdir /var/run/proftpd
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use mysql && use postgres ; then
-		elog
-		elog "ProFTPD has been built with the MySQL and PostgreSQL modules."
-		elog "You can use the 'SQLBackend' directive to specify the used SQL"
-		elog "backend. Without this directive the default backend is MySQL."
-		elog
-	fi
-	if use exec ; then
-		ewarn
-		ewarn "ProFTPD has been built with the mod_exec module. This module"
-		ewarn "can be a security risk for your server as it executes external"
-		ewarn "programs. Vulnerables in these external programs may disclose"
-		ewarn "information or even compromise your server."
-		ewarn "You have been warned! Use this module at your own risk!"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.3a.ebuild b/net-ftp/proftpd/proftpd-1.3.3a.ebuild
deleted file mode 100644
index fe089f0c0a39..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3a.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3a.ebuild,v 1.9 2010/10/26 09:29:45 jer Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-CASE_VER="0.4"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.5.4"
-GSS_VER="1.3.3"
-VROOT_VER="0.8.5"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-	deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xinetd? ( virtual/inetd )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-pkg_setup() {
-	if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then
-		eerror "Your ProFTPD server is running. In order to install this update"
-		eerror "you have to stop the running server. If you are using ProFTPD in"
-		eerror "the standalone mode you can stop the server by executing:"
-		eerror "  /etc/init.d/proftpd stop"
-		eerror "If you are sure that ProFTPD is not running anymore you have to"
-		eerror "delete the /var/run/proftpd.pid file."
-		die "This update requires to stop the ProFTPD server!"
-	fi
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER}
-	fi
-	use deflate && __prepare_module mod_deflate
-	use vroot && __prepare_module mod_vroot
-
-	# Fix MySQL includes
-	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
-
-	# Manipulate build system
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-	sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in
-
-	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-		sed -i -e "/ac_gss_libs/s/\-ldes425\ //" configure.in
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myc myl mym
-
-	use acl && mym="${mym}:mod_facl"
-	use ban && mym="${mym}:mod_ban"
-	use case && mym="${mym}:mod_case"
-	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use shaper ; then
-		myc="${myc} --enable-ctrls"
-		mym="${mym}:mod_ctrls_admin"
-	fi
-	use deflate && mym="${mym}:mod_deflate"
-	use exec && mym="${mym}:mod_exec"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_gss-${GSS_VER}
-		mym="${mym}:mod_gss:mod_auth_gss"
-	fi
-	if use ldap ; then
-		myl="${myl} -lresolv"
-		mym="${mym}:mod_ldap"
-	fi
-	if use mysql || use postgres ; then
-		mym="${mym}:mod_sql:mod_sql_passwd"
-		if use mysql ; then
-			myc="${myc} --with-includes=/usr/include/mysql"
-			mym="${mym}:mod_sql_mysql"
-		fi
-		if use postgres ; then
-			myc="${myc} --with-includes=/usr/include/postgresql"
-			mym="${mym}:mod_sql_postgres"
-		fi
-	fi
-	if use sftp || use ssl ; then
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-		myc="${myc} --enable-openssl --with-includes=/usr/include/openssl"
-		myl="${myl} -lcrypto"
-	fi
-	use radius && mym="${mym}:mod_radius"
-	use ratio && mym="${mym}:mod_ratio"
-	use readme && mym="${mym}:mod_readme"
-	use rewrite && mym="${mym}:mod_rewrite"
-	if use sftp ; then
-		mym="${mym}:mod_sftp"
-		use pam && mym="${mym}:mod_sftp_pam"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_sftp_sql"
-		fi
-	fi
-	use shaper && mym="${mym}:mod_shaper"
-	use sitemisc && mym="${mym}:mod_site_misc"
-	if use softquota ; then
-		mym="${mym}:mod_quotatab:mod_quotatab_file"
-		use ldap && mym="${mym}:mod_quotatab_ldap"
-		use radius && mym="${mym}:mod_quotatab_radius"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_quotatab_sql"
-		fi
-	fi
-	use ssl && mym="${mym}:mod_tls:mod_tls_shmcache"
-	use tcpd && mym="${mym}:mod_wrap"
-	use vroot && mym="${mym}:mod_vroot"
-	# mod_ifsession needs to be the last module in the mym list.
-	use ifsession && mym="${mym}:mod_ifsession"
-
-	[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}"
-	LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable trace) \
-		$(use_enable pam auth-pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-	keepdir /var/run/proftpd
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use mysql && use postgres ; then
-		elog
-		elog "ProFTPD has been built with the MySQL and PostgreSQL modules."
-		elog "You can use the 'SQLBackend' directive to specify the used SQL"
-		elog "backend. Without this directive the default backend is MySQL."
-		elog
-	fi
-	if use exec ; then
-		ewarn
-		ewarn "ProFTPD has been built with the mod_exec module. This module"
-		ewarn "can be a security risk for your server as it executes external"
-		ewarn "programs. Vulnerables in these external programs may disclose"
-		ewarn "information or even compromise your server."
-		ewarn "You have been warned! Use this module at your own risk!"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.3b.ebuild b/net-ftp/proftpd/proftpd-1.3.3b.ebuild
deleted file mode 100644
index c8fd6d6ee3a6..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3b.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3b.ebuild,v 1.1 2010/10/08 23:22:43 jokey Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-CASE_VER="0.4"
-CLAMAV_VER="0.11rc"
-DEFLATE_VER="0.5.4"
-GSS_VER="1.3.3"
-VROOT_VER="0.8.5"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-HOMEPAGE="http://www.proftpd.org/
-	http://www.castaglia.org/proftpd/
-	http://www.thrallingpenguin.com/resources/mod_clamav.htm
-	http://gssmod.sourceforge.net/"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz )
-	deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	ssl? ( dev-libs/openssl )
-	tcpd? ( sys-apps/tcp-wrappers )
-	xinetd? ( virtual/inetd )"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftpd )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-pkg_setup() {
-	if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then
-		eerror "Your ProFTPD server is running. In order to install this update"
-		eerror "you have to stop the running server. If you are using ProFTPD in"
-		eerror "the standalone mode you can stop the server by executing:"
-		eerror "  /etc/init.d/proftpd stop"
-		eerror "If you are sure that ProFTPD is not running anymore you have to"
-		eerror "delete the /var/run/proftpd.pid file."
-		die "This update requires to stop the ProFTPD server!"
-	fi
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER}
-	fi
-	use deflate && __prepare_module mod_deflate
-	use vroot && __prepare_module mod_vroot
-
-	# Fix MySQL includes
-	sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c
-
-	# Manipulate build system
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-	sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in
-
-	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-		sed -i -e "/ac_gss_libs/s/\-ldes425\ //" configure.in
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myc myl mym
-
-	use acl && mym="${mym}:mod_facl"
-	use ban && mym="${mym}:mod_ban"
-	use case && mym="${mym}:mod_case"
-	use clamav && mym="${mym}:mod_clamav"
-	if use ctrls || use shaper ; then
-		myc="${myc} --enable-ctrls"
-		mym="${mym}:mod_ctrls_admin"
-	fi
-	use deflate && mym="${mym}:mod_deflate"
-	use exec && mym="${mym}:mod_exec"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${GSS_VER}
-		if has_version app-crypt/mit-krb5 ; then
-			econf --enable-mit
-		else
-			econf --enable-heimdal
-		fi
-		mv mod_{auth_gss,gss}.c "${S}"/contrib
-		mv mod_gss.h "${S}"/include
-		mv README.mod_{auth_gss,gss} "${S}"
-		mv mod_gss.html "${S}"/doc/contrib
-		mv rfc{1509,2228}.txt "${S}"/doc/rfc
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_gss-${GSS_VER}
-		mym="${mym}:mod_gss:mod_auth_gss"
-	fi
-	if use ldap ; then
-		myl="${myl} -lresolv"
-		mym="${mym}:mod_ldap"
-	fi
-	if use mysql || use postgres ; then
-		mym="${mym}:mod_sql:mod_sql_passwd"
-		if use mysql ; then
-			myc="${myc} --with-includes=/usr/include/mysql"
-			mym="${mym}:mod_sql_mysql"
-		fi
-		if use postgres ; then
-			myc="${myc} --with-includes=/usr/include/postgresql"
-			mym="${mym}:mod_sql_postgres"
-		fi
-	fi
-	if use sftp || use ssl ; then
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-		myc="${myc} --enable-openssl --with-includes=/usr/include/openssl"
-		myl="${myl} -lcrypto"
-	fi
-	use radius && mym="${mym}:mod_radius"
-	use ratio && mym="${mym}:mod_ratio"
-	use readme && mym="${mym}:mod_readme"
-	use rewrite && mym="${mym}:mod_rewrite"
-	if use sftp ; then
-		mym="${mym}:mod_sftp"
-		use pam && mym="${mym}:mod_sftp_pam"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_sftp_sql"
-		fi
-	fi
-	use shaper && mym="${mym}:mod_shaper"
-	use sitemisc && mym="${mym}:mod_site_misc"
-	if use softquota ; then
-		mym="${mym}:mod_quotatab:mod_quotatab_file"
-		use ldap && mym="${mym}:mod_quotatab_ldap"
-		use radius && mym="${mym}:mod_quotatab_radius"
-		if use mysql || use postgres ; then
-			mym="${mym}:mod_quotatab_sql"
-		fi
-	fi
-	use ssl && mym="${mym}:mod_tls:mod_tls_shmcache"
-	use tcpd && mym="${mym}:mod_wrap"
-	use vroot && mym="${mym}:mod_vroot"
-	# mod_ifsession needs to be the last module in the mym list.
-	use ifsession && mym="${mym}:mod_ifsession"
-
-	[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}"
-	LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \
-		--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable trace) \
-		$(use_enable pam auth-pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-	keepdir /var/run/proftpd
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/proftpd.xinetd proftpd
-	fi
-
-	dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
-	if use doc ; then
-		dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
-		docinto rfc
-		dodoc doc/rfc/*.txt
-	fi
-}
-
-pkg_postinst() {
-	if use mysql && use postgres ; then
-		elog
-		elog "ProFTPD has been built with the MySQL and PostgreSQL modules."
-		elog "You can use the 'SQLBackend' directive to specify the used SQL"
-		elog "backend. Without this directive the default backend is MySQL."
-		elog
-	fi
-	if use exec ; then
-		ewarn
-		ewarn "ProFTPD has been built with the mod_exec module. This module"
-		ewarn "can be a security risk for your server as it executes external"
-		ewarn "programs. Vulnerables in these external programs may disclose"
-		ewarn "information or even compromise your server."
-		ewarn "You have been warned! Use this module at your own risk!"
-		ewarn
-	fi
-}