removed old obsolet version

Package-Manager: portage-2.1_rc2-r2

15 files changed, 54 insertions, 1151 deletions

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index a00e81e67173..8219957def12 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,39 +1,71 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 188bb31f357211dfbaf88869d378c836 ChangeLog 16549
+AUX 1.2.9_rc3-reversedns.diff 1974 RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a SHA1 55eaf2f9c230f309602a728acb7f5a794398aa9c SHA256 c6065fbe185cc0b1194d765a59161eec7ea0e2312885a7440e80279899848efd
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
-MD5 fa041c7b343099eef454338152a04ea7 files/digest-proftpd-1.2.10 67
-MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
-MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r2 213
-MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r3 142
-MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r5 142
-MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r6 142
-MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r7 142
-MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
+RMD160 f060a6c7df6e0b75d5a7fc974c49f977b4242c0a files/1.2.9_rc3-reversedns.diff 1974
+SHA256 c6065fbe185cc0b1194d765a59161eec7ea0e2312885a7440e80279899848efd files/1.2.9_rc3-reversedns.diff 1974
+AUX ftp.pamd 701 RMD160 447c177a0138f12532d463bf1fb037c65939d01d SHA1 5e9bb36659649b6adcd8505a5593f84162180f99 SHA256 423fd2b852d8ae4edbeb26d94995fcfba1ef4d42e07dd6b96d7375d3d88d550c
 MD5 cfe47c0d5f8fece1d36ca8d56d0f2b99 files/ftp.pamd 701
+RMD160 447c177a0138f12532d463bf1fb037c65939d01d files/ftp.pamd 701
+SHA256 423fd2b852d8ae4edbeb26d94995fcfba1ef4d42e07dd6b96d7375d3d88d550c files/ftp.pamd 701
+AUX ftp.pamd-include 592 RMD160 b69cd9acfa99b89deddf88239321af39f6a3d1b2 SHA1 f0a0abd7c24a757780d478a78d373aade36b6cc9 SHA256 800d591dcf9eb1c6cab3b4bafeb0ac7acb20d6704425da3d89180797468beba2
 MD5 3f7725dfa4ff0f5b632ddf41104ba44b files/ftp.pamd-include 592
+RMD160 b69cd9acfa99b89deddf88239321af39f6a3d1b2 files/ftp.pamd-include 592
+SHA256 800d591dcf9eb1c6cab3b4bafeb0ac7acb20d6704425da3d89180797468beba2 files/ftp.pamd-include 592
+AUX mod_sql_postgres.c.patch 275 RMD160 adfe41f6ba60eaf8b40e0a59dd9b3113dd43ec83 SHA1 6c89533dfdf0b8a258b44c941d41b8a399aa2648 SHA256 e5cb4bc7ef72e4972a8c024e5e93fc4b1dfc0d215ec3bde3c3094b1f00c330cd
 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
+RMD160 adfe41f6ba60eaf8b40e0a59dd9b3113dd43ec83 files/mod_sql_postgres.c.patch 275
+SHA256 e5cb4bc7ef72e4972a8c024e5e93fc4b1dfc0d215ec3bde3c3094b1f00c330cd files/mod_sql_postgres.c.patch 275
+AUX proftpd-1.2.9-makefile.patch 434 RMD160 576703b5b59c4b029817176aa63ed1d5c2608b97 SHA1 fc17de1c5752c57b5f13e843f4977058f272e987 SHA256 5260b76d589dbef8864e10e74ddad3c13119a4a5bc06dbbdc3393328ded0c649
 MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
+RMD160 576703b5b59c4b029817176aa63ed1d5c2608b97 files/proftpd-1.2.9-makefile.patch 434
+SHA256 5260b76d589dbef8864e10e74ddad3c13119a4a5bc06dbbdc3393328ded0c649 files/proftpd-1.2.9-makefile.patch 434
+AUX proftpd-1.2.9-privescal-fix.patch 588 RMD160 350a5f35949e6eac9c9b6ad9a1155da2135c18c0 SHA1 0d3821e1a5e9076715781435e4084c6458f2497c SHA256 50f9ec75f74001b0b89e04811d258b70fb9dfefea153036cb48b3320d44dc3a7
 MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
+RMD160 350a5f35949e6eac9c9b6ad9a1155da2135c18c0 files/proftpd-1.2.9-privescal-fix.patch 588
+SHA256 50f9ec75f74001b0b89e04811d258b70fb9dfefea153036cb48b3320d44dc3a7 files/proftpd-1.2.9-privescal-fix.patch 588
+AUX proftpd-ftpshut.patch 897 RMD160 5044b188c400160b1c22c85ea91099b1b4280898 SHA1 2b18239d4742ddb18727aaf08e1c72ea5ba96b1d SHA256 9759256452dacf7c7b197e9b038fd939ade0459ba089536b67d15a01c124ad76
 MD5 f739a48054eabaf69f819f6e31bad069 files/proftpd-ftpshut.patch 897
+RMD160 5044b188c400160b1c22c85ea91099b1b4280898 files/proftpd-ftpshut.patch 897
+SHA256 9759256452dacf7c7b197e9b038fd939ade0459ba089536b67d15a01c124ad76 files/proftpd-ftpshut.patch 897
+AUX proftpd-sqlshowinfo.patch 1191 RMD160 c29fd8866760a34ff835bfaadc3d7bb2bb10c3b3 SHA1 eac809b868b2a5aeb9efe4ba18c4818b12c84995 SHA256 f2b862eb2af71b2102d577290b3adec40ff9ea9000e8727e50b353d9567aa4d1
 MD5 098337e85fc8b71a16e91114ff54ece1 files/proftpd-sqlshowinfo.patch 1191
+RMD160 c29fd8866760a34ff835bfaadc3d7bb2bb10c3b3 files/proftpd-sqlshowinfo.patch 1191
+SHA256 f2b862eb2af71b2102d577290b3adec40ff9ea9000e8727e50b353d9567aa4d1 files/proftpd-sqlshowinfo.patch 1191
+AUX proftpd.conf 1704 RMD160 37b01c3e4989e2e332e3ade7fae0d1b4939f7cd6 SHA1 ed757bba6d1cc46f93a8de4a707bb8eaf38102c6 SHA256 6258fb4ce0e8145616cc95d0dc683e891ed5075769b41b765e281b23923a0b69
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
+RMD160 37b01c3e4989e2e332e3ade7fae0d1b4939f7cd6 files/proftpd.conf 1704
+SHA256 6258fb4ce0e8145616cc95d0dc683e891ed5075769b41b765e281b23923a0b69 files/proftpd.conf 1704
+AUX proftpd.rc6 731 RMD160 58198e9d31d6350f9b4a001ab5b66de906dabf51 SHA1 251cd935aae44ff068e80e23b17b80d7d139bb3a SHA256 bd56d9d6776cf9ae48bbd4b012baad827f7526feba9923a10cae45e2b644b560
 MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731
+RMD160 58198e9d31d6350f9b4a001ab5b66de906dabf51 files/proftpd.rc6 731
+SHA256 bd56d9d6776cf9ae48bbd4b012baad827f7526feba9923a10cae45e2b644b560 files/proftpd.rc6 731
+AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
 MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
-MD5 b47207aedd0149443faa2152950714ed metadata.xml 401
-MD5 47c7909cf9d623eaa77933d997bdb7c1 proftpd-1.2.10-r1.ebuild 4422
-MD5 49ff4274614a4ecc736e8674b47b9d2b proftpd-1.2.10-r2.ebuild 4505
-MD5 ccd3b0639bb673d4f542f42b1a9824b2 proftpd-1.2.10-r3.ebuild 4356
-MD5 f1a422c4567701c8af164a31a042a378 proftpd-1.2.10-r5.ebuild 4386
-MD5 a8c4e478e33928ef12d4786d72dbe3d0 proftpd-1.2.10-r6.ebuild 4444
-MD5 bba4a57fb848beed9e0bf5101efbbcce proftpd-1.2.10-r7.ebuild 4574
-MD5 0215c43fd279ba334fe05f9761ec8293 proftpd-1.2.10.ebuild 4166
-MD5 032f9750ce490f668ca047a660bd099b proftpd-1.2.9-r2.ebuild 3466
+RMD160 c5c829319e901f478fe58b920347cc1b8706a366 files/proftpd.xinetd 295
+SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d files/proftpd.xinetd 295
+DIST proftpd-1.2.10.tar.bz2 920337
+DIST proftpd-mod-shaper-0.5.5.tar.gz 18090
+EBUILD proftpd-1.2.10-r7.ebuild 4574 RMD160 effd6fecf47e23a61548e785259109c2df4d0a29 SHA1 5e2d550670dbef122ab9a6c890007c9728e61d6e SHA256 d7b1b3255c6ccbed6a3ff12e6323a1ba6e0258d8931053e9ef06152573deaa47
+MD5 611edc7465c5c640b305903b21819046 proftpd-1.2.10-r7.ebuild 4574
+RMD160 effd6fecf47e23a61548e785259109c2df4d0a29 proftpd-1.2.10-r7.ebuild 4574
+SHA256 d7b1b3255c6ccbed6a3ff12e6323a1ba6e0258d8931053e9ef06152573deaa47 proftpd-1.2.10-r7.ebuild 4574
+MISC ChangeLog 16876 RMD160 0c2a6cc8d6866fb013eff26532f12867f969fae7 SHA1 b19563b39c1673ffde25147b9c1c86f60329df97 SHA256 368e13d798ceb96b4857bd25f841dd98efc50c312981aad55e60c5d0da1619e2
+MD5 2432042d3aeee0b28bc9b0eb4a208695 ChangeLog 16876
+RMD160 0c2a6cc8d6866fb013eff26532f12867f969fae7 ChangeLog 16876
+SHA256 368e13d798ceb96b4857bd25f841dd98efc50c312981aad55e60c5d0da1619e2 ChangeLog 16876
+MISC metadata.xml 401 RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 SHA1 4de99423d6ea2dc602310a18e89e6f889aafe972 SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f
+MD5 5c73abc1fe44fb1d866736316d2c89ac metadata.xml 401
+RMD160 7440f97adc26aa165c6d9a343a3f227ac9962036 metadata.xml 401
+SHA256 035eb7c56b3e676e3549207650c993fe3c38762db55a57a40a9b479c3a8cdb2f metadata.xml 401
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r7 142
+RMD160 0ca845195d9659ea72d00d5755ffce659a7df751 files/digest-proftpd-1.2.10-r7 142
+SHA256 f85d284ae51d8763204788be6fc821d9daa429876f141cee641cf2cdcdf312c4 files/digest-proftpd-1.2.10-r7 142
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFDto/DAiZjviIA2XgRAssxAJ484pHYzX+VbDlaqn/2lPpVHXDlEQCg0xtj
-UDbYp4DMiNrbaa4dGFJg1M8=
-=DSte
+iD8DBQFEeGFN8zY1VwezZiERAl5+AJ4+W344F54qaCawP+kndT7IlRnOSQCfXxfk
+227/KkCz4AbBgslEcO0R7mA=
+=tNQz
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10 b/net-ftp/proftpd/files/digest-proftpd-1.2.10
deleted file mode 100644
index 2fa34a67357e..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r1 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r1
deleted file mode 100644
index 6e5808e84c43..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
-MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
-MD5 f1dba4f32dcabef8651bb3cd7cebb756 proftpd-mod-delay-0.4.tar.gz 7412
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r2 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r2
deleted file mode 100644
index 6e5808e84c43..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
-MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
-MD5 f1dba4f32dcabef8651bb3cd7cebb756 proftpd-mod-delay-0.4.tar.gz 7412
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r3 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r3
deleted file mode 100644
index 211d52a3fca3..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
-MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r5 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r5
deleted file mode 100644
index 211d52a3fca3..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
-MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r6 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r6
deleted file mode 100644
index 211d52a3fca3..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
-MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.9-r2 b/net-ftp/proftpd/files/digest-proftpd-1.2.9-r2
deleted file mode 100644
index dc35e2c279e0..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c85503b160a36a96594ef75f3180a07 proftpd-1.2.9.tar.bz2 778953
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild
deleted file mode 100644
index df20e1d7f826..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r1.ebuild,v 1.9 2005/07/07 23:58:53 humpback Exp $
-
-inherit flag-o-matic eutils
-
-#Mod shaper is giving problems on some machines
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux"
-#IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )
-		http://www.castaglia.org/${PN}/modules/${PN}-mod-delay-0.4.tar.gz"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc hppa alpha ppc ~mips amd64"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
-
-RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	unpack ${PN}-mod-delay-0.4.tar.gz
-	mv mod_delay/mod_delay.c contrib
-	if use shaper; then
-		unpack ${PN}-mod-shaper-0.5.5.tar.gz
-		mv mod_shaper/mod_shaper.c contrib/
-	fi
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme:mod_delay"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-	use shaper && modules="${modules}:mod_shaper"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	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="--with-includes=/usr/include/mysql"
-	elif use postgres; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		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"
-		elif use ldap; then
-			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
-		else
-			modules="${modules}:mod_quotatab_file"
-		fi
-	fi
-
-	# New modules for 1.2.9
-	# Not sure how these should be enabled yet as no use variables
-	# apply currently.  Uncomment if you want to use them though.
-	# -raker 06/16/2003
-	#
-	# modules="${modules}:mod_ifsession"
-	# modules="${modules}:mod_radius"
-	# modules="${modules}:mod_rewrite"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	has_pic && echo > lib/libcap/cap_sys.c
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--enable-ctrls \
-		--with-modules=${modules} \
-		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-	dohtml mod_delay/mod_delay.html
-	use shaper && dohtml mod_shaper/mod_shaper.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-	einfo 'For info on the mod_delay please read mod_delay.html in the doc dir'
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild
deleted file mode 100644
index 4669d6d677ec..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild,v 1.5 2005/07/07 23:58:53 humpback Exp $
-
-inherit flag-o-matic eutils
-
-#Mod shaper is giving problems on some machines
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux sendfile"
-#IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )
-		http://www.castaglia.org/${PN}/modules/${PN}-mod-delay-0.4.tar.gz"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ppc64"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
-
-RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	unpack ${PN}-mod-delay-0.4.tar.gz
-	mv mod_delay/mod_delay.c contrib
-	if use shaper; then
-		unpack ${PN}-mod-shaper-0.5.5.tar.gz
-		mv mod_shaper/mod_shaper.c contrib/
-	fi
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme:mod_delay"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-	use shaper && modules="${modules}:mod_shaper"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	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 sendfile; then
-		myconf="${myconf} --with-sendfile"
-	fi
-
-	if use softquota; then
-		modules="${modules}:mod_quotatab"
-		if use mysql || use postgres; then
-			modules="${modules}:mod_quotatab_sql"
-		elif use ldap; then
-			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
-		else
-			modules="${modules}:mod_quotatab_file"
-		fi
-	fi
-
-	# New modules for 1.2.9
-	# Not sure how these should be enabled yet as no use variables
-	# apply currently.  Uncomment if you want to use them though.
-	# -raker 06/16/2003
-	#
-	# modules="${modules}:mod_ifsession"
-	# modules="${modules}:mod_radius"
-	# modules="${modules}:mod_rewrite"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	has_pic && echo > lib/libcap/cap_sys.c
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--enable-autoshadow \
-		--enable-ctrls \
-		--with-modules=${modules} \
-		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-	dohtml mod_delay/mod_delay.html
-	use shaper && dohtml mod_shaper/mod_shaper.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-	einfo 'For info on the mod_delay please read mod_delay.html in the doc dir'
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild
deleted file mode 100644
index e4c5b3eae10f..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r3.ebuild,v 1.4 2005/07/07 23:58:53 humpback Exp $
-
-inherit flag-o-matic eutils
-
-#Mod shaper is giving problems on some machines
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux sendfile"
-#IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 ~sparc ~x86"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
-
-RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	if use shaper; then
-		unpack ${PN}-mod-shaper-0.5.5.tar.gz
-		mv mod_shaper/mod_shaper.c contrib/
-	fi
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-	use shaper && modules="${modules}:mod_shaper"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	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 sendfile; then
-		myconf="${myconf} --with-sendfile"
-	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
-
-	# New modules for 1.2.9
-	# Not sure how these should be enabled yet as no use variables
-	# apply currently.  Uncomment if you want to use them though.
-	# -raker 06/16/2003
-	#
-	# modules="${modules}:mod_ifsession"
-	# modules="${modules}:mod_radius"
-	# modules="${modules}:mod_rewrite"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	has_pic && echo > lib/libcap/cap_sys.c
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--enable-autoshadow \
-		--enable-ctrls \
-		--with-modules=${modules} \
-		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/UPGRADE.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-
-	use shaper && dohtml mod_shaper/mod_shaper.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/ftp.pamd ftp
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-	einfo 'mod_delay has been causing more bad than good and has been removed'
-	einfo 'see Changelog for more info'
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild
deleted file mode 100644
index 40d7b1542665..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r5.ebuild,v 1.3 2005/12/31 14:03:34 flameeyes Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd
-	selinux sendfile noauthunix authfile ncurses xinetd"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
-
-DEPEND="pam? ( virtual/pam )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-	ncurses? ( sys-libs/ncurses )
-	xinetd? ( sys-apps/xinetd )"
-
-RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	if use shaper; then
-		unpack ${PN}-mod-shaper-0.5.5.tar.gz
-		mv mod_shaper/mod_shaper.c contrib/
-	fi
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-	use shaper && modules="${modules}:mod_shaper"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	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
-
-	# New modules for 1.2.9
-	# Not sure how these should be enabled yet as no use variables
-	# apply currently.  Uncomment if you want to use them though.
-	# -raker 06/16/2003
-	#
-	# modules="${modules}:mod_ifsession"
-	# modules="${modules}:mod_radius"
-	# modules="${modules}:mod_rewrite"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	has_pic && 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 authfile auth-file) \
-		$(use_enable ncurses) \
-		$(use_enable ipv6) \
-		$(use_with sendfile) \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/UPGRADE.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-
-	use shaper && dohtml mod_shaper/mod_shaper.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	newpamd ${FILESDIR}/ftp.pamd-include ftp
-
-	if use xinetd; then
-		insinto /etc/xinetd.d
-		newins ${FILESDIR}/proftpd.xinetd proftpd
-	fi
-
-	newinitd ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	enewgroup proftpd
-	enewuser proftpd -1 -1 /home/ftp proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-	einfo 'mod_delay has been causing more bad than good and has been removed'
-	einfo 'see Changelog for more info'
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild
deleted file mode 100644
index 922b568c528b..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild,v 1.3 2005/07/09 12:35:11 humpback Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd
-	selinux sendfile noauthunix authfile ncurses xinetd"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
-		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.5.tar.gz )"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
-
-DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
-	ncurses? ( sys-libs/ncurses )
-	xinetd? ( sys-apps/xinetd )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-	if use shaper; then
-		unpack ${PN}-mod-shaper-0.5.5.tar.gz
-		mv mod_shaper/mod_shaper.c contrib/
-	fi
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-	use shaper && modules="${modules}:mod_shaper"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	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
-
-	# New modules for 1.2.9
-	# Not sure how these should be enabled yet as no use variables
-	# apply currently.  Uncomment if you want to use them though.
-	# -raker 06/16/2003
-	#
-	# modules="${modules}:mod_ifsession"
-	# modules="${modules}:mod_radius"
-	# modules="${modules}:mod_rewrite"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	has_pic && 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 authfile auth-file) \
-		$(use_enable ncurses) \
-		$(use_enable ipv6) \
-		$(use_with sendfile) \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /var/run/proftpd
-
-	dodoc contrib/UPGRADE.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-
-	use shaper && dohtml mod_shaper/mod_shaper.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${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
-	einfo 'mod_delay has been causing more bad than good and has been removed'
-	einfo 'see Changelog for more info'
-	ewarn 'With introduction of net-ftp/ftpbase the ftp user is now ftp.'
-	ewarn 'Remember to change that in the configuration file.'
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.10.ebuild b/net-ftp/proftpd/proftpd-1.2.10.ebuild
deleted file mode 100644
index c38e65c5539d..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.10.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10.ebuild,v 1.9 2005/07/07 23:58:53 humpback Exp $
-
-inherit flag-o-matic eutils
-
-#Mod shaper is giving problems on some machines
-#IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux"
-IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2"
-#		shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.3.tar.gz"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc hppa alpha ppc ~mips amd64"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
-
-RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-#	if use shaper; then
-#		unpack ${PN}-mod-shaper-0.5.3.tar.gz
-#		mv mod_shaper/mod_shaper.c contrib/
-#	fi
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-#	use shaper && modules="${modules}:mod_shaper"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	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="--with-includes=/usr/include/mysql"
-	elif use postgres; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		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"
-		elif use ldap; then
-			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
-		else
-			modules="${modules}:mod_quotatab_file"
-		fi
-	fi
-
-	# New modules for 1.2.9
-	# Not sure how these should be enabled yet as no use variables
-	# apply currently.  Uncomment if you want to use them though.
-	# -raker 06/16/2003
-	#
-	# modules="${modules}:mod_ifsession"
-	# modules="${modules}:mod_radius"
-	# modules="${modules}:mod_rewrite"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	has_pic && echo > lib/libcap/cap_sys.c
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--enable-ctrls \
-		--with-modules=${modules} \
-		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-	#use shaper && dohtml mod_shaper/mod_shaper.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild b/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild
deleted file mode 100644
index 8df3c9100e64..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9-r2.ebuild,v 1.12 2005/07/07 23:58:53 humpback Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="hardened ipv6 ldap mysql pam postgres ssl tcpd"
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc hppa alpha ppc ~mips amd64"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch
-	epatch ${FILESDIR}/${P}-privescal-fix.patch
-}
-
-src_compile() {
-	addpredict /etc/krb5.conf
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		append-ldflags "-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	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="--with-includes=/usr/include/mysql"
-	elif use postgres; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="--with-includes=/usr/include/postgresql"
-	fi
-
-	# New modules for 1.2.9
-	# Not sure how these should be enabled yet as no use variables
-	# apply currently.  Uncomment if you want to use them though.
-	# -raker 06/16/2003
-	#
-	# modules="${modules}:mod_ifsession"
-	# modules="${modules}:mod_radius"
-	# modules="${modules}:mod_rewrite"
-
-	# bug #30359
-	use hardened && echo > lib/libcap/cap_sys.c
-	has_pic && echo > lib/libcap/cap_sys.c
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--with-modules=${modules} \
-		${myconf} $( use_enable ipv6 ) || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	make DESTDIR=${D} install || die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-}