Version bump (old stable branch).

(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

13 files changed, 34 insertions, 1640 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 2dc55dcffd3d..de3068dfd914 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-ftp/proftpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.315 2013/09/14 10:37:51 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.316 2014/05/16 21:08:45 slyfox Exp $
+
+*proftpd-1.3.4e (16 May 2014)
+
+  16 May 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/proftpd-1.3.4e-link-tests.patch, +proftpd-1.3.4e.ebuild,
+  -files/proftpd-1.3.4a-ubug-3682.patch, -files/proftpd-1.3.4a-ubug-3728.patch,
+  -files/proftpd-1.3.4b-ubug-3795.patch,
+  -files/proftpd-1.3.4c-fix-build-noipv6.patch, -proftpd-1.3.3g.ebuild,
+  -proftpd-1.3.4a-r1.ebuild, -proftpd-1.3.4a.ebuild, -proftpd-1.3.4b.ebuild,
+  -proftpd-1.3.4c-r1.ebuild, -proftpd-1.3.4c-r2.ebuild, -proftpd-1.3.4c.ebuild:
+  Version bump (old stable branch).
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> proftpd-1.3.4d.ebuild:
   Stable for ppc, wrt bug #484614
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch
deleted file mode 100644
index c6ebef741a47..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- configure
-+++ configure
-@@ -15457,7 +15457,7 @@
- fi
- 
- 
--                  { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
-+                        { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
- echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
- if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -15533,6 +15533,82 @@
-          ENABLE_NLS="1"
- 
- else
-+  { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
-+echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char libiconv_open ();
-+int
-+main ()
-+{
-+return libiconv_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-+  ac_cv_lib_iconv_libiconv_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_iconv_libiconv_open=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
-+if test $ac_cv_lib_iconv_libiconv_open = yes; then
-+  LIBS="$LIBS -liconv"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBICONV 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define PR_USE_NLS 1
-+_ACEOF
-+
-+           ENABLE_NLS="1"
-+
-+else
-   { echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
- echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_c_iconv_open+set}" = set; then
-@@ -15600,7 +15676,7 @@
- #define PR_USE_NLS 1
- _ACEOF
- 
--           ENABLE_NLS="1"
-+             ENABLE_NLS="1"
- 
- else
-   { { echo "$as_me:$LINENO: error: libiconv support, required for NLS, not present -- aborting" >&5
-@@ -15609,6 +15685,9 @@
- 
- fi
- 
-+
-+fi
-+
- 
- fi
- 
---- configure.in
-+++ configure.in
-@@ -715,18 +715,26 @@
-       )
- 
-       dnl Similarly, the libiconv library is only needed on some non-GNU
--      dnl systems.
-+      dnl systems.  Note that some systems redefine the iconv_open function
-+      dnl to something else (Bug#3682), e.g. libiconv_open.
-       AC_CHECK_LIB(iconv, iconv_open,
-         [LIBS="$LIBS -liconv"
-          AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
-          AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-          ENABLE_NLS="1"
-         ],
--        [AC_CHECK_LIB(c, iconv_open,
--          [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-+        [AC_CHECK_LIB(iconv, libiconv_open,
-+          [LIBS="$LIBS -liconv"
-+           AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
-+           AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-            ENABLE_NLS="1"
-           ],
--          [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
-+          [AC_CHECK_LIB(c, iconv_open,
-+            [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
-+             ENABLE_NLS="1"
-+            ],
-+            [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
-+          ])
-         ])
-       )
-     fi
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch
deleted file mode 100644
index 8f656dd8a899..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wtmp.c
-+++ src/wtmp.c
-@@ -42,7 +42,7 @@
-     !(defined(LINUX) || defined(__hpux) || defined (_AIX))
-   /* This "auxilliary" utmp doesn't exist under linux. */
- 
--#if defined(__sparcv9) && !defined(__NetBSD__)
-+#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__)
-   struct futmpx utx;
-   time_t t;
- 
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch b/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch
deleted file mode 100644
index b39442620438..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4b-ubug-3795.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure
-+++ configure
-@@ -33211,6 +33211,21 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-+
-+  if test x"$openssl_cmdline" != xno; then
-+    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
-+      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
-+      if test ! -z "$openssl_cflags"; then
-+        # Look for the -pthread flag, indicating that this OpenSSL was built
-+        # with threads support (see Bug#3795)
-+        for openssl_cflag in $openssl_cflags; do
-+          if test x"$openssl_cflag" = x"-pthread"; then
-+            LIBS="$LIBS -pthread"
-+          fi
-+        done
-+      fi
-+    fi
-+  fi
- fi
- 
- if test x"$pr_use_postgres" = xyes; then
-@@ -33303,21 +33318,6 @@
-   CPPFLAGS="$saved_cppflags"
-   LDFLAGS="$saved_ldflags"
-   LIBS="$saved_libs"
--
--  if test x"$openssl_cmdline" != xno; then
--    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
--      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
--      if test ! -z "$openssl_cflags"; then
--        # Look for the -pthread flag, indicating that this OpenSSL was built
--        # with threads support (see Bug#3795)
--        for openssl_cflag in $openssl_cflags; do
--          if test x"$openssl_cflag" = x"-pthread"; then
--            LIBS="$LIBS -pthread"
--          fi
--        done
--      fi
--    fi
--  fi
- fi
- 
- for module in $ac_shared_modules ; do
---- configure.in
-+++ configure.in
-@@ -2473,6 +2473,21 @@
-       )
-     ]
-   )
-+
-+  if test x"$openssl_cmdline" != xno; then
-+    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
-+      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
-+      if test ! -z "$openssl_cflags"; then
-+        # Look for the -pthread flag, indicating that this OpenSSL was built
-+        # with threads support (see Bug#3795)
-+        for openssl_cflag in $openssl_cflags; do
-+          if test x"$openssl_cflag" = x"-pthread"; then
-+            LIBS="$LIBS -pthread"
-+          fi
-+        done
-+      fi
-+    fi
-+  fi
- fi
- 
- if test x"$pr_use_postgres" = xyes; then
-@@ -2521,21 +2536,6 @@
-   CPPFLAGS="$saved_cppflags"
-   LDFLAGS="$saved_ldflags"
-   LIBS="$saved_libs"
--
--  if test x"$openssl_cmdline" != xno; then
--    if `$openssl_cmdline version 2>/dev/null 1>&2`; then
--      openssl_cflags=`$openssl_cmdline version -f 2>/dev/null`
--      if test ! -z "$openssl_cflags"; then
--        # Look for the -pthread flag, indicating that this OpenSSL was built
--        # with threads support (see Bug#3795)
--        for openssl_cflag in $openssl_cflags; do 
--          if test x"$openssl_cflag" = x"-pthread"; then
--            LIBS="$LIBS -pthread"
--          fi
--        done
--      fi
--    fi
--  fi
- fi
- 
- for module in $ac_shared_modules ; do
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch b/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch
deleted file mode 100644
index 937fff019415..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix buld failure of USE=-ipv6 case.
-
-> netaddr.c: In function 'get_addr_by_name':
-> netaddr.c:694:3: warning: control reaches end of non-void function [-Wreturn-type]
->    }
->    ^
-
-Fixes: http://bugs.gentoo.org/465134
-Patch-by:  Yuri Shatroff <yks-uno@ya.ru>
-diff --git a/src/netaddr.c b/src/netaddr.c
-index 9dbc716..2b025b6 100644
---- a/src/netaddr.c
-+++ b/src/netaddr.c
-@@ -690,8 +690,8 @@ static pr_netaddr_t *get_addr_by_name(pool *p, const char *name,
-         pr_freeaddrinfo(info);
-       }
-     }
--#endif /* PR_USE_IPV6 */
-   }
-+#endif /* PR_USE_IPV6 */
- 
-   return na;
- }
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch b/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch
new file mode 100644
index 000000000000..d19c98a41849
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/api/stubs.c b/tests/api/stubs.c
+index 9f49c9d..7f1e898 100644
+--- a/tests/api/stubs.c
++++ b/tests/api/stubs.c
+@@ -46,6 +46,10 @@ char *pr_fs_encode_path(pool *p, const char *path) {
+   return (char *) path;
+ }
+ 
++int pr_fs_get_usable_fd(int fd) {
++  return -1;
++}
++
+ void pr_log_debug(int level, const char *fmt, ...) {
+ }
+ 
diff --git a/net-ftp/proftpd/proftpd-1.3.3g.ebuild b/net-ftp/proftpd/proftpd-1.3.3g.ebuild
deleted file mode 100644
index 3f8a5ab41e69..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.3g.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3g.ebuild,v 1.7 2012/05/13 10:49:47 swift 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.9.2"
-
-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 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-ftp )"
-
-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 ban || 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 || die "install failed"
-
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-	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.4a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild
deleted file mode 100644
index b4554d10007e..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a-r1.ebuild,v 1.3 2012/09/19 08:27:54 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-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-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	# Fix Gentoo Bug #354295 / ProFTPD Bug #3682
-	epatch "${FILESDIR}"/${P}-ubug-3682.patch
-
-	# Fix Gentoo Bug #393189 / ProFTPD Bug #3728
-	epatch "${FILESDIR}"/${P}-ubug-3728.patch
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		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 -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	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 tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4a.ebuild b/net-ftp/proftpd/proftpd-1.3.4a.ebuild
deleted file mode 100644
index 2b8dff3b7bae..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4a.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a.ebuild,v 1.3 2012/05/13 10:49:47 swift Exp $
-
-EAPI=4
-inherit eutils autotools
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-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-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc exec ifsession ifversion ident
-	ipv6 kerberos ldap memcache mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite
-	selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sftp? ( dev-libs/openssl )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -rf "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -rf "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
-
-	# Fixes Gentoo Bug #354295 / ProFTPD Bug #3682
-	epatch "${FILESDIR}"/${P}-ubug-3682.patch
-
-	# Fixes Gentoo Bug #393189 / ProFTPD Bug #3728
-	epatch "${FILESDIR}"/${P}-ubug-3728.patch
-
-	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		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 c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	if use ctrls || use ban || use shaper ; then
-		c="${c} --enable-ctrls"
-		m="${m}:mod_ctrls_admin"
-	fi
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -rf "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		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-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	use sftp || use ssl && c="${c} --enable-openssl"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	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 tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4b.ebuild b/net-ftp/proftpd/proftpd-1.3.4b.ebuild
deleted file mode 100644
index 9b7e5e5eb3bf..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4b.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4b.ebuild,v 1.1 2012/09/19 08:27:54 voyageur Exp $
-
-EAPI=4
-inherit eutils multilib
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-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.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	# Fix Gentoo Bug #422941 / ProFTPD Bug #3795
-	epatch "${FILESDIR}"/${P}-ubug-3795.patch
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		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 -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	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 tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild
deleted file mode 100644
index d2fc5afadb12..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c-r1.ebuild,v 1.1 2013/04/09 20:22:24 slyfox Exp $
-
-EAPI=5
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_MSG="0.4.1"
-MOD_VROOT="0.9.2"
-
-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.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-build-noipv6.patch #465134
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use msg && __prepare_module mod_msg
-	use vroot && __prepare_module mod_vroot
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use dynmasq && mym="${mym}:mod_dynmasq"
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		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 -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	use msg && mym="${mym}:mod_msg"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	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
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4c.ebuild b/net-ftp/proftpd/proftpd-1.3.4c.ebuild
deleted file mode 100644
index 50b9ea31f0b8..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.4c.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c.ebuild,v 1.10 2013/07/14 17:37:56 ago Exp $
-
-EAPI=4
-inherit eutils multilib systemd
-
-MOD_CASE="0.7"
-MOD_CLAMAV="0.11rc"
-MOD_DISKUSE="0.9"
-MOD_GSS="1.3.3"
-MOD_VROOT="0.9.2"
-
-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.gz
-	case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
-	clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
-	diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
-	kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
-	vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${MOD_VROOT}.tar.gz )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso exec ifsession ifversion ident ipv6
-	kerberos ldap linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW memcache mysql ncurses nls openssl pam +pcre postgres qos radius
-	ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd"
-REQUIRED_USE="ban? ( ctrls )
-	sftp? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
-
-CDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	memcache? ( >=dev-libs/libmemcached-0.41 )
-	mysql? ( virtual/mysql )
-	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl )
-	pam? ( virtual/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	sqlite? ( dev-db/sqlite:3 )
-	xinetd? ( virtual/inetd )"
-DEPEND="${CDEPEND}
-	test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-S="${WORKDIR}/${P/_/}"
-
-__prepare_module() {
-	mv "${WORKDIR}"/$1/$1.c contrib
-	mv "${WORKDIR}"/$1/$1.html doc/contrib
-	rm -r "${WORKDIR}"/$1
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-build-noipv6.patch #465134
-
-	# Skip 'install-conf' / Support LINGUAS
-	sed -i -e "/install-all/s/ install-conf//" Makefile.in
-	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in
-
-	# Prepare external modules
-	use case && __prepare_module mod_case
-	if use clamav ; then
-		mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib
-		epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
-		rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}
-	fi
-	use vroot && __prepare_module mod_vroot
-
-	# Prepare external kerberos module
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-
-		# Support app-crypt/heimdal / Gentoo Bug #284853
-		sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in
-
-		# Remove obsolete DES / Gentoo Bug #324903
-		# Replace 'rpm' lookups / Gentoo Bug #391021
-		sed -i -e "/ac_gss_libs/s/ -ldes425//" \
-			-e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
-			-e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" configure{,.in}
-	fi
-}
-
-src_configure() {
-	local c m
-
-	use acl && m="${m}:mod_facl"
-	use ban && m="${m}:mod_ban"
-	use case && m="${m}:mod_case"
-	use clamav && m="${m}:mod_clamav"
-	use copy && m="${m}:mod_copy"
-	use ctrls && m="${m}:mod_ctrls_admin"
-	use deflate && m="${m}:mod_deflate"
-	if use diskuse ; then
-		cd "${WORKDIR}"/mod_diskuse
-		econf
-		mv mod_diskuse.{c,h} "${S}"/contrib
-		mv mod_diskuse.html "${S}"/doc/contrib
-		cd "${S}"
-		rm -r "${WORKDIR}"/mod_diskuse
-		m="${m}:mod_diskuse"
-	fi
-	use exec && m="${m}:mod_exec"
-	use ifsession && m="${m}:mod_ifsession"
-	use ifversion && m="${m}:mod_ifversion"
-	if use kerberos ; then
-		cd "${WORKDIR}"/mod_gss-${MOD_GSS}
-		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 -r "${WORKDIR}"/mod_gss-${MOD_GSS}
-		m="${m}:mod_gss:mod_auth_gss"
-	fi
-	use ldap && m="${m}:mod_ldap"
-	if use mysql || use postgres || use sqlite ; then
-		m="${m}:mod_sql:mod_sql_passwd"
-		use mysql && m="${m}:mod_sql_mysql"
-		use postgres && m="${m}:mod_sql_postgres"
-		use sqlite && m="${m}:mod_sql_sqlite"
-	fi
-	use qos && m="${m}:mod_qos"
-	use radius && m="${m}:mod_radius"
-	use ratio && m="${m}:mod_ratio"
-	use readme && m="${m}:mod_readme"
-	use rewrite && m="${m}:mod_rewrite"
-	if use sftp ; then
-		m="${m}:mod_sftp"
-		use pam && m="${m}:mod_sftp_pam"
-		use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
-	fi
-	use shaper && m="${m}:mod_shaper"
-	use sitemisc && m="${m}:mod_site_misc"
-	if use softquota ; then
-		m="${m}:mod_quotatab:mod_quotatab_file"
-		use ldap && m="${m}:mod_quotatab_ldap"
-		use radius && m="${m}:mod_quotatab_radius"
-		use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
-	fi
-	if use ssl ; then
-		m="${m}:mod_tls:mod_tls_shmcache"
-		use memcache && m="${m}:mod_tls_memcache"
-	fi
-	if use tcpd ; then
-		m="${m}:mod_wrap2:mod_wrap2_file"
-		use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
-	fi
-	use vroot && m="${m}:mod_vroot"
-
-	[ -z ${m} ] || c="${c} --with-modules=${m:1}"
-	econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
-		$(use_enable acl facl) \
-		$(use_enable authfile auth-file) \
-		$(use_enable caps cap) \
-		$(use_enable ctrls) \
-		$(use_enable dso) \
-		$(use_enable ident) \
-		$(use_enable ipv6) \
-		$(use_enable memcache) \
-		$(use_enable ncurses) \
-		$(use_enable nls) \
-		$(use_enable openssl) \
-		$(use_enable pam auth-pam) \
-		$(use_enable pcre) \
-		$(use_enable test tests) \
-		$(use_enable trace) \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
-		${c:1}
-}
-
-src_test() {
-	emake api-tests -C tests
-}
-
-src_install() {
-	default
-	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
-	newinitd "${FILESDIR}"/proftpd.initd proftpd
-	insinto /etc/proftpd
-	doins "${FILESDIR}"/proftpd.conf.sample
-
-	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
-
-	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
-}
-
-pkg_postinst() {
-	if use tcpd ; then
-		ewarn
-		ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper"
-		ewarn "support has been replaced by mod_wrap2 which is more configurable and"
-		ewarn "portable.  But you have to adjust your configuration before restaring"
-		ewarn "ProFTPD. On the following website you can find more information:"
-		ewarn "  http://proftpd.org/docs/contrib/mod_wrap2.html"
-		ewarn
-	fi
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.4c-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.4e.ebuild
index cb23bc8eba37..a04cea6157dd 100644
--- a/net-ftp/proftpd/proftpd-1.3.4c-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4e.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c-r2.ebuild,v 1.1 2013/07/16 08:12:52 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4e.ebuild,v 1.1 2014/05/16 21:08:45 slyfox Exp $
 
 EAPI=5
 inherit eutils multilib systemd
@@ -71,7 +71,8 @@ __prepare_module() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-build-noipv6.patch #465134
+	epatch "${FILESDIR}"/${P}-link-tests.patch
+	epatch "${FILESDIR}"/${PN}-1.3.4d-memset-fix.patch
 
 	# Skip 'install-conf' / Support LINGUAS
 	sed -i -e "/install-all/s/ install-conf//" Makefile.in
@@ -206,6 +207,8 @@ src_test() {
 src_install() {
 	default
 	[ -z ${LINGUAS} ] && rm -r "${ED}"/usr/share/locale
+	rm -rf "${ED}"/var/run
+
 	newinitd "${FILESDIR}"/proftpd.initd proftpd
 	insinto /etc/proftpd
 	doins "${FILESDIR}"/proftpd.conf.sample