Removed old versions

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

9 files changed, 22 insertions, 498 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 260c1e560f1d..abf2c647fdae 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.108 2011/03/18 17:38:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.109 2011/03/23 07:09:46 polynomial-c Exp $
+
+  23 Mar 2011; Lars Wendler <polynomial-c@gentoo.org> -pure-ftpd-1.0.28.ebuild,
+  pure-ftpd-1.0.29-r1.ebuild, -pure-ftpd-1.0.29-r2.ebuild,
+  -files/pure-ftpd.conf_d, -files/pure-ftpd.rc7, -files/pure-ftpd.rc8,
+  -files/pure-ftpd.rc9:
+  Removed old versions. Removed all keywords but ~x86-fbsd for 1.0.29-r1.
 
   18 Mar 2011; Raúl Porcel <armin76@gentoo.org> pure-ftpd-1.0.30.ebuild:
   arm/ia64/sparc stable wrt #358375
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index ea1b046b6dc0..bad9d1e022a6 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55e7 SHA1 46fcf04194631cd1b4488a486a48884b80b188ac SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7
-AUX pure-ftpd.conf_d 3378 RMD160 82d5d319b35e1262e8d72cff46c328429e3e3bce SHA1 93c4f65ce1592ad1ccbe8e04250c4cc1c9cdb5f2 SHA256 4361690c4217fd1cdae0c050015629ce6e74046446def2c7d646020d0682a579
 AUX pure-ftpd.conf_d-2 3778 RMD160 4e7d6c5fffd56ee3b0dffc6e5873f3d854b9bfaa SHA1 631030ed9249101594c1cb08e549bf34c99c5105 SHA256 8e48df3365bd74a1d8fa7c394e035c69bf7953a70ccc417377c9c881097bddca
 AUX pure-ftpd.rc10 2055 RMD160 125a410ddc5d63067b7f8c91f1babc7a349da1a3 SHA1 0f7d077b2531e8e9857d3baeeba8b67cc624e99c SHA256 72e8df706f2c856229617daae24dd98e522f11f3420eb515f4627244b63bde7f
-AUX pure-ftpd.rc7 1528 RMD160 1aafe4844c0101d0a2b5619ef5f0190abd7adfd6 SHA1 cb85e539f6a0e1a3809cea634b669b2d0ca36b3e SHA256 69af305f5c2747acc943f71779fd4a9a6b1f8c9a2d3e1860a01ab0753bb4260a
-AUX pure-ftpd.rc8 1525 RMD160 493bb88ed4fcd2a6cf0bd0f878e365c54dd2f37f SHA1 881ae446be0cb7eabf537ffd4933e19dcab4c77d SHA256 2ce7c27ffeff40d02f3ef7f6b7f15cfbd218d4942b6da49506451f7acd975612
-AUX pure-ftpd.rc9 1640 RMD160 283ce959f3f4b86431e34f82c2e3e597a4ac250a SHA1 a9c29575a7f646c1ff8c5d899aee60a57886a97d SHA256 4d258d44735067acd3c1535360176a150ce90e170c21bddadbd0c9aa626eef79
 AUX pure-ftpd.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
-DIST pure-ftpd-1.0.28.tar.bz2 465887 RMD160 1a75ea239129de1f2bcd52a34d1b379928e790f6 SHA1 199580574257f144bc958d05c166c23066bfed3c SHA256 1c8e0f4ddac3731ecb2432631d7af342b3800499d7ea7f8442c3e79e3e4c27d8
 DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
 DIST pure-ftpd-1.0.30.tar.bz2 475402 RMD160 137c38d491b311e826076a85589e0ce4f1b46826 SHA1 0b73b80f102f2b62f97e6c7de55fa3e1eba1feaa SHA256 9b85cf5f6290f6cbed18ede22862922a8701c691abee78b15e9aa40da63de0fe
-EBUILD pure-ftpd-1.0.28.ebuild 3721 RMD160 67af40e1e03c1a7142a91377a78b6d7bec393bf8 SHA1 1bf4deeddae2cbe6bab839d0f509374f20c104be SHA256 af1b24c251810c542a552ead29b7979fd2966375a44de6595889a23785e5558a
-EBUILD pure-ftpd-1.0.29-r1.ebuild 3741 RMD160 44bd21d2618be740b0469e02e294df28f65f9d19 SHA1 830571dd0b7d111d514f1d59ffe7365a21cd1961 SHA256 173e1aef572089af2ea2631c83dd90061c5d6726ecb4a9b6015a8e77e83638cc
-EBUILD pure-ftpd-1.0.29-r2.ebuild 3828 RMD160 e77f4c9d91eca431966b7696c150a2c4af9450e4 SHA1 62bcca082332b0a19ba0843b0a1f278da2f654f9 SHA256 b968f6dd9b9bd51b6acbf33085649ffda515023de580c7e8778ca1c3e6cef7aa
+EBUILD pure-ftpd-1.0.29-r1.ebuild 3686 RMD160 cf24761d79bf24e480448ab4ab1b574606f0f46e SHA1 efc0cd2daa740b8196f92f15788f2d0bc55a727a SHA256 2594c4ed9c60f3bfc4d8b808bfd53062ed5914cf63eaf4516073952e49b64eb1
 EBUILD pure-ftpd-1.0.30.ebuild 3880 RMD160 4e131f4da464b8a7176aca73fa37fbd41f7d6f58 SHA1 fdb51700b7c82c207d2ceb19a169196ac9c08d8d SHA256 8eddd84b7fc5a350b3b518c939afbb957e7126aee158fd1c7a6f7ab4ae1920aa
-MISC ChangeLog 17050 RMD160 2ca9acd29df800dae2d9073088eecc7e9af9da80 SHA1 195382bf800bcecd76ea8173d42f05a713757caf SHA256 3c243c1cf09fe1f82f97a1dd7dbb187b78001643cdc0a560f435dbb9a224e557
+MISC ChangeLog 17364 RMD160 ba8d27b6ba106b7b61a4e3f3d3b97872454f6370 SHA1 db0235ec0aade119b9b6baecaf00b5499a09d927 SHA256 7431fe17163dcc79d7385ddf0ca98dd50e0805cb5ab1992a5bb40c1e57362a91
 MISC metadata.xml 1184 RMD160 1e755f909e9b9e8cdc3e247fb64485f03cdc4167 SHA1 5a50f33ea3ca553f1f290a4ed6a731adcbb7770c SHA256 7fc78f63752fb89e449e2d922d7d29909006ca0eadf3e8ebe751a5527b28d99b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2JnL8ACgkQ9pZ0q5gcpvy7QgCbBRvMifJpuwBA65N6HTHMzU2u
+tB4AoKcoFuGbv0j68wom57FQ2wd6m8Pn
+=Uk3k
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
deleted file mode 100644
index bd06bf65950f..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
+++ /dev/null
@@ -1,82 +0,0 @@
-# Config file for /etc/init.d/pure-ftpd
-##Comment variables out to disable its features, or change the values in it... ##
-
-## This variable must be uncommented in order for the server to start ##
-#IS_CONFIGURED="yes"
-
-## FTP Server,Port (separated by comma) ##
-## If you prefer host names over IP addresses, it's your choice:
-## SERVER="-S ftp.rtchat.com,21"
-## IPv6 addresses are supported.
-## !!! WARNING !!!
-## Using an invalid IP will result in the server not starting,
-## but reporting a correct start!
-## SERVER="-S 192.168.0.1,21"
-## By default binds to all available IPs.
-SERVER="-S 21"
-
-## Number of simultaneous connections in total, and per IP ##
-MAX_CONN="-c 30"
-MAX_CONN_IP="-C 10"
-
-## Start daemonized in background ##
-DAEMON="-B"
-
-## Don't allow uploads if the partition is more full then this var ##
-DISK_FULL="-k 90%"
-
-## If your FTP server is behind a NAT box, uncomment this ##
-#USE_NAT="-N"
-
-## Authentication mechanisms (others are 'pam', ...) ##
-## Further infos can be found in the README file.
-AUTH="-l unix"
-
-## Change the maximum idle time (in minutes) ##
-## If this variable is not defined, it will default to 15 minutes.
-#TIMEOUT="-I <timeout>'"
-
-## Facility used for syslog logging ##
-## If this variable is not defined, it will default to the 'ftp' facility.
-## Logging can be disabled with '-f none'.
-#LOG="-f <facility>"
-
-## Charset conversion support *experimental* ##
-## Only works if USE "charconv" is enabled (only Pure-FTPd >=1.0.21).
-## Set the charset of the filesystem.
-# CHARCONV="--fscharset <charset>"
-
-## If you want to process each file uploaded through Pure-FTPd, enter the name
-## of the script that should process the files below.
-## man pure-uploadscript to learn more about how to write this script.
-# UPLOADSCRIPT="/path/to/uploadscript"
-
-## Misc. Others ##
-MISC_OTHER="-A -x -j -R -Z"
-
-#
-# Use these inside $MISC_OTHER
-# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README"
-#
-# -A [ chroot() everyone, but root ]
-# -e [ Only allow anonymous users ]
-# -E [ Only allow authenticated users. Anonymous logins are prohibited. ]
-# -i [ Disallow upload for anonymous users, whatever directory perms are ]
-# -j [ If the home directory of a user doesn't exist, auto-create it ]
-# -M [ Allow anonymous users to create directories. ]
-# -R [ Disallow users (even non-anonymous ones) usage of the CHMOD command ]
-# -x [ In  normal  operation mode, authenticated users can read/write
-#	files beginning with a dot ('.'). Anonymous users can't, for security reasons
-#	(like changing banners or a forgotten .rhosts). When '-x' is used, authenticated
-#	users can download dot-files, but not overwrite/create  them,  even  if they own
-#	them. ]
-# -X [ This  flag  is  identical  to  the  previous one (writing
-#       dot-files is prohibited), but in addition, users can't even *read* files and
-#       directories beginning with a dot (like "cd .ssh"). ]
-# -D [ List files beginning with a dot ('.') even when the client doesn't
-#      append the '-a' option to the list command. A workaround for badly
-#      configured FTP clients. ]
-# -G [ Disallow renaming. ]
-# -d [ Send various debugging messages to the syslog. ONLY for DEBUG ]
-# -F <fortune file> [ Display a fortune cookie on login. Check the README file ]
-# -H [ By default, fully-qualified host names are logged. The '-H' flag avoids host names resolution. ]
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc7 b/net-ftp/pure-ftpd/files/pure-ftpd.rc7
deleted file mode 100644
index 312357c8cc31..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc7
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.6 2010/07/18 13:04:34 polynomial-c Exp $
-
-ftpd_pidfile="/var/run/pure-ftpd.pid"
-script_pidfile="/var/run/pure-uploadscript.pid"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "$IS_CONFIGURED" ] ; then
-		eerror "You need to setup /etc/conf.d/pure-ftpd first!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	UPSCRIPT=""
-	OKNODO=""
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		UPSCRIPT="--uploadscript"
-		OKNODO="--oknodo"
-	fi
-	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
-	result=$?
-	if [ $result -ne 0 ] ; then
-		eend 1 "Could not launch Pure-FTPd"
-	else
-		eend $result
-		if [ -n "$UPLOADSCRIPT" ] ; then
-			ebegin "Starting Pure-FTPd upload script"
-			start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript --background -- -r $UPLOADSCRIPT
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	ebegin "Stopping Pure-FTPd"
-	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
-	eend $?
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		ebegin "Stopping Pure-FTPd upload script"
-		start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile}
-		eend $?
-	fi
-}
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc8 b/net-ftp/pure-ftpd/files/pure-ftpd.rc8
deleted file mode 100644
index 50917f39d609..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc8
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc8,v 1.1 2010/03/22 19:41:47 voyageur Exp $
-
-ftpd_pidfile="/var/run/pure-ftpd.pid"
-script_pidfile="/var/run/pure-uploadscript.pid"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "$IS_CONFIGURED" ] ; then
-		eerror "You need to setup /etc/conf.d/pure-ftpd first!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	UPSCRIPT=""
-	OKNODO=""
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		UPSCRIPT="--uploadscript"
-		OKNODO="--oknodo"
-	fi
-	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd --wait 100 -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
-	result=$?
-	if [ $result -ne 0 ] ; then
-		eend 1 "Could not launch Pure-FTPd"
-	else
-		eend $result
-		if [ -n "$UPLOADSCRIPT" ] ; then
-			ebegin "Starting Pure-FTPd upload script"
-			start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	ebegin "Stopping Pure-FTPd"
-	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
-	eend $?
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		ebegin "Stopping Pure-FTPd upload script"
-		start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile}
-		eend $?
-	fi
-}
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc9 b/net-ftp/pure-ftpd/files/pure-ftpd.rc9
deleted file mode 100644
index 71adf9758dd9..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc9
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc9,v 1.2 2010/07/18 13:04:34 polynomial-c Exp $
-
-ftpd_pidfile="/var/run/pure-ftpd.pid"
-script_pidfile="/var/run/pure-uploadscript.pid"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "$IS_CONFIGURED" ] ; then
-		eerror "You need to setup /etc/conf.d/pure-ftpd first!"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	# only works with openrc
-	WAIT=""
-	if [ -f /etc/init.d/sysfs ]; then
-		WAIT="--wait 100"
-	fi
-
-	UPSCRIPT=""
-	OKNODO=""
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		UPSCRIPT="--uploadscript"
-		OKNODO="--oknodo"
-	fi
-	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd ${WAIT} -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
-	result=$?
-	if [ $result -ne 0 ] ; then
-		eend 1 "Could not launch Pure-FTPd"
-	else
-		eend $result
-		if [ -n "$UPLOADSCRIPT" ] ; then
-			ebegin "Starting Pure-FTPd upload script"
-			start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript --background ${WAIT} -- -r $UPLOADSCRIPT
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	ebegin "Stopping Pure-FTPd"
-	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
-	eend $?
-	if [ -n "$UPLOADSCRIPT" ] ; then
-		ebegin "Stopping Pure-FTPd upload script"
-		start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile}
-		eend $?
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.28.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.28.ebuild
deleted file mode 100644
index 0f6a9028bdef..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.28.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.28.ebuild,v 1.8 2010/06/17 20:46:52 patrick Exp $
-
-EAPI=2
-inherit eutils confutils flag-o-matic
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server."
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres selinux ssl vchroot xinetd"
-
-DEPEND="caps? ( sys-libs/libcap )
-		charconv? ( virtual/libiconv )
-		ldap? ( >=net-nds/openldap-2.0.25 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		ssl? ( >=dev-libs/openssl-0.9.6g )
-		xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch
-}
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" -i "${S}/src/ftpd.h" || die "sed failed"
-
-	local my_conf=""
-
-	# Let's configure the USE-enabled stuff
-	enable_extension_without	"capabilities"	"caps"
-	enable_extension_with		"rfc2640"		"charconv"		0
-	enable_extension_with		"ldap"			"ldap"			0
-	enable_extension_with		"mysql"			"mysql"			0
-	enable_extension_with		"pam"			"pam"			0
-	enable_extension_with		"paranoidmsg"	"paranoidmsg"	0
-	enable_extension_with		"pgsql"			"postgres"		0
-	enable_extension_with		"tls"			"ssl"			0
-	enable_extension_with		"virtualchroot"	"vchroot"		0
-	enable_extension_without	"inetd"			"xinetd"
-
-	# noiplog is a negative flag, we don't want that enabled by default,
-	# so we handle it manually, as confutils can't do that
-	use noiplog && my_conf="${my_conf} --without-iplogging"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-
-	econf \
-		--with-altlog \
-		--with-cookie \
-		--with-diraliases \
-		--with-extauth \
-		--with-ftpwho \
-		--with-language=${PUREFTPD_LANG:=english} \
-		--with-peruserlimits \
-		--with-privsep \
-		--with-puredb \
-		--with-quotas \
-		--with-ratios \
-		--with-throttling \
-		--with-uploadscript \
-		--with-virtualhosts \
-		--enable-largefile \
-		${my_conf} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
-
-	newconfd "${FILESDIR}/pure-ftpd.conf_d" pure-ftpd
-
-	newinitd "${FILESDIR}/pure-ftpd.rc7" pure-ftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-	elog
-	ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-	ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-	ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-	ewarn
-	if use charconv ; then
-		ewarn "Charset conversion is an *experimental* feature!"
-		ewarn "Remember to set a valid charset for your filesystem in the configuration!"
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
index 571dbef54b9c..3583c9553c50 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild,v 1.2 2010/08/19 08:07:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r1.ebuild,v 1.3 2011/03/23 07:09:46 polynomial-c Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server."
 HOMEPAGE="http://www.pureftpd.org/"
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r2.ebuild
deleted file mode 100644
index 92810ff9516c..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.29-r2.ebuild,v 1.3 2011/02/26 16:55:25 xarthisius Exp $
-
-EAPI=2
-inherit eutils confutils flag-o-matic
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server."
-HOMEPAGE="http://www.pureftpd.org/"
-SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres selinux ssl sysquota vchroot xinetd"
-
-DEPEND="caps? ( sys-libs/libcap )
-		charconv? ( virtual/libiconv )
-		ldap? ( >=net-nds/openldap-2.0.25 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		ssl? ( >=dev-libs/openssl-0.9.6g )
-		sysquota? ( sys-fs/quota[-rpc] )
-		xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-		net-ftp/ftpbase
-		selinux? ( sec-policy/selinux-ftpd )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch
-}
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" -i "${S}/src/ftpd.h" || die "sed failed"
-
-	local my_conf=""
-
-	# Let's configure the USE-enabled stuff
-	enable_extension_without	"capabilities"		"caps"
-	enable_extension_with		"rfc2640"		"charconv"		0
-	enable_extension_with		"ldap"			"ldap"			0
-	enable_extension_with		"mysql"			"mysql"			0
-	enable_extension_with		"pam"			"pam"			0
-	enable_extension_with		"paranoidmsg"		"paranoidmsg"		0
-	enable_extension_with		"pgsql"			"postgres"		0
-	enable_extension_with		"tls"			"ssl"			0
-	enable_extension_with		"virtualchroot"		"vchroot"		0
-	enable_extension_with		"sysquotas"		"sysquota"		0
-	enable_extension_without	"inetd"			"xinetd"
-
-	# noiplog is a negative flag, we don't want that enabled by default,
-	# so we handle it manually, as confutils can't do that
-	use noiplog && my_conf="${my_conf} --without-iplogging"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-
-	econf \
-		--with-altlog \
-		--with-cookie \
-		--with-diraliases \
-		--with-extauth \
-		--with-ftpwho \
-		--with-language=${PUREFTPD_LANG:=english} \
-		--with-peruserlimits \
-		--with-privsep \
-		--with-puredb \
-		--with-quotas \
-		--with-ratios \
-		--with-throttling \
-		--with-uploadscript \
-		--with-virtualhosts \
-		--enable-largefile \
-		${my_conf} || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
-
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-2" pure-ftpd
-
-	newinitd "${FILESDIR}/pure-ftpd.rc10" pure-ftpd
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-	elog
-	ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-	ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-	ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-	ewarn
-	if use charconv ; then
-		ewarn "Charset conversion is an *experimental* feature!"
-		ewarn "Remember to set a valid charset for your filesystem in the configuration!"
-	fi
-}