Added keywords, old ebuild cleanup.

5 files changed, 2 insertions, 164 deletions

diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.4-r7 b/net-ftp/proftpd/files/digest-proftpd-1.2.4-r7
deleted file mode 100644
index 1d6ea18c8e8b..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.4-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98570c48e3187ddaac385e33e0765c74 proftpd-1.2.4.tar.bz2 488433
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.5 b/net-ftp/proftpd/files/digest-proftpd-1.2.5
deleted file mode 100644
index 191c56ac379f..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 100a374dfcaa4852cb767dc6afeb4277 proftpd-1.2.5.tar.bz2 554199
diff --git a/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild
deleted file mode 100644
index 0bafd91e6fd0..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Gentoo System <system@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.4-r7.ebuild,v 1.3 2002/04/30 11:10:55 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://www.linuxceptional.com/proftpd/distrib/source/${P}.tar.bz2"
-HOMEPAGE="http://www.proftpd.net/"
-
-DEPEND="virtual/glibc
-	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.1 )"
-
-src_compile() {
-	local modules myconf
-
-	modules="mod_ratio:mod_readme:mod_linuxprivs"
-	use pam && modules="${modules}:mod_pam"
-	use ldap && modules="${modules}:mod_ldap"
-
-	if [ "`use mysql`" ] ; then
-		modules="${modules}:mod_sql:mod_sql_mysql"
-	elif [ "`use postgres`" ] ; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="--with-includes=/usr/include/postgresql"
-	fi
-
-	use ldap && export LDFLAGS="-lresolv"
-
-	./configure \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--with-modules=${modules} \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	
-	#Note rundir needs to be specified to avoid sanbox violation
-	#on initial install. See Make.rules
-	make \
-		prefix=${D}/usr \
-		sbindir=${D}/usr/sbin \
-		mandir=${D}/usr/share/man \
-		localstatedir=${D}/var/run \
-		rundir=${D}/var/run/proftpd \
-		sysconfdir=${D}/etc/proftpd \
-		install || die
-
-	dobin contrib/genuser.pl
-	dodir /home/ftp
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{API,Changes*,license.txt,GetConf} \
-		doc/{ShowUndocumented,Undocumented.txt} \
-		doc/development.notes
-	dohtml *.html
-	docinto rfc
-	dodoc rfc/*.txt
-
-	cd ${D}/etc/proftpd
-	mv proftpd.conf proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild
index ba9881a064e2..07bad8fe5691 100644
--- a/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild,v 1.2 2002/06/27 22:37:44 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild,v 1.3 2002/07/09 22:21:17 nitro Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An advanced and very configurable FTP server"
 SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2"
 HOMEPAGE="http://www.proftpd.net/"
 
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/net-ftp/proftpd/proftpd-1.2.5.ebuild b/net-ftp/proftpd/proftpd-1.2.5.ebuild
deleted file mode 100644
index d11f449ed03f..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.5.ebuild,v 1.2 2002/06/09 14:45:09 nitro Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2"
-HOMEPAGE="http://www.proftpd.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	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.1 )"
-
-src_compile() {
-	local modules myconf
-
-	modules="mod_ratio:mod_readme:mod_linuxprivs"
-	use pam && modules="${modules}:mod_pam"
-	use ldap && modules="${modules}:mod_ldap"
-
-	if [ "`use mysql`" ] ; then
-		modules="${modules}:mod_sql:mod_sql_mysql"
-	elif [ "`use postgres`" ] ; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="--with-includes=/usr/include/postgresql"
-	fi
-
-	use ldap && export LDFLAGS="-lresolv"
-
-	./configure \
-		--prefix=/usr \
-		--sbindir=/usr/sbin \
-		--mandir=/usr/share/man \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--with-modules=${modules} \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	
-	#Note rundir needs to be specified to avoid sanbox violation
-	#on initial install. See Make.rules
-	make \
-		prefix=${D}/usr \
-		sbindir=${D}/usr/sbin \
-		mandir=${D}/usr/share/man \
-		localstatedir=${D}/var/run \
-		rundir=${D}/var/run/proftpd \
-		sysconfdir=${D}/etc/proftpd \
-		install || die
-
-	#dobin contrib/genuser.pl
-	dodir /home/ftp
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{API,license.txt,GetConf,ShowUndocumented} \
-		doc/development.notes
-	dohtml doc/*.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	cd ${D}/etc/proftpd
-	mv proftpd.conf proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}