added LICENSE, SLOT, $Headers.

19 files changed, 16 insertions, 794 deletions

diff --git a/net-mail/postfix/ChangeLog b/net-mail/postfix/ChangeLog
index 82af66f2f78f..05552835e8d5 100644
--- a/net-mail/postfix/ChangeLog
+++ b/net-mail/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/postfix
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.14 2002/04/19 15:56:20 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/ChangeLog,v 1.15 2002/05/04 03:55:29 woodchip Exp $
+
+*postfix-1.1.7-r4 (3 May 2002)
+  
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  
+  Added LICENSE, SLOT, $Headers.
 
 *postfix-1.1.7-r3 (19 Apr 2002)
 
diff --git a/net-mail/postfix/files/digest-postfix-1.1.3-r3 b/net-mail/postfix/files/digest-postfix-1.1.3-r3
deleted file mode 100644
index c968c292e9b9..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.3-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f70c14f34f0f38b0466cc40f65a53b22 postfix-1.1.3.tar.gz 1180166
-MD5 1a7756cab77ab793f5777c62b8b32bcb pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz 194657
diff --git a/net-mail/postfix/files/digest-postfix-1.1.6 b/net-mail/postfix/files/digest-postfix-1.1.6
deleted file mode 100644
index ab4b16d4435b..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a3d4663bfb564fa5b190ca4b00c6e85e postfix-1.1.6.tar.gz 1186576
-MD5 578ade33d4d5475c55c31041857cc6f1 pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz 195116
diff --git a/net-mail/postfix/files/digest-postfix-1.1.6-r1 b/net-mail/postfix/files/digest-postfix-1.1.6-r1
deleted file mode 100644
index 30549ee4d1e0..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.6-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 578ade33d4d5475c55c31041857cc6f1 pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz 195116
-MD5 a3d4663bfb564fa5b190ca4b00c6e85e postfix-1.1.6.tar.gz 1186576
diff --git a/net-mail/postfix/files/digest-postfix-1.1.7 b/net-mail/postfix/files/digest-postfix-1.1.7
deleted file mode 100644
index a509f7d82589..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 320ea040f13c084a5e8bea680b422e06 postfix-1.1.7.tar.gz 1186995
diff --git a/net-mail/postfix/files/digest-postfix-1.1.7-r2 b/net-mail/postfix/files/digest-postfix-1.1.7-r2
deleted file mode 100644
index 9d34ea6d05c2..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.7-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 320ea040f13c084a5e8bea680b422e06 postfix-1.1.7.tar.gz 1186995
-MD5 a00656e4e7fd1e4827c3e805799d2359 pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz 195132
diff --git a/net-mail/postfix/files/digest-postfix-1.1.7-r3 b/net-mail/postfix/files/digest-postfix-1.1.7-r3
deleted file mode 100644
index 9d34ea6d05c2..000000000000
--- a/net-mail/postfix/files/digest-postfix-1.1.7-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 320ea040f13c084a5e8bea680b422e06 postfix-1.1.7.tar.gz 1186995
-MD5 a00656e4e7fd1e4827c3e805799d2359 pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz 195132
diff --git a/net-mail/postfix/files/digest-postfix-1.1.7-r1 b/net-mail/postfix/files/digest-postfix-1.1.7-r4
index 9d34ea6d05c2..9d34ea6d05c2 100644
--- a/net-mail/postfix/files/digest-postfix-1.1.7-r1
+++ b/net-mail/postfix/files/digest-postfix-1.1.7-r4
diff --git a/net-mail/postfix/files/main.cf b/net-mail/postfix/files/main.cf
index 5ad1d9f84e87..b8458a3cb269 100644
--- a/net-mail/postfix/files/main.cf
+++ b/net-mail/postfix/files/main.cf
@@ -1,9 +1,12 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/main.cf,v 1.3 2002/05/04 03:55:29 woodchip Exp $
+#
 # Global Postfix configuration file. This file lists only a subset
 # of all 100+ parameters. See the sample-xxx.cf files for a full list.
 # 
 # The general format is lines with parameter = value pairs. Lines
 # that begin with whitespace continue the previous line. A value can
 # contain references to other $names or ${name}s.
+#
 
 # SOFT BOUNCE
 #
diff --git a/net-mail/postfix/files/master.cf b/net-mail/postfix/files/master.cf
index 15deb0142e1b..cec123749f58 100644
--- a/net-mail/postfix/files/master.cf
+++ b/net-mail/postfix/files/master.cf
@@ -1,3 +1,4 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/master.cf,v 1.2 2002/05/04 03:55:29 woodchip Exp $
 #
 # Postfix master process configuration file.  Each line describes how
 # a mailer component program should be run. The fields that make up
diff --git a/net-mail/postfix/files/smtp.pam b/net-mail/postfix/files/smtp.pam
index f38e70184afb..987abd2e31e2 100644
--- a/net-mail/postfix/files/smtp.pam
+++ b/net-mail/postfix/files/smtp.pam
@@ -1,2 +1,3 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/smtp.pam,v 1.2 2002/05/04 03:55:29 woodchip Exp $
 auth	required	/lib/security/pam_pwdb.so nullok shadow
 account	required	/lib/security/pam_pwdb.so
diff --git a/net-mail/postfix/files/smtpd.conf b/net-mail/postfix/files/smtpd.conf
index 44af343aeacd..d10021e1b66a 100644
--- a/net-mail/postfix/files/smtpd.conf
+++ b/net-mail/postfix/files/smtpd.conf
@@ -1 +1,2 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/files/smtpd.conf,v 1.2 2002/05/04 03:55:29 woodchip Exp $
 pwcheck_method:pam
diff --git a/net-mail/postfix/postfix-1.1.3-r3.ebuild b/net-mail/postfix/postfix-1.1.3-r3.ebuild
deleted file mode 100644
index 37f0c9341340..000000000000
--- a/net-mail/postfix/postfix-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.3-r3.ebuild,v 1.1 2002/03/24 19:57:01 woodchip Exp $
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.3-1.1.3-0.9.6c"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	mta-tls? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-1.5.27
-	mta-ldap? ( >=net-nds/openldap-1.2 )
-	mta-mysql? ( >=dev-db/mysql-3.23.28 )
-	mta-tls? ( >=dev-libs/openssl-0.9.6c )"
-RDEPEND="${DEPEND} >=net-mail/mailbase-0.00 !virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if [ "`use mta-tls`" ] ; then
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	fi
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	if [ "`use mta-mysql`" ] ; then
-		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
-		AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-	fi
-
-	if [ "`use mta-ldap`" ] ; then
-		CCARGS="${CCARGS} -DHAS_LDAP"
-		AUXLIBS="${AUXLIBS} -lldap -llber"
-	fi
-
-	if [ "`use mta-tls`" ] ; then
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl"
-	fi
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE -DUSE_SASL_AUTH"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -lsasl"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version          *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly.                              *"
-	einfo "***************************************************************"
-}
diff --git a/net-mail/postfix/postfix-1.1.6-r1.ebuild b/net-mail/postfix/postfix-1.1.6-r1.ebuild
deleted file mode 100644
index 13e32007d39f..000000000000
--- a/net-mail/postfix/postfix-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.6-r1.ebuild,v 1.1 2002/04/01 17:01:15 g2boojum Exp $
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.7-${PV}-0.9.6c"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	mta-tls? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-1.5.27
-	mta-ldap? ( >=net-nds/openldap-1.2 )
-	mta-mysql? ( >=dev-db/mysql-3.23.28 )
-	mta-tls? ( >=dev-libs/openssl-0.9.6c )"
-RDEPEND="${DEPEND} >=net-mail/mailbase-0.00 !virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if [ "`use mta-tls`" ] ; then
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	fi
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	if [ "`use mta-mysql`" ] ; then
-		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
-		AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-	fi
-
-	if [ "`use mta-ldap`" ] ; then
-		CCARGS="${CCARGS} -DHAS_LDAP"
-		AUXLIBS="${AUXLIBS} -lldap -llber"
-	fi
-
-	if [ "`use mta-tls`" ] ; then
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl"
-	fi
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	if [ "`use pam`" ] ; then
-		AUXLIBS="${AUXLIBS} -lpam"
-	fi
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE -DUSE_SASL_AUTH"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -lsasl -ldl -lcrypt"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version          *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly.                              *"
-	einfo "***************************************************************"
-}
diff --git a/net-mail/postfix/postfix-1.1.6.ebuild b/net-mail/postfix/postfix-1.1.6.ebuild
deleted file mode 100644
index 2b6fee044c43..000000000000
--- a/net-mail/postfix/postfix-1.1.6.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.6.ebuild,v 1.1 2002/03/30 16:06:26 seemant Exp $
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.7-${PV}-0.9.6c"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	mta-tls? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-1.5.27
-	mta-ldap? ( >=net-nds/openldap-1.2 )
-	mta-mysql? ( >=dev-db/mysql-3.23.28 )
-	mta-tls? ( >=dev-libs/openssl-0.9.6c )"
-RDEPEND="${DEPEND} >=net-mail/mailbase-0.00 !virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if [ "`use mta-tls`" ] ; then
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	fi
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	if [ "`use mta-mysql`" ] ; then
-		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
-		AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-	fi
-
-	if [ "`use mta-ldap`" ] ; then
-		CCARGS="${CCARGS} -DHAS_LDAP"
-		AUXLIBS="${AUXLIBS} -lldap -llber"
-	fi
-
-	if [ "`use mta-tls`" ] ; then
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl"
-	fi
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE -DUSE_SASL_AUTH"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -lsasl"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version          *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly.                              *"
-	einfo "***************************************************************"
-}
diff --git a/net-mail/postfix/postfix-1.1.7-r1.ebuild b/net-mail/postfix/postfix-1.1.7-r1.ebuild
deleted file mode 100644
index 70cee91baae0..000000000000
--- a/net-mail/postfix/postfix-1.1.7-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.7-r1.ebuild,v 1.1 2002/04/10 02:49:59 jnelson Exp $
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.7-${PV}-0.9.6c"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	mta-tls? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-1.5.27
-	mta-ldap? ( >=net-nds/openldap-1.2 )
-	mta-mysql? ( >=dev-db/mysql-3.23.28 )
-	mta-tls? ( >=dev-libs/openssl-0.9.6c )"
-RDEPEND="${DEPEND} >=net-mail/mailbase-0.00 !virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if [ "`use mta-tls`" ] ; then
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	fi
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	if [ "`use mta-mysql`" ] ; then
-		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
-		AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-	fi
-
-	if [ "`use mta-ldap`" ] ; then
-		CCARGS="${CCARGS} -DHAS_LDAP"
-		AUXLIBS="${AUXLIBS} -lldap -llber"
-	fi
-
-	if [ "`use mta-tls`" ] ; then
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl"
-	fi
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	if [ "`use pam`" ] ; then
-		AUXLIBS="${AUXLIBS} -lpam"
-	fi
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE -DUSE_SASL_AUTH"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -lsasl -ldl -lcrypt"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version	     *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly. 			     *"
-	einfo "***************************************************************"
-}
diff --git a/net-mail/postfix/postfix-1.1.7-r2.ebuild b/net-mail/postfix/postfix-1.1.7-r2.ebuild
deleted file mode 100644
index b3f00e68e0de..000000000000
--- a/net-mail/postfix/postfix-1.1.7-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.7-r2.ebuild,v 1.1 2002/04/15 23:46:06 seemant Exp $
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.7-${PV}-0.9.6c"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-1.5.27
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.28 )
-	ssl? ( >=dev-libs/openssl-0.9.6c )"
-
-RDEPEND="${DEPEND} 
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	use ssl && ( \
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	)
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	use mysql \
-		&& CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" \
-		&& AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-
-	use ldap \
-		&& CCARGS="${CCARGS} -DHAS_LDAP" \
-		&& AUXLIBS="${AUXLIBS} -lldap -llber"
-
-	use ssl \
-		&& CCARGS="${CCARGS} -DHAS_SSL" \
-		&& AUXLIBS="${AUXLIBS} -lssl"
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	use pam \
-		&& AUXLIBS="${AUXLIBS} -lpam"
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE -DUSE_SASL_AUTH"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -lsasl -ldl -lcrypt"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version	     *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly. 			     *"
-	einfo "***************************************************************"
-}
diff --git a/net-mail/postfix/postfix-1.1.7-r3.ebuild b/net-mail/postfix/postfix-1.1.7-r4.ebuild
index 75ed87be12cc..d0d3801cd919 100644
--- a/net-mail/postfix/postfix-1.1.7-r3.ebuild
+++ b/net-mail/postfix/postfix-1.1.7-r4.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.7-r3.ebuild,v 1.1 2002/04/19 07:16:40 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.7-r4.ebuild,v 1.1 2002/05/04 03:55:29 woodchip Exp $
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail"
 HOMEPAGE="http://www.postfix.org/"
@@ -23,6 +22,8 @@ DEPEND=">=sys-libs/db-3.2
 RDEPEND="${DEPEND} 
 	>=net-mail/mailbase-0.00
 	!virtual/mta"
+LICENSE="IPL-1"
+SLOT="0"
 
 pkg_setup() {
 	if ! grep -q ^postdrop: /etc/group ; then
diff --git a/net-mail/postfix/postfix-1.1.7.ebuild b/net-mail/postfix/postfix-1.1.7.ebuild
deleted file mode 100644
index 7e9af8b7a141..000000000000
--- a/net-mail/postfix/postfix-1.1.7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/postfix/postfix-1.1.7.ebuild,v 1.2 2002/04/10 02:34:35 jnelson Exp $
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-
-POSTFIX_TLS_VER="0.8.7-${PV}-0.9.6c"
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	mta-tls? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-${POSTFIX_TLS_VER}.tar.gz )"
-
-PROVIDE="virtual/mta"
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=dev-libs/cyrus-sasl-1.5.27
-	mta-ldap? ( >=net-nds/openldap-1.2 )
-	mta-mysql? ( >=dev-db/mysql-3.23.28 )
-	mta-tls? ( >=dev-libs/openssl-0.9.6c )"
-RDEPEND="${DEPEND} >=net-mail/mailbase-0.00 !virtual/mta"
-
-pkg_setup() {
-	if ! grep -q ^postdrop: /etc/group ; then
-		groupadd postdrop || die "problem adding group postdrop"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if use mta-tls; then
-		cd ${S}
-		patch -p1 < ${WORKDIR}/pfixtls-${POSTFIX_TLS_VER}/pfixtls.diff || die
-	fi
-
-	cd ${S}/conf
-	cp main.cf main.cf.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf
-
-	cd ${S}/src/global
-	cp mail_params.h mail_params.h.orig
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h.orig > mail_params.h
-
-	if use mta-mysql; then
-		CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql"
-		AUXLIBS="${AUXLIBS} -lmysqlclient -lm"
-	fi
-
-	if use mta-ldap ; then
-		CCARGS="${CCARGS} -DHAS_LDAP"
-		AUXLIBS="${AUXLIBS} -lldap -llber"
-	fi
-
-	if use mta-tls; then
-		CCARGS="${CCARGS} -DHAS_SSL"
-		AUXLIBS="${AUXLIBS} -lssl"
-	fi
-
-	# note: if sasl is built w/ pam, then postfix _MUST_ be built w/ pam
-	if use pam; then
-		AUXLIBS="${AUXLIBS} -lpam"
-	fi
-
-	# stuff we always want...
-	CCARGS="${CCARGS} -I/usr/include -DHAS_PCRE -DUSE_SASL_AUTH"
-	AUXLIBS="${AUXLIBS} -L/usr/lib -lpcre -lsasl -ldl -lcrypt"
-	DEBUG=""
-
-	cd ${S}
-	make tidy || die
-	make makefiles CC="cc" OPT="${CFLAGS}" DEBUG="${DEBUG}" \
-		CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" || die
-}
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dodir /usr/bin /usr/sbin /usr/lib/postfix /etc/postfix/sample
-
-	cd ${S}/bin
-	dosbin post* sendmail
-	chown root.postdrop ${D}/usr/sbin/{postdrop,postqueue}
-	chmod 2755 ${D}/usr/sbin/{postdrop,postqueue}
-
-	dosym /usr/sbin/sendmail /usr/bin/mail
-	dosym /usr/sbin/sendmail /usr/bin/mailq
-	dosym /usr/sbin/sendmail /usr/bin/newaliases
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	cd ${S}/libexec
-	exeinto /usr/lib/postfix
-	doexe *
-
-	cd ${S}/man
-	doman man*/*
-
-	cd ${S}
-	dodoc *README COMPATIBILITY HISTORY LICENSE PORTING RELEASE_NOTES
-	dohtml html/*
-
-	cd ${S}/conf
-	insinto /etc/postfix/sample
-	doins access aliases canonical relocated transport \
-		pcre_table regexp_table postfix-script* *.cf
-
-	exeinto /etc/postfix
-	doexe postfix-script post-install postfix-files || die
-
-	insinto /etc/postfix
-	doins ${FILESDIR}/main.cf master.cf || die
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix
-	insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp
-	insinto /etc/sasl ; doins ${FILESDIR}/smtpd.conf
-}
-
-pkg_postinst() {
-	install -d 0755 ${ROOT}/var/spool/postfix
-
-	einfo "***************************************************************"
-	einfo "* NOTE: If config file protection is enabled and you upgraded *"
-	einfo "*       from an earlier version of postfix you must update    *"
-	einfo "*       /etc/postfix/master.cf to the latest version	     *"
-	einfo "*       (/etc/postfix/._cfg????_master.cf). Otherwise postfix *"
-	einfo "*       will not work correctly. 			     *"
-	einfo "***************************************************************"
-}