AMD64 stable and remove old vulnerable versions.

(Portage version: 2.1.2_rc2-r2)
 (Unsigned Manifest commit)

5 files changed, 8 insertions, 466 deletions

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 939f375bfc77..91bca6850d6b 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -42,37 +42,25 @@ AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1b
 MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 files/proftpd.xinetd 295
 SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d files/proftpd.xinetd 295
-DIST mod_clamav.c 6338 RMD160 0a642be8149ee118426bf04d04eca5b2250ea2b2 SHA1 721ab740ce960237b668585934c03cb5b6dc7ae7 SHA256 d3b7da4b145b355fe4d05f453d6803a7c6b0bf99af2aedbd65431ae6b98a4db7
-DIST mod_clamav.html 4151 RMD160 8ada0d2126ff1977d9277e0f5a1464caaf5f7b62 SHA1 ef19409f04ea36007a81086f3f90028580d843be SHA256 4e6c3936ba307376561dd164c52964c14a83bcb23fd5801eaaab22be325370bc
 DIST mod_clamav_new.c 7399 RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb SHA1 f037c573b6c0052f8ed5ee427504a8cd8834f15c SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1
 DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SHA1 58479f3aae082effad3636026a27c09ddb232905 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e
 DIST proftpd-1.2.10.tar.bz2 920337 RMD160 198dc321fab5dde37465880d41bbab29f39c3c4b SHA1 5e3a4d7ae65429a5e3c2934db4ed36a19f41eb0b SHA256 5607d70b8cae3a99e60dcbc4a8286f6de2e10d765136d97834fafd75783c0b25
-DIST proftpd-1.3.0.tar.bz2 1386086 RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec SHA1 d117134035a3d8d130c5aa44d6b1788683a33410 SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe
 DIST proftpd-1.3.0a.tar.bz2 1386956 RMD160 406998669e798e1af253fd822d4d09dbeb75c98a SHA1 03573bfe342e1e9dbfec2983efe2265d3c0c5a12 SHA256 02f614586ff692a67299510064100b0537fd53b4ed0d238d7aaa5b723bf7a0aa
 DIST proftpd-mod-shaper-0.5.5.tar.gz 18090 RMD160 ef99f3b1e6cf4d4461ab7463bf65dc5ef8e21697 SHA1 667b59184aa08e6f5ad7a2edc3c949b8534cf5af SHA256 eb079bf98ef382086b952977cac1a84c2add9d7add4f8b989c7bd67d8ab61696
-DIST proftpd-mod-shaper-0.5.6.tar.gz 18099 RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 SHA1 33af13cf95374e0118fd6fece63d5fa55779810a SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827
 DIST proftpd-mod-shaper-0.6.2.tar.gz 19002 RMD160 3d1fdb82596672c9177009ebb30459a017e74c53 SHA1 930d6dc6b8785da48dc7102db5f1eb20546ccd75 SHA256 59f39bca40462c3bba20feb7be031d7453c366adb4b7fa6d8f50974eb45ae99e
 DIST proftpd-mod-vroot-0.7.1.tar.gz 5613 RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 SHA1 e773f850d5736ecede45304eca7b3ff339fdcd8c SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1
 EBUILD proftpd-1.2.10-r7.ebuild 4691 RMD160 473d95e56e567df989b0bb02fa4a8e9d3bb94467 SHA1 e9c3c8e473da8ec3499e5a18addf967f284baf21 SHA256 687b309d95e9c7c0f2759475cc87423f52da66656771847c160d945ea8deb085
 MD5 2b18c7dddb0f2239ba204e8d9d7d59dd proftpd-1.2.10-r7.ebuild 4691
 RMD160 473d95e56e567df989b0bb02fa4a8e9d3bb94467 proftpd-1.2.10-r7.ebuild 4691
 SHA256 687b309d95e9c7c0f2759475cc87423f52da66656771847c160d945ea8deb085 proftpd-1.2.10-r7.ebuild 4691
-EBUILD proftpd-1.3.0-r1.ebuild 5633 RMD160 215def19df70faf09194b2a072920cf45c0f9dc4 SHA1 6f0ce8788b6d14f99e8d6b1a2fc465b4eaa461a9 SHA256 738a239cd27fae2a74a6252cb58c73c07d00712706207e0983e47b51ac856c2f
-MD5 7df1f8e19c0e184f996b190e42a487d8 proftpd-1.3.0-r1.ebuild 5633
-RMD160 215def19df70faf09194b2a072920cf45c0f9dc4 proftpd-1.3.0-r1.ebuild 5633
-SHA256 738a239cd27fae2a74a6252cb58c73c07d00712706207e0983e47b51ac856c2f proftpd-1.3.0-r1.ebuild 5633
-EBUILD proftpd-1.3.0-r2.ebuild 6085 RMD160 fab061b4404f32b2f85459a447eaf5c509d372f3 SHA1 d5dada795f232dddd4b8e2378de43214b15f97f0 SHA256 e9f8487ed751ef5b923f4c089fe5bcaad68a15f4d8bfb7f1a72c83c23712d15a
-MD5 7fbcb6fc51d3688d694506f44dc3aeee proftpd-1.3.0-r2.ebuild 6085
-RMD160 fab061b4404f32b2f85459a447eaf5c509d372f3 proftpd-1.3.0-r2.ebuild 6085
-SHA256 e9f8487ed751ef5b923f4c089fe5bcaad68a15f4d8bfb7f1a72c83c23712d15a proftpd-1.3.0-r2.ebuild 6085
-EBUILD proftpd-1.3.0a.ebuild 6319 RMD160 5be23564a0510bf8e3bcd3f7ec319db85627dd47 SHA1 99cf927914b43f9d95b585ffdd0dd0e088286b48 SHA256 b51bbd12fadbe225fe728ce136b5b489a13c91ee847e6461b3fd76afcfeff3c4
-MD5 1f5b540f7c2f27264c013ef8c8cb2848 proftpd-1.3.0a.ebuild 6319
-RMD160 5be23564a0510bf8e3bcd3f7ec319db85627dd47 proftpd-1.3.0a.ebuild 6319
-SHA256 b51bbd12fadbe225fe728ce136b5b489a13c91ee847e6461b3fd76afcfeff3c4 proftpd-1.3.0a.ebuild 6319
-MISC ChangeLog 22086 RMD160 d69643eac4266cb770b52477fad46a561400cf24 SHA1 c6d157505dc73ba96e80ce0150d6652f7fc63f03 SHA256 9a079f14b58ce43b5244fd298562b21c8aba2051f635dd908db57cf7be22400c
-MD5 69840c2f2faa1dbbac4af710c84dddc7 ChangeLog 22086
-RMD160 d69643eac4266cb770b52477fad46a561400cf24 ChangeLog 22086
-SHA256 9a079f14b58ce43b5244fd298562b21c8aba2051f635dd908db57cf7be22400c ChangeLog 22086
+EBUILD proftpd-1.3.0a.ebuild 6319 RMD160 7044c76524328003d95f1610f09b1388dc285101 SHA1 f54e5be8bfd64079bfd442a52d8795cebeac941d SHA256 219c81c01a0d2169e2a0b68ab81163fd3b1df226debf6f5681af4c897d5fbf3a
+MD5 b65af93cf8d408443690afdf3c22ad34 proftpd-1.3.0a.ebuild 6319
+RMD160 7044c76524328003d95f1610f09b1388dc285101 proftpd-1.3.0a.ebuild 6319
+SHA256 219c81c01a0d2169e2a0b68ab81163fd3b1df226debf6f5681af4c897d5fbf3a proftpd-1.3.0a.ebuild 6319
+MISC ChangeLog 22267 RMD160 18b8a4de6f68217218232eec29c7a78b9c65a45c SHA1 cd849618febccf0ebab317359af9820fc423fea7 SHA256 7bef061d3a8cf634fc28cb50abee3193d1ee3ee6558f76619d017066720b10c7
+MD5 9401a044969fc43c84ed91d1e63e2e63 ChangeLog 22267
+RMD160 18b8a4de6f68217218232eec29c7a78b9c65a45c ChangeLog 22267
+SHA256 7bef061d3a8cf634fc28cb50abee3193d1ee3ee6558f76619d017066720b10c7 ChangeLog 22267
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
@@ -80,12 +68,6 @@ SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f metadata
 MD5 d8ff66c411bfd99d5551438fd5b2736a files/digest-proftpd-1.2.10-r7 518
 RMD160 ec25a22bf78ee25df0c5168defeb6fe6db6cf179 files/digest-proftpd-1.2.10-r7 518
 SHA256 ea87bf530416e83405291521ef6268680a3b6a93cb982098e22e2ba9ebdac203 files/digest-proftpd-1.2.10-r7 518
-MD5 35995cbe20ae79ce7bfe3c607082f42d files/digest-proftpd-1.3.0-r1 1214
-RMD160 a3b3282020c26af5c1725d10c26e98bcccda3d36 files/digest-proftpd-1.3.0-r1 1214
-SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/digest-proftpd-1.3.0-r1 1214
-MD5 c7b2fb963efdaad72f8b632c8293e3ff files/digest-proftpd-1.3.0-r2 1238
-RMD160 f21ff80eb1d1bd7a546105658d2f3d06849b84b1 files/digest-proftpd-1.3.0-r2 1238
-SHA256 874b41c34f7abfaa0af7232570fd80e494c6ae2a91ca72a61dd36d160cb1b11c files/digest-proftpd-1.3.0-r2 1238
 MD5 66f98bb7535b92691c80b850f2587c33 files/digest-proftpd-1.3.0a 1241
 RMD160 fec1ce9aa44ecd4875887fcfaa39580d81999c6d files/digest-proftpd-1.3.0a 1241
 SHA256 ce23a27fd36f6b5227bdec431ab632356e4a244e8eda95dbc188bcf58da665ed files/digest-proftpd-1.3.0a 1241
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.0-r1 b/net-ftp/proftpd/files/digest-proftpd-1.3.0-r1
deleted file mode 100644
index 080bbeb3944e..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 1786d61986bde69ef9c3d882cd90c7ae mod_clamav.c 6338
-RMD160 0a642be8149ee118426bf04d04eca5b2250ea2b2 mod_clamav.c 6338
-SHA256 d3b7da4b145b355fe4d05f453d6803a7c6b0bf99af2aedbd65431ae6b98a4db7 mod_clamav.c 6338
-MD5 90df329b43b29cea757efb6b11dcc87d mod_clamav.html 4151
-RMD160 8ada0d2126ff1977d9277e0f5a1464caaf5f7b62 mod_clamav.html 4151
-SHA256 4e6c3936ba307376561dd164c52964c14a83bcb23fd5801eaaab22be325370bc mod_clamav.html 4151
-MD5 fae47d01b52e035eb6b7190e74c17722 proftpd-1.3.0.tar.bz2 1386086
-RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec proftpd-1.3.0.tar.bz2 1386086
-SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe proftpd-1.3.0.tar.bz2 1386086
-MD5 a81c3ed2d45f7c938416a970fd559703 proftpd-mod-shaper-0.5.6.tar.gz 18099
-RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 proftpd-mod-shaper-0.5.6.tar.gz 18099
-SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827 proftpd-mod-shaper-0.5.6.tar.gz 18099
-MD5 bafd6c9ecfdf352641465b866be12f27 proftpd-mod-vroot-0.7.1.tar.gz 5613
-RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 proftpd-mod-vroot-0.7.1.tar.gz 5613
-SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 proftpd-mod-vroot-0.7.1.tar.gz 5613
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2 b/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2
deleted file mode 100644
index 396fb437e240..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 da279361d5a34b37ce1f64d3830c4c17 mod_clamav_new.c 7399
-RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb mod_clamav_new.c 7399
-SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1 mod_clamav_new.c 7399
-MD5 098551feed28f069ef01e77af88d55dc mod_clamav_new.html 4645
-RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 mod_clamav_new.html 4645
-SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e mod_clamav_new.html 4645
-MD5 fae47d01b52e035eb6b7190e74c17722 proftpd-1.3.0.tar.bz2 1386086
-RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec proftpd-1.3.0.tar.bz2 1386086
-SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe proftpd-1.3.0.tar.bz2 1386086
-MD5 a81c3ed2d45f7c938416a970fd559703 proftpd-mod-shaper-0.5.6.tar.gz 18099
-RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 proftpd-mod-shaper-0.5.6.tar.gz 18099
-SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827 proftpd-mod-shaper-0.5.6.tar.gz 18099
-MD5 bafd6c9ecfdf352641465b866be12f27 proftpd-mod-vroot-0.7.1.tar.gz 5613
-RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 proftpd-mod-vroot-0.7.1.tar.gz 5613
-SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 proftpd-mod-vroot-0.7.1.tar.gz 5613
diff --git a/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild
deleted file mode 100644
index a115b03750de..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild,v 1.12 2006/11/23 16:45:27 vivo Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-
-IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
-
-SHAPER_VER="0.5.6"
-VROOT_VER="0.7.1"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2
-		clamav? ( http://www.uglyboxindustries.com/mod_clamav.c http://www.uglyboxindustries.com/mod_clamav.html )
-		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.uglyboxindustries.com/open-source.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-		clamav? ( app-antivirus/clamav )
-		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-7.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6f )
-		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-		xinetd? ( sys-apps/xinetd )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-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 stripping of files
-	sed -e "s| @INSTALL_STRIP@||g" -i Make*
-
-	epatch "${FILESDIR}/${P}-mod_sql_mysql.patch"
-
-	if use shaper ; then
-		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
-		cp -f mod_shaper/mod_shaper.c contrib/
-	fi
-
-	if use clamav ; then
-		cp -f "${DISTDIR}/mod_clamav.c" contrib/
-		cp -f "${DISTDIR}/mod_clamav.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
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use acl && modules="${modules}:mod_facl"
-	use clamav && modules="${modules}:mod_clamav"
-	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"
-
-	if use ldap ; then
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use opensslcrypt ; then
-		append-ldflags "-lcrypto"
-		myconf="${myconf} --with-includes=/usr/include/openssl"
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-	fi
-
-	if use mysql && use postgres ; then
-		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
-		ewarn "Presently this ebuild defaults to mysql. If you would like to"
-		ewarn "change the default behaviour, merge ProFTPD with:"
-		ewarn "USE='-mysql postgres' emerge proftpd"
-		epause 5
-	fi
-
-	if use mysql ; then
-		modules="${modules}:mod_sql:mod_sql_mysql"
-		myconf="${myconf} --with-includes=/usr/include/mysql"
-	elif use postgres ; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="${myconf} --with-includes=/usr/include/postgresql"
-	fi
-
-	if use softquota ; then
-		modules="${modules}:mod_quotatab"
-		if use mysql || use postgres ; then
-			modules="${modules}:mod_quotatab_sql"
-		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
-
-	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() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	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
-
-	use shaper && dohtml mod_shaper/mod_shaper.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() {
-	einfo
-	einfo "You can find the config files in /etc/proftpd"
-	einfo
-	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
-	ewarn "Remember to change that in the configuration file."
-	einfo
-}
diff --git a/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild
deleted file mode 100644
index b5b541b29557..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild,v 1.8 2006/11/23 16:45:27 vivo Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-
-IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
-
-SHAPER_VER="0.5.6"
-VROOT_VER="0.7.1"
-
-DESCRIPTION="An advanced and very configurable FTP server."
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2
-		clamav? ( http://www.uglyboxindustries.com/mod_clamav_new.c http://www.uglyboxindustries.com/mod_clamav_new.html )
-		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.uglyboxindustries.com/open-source.php"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="acl? ( sys-apps/acl sys-apps/attr )
-		clamav? ( app-antivirus/clamav )
-		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-7.3 )
-		ssl? ( >=dev-libs/openssl-0.9.6f )
-		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-		xinetd? ( sys-apps/xinetd )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-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 stripping of files
-	sed -e "s| @INSTALL_STRIP@||g" -i Make*
-
-	# Fix bug #147654, patch by upstream
-	epatch "${FILESDIR}/${P}-mod_ctrls_sighup.patch"
-
-	epatch "${FILESDIR}/${P}-mod_sql_mysql.patch"
-
-	if use shaper ; then
-		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
-		cp -f mod_shaper/mod_shaper.c contrib/
-	fi
-
-	if use clamav ; then
-		cp -f "${DISTDIR}/mod_clamav_new.c" contrib/mod_clamav.c
-		cp -f "${DISTDIR}/mod_clamav_new.html" doc/mod_clamav.html
-	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
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use acl && modules="${modules}:mod_facl"
-	use clamav && modules="${modules}:mod_clamav"
-	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"
-		append-ldflags "-lresolv"
-	fi
-
-	if use opensslcrypt ; then
-		append-ldflags "-lcrypto"
-		myconf="${myconf} --with-includes=/usr/include/openssl"
-		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
-	fi
-
-	if use mysql && use postgres ; then
-		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
-		ewarn "Presently this ebuild defaults to mysql. If you would like to"
-		ewarn "change the default behaviour, merge ProFTPD with:"
-		ewarn "USE='-mysql postgres' emerge proftpd"
-		epause 5
-	fi
-
-	if use mysql ; then
-		modules="${modules}:mod_sql:mod_sql_mysql"
-		myconf="${myconf} --with-includes=/usr/include/mysql"
-	elif use postgres ; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="${myconf} --with-includes=/usr/include/postgresql"
-	fi
-
-	if use softquota ; then
-		modules="${modules}:mod_quotatab"
-		if use mysql || use postgres ; then
-			modules="${modules}:mod_quotatab_sql"
-		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
-
-	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() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	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
-
-	use shaper && dohtml mod_shaper/mod_shaper.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() {
-	einfo
-	einfo "You can find the config files in /etc/proftpd"
-	einfo
-	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
-	ewarn "Remember to change that in the configuration file."
-	einfo
-	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."
-		einfo
-	fi
-}