new dev snapshot. clean out old ebuilds.

9 files changed, 20 insertions, 513 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 7c9e191abddb..0460cc4ca7a6 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.41 2005/01/05 17:47:13 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.42 2005/01/05 23:39:41 langthang Exp $
+
+*postfix-2.2_beta20041230 (05 Jan 2005)
+
+  05 Jan 2005; Tuấn Văn <langthang@gentoo.org> -postfix-2.0.19.ebuild,
+  -postfix-2.1.3.ebuild, -postfix-2.2.20041221.ebuild,
+  +postfix-2.2_beta20041230.ebuild:
+  new dev snapshot.
+  clean out old ebuilds.
 
   05 Jan 2005; petre rodan <kaiowas@gentoo.org> postfix-2.1.5-r1.ebuild,
   postfix-2.2.20041221.ebuild:
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index ef2c617f4435..1ed0a83e8ea4 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,26 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 036f11fe148d47f7451b58ff9d8ba9b4 postfix-2.2_beta20041230.ebuild 9214
+MD5 a52764b04b8ba78606b93723291828f8 postfix-2.1.5-r1.ebuild 7498
 MD5 ae6223129768a4a6f67589977ac1bad0 ChangeLog 29020
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
-MD5 f325ae6025cdae493066e28b705e80a6 postfix-2.0.19.ebuild 6713
-MD5 2f7d919944312f89f2c822d9ed6cf6b9 postfix-2.1.3.ebuild 7354
-MD5 a52764b04b8ba78606b93723291828f8 postfix-2.1.5-r1.ebuild 7498
-MD5 7a32d350a1dcc0e7c43f31312482d1de postfix-2.2.20041221.ebuild 9219
-MD5 20fa9d533a75c392127160b6b83d4229 files/digest-postfix-2.0.19 445
-MD5 7923292c13473118323ceff84e770a1d files/digest-postfix-2.1.3 357
-MD5 6ae48624e946756fb17572811abf8961 files/digest-postfix-2.1.5-r1 363
-MD5 25ae89f7a830c8358a449198a69d703d files/digest-postfix-2.2.20041221 158
-MD5 78c16ededccb206774194bfe05475a99 files/mailer.conf 1547
-MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
 MD5 f4fb1c0bcd39fe4ead34ade333819389 files/postfix.rc6 592
-MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
 MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
 MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB3CaVGSBEIeh4AEYRAsNuAJsG/YTDzn48cvpCPeW+oQjszCG6NgCdEzXz
-p5HLMy6PBs2PMhHCZ5xdVNc=
-=TImc
------END PGP SIGNATURE-----
+MD5 b25a7a3f2accb451451296344c05beb1 files/digest-postfix-2.2_beta20041230 158
+MD5 6ae48624e946756fb17572811abf8961 files/digest-postfix-2.1.5-r1 363
+MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
+MD5 78c16ededccb206774194bfe05475a99 files/mailer.conf 1547
+MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
diff --git a/mail-mta/postfix/files/digest-postfix-2.0.19 b/mail-mta/postfix/files/digest-postfix-2.0.19
deleted file mode 100644
index 2e44b784a13d..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.0.19
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3515ba531b0fadd0e54ef688797d393e postfix-2.0.19.tar.gz 1355184
-MD5 55a3d76d52fddd5cd0365004957a1160 postfix-2.0-ns-mx-acl-patch.gz 4673
-MD5 2d9b07d3847a06b77db3be25973acf14 pfixtls-0.8.16-2.0.18-0.9.7c.tar.gz 234300
-MD5 f30495d44b140239df02a0599d280d68 ipv6-1.21-pf-2.0.18.patch.gz 47266
-MD5 8d273f922352a0ff32c57c29bec26b46 tls+ipv6-1.21-pf-2.0.18.patch.gz 254862
-MD5 5a0aa5ef6a231a593eb6c5628236a3e4 postfix-pg.postfix-2.0.0.2.patch 27419
diff --git a/mail-mta/postfix/files/digest-postfix-2.1.3 b/mail-mta/postfix/files/digest-postfix-2.1.3
deleted file mode 100644
index 0a294e55802b..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.1.3
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 1f515b0d80cd1f9db0113240bf36f248 postfix-2.1.3.tar.gz 1971632
-MD5 36f37634a71bed0a1bdae5061d4d6370 postfix-2.1.3.patch.gz 6924
-MD5 d3211ebd4d2fbbc9c78235666ed355ac pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz 239141
-MD5 cd99ff3ddf9bb88e23a7e33ae42d0772 ipv6-1.25-pf-2.1.3.patch.gz 79473
-MD5 e013ff8d4aa49e17d7ee85419481cfc7 tls+ipv6-1.25-pf-2.1.3.patch.gz 256591
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.20041221 b/mail-mta/postfix/files/digest-postfix-2.2.20041221
deleted file mode 100644
index 18079729ce78..000000000000
--- a/mail-mta/postfix/files/digest-postfix-2.2.20041221
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 07be26ad748e9e08939d2a9dcf69bc60 postfix-2.2-20041221.tar.gz 2127245
-MD5 0b141e5dd14abe0725b31f937c5af35c postfix-2.2-20041221+tls-nonprod.tar.gz 2293763
diff --git a/mail-mta/postfix/files/digest-postfix-2.2_beta20041230 b/mail-mta/postfix/files/digest-postfix-2.2_beta20041230
new file mode 100644
index 000000000000..ed022c9d3d66
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.2_beta20041230
@@ -0,0 +1,2 @@
+MD5 368e3e9a9dbc885339c28dcdc1e84705 postfix-2.2-20041230.tar.gz 2128258
+MD5 f6a638eebbe5f1f9e74990cef8ac57ef postfix-2.2-20041230+tls-nonprod.tar.gz 2288954
diff --git a/mail-mta/postfix/postfix-2.0.19.ebuild b/mail-mta/postfix/postfix-2.0.19.ebuild
deleted file mode 100644
index d23615216013..000000000000
--- a/mail-mta/postfix/postfix-2.0.19.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19.ebuild,v 1.4 2005/01/02 21:04:26 kloeri Exp $
-
-inherit eutils ssl-cert
-
-TLS_P="pfixtls-0.8.16-2.0.18-0.9.7c"
-IPV6="1.21"
-IPV6_P="ipv6-${IPV6}-pf-2.0.18"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	ftp://ftp.porcupine.org/mirrors/postfix-release/official/${PN}-2.0-ns-mx-acl-patch.gz
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )
-	postgres? ( http://www.mat.cc/postfix/${PGSQL_P}.patch )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~alpha mips"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl maildir mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!virtual/mta"
-
-# Is this still necessary since gentoo sasl looks
-# in /etc/sasl2 for it's config files?
-pkg_setup() {
-	# Prevent mangling the smtpd.conf file.
-	if [ ! -L "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
-		if [ -f "${ROOT}/usr/lib/sasl2/smtpd.conf" ] ; then
-			ebegin "Protecting your smtpd.conf file"
-			if [ ! -d "${ROOT}/etc/sasl2" ] ; then
-				mkdir -p "${ROOT}/etc/sasl2"
-			fi
-
-			# This shouldn't be necessary, but apparently
-			# without it things can still get messy.
-			if [ -L "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
-				rm "${ROOT}/etc/sasl2/smtpd.conf"
-			fi
-
-			# If both files exist, make sure that we preserve
-			# a copy of each with the ._cfg system.
-			if [ -f "${ROOT}/etc/sasl2/smtpd.conf" ] ; then
-				mv "${ROOT}/etc/sasl2/smtpd.conf" \
-					"${ROOT}/etc/sasl2/._cfg0000_smtpd.conf"
-			fi
-			mv "${ROOT}/usr/lib/sasl2/smtpd.conf" "${ROOT}/etc/sasl2"
-			eend
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	if use ssl ; then
-		if use ipv6 ; then
-			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
-		else
-			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
-		fi
-	elif use ipv6; then
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use postgres ; then
-		epatch "${DISTDIR}/${PGSQL_P}.patch"
-	fi
-
-	# Verisign name services fixes.
-	epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-	mycc="${mycc} -DDEF_SAMPLE_DIR=\\\"/usr/share/doc/${PF}/sample\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		sample_directory="/usr/share/doc/${PF}/sample" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use maildir ; then
-		mypostconf="home_mailbox=.maildir/"
-	elif use mbox ; then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	if use ssl ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	eend $?
-	echo
-
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.1.3.ebuild b/mail-mta/postfix/postfix-2.1.3.ebuild
deleted file mode 100644
index abee5e6ef128..000000000000
--- a/mail-mta/postfix/postfix-2.1.3.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.1.3.ebuild,v 1.13 2005/01/02 21:04:26 kloeri Exp $
-
-inherit eutils ssl-cert
-
-VDA_P="${PN}-2.1.3"
-TLS_P="pfixtls-0.8.18-2.1.3-0.9.7d"
-IPV6="1.25"
-IPV6_P="ipv6-${IPV6}-pf-2.1.3"
-IPV6_TLS_P="tls+${IPV6_P}"
-PGSQL_P="postfix-pg.postfix-2.0.0.2"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail."
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${P}.tar.gz
-	vda? ( http://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz )
-	ssl? ( ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/${TLS_P}.tar.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_P}.patch.gz )
-	ipv6? ( ftp://ftp.stack.nl/pub/postfix/tls+ipv6/${IPV6}/${IPV6_TLS_P}.patch.gz )"
-
-LICENSE="IPL-1"
-SLOT="0"
-KEYWORDS="x86 sparc ppc alpha amd64 ~s390 ~mips ppc64"
-IUSE="ipv6 pam ldap mysql postgres ssl sasl vda mailwrapper mbox"
-
-PROVIDE="virtual/mta virtual/mda"
-DEPEND=">=sys-libs/db-3.2
-	>=dev-libs/libpcre-3.4
-	>=sys-apps/sed-4
-	ldap? ( >=net-nds/openldap-1.2 )
-	mysql? ( >=dev-db/mysql-3.23.51 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-
-pkg_setup() {
-	# put out warnings to work around bug #45764
-	if has_version '<=mail-mta/postfix-2.0.18'; then
-		echo
-		ewarn "You are upgrading from postfix-2.0.18 or earlier, one of the empty queue"
-		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
-		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
-		echo
-	epause 5
-	fi
-
-	# logic to fix bug #53324
-	if [[ -n $(pidof master) ]] ; then
-		if has_version '<mail-mta/postfix-2.1.3' ; then
-			echo
-			eerror "You are upgrading from the incompatible version."
-			eerror "Please stop Postfix then emerge again."
-			die "Upgrade from incompatible version."
-		else
-			echo
-			ewarn "It is safe to upgrade your current version while it's running."
-			ewarn "If you don't want to take any chance; please hit Ctrl+C now;"
-			ewarn "stop Postfix then emerge again."
-			ewarn "You have been warned!"
-			ewarn "Waiting 10 seconds before continuing."
-			echo
-			epause 10
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
-	if use ssl ; then
-		if use ipv6 ; then
-			epatch "${WORKDIR}/${IPV6_TLS_P}.patch"
-		else
-			epatch "${WORKDIR}/${TLS_P}/pfixtls.diff"
-		fi
-	elif use ipv6; then
-		epatch "${WORKDIR}/${IPV6_P}.patch"
-	fi
-
-	if use vda ; then
-		epatch "${WORKDIR}/${VDA_P}.patch"
-	fi
-
-	# We don't need this patch anymore
-	# http://www.postfix.org/PGSQL_README.html
-	# if use postgres ; then
-	#	epatch "${DISTDIR}/${PGSQL_P}.patch"
-	# fi
-
-	# Verisign name services fixes. Do we need this anymore?
-	# epatch "${WORKDIR}/${PN}-2.0-ns-mx-acl-patch"
-
-	# Postfix does not get the FQDN if no hostname is configured.
-	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
-
-	# Fix install paths.
-	sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" \
-		-i src/global/mail_params.h -i conf/main.cf || die "sed failed"
-}
-
-src_compile() {
-	local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread"
-
-	if use pam ; then
-		mylibs="${mylibs} -lpam"
-	fi
-	if use ldap ; then
-		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
-	fi
-	if use mysql ; then
-		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
-		mylibs="${mylibs} -lmysqlclient -lm -lz"
-	fi
-	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
-		else
-			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
-		fi
-		mylibs="${mylibs} -lpq"
-	fi
-	if use ssl ; then
-		mycc="${mycc} -DUSE_SSL"
-		mylibs="${mylibs} -lssl -lcrypto"
-	fi
-	if use sasl ; then
-		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
-		mylibs="${mylibs} -lsasl2"
-	fi
-
-	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
-	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_PROGRAM_DIR=\\\"/usr/lib/postfix\\\""
-	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
-	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
-
-	make CC="${CC:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
-		makefiles || die "configure problem"
-
-	emake || die "compile problem"
-}
-
-src_install () {
-	/bin/sh postfix-install \
-		-non-interactive \
-		install_root="${D}" \
-		daemon_directory="/usr/lib/postfix" \
-		program_directory="/usr/lib/postfix" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
-		readme_directory="/usr/share/doc/${PF}/readme" \
-		manpage_directory="/usr/share/man" \
-		mail_owner="postfix" \
-		setgid_group="postdrop" || die "postfix-install failed"
-
-	# Fix spool removal on upgrade.
-	rm -rf "${D}/var"
-	keepdir /var/spool/postfix
-
-	# mailwrapper stuff
-	if use mailwrapper
-	then
-		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	fi
-
-
-	# Provide another link for legacy FSH.
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
-	# Install qshape tool.
-	dobin auxiliary/qshape/qshape.pl
-
-	# Set proper permissions on required files/directories.
-	fowners root:postdrop /usr/sbin/post{drop,queue}
-	fperms 02711 /usr/sbin/post{drop,queue}
-
-	keepdir /etc/postfix
-	mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix"
-	if use mbox
-	then
-		mypostconf="mail_spool_directory=/var/spool/mail"
-	else
-		mypostconf="home_mailbox=.maildir/"
-	fi
-	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \
-		"alias_maps=hash:/etc/mail/aliases" \
-		"alias_database=hash:/etc/mail/aliases" \
-		"local_destination_concurrency_limit=2" \
-		"default_destination_concurrency_limit=2" \
-		${mypostconf} || die "postconf failed"
-
-	insinto /etc/postfix
-	newins "${FILESDIR}/smtp.pass" saslpass
-	fperms 600 /etc/postfix/saslpass
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/postfix.rc6" postfix
-
-	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
-	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins "${FILESDIR}/smtp.pam" smtp
-	fi
-	if use ssl ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		insinto /etc/ssl/postfix
-		docert server
-		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
-	fi
-	if use sasl ; then
-		insinto /etc/sasl2
-		newins "${FILESDIR}/smtp.sasl" smtpd.conf
-	fi
-}
-
-pkg_postinst() {
-	ebegin "Fixing queue directories and permissions"
-	"${ROOT}/etc/postfix/post-install" upgrade-permissions
-	echo
-	ewarn "If you upgraded from postfix-1.x, you must revisit"
-	ewarn "your configuration files.  See"
-	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
-	ewarn "for a list of changes."
-
-	if [ ! -e /etc/mail/aliases.db ] ; then
-		echo
-		ewarn "You must edit /etc/mail/aliases to suit your needs"
-		ewarn "and then run /usr/bin/newaliases. Postfix will not"
-		ewarn "work correctly without it."
-	fi
-
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged $PN without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/postfix/postfix-2.2.20041221.ebuild b/mail-mta/postfix/postfix-2.2_beta20041230.ebuild
index 33dd4981f3c5..17f22b10394f 100644
--- a/mail-mta/postfix/postfix-2.2.20041221.ebuild
+++ b/mail-mta/postfix/postfix-2.2_beta20041230.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.20041221.ebuild,v 1.3 2005/01/05 17:47:13 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2_beta20041230.ebuild,v 1.1 2005/01/05 23:39:41 langthang Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux"
 
-MY_PV=${PV%.*}-${PV##*.}
+MY_PV=${PV/_beta/-}
 PROD_PV=${MY_PV}
 TLS_SRC=${PN}-${MY_PV}+tls-nonprod
 PROD_SRC=${PN}-${PROD_PV}