Version bump

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0x77F1F175586A3B1F

4 files changed, 619 insertions, 15 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index ab6a2d3de077..1320ec542c8f 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.401 2012/12/11 11:04:28 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.402 2012/12/13 07:05:49 eras Exp $
+
+*postfix-2.9.5 (13 Dec 2012)
+*postfix-2.8.13 (13 Dec 2012)
+
+  13 Dec 2012; Eray Aslan <eras@gentoo.org> +postfix-2.8.13.ebuild,
+  +postfix-2.9.5.ebuild:
+  Version bump
 
 *postfix-2.10_pre20121210 (11 Dec 2012)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 6f0aeb9a0f62..73cae5f696f9 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,31 +8,35 @@ AUX smtp.pass 141 SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bf
 AUX smtp.sasl 147 SHA256 0ef6a2a7846498f56b9a8879f561a51c1e3a203ba90b2991d499afa69fd85629 SHA512 0beba4baecb4c4abdd3d2dd61e9e56d3abbc0035184992c98c57538b9244c6a07470974afe663775c3f3f10354e64457aa07e657dfd212e31a0920e3f04a6000 WHIRLPOOL 0c3eef040dd4486e007c31111b965725d3e9cf5a896881e0c927a715598dcc936dbf1034d6add2e6fb8ef4bd0114a7a49a8bba6f27b14aac30023457a1da12a3
 DIST postfix-2.10-20121210.tar.gz 3817926 SHA256 985c6a10805f0b63dac42e36f96915435b811c1fa6b60a62a0e30876bfee6867 SHA512 49154b675c758fdc374c8d271cd2e2cdd1bf1bcdd318441cf8c3c868bb26c69c3fc1c58034f0efbf8923fcaa0e848d6ed58819b11b376255bb7b6cd1823cbcd2 WHIRLPOOL f64071c1da92e94318d653792f77d87cce38158234baa97b5778ebc99e9c67151183975c073fbe20bba772e33277fd637f21c436753b925380e439ec79ff70cc
 DIST postfix-2.8.12.tar.gz 3641269 SHA256 f46b0117cab52e862b12869810327e2bd248a60f209079a875818ee2653de087 SHA512 55141e75da43b13975f85af636dceeed7783440fb5f7b83642e5a146d8a06af3a847beff77fe0dd495c58c7caed492dbb2dc52f542f44b9388f2ded30e37acee WHIRLPOOL 1d3c454fc938546c74b666feb109229a71b4e55d72c6f3833a15a81ec8eb3b48e318df69611fe4c40ac970332a8fcdfe98fa235863ae44bdf952b2b74537100c
+DIST postfix-2.8.13.tar.gz 3641782 SHA256 66d278471b790eed663d6fe991403395e6340d45c92c8d0c445f7e9d77881502 SHA512 f316b27371d56fc1ae6c51966ff60ec5fab658b92053aaf45093f6f3fc421637e00d9c75bf4140e66ed3300ace2453b5449ec356008cd057a550cee21eb95262 WHIRLPOOL edede2fdace67aa9cefe8f9c044b86a4fc152c9108ec0b83471152bbcdec4b8255a627edcfb75962157e5cb75383d2569fa668234741f60f811cfa0a0890cecc
 DIST postfix-2.8.9.tar.gz 3648498 SHA256 6a63bafad1002abbab2d2592a40dc4b3e35defd97f2026d6ccc398e5d7ee9bf3 SHA512 74c3735e8e701f223c2730345fb3d2876e839579d431d21c9b5ae870eac06c17978e2071dd31e3e08f947d2a20281e644af011749407f9bd7afaf53ce278ca6a WHIRLPOOL 1809ece94697c7ae6a8e9dfaf3a89ddc7e1f2e049e51d02f6772f554b4af5040cc07538886ec32491cc40b57c17e03e32663ef3f811324f7a2a0cbe926ff7c8a
 DIST postfix-2.9.4.tar.gz 3760718 SHA256 58343afcc727594cc1f9a3980562d8199aa55fc2cf2330da6b9ddfbf31502679 SHA512 f8932ae510805261b4a6c204bd4bba41d50e1833f87326b986ef174b51eb695cf0588d7d98850bb7b83ba56f1257406da072c423cc768f68d3723daf645b9490 WHIRLPOOL 7d7d619e0fa8375f1b653b9e1a0a2fa723929ab87db05445f2c2a73c213e91476d202806a439dd9792499e6a4d43c86f84133e90ffbd3bc9828ba1a925d8d11c
+DIST postfix-2.9.5.tar.gz 3761272 SHA256 590381cc0705a6d3fd2279760e79aff625adab6000cb895cf5336ae6a11ee6e4 SHA512 935f0eb653169d77d5902e1046d195d412a6c83271376b6450ddd647d250cc85d5ccd2427ad581f0d65bc57840db4c98f4976faedbe596573be590ea7433a1d4 WHIRLPOOL d57c29683ce389452c55d26ff8f2245f361a9cf6284ce6c2475fd2da1cdea7b9f9ca18376fef8c17f53e19cd29ce624dfd2b0eb5ff3983445ce4de8ea2fb736f
 DIST postfix-vda-v10-2.8.8.patch 56777 SHA256 40e32a1c159fe3d12836f81e4871e4a628a87623b80402e90f7465eb39f89a86
 DIST postfix-vda-v10-2.8.9.patch 56777 SHA256 e671f7349173349d66f1b091359761ed5a5d517f8a58c86a42ff461997d2cd7e
 DIST postfix-vda-v11-2.9.1.patch 55009 SHA256 611283a932577944bcdde36e5fe1a80ca750a0a66eb5f3490666e2adafd2bf84 SHA512 ce34b533c2f50cf714d8bd51791c3e30ba91f49861e3c1dcfb08d21d2d38be970b3e3040c7e224142d085c7b11b6b14bfa230844e21daa2eb0bf59641dcc29b9 WHIRLPOOL 0668cafec5678d09504220e31ce60344fc0cb46cfec449db2aade89ee09c598484012c5ef0536a0dfea24df51c6bc86d1a9e491f136312afdab90725e5efe86e
 EBUILD postfix-2.10_pre20121210.ebuild 10417 SHA256 0de6dede752651378f5de07f47276d476edc8632c6ac8af61a6cfeb22454710a SHA512 e12b5fde086dbefdee9ade73228c8d6757ec033a0ea1ab2cc69f17ddc3a6be1796d236d78d443ca434ed6bf05cd15d67b2a81128c17d39069f18ab633c9bbf07 WHIRLPOOL 26c5e59ea7be2fad03999873dd4554dd4e826f3bccb49b3db77b9ca95af8526363600ab628621d1bc4e856d60f8445c6c8e12aa5aa1ada08d9e24c2dfefeee2f
 EBUILD postfix-2.8.12.ebuild 8413 SHA256 aac6bec6efd85068603a15aa986ceb6a81e88a5796e66d20558cd9029ceba584 SHA512 62a3f3a126cb2c2e7760b447182d6eab4bed72eba2a37e2a2d3b0d0610baf0f9dd16cb59299d97b23427b8978563ce8f26ad8793a8fc7458fe1d4e3348beac2d WHIRLPOOL 5648e4f491b994c566a21804037abcfa37ac7eb107a427156d8c421d2b4bceecd69fdee0f88a34aac791876a5d7fe27d7a986f79c857684e2496c03ad9c114d9
+EBUILD postfix-2.8.13.ebuild 8413 SHA256 149946b8663c424762259df3b5834ecea37929c01b2b1d0b9b4009b03071e067 SHA512 d119fdf98c020cb9c0c7f0ffa17b944e753572ca7c66956717643a5ca51b51944e03dcf523eaaded9601d86b7c4c7abe81a6179cc689abacc4d0b50c5e124deb WHIRLPOOL 1794b42bc034d1486988d69b001b3818ae19ecf7a2c743a88295906ecdb35969fb9d33dfe1288be50357d4cfa774568fd217ca82cc094602e4ddb5a78d50487e
 EBUILD postfix-2.8.9.ebuild 8403 SHA256 4edc51588230aeee33e810e22ddbb8ffc5c3da757e3515cb1a81961a7bf1d0c4 SHA512 a020cf415c21b1353d76a8d07fa7324535ad170aa754db8f6ff021df68e04504d8fbf5e69364eadbb8898d4cdc08652f474f5c51c92e080f2cbf23721b1acbf8 WHIRLPOOL 4190c18cf6d2ade78717b0f13abf450467a7e2872c12f44e07ccbd5421878f1b36ba7269bddd5d0962e2d2e73fb607268b278ed1a32382fbd197e5289ad046f5
 EBUILD postfix-2.9.4.ebuild 9607 SHA256 fc5adc3752832a6eb890cd09f455d19cf5f46be90b9506dc0a62941a8a2bd3c2 SHA512 2113abad4c72af6a87587abfcf5e45c757d1ce28e92011ecefdfa7a1803fb14e4b448086de11d13deb7f075448003664b6e7576de1cc20ad733ae04b739fc814 WHIRLPOOL 0fe266bc1597991606d2a3c71834ab62b9abdce161ed5a9bd0f155c6ea25e5ec0c0ed3d46d5667efde42569c514eb12875646b0d7768370dd3bb606b9db12632
-MISC ChangeLog 88346 SHA256 524af7cfd1a03fc14bae0ff474b22b81bb62ba746d29b7fa640f55f09789e862 SHA512 b0edaf78b2b7363c3f539d1bdba39043ffa6329e83efd7e2cb978a5dc81ae336c08e586c0eccf57fd1649b973c1be0aabcf543c30cb27364473c040c5bc95e7a WHIRLPOOL a6a84607ca69d0e2fef1365518d598cc404eb0451d26b566b602fea64b629455fffbc9e8c9496e52a457049998ee9ebcf562bb4b09283ffc897de95fb7fff440
+EBUILD postfix-2.9.5.ebuild 9617 SHA256 87664eaba3799c526230cca7257a14466855a0eaa8075853853ab8f134a1e7f6 SHA512 b9a49f478433cee56a4b38f3cdc0565eb2f6b6e9b97c9c94271c0a2b7a0cd2d33cd2ed87efa38286562717e593121ed0d7dd7eeefe8e903da54d27988a65d3d3 WHIRLPOOL c3dee5922948347474e3159ad701e7ceff94daa7a9183c9c113b9daa17fc0b1b39c395d0f316e5a34935a16ae0da09a38f472415f64f15ee952b1e814253686a
+MISC ChangeLog 88515 SHA256 fac00378f3690d6de54b69974fba905474d41551134c6d8e8aafa994d8d2c500 SHA512 80d8749cfa0d3f9cab2e134127badabc4d84ada183a5d39f9d2af49db359217309a4a37b0f884e1aab905691ec47d5bcf9c2b11d558715a3daec9aa9a947e8f3 WHIRLPOOL a650924309415b58ff45deab3517b9be4039ab24bca315c1f8d4604602ea9c28fce6a033bb493e7e3a5e52c6f3eab38def2b2268bfa79aaf5cabea560a8d0782
 MISC metadata.xml 610 SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88 SHA512 fd446f288b11070e2d6b5dad3ec259a889508c3c7f4755ea2ceda18500844e065ddc2bbce5f4108b30ebacff76443ea8a23805c21d39c2bf72210f801adcfe06 WHIRLPOOL 815ae4ddbaca96871454d44adbe3bec4a081d857c61b07cd0e382ce0d44503421a4ad156da6009cc91f24855b7c1d8adfe3fbd48c82833f9d82c1afaf798072e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQxxNHAAoJEHfx8XVYajsf2iEP/3nmuG7FkV84aycprh14Wfgb
-XtS+GZtYB/NSDEEpLExj6xd3UdTwMFGLhRhalpH5PHa6LHSgW7TvxzuJnXZ/N8Hd
-w5E7RhFL7SjnTFpe7v/rFRlAD+DpbxDknPtkqLOFfy6+KBEKSJ8lSMI7B9u1/DMh
-e3zURRRaBuS2aHzZ0QXg/94dx/m/Z+wlEJ0W4lfSHy0hvGLJ8di6dH2icKQuUkFO
-FD5XM1bVQb8Eebrm7m2e9d6Tw5+JPrTIIy0MJen8e1PTAJ6rLRcemyhtqY7DgHsY
-1zHpZCNth0z4mjOMlppIKVEG6/bZOLkm/tprCneJ3NCzvkPDQlRxdeNGmd9Cm3Ds
-eks8kvIoV+6lCFEv8HfS0HsJM0Yttb6Dvot2otU+IBzR6OGcjq4NfcWMtoEwVoao
-15HzpYcZAced/yiByK5FqF1qXp7T1LSQ2aG7FIDEPGns62ESJfCqJcBjH1G86Eyl
-ujQ0/k6SYpgxSPO66K4ObPeME5J/x1RwfZMFY+goGYegc2FNz8IR0Tn1hHp/j4ix
-zLRzo+ESmG8k8huOkI5YUGWosJnReawf2KyXpRmKxzihPzVq/u90U4EkPcWn2zkx
-O08kCibPDLe58E/9T6scfg4rnLQqj4xkY7pEeqXM1gJMMCYYcZtnRvX+p2AxOrly
-mQqhbe8kLf8ft2Ajw428
-=Ix0I
+iQIcBAEBCAAGBQJQyX5XAAoJEHfx8XVYajsf+oEP+wVksVMrPSDReOX3Ma6Ikm0K
+xYdqpvBUJSgHAmRkiAVmRdZyIcklxjM0U/ncKlS5qMBEOVykXlvvq+9aOHnO8Qzn
+eNKdpYV2Nduk7ugByzXSKCEqQz8cwspQzNs/ma0c9NHqPrszIxUx/2gop+7OB80Y
+xpFO8C7+k99HmTUaZHH2n7kuS0wl+1cj3Z9c7DzC/aT4kBEx3s9kk0sa5cTSYEXa
+7UoEV83N0p+3d0l2aM+ZJwggAEWpujhUXVmF1KcqzRq10aQDLaVTtiC3Ky5DztWt
+g70+AQ29T+//8ATw9QmLy6XRxrnVvv0LpMRHzUFzUrl+pHTanofgUU0vRcP+Go/N
+2rXM2VaILY+PsKx+ZufOJhps/OPNMBKOlj1k+iyMCgihLjtlrqrARapCE+21BbLD
+WCdrPjJGjcO1tCbsvkZ/2eqaH9cz9Xm4i06APqP15Bbg4uk1AXOJaMf8qWAZdaWq
+LKRfwMs8IXILprDzgJ7n9C/6GpHLiOLxw064nCQ5XbhL+CDMLTKRkbcpTgfBLnmt
+n5vwWg+T0sPLbsTbS9ufZ+eDMbUrPsxgu0FcmBUrmcJX6Vw2v8Z90B8PvmQ2WfRN
+IsxvwVcf5EEDzlQ3tvMdhF8NhF3tFjS09vaLu+dKTX/xaG3J1PyTe62AgsA8BZq6
+ZW04KWUTREEZvT8mwgsg
+=OSuK
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.8.13.ebuild b/mail-mta/postfix/postfix-2.8.13.ebuild
new file mode 100644
index 000000000000..5ccda181872a
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.8.13.ebuild
@@ -0,0 +1,278 @@
+# 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.8.13.ebuild,v 1.1 2012/12/13 07:05:49 eras Exp $
+
+EAPI=4
+
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.8.9"
+VDA_P="${PN}-vda-v10-${VDA_PV}"
+RC_VER="2.5"
+
+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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	dev-lang/perl
+	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 )
+	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/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}"
+
+group_user_check() {
+	einfo "Checking for postfix group ..."
+	enewgroup postfix 207
+	einfo "Checking for postdrop group ..."
+	enewgroup postdrop 208
+	einfo "Checking for postfix user ..."
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	group_user_check || die "Failed to check/add needed user/group"
+}
+
+src_prepare() {
+	if use vda ; then
+		epatch "${DISTDIR}"/${VDA_P}.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
+
+	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 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
+
+	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
+	# 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"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# Remove unnecessary files
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+}
+
+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
+
+	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
+	elog "for incompatibilities and other major changes between releases."
+}
diff --git a/mail-mta/postfix/postfix-2.9.5.ebuild b/mail-mta/postfix/postfix-2.9.5.ebuild
new file mode 100644
index 000000000000..126017ababa7
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.9.5.ebuild
@@ -0,0 +1,315 @@
+# 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.5.ebuild,v 1.1 2012/12/13 07:05:49 eras Exp $
+
+EAPI=4
+
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.9.1"
+VDA_P="${PN}-vda-v11-${VDA_PV}"
+RC_VER="2.7"
+
+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 ~mips ~ppc ~ppc64 ~s390 ~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/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
+
+	# 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
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| 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 -R postfix:postfix /var/lib/postfix
+	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"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	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 [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 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 for hash or btree table"
+			ewarn "lookup support.\n"
+		fi
+		ewarn "Postfix daemons now live under /usr/libexec/postfix"
+		ewarn "Please adjust your main.cf accordingly by running"
+		ewarn "etc-update/dispatch-conf or similar and accepting the new"
+		ewarn "daemon_directory setting."
+	fi
+}