version bump. rename patch file

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 352 insertions, 19 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index eb6666c4f485..50246b450f07 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.327 2012/01/18 22:19:50 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.328 2012/01/19 16:36:24 eras Exp $
+
+*postfix-2.10_pre20120118 (19 Jan 2012)
+
+  19 Jan 2012; Eray Aslan <eras@gentoo.org> postfix-2.9.0_rc1.ebuild,
+  -files/postfix-2.9.0_rc1_no-berkdb.patch, +postfix-2.10_pre20120118.ebuild,
+  +files/postfix_no-berkdb.patch:
+  version bump. rename patch file
 
 *postfix-2.9.0_rc1 (18 Jan 2012)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 422a9e50af17..45ac4026ffb0 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX postfix-2.9.0_rc1_no-berkdb.patch 2729 RMD160 2e80e5c446b58afe8cda35991ac3af5f3db3f7eb SHA1 8c6d8695bf347769f957a79f3320fcff8d844315 SHA256 c21e9582346c913b3033ec6d3567d0b0bd3576ad64052fed48a5cf78d7ad92fc
 AUX postfix.rc6.2.5 1424 RMD160 c0026032a5a807c19431b1381df48dab14469796 SHA1 3aae6fdb80488398442237b2a8a581e4da448e0d SHA256 f5ab48b469db3f62a5e5ccc15e5cfa6e0ace97d2c2bc66af334d105b0dfa7d31
 AUX postfix.rc6.2.6 1996 RMD160 a7936897d1b8249e3fc0da2426afcbbe25bbe0ce SHA1 34e7d5899649b932808551f4d08517b4c1dcceca SHA256 2beed4cf54d6634620bd44ce6337912a7dfaeada1fd03c04f37f777628a5c9bf
+AUX postfix_no-berkdb.patch 2729 RMD160 2e80e5c446b58afe8cda35991ac3af5f3db3f7eb SHA1 8c6d8695bf347769f957a79f3320fcff8d844315 SHA256 c21e9582346c913b3033ec6d3567d0b0bd3576ad64052fed48a5cf78d7ad92fc
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 147 RMD160 8565ca413ec1a9e369be227643d3610124b34566 SHA1 565035b230d4997a207d146609336dfe643c6ed3 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629
+DIST postfix-2.10-20120118.tar.gz 3764796 RMD160 3429012003e563a9c7d6444952b1c46c25b69620 SHA1 e39f08d5aeb2eb3e213663d8ab903159901bb829 SHA256 ef924fa83c496882385e455d0a3b1140d66e09f4a502d79f27bd34380eeb1274
 DIST postfix-2.7.4.tar.gz 3423968 RMD160 4f3e0db43c55cd50b3fb4493dbc698ff3f343294 SHA1 c755ceb3a5ee983f3b72f08e1fffb6384b1f1865 SHA256 9bad5851e8a7c97890ee9465e7f675f7826d56361369d3e792a79eaf98ed2b11
 DIST postfix-2.7.5.tar.gz 3425071 RMD160 a900ff09c0a54382a4af62b609f6ddaba17963fc SHA1 066cc87f602f2daf1d3207de92ca08de9eb16bab SHA256 2fe408f49bc8540bc41b44f1b7ee7a27561f1baa4e25ef55645778ba96d15932
 DIST postfix-2.7.6.tar.gz 3425286 RMD160 9961b959ae34a1fe1d3bf70acce1f16e5ada255d SHA1 9a2cd652abdc0d3cf29563261d5c0f407d8d7bf9 SHA256 4f7546d25463c5fc300eccd05c302a44458b1cc8dfda02c7205daa0038d5ab17
@@ -20,6 +21,7 @@ DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c9361
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
 DIST postfix-vda-v10-2.8.5.patch 56777 RMD160 fc1622a91c88d6d91782b9d4e9dfecd3f603251b SHA1 b9f8480a738dccf0023698274c8d5f5cb4fb308f SHA256 0106e0bfdea8bb3888e8f33e7cb4b1530d171abbf2d3ac91567f91240e4b6b5a
+EBUILD postfix-2.10_pre20120118.ebuild 10096 RMD160 acafe257e79cc8defa6f56135eeab2fa7fb3e523 SHA1 d278b2288d9eb6b172f35bfe65d55ad15c086231 SHA256 f83375aed8c746b16f1ef516adab80aa24b435f035dafa92b03762a175bf9177
 EBUILD postfix-2.7.4.ebuild 7562 RMD160 7b1874aa1c5fb0357ab8bafd740e38ec00ecdb45 SHA1 db22462d85927f3afc7c172597842d1fc0ac5fb5 SHA256 aaa33b10ecc21d9dcd8256b12974912bf3481544c5f7cb5119da7b52fcefc9d9
 EBUILD postfix-2.7.5.ebuild 7573 RMD160 767bf6a470af95a14e1e725fc77287d3f3907ffd SHA1 2f897791234a3c2bfbcb3fe39406c60e2f7e9b09 SHA256 b348d000438cae031fa48e04a938aa623dd722120699a9969cccc99d05842122
 EBUILD postfix-2.7.6.ebuild 7573 RMD160 6e8c3b59101d7d4d19f20f0df24b5f53d2a23957 SHA1 f703ec9a31a1a6a2e3930fbd7660f998d1753c27 SHA256 7ade993dbeba99be1ab0f97d35227fbb0d208f70e4a718bf3d2a56bc4983f512
@@ -31,23 +33,23 @@ EBUILD postfix-2.8.4.ebuild 8438 RMD160 cdf05986adb042588e332017a430d1c9c10bc527
 EBUILD postfix-2.8.5.ebuild 8447 RMD160 d783620f452d45b164b81c3f32fea5488dd703d1 SHA1 55cb7e91a94f1765e13ee8e130f991cc31561fab SHA256 01dcded08cbdb7317ea6fb7d75005d6f49c3faa32209f746bc63710dff77d7cf
 EBUILD postfix-2.8.6.ebuild 8435 RMD160 d794ccd5fae24cbef65034aedb5f8919ca216483 SHA1 3a0e9b1920bc6fab81287057f1f15bf00a5376a2 SHA256 6c25ce81553164eb797f83b4b170e0b8dd4049ee984653b043e27605ca32ce3a
 EBUILD postfix-2.8.7.ebuild 8427 RMD160 c5760fb0e0c943aebaa86af2ddaf0cff819e6b2f SHA1 46987dcf88be669d43d1859c836ce88f327bd407 SHA256 b04ac78d4dc3743246c4c680ea8e4b10a1b32aac485d5719fd0eba86dabe04cb
-EBUILD postfix-2.9.0_rc1.ebuild 10085 RMD160 7a87283e830c8aa2437ba252fa33ae144132cd56 SHA1 265ca5b6d47c667a5fc709fea389ba791e805e0b SHA256 a011acc233f085d16dcdb1f9ca3cc665a3f8ff0f9c0bb4d7d15bd0a4e283f02a
-MISC ChangeLog 75813 RMD160 d8e591bb4849590a80bbac49080a1a24b7568730 SHA1 d4824561a9d4dc10b3e7828be48b38000643ed1d SHA256 d4ab251a1d0f8da08d4497f8bcf0c91b1ffd51dfed3afd084114a29ac995daca
+EBUILD postfix-2.9.0_rc1.ebuild 10086 RMD160 961aabd42e3c2df69f29921944fee45bd8c83522 SHA1 a707bd9c48d47ff747bc6575cb21ebdb87437a66 SHA256 5a90470e37d238ad429c63ce3c776d0fd42b73cd7493999798997a4e6933063d
+MISC ChangeLog 76071 RMD160 f1a1016ecf31856904137e7142a1dbc5bc626686 SHA1 a209f32d732ea51e92dd66b28856685126cced14 SHA256 a8453a0a6488d5ffb82874ac67825fc0bb5eecd05aae7a870285f90d74bc001b
 MISC metadata.xml 610 RMD160 095d8cd529350f58c64d6d2eb40e8534d3dddfae SHA1 d53048933e7490f3f342ccf8972c191ee8030ccd SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPF0WVAAoJEHfx8XVYajsf+ggP/jtstu2MDG1Xg63m+O2o1eUG
-XAhJHj4DKNYWxQamPmL3a8or0yvpHs+8sHIc7ROQXDT4rAdBDfTnxojj7gnr7AwG
-7fpBdaStOPEFuiiHDd+A7lBb2vd9URb80YYvxhTbejVtG+Vi/8VjJlbTcdTQCZQP
-Qk/PwE299ANH8A3cdn5b4IUcT8GCTeJa9M+bmrSqR1bqeV03dpXwxYkTFvxFqlM8
-or6bxAALU9SEpz47mnNb8dUbL8zTzULye/H5uaEIJAJUl07OjPQCzuK1cRpnr5AN
-aUoEFdIyHBHVgs0IFGBqfh5xZBPfd80aJpofIffq6ULUMjolWmInKtoeA3o+JgD9
-pgVGlDhdkScGkmbmLoPnwJb5GPn9sUk+sg7bjqX5GKCPrhYv66dO2C7EdB0XPLzg
-ONm9AM80bKUWkkTzrKqjLCW8njnvOhXAoML7edvp0BC8kHxNj0B5p9C6+bQbnQwO
-uoOYDZAdVsZQwwl57xCscwLb7KG+EwSESNL6leYstfi04llv1QcHoxjGG9FspJm5
-C8UHaaG0ZBIMzIMsF0fk1flhi+Rp3wOp49HGORJ2kcpUbuAPWvzupo14cgml/HA6
-NHnQhisa5w7JxQwQBMjIA94lKTiEl+TZgza8qZujJatUlsWlbVLLASgA6q5IMZ9j
-rbUO7uHVXzL3LG1b6DNW
-=ajCK
+iQIcBAEBCAAGBQJPGEaOAAoJEHfx8XVYajsfAA0P/RGmivd/Ub3qYu4EF/tmXWlZ
+M794cge8gVa+hTqIQhSQq7sXgqGK0s+9sKEIwfoDCngvuvSmfuW7+JG9poPQtupZ
+/9trBDxQEbmxzNjdjghx6/tkQ6xeQP30hGUfZu/4QMmiHOIsCzBeD53QfWdx9tqT
+3Ssw5YtIGF+Ps8McVT9BM9z+th5swQ+NWRahm3nY1rMoRSbwC4F6zEIu9YadA7BN
+Ybm7wqr5a2CYxoqtL+lLSz8G4M6hpqARQCfLjs9JPkQDwDeLtxynO5p7KSopDCWD
+ICrdbhPmUbU7b7AB+ZC30Y5ALl5zGW+1PiPVRodElldKefTmqPvXn+PqDJzeWbPL
+/CQ4/GLTI0YLuv18EU6OLhz8bxoE2lMOgoKfOYR5mcmRQz/1gY0FFcy8t4PYsja4
+f29zddtIz0MekpvuQi0xN38WYrt8IgEbUUAiAkLbdg6Eg8Ae921hLOqzRx//VDcQ
+ARV2/JLS82hc1WhciD5LmSB+Q6A+tDxz5kOmT7cDC8iXVY8/rytKZ635Q7gveABR
+11wxQcLwYzc5QRksLo4P3S7+WXoo/+YngdMNjrcYDxtPynIC0xGokMzFLlsALMnh
+hDnc3AeoH8Xd6Chee6e2sIfh98JwgXLJjW76hqnLtoovZ88YqaFnwEY30EGIXnFL
+e50AkjISAuG94AlOqPlI
+=vx+m
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch b/mail-mta/postfix/files/postfix_no-berkdb.patch
index 3f9eef7e5161..3f9eef7e5161 100644
--- a/mail-mta/postfix/files/postfix-2.9.0_rc1_no-berkdb.patch
+++ b/mail-mta/postfix/files/postfix_no-berkdb.patch
diff --git a/mail-mta/postfix/postfix-2.10_pre20120118.ebuild b/mail-mta/postfix/postfix-2.10_pre20120118.ebuild
new file mode 100644
index 000000000000..4c1ff9654ab5
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.10_pre20120118.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120118.ebuild,v 1.1 2012/01/19 16:36:24 eras Exp $
+
+EAPI=4
+
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+VDA_PV="2.8.5"
+VDA_P="${PN}-vda-v10-${VDA_PV}"
+RC_VER="2.6"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2 )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	selinux? ( sec-policy/selinux-postfix )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	if use vda; then
+		epatch "${DISTDIR}"/${VDA_P}.patch
+	fi
+
+	if ! use berkdb; then
+		epatch "${FILESDIR}/${PN}_no-berkdb.patch"
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		mylibs="${mylibs} $(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		mylibs="${mylibs} -lsqlite3"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
+			src/util/sys_defs.h || die "sed failed"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		CDB_LIBS=""
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			CDB_LIBS="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+			done
+		fi
+		mylibs="${mylibs} ${CDB_LIBS}"
+	fi
+
+#	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
+#	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+#	mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
+#	mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
+#	mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
+#	mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
+#	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+#	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+#	mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
+#	mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
+#	mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
+#	mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
+#	mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		html_directory="/usr/share/doc/${PF}/html" \
+		command_directory="/usr/sbin" \
+		daemon_directory="/usr/$(get_libdir)/postfix" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /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 ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Remove unnecessary files
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+}
+
+pkg_preinst() {
+	# default for inet_protocols changed from ipv4 to all in postfix-2.9.
+	# check inet_protocols setting in main.cf and modify if necessary to prevent
+	# performance loss with useless DNS lookups and useless connection attempts.
+	[[ -d ${ROOT}/etc/postfix ]] && {
+	if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
+		if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -nh inet_protocols)" ]];
+		then
+			ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
+			ewarn "That will keep the same behaviour as previous postfix versions."
+			ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
+		else
+			# delete inet_protocols setting. there is already one in /etc/postfix
+			sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
+		fi
+	fi
+	}
+}
+
+pkg_postinst() {
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
+		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		install_cert /etc/ssl/postfix/server
+		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
+	fi
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		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."
+		ewarn
+	fi
+
+	if [[ ${REPLACING_VERSIONS} < 2.9 ]]; then
+		elog "If you are using old style postfix instances by symlinking"
+		elog "startup scripts in ${ROOT}etc/init.d, please consider"
+		elog "upgrading your config for postmulti support. For more info:"
+		elog "http://www.postfix.org/MULTI_INSTANCE_README.html"
+		if ! use berkdb; then
+			ewarn "\nPostfix is installed without BerkeleyDB support."
+			ewarn "Please turn on berkdb USE flag if hash or btree table"
+			ewarn "lookup support is needed.\n"
+		fi
+	fi
+}
diff --git a/mail-mta/postfix/postfix-2.9.0_rc1.ebuild b/mail-mta/postfix/postfix-2.9.0_rc1.ebuild
index 1a1e17fabd28..ce53ef87dcd8 100644
--- a/mail-mta/postfix/postfix-2.9.0_rc1.ebuild
+++ b/mail-mta/postfix/postfix-2.9.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0_rc1.ebuild,v 1.1 2012/01/18 22:19:50 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0_rc1.ebuild,v 1.2 2012/01/19 16:36:24 eras Exp $
 
 EAPI=4
 
@@ -72,7 +72,7 @@ src_prepare() {
 	fi
 
 	if ! use berkdb; then
-		epatch "${FILESDIR}/${P}_no-berkdb.patch"
+		epatch "${FILESDIR}/${PN}_no-berkdb.patch"
 	fi
 
 	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \