version bump

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

5 files changed, 315 insertions, 53 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 144dcfecd8dc..c935af762064 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,15 @@
 # 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.329 2012/01/25 06:20:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.330 2012/02/01 22:46:56 eras Exp $
+
+*postfix-2.10_pre20120130 (01 Feb 2012)
+*postfix-2.9.0 (01 Feb 2012)
+*postfix-2.8.8 (01 Feb 2012)
+
+  01 Feb 2012; Eray Aslan <eras@gentoo.org> +postfix-2.8.8.ebuild,
+  -postfix-2.9.0_rc2.ebuild, +postfix-2.9.0.ebuild,
+  -postfix-2.10_pre20120124.ebuild, +postfix-2.10_pre20120130.ebuild:
+  version bump
 
 *postfix-2.10_pre20120124 (25 Jan 2012)
 *postfix-2.9.0_rc2 (25 Jan 2012)
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 894ad5538efe..1d935fc1764a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -6,7 +6,7 @@ AUX postfix.rc6.2.6 1996 RMD160 a7936897d1b8249e3fc0da2426afcbbe25bbe0ce SHA1 34
 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-20120124.tar.gz 3757968 RMD160 d49ee7fcce180df9ccefbff155cab12e47437505 SHA1 01a0278217046435f8b184e9f46b3e839b9a7655 SHA256 95b2273c966e5ed146fcc4165c3a4e7fc04adc5863ac384516081495ac568515
+DIST postfix-2.10-20120130.tar.gz 3758469 RMD160 84508f4640569e244fae6b44dac68cd55526408c SHA1 b075330c3faa6b490ba6333dc7b88ad2cb22f150 SHA256 5ac145fb594044538c90c12306b295374705df327a7b95316c54de09a96dcebb
 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
@@ -16,12 +16,13 @@ DIST postfix-2.8.4.tar.gz 3646391 RMD160 fbeb785c5ed08febf5cf71ea375b10120c1f62b
 DIST postfix-2.8.5.tar.gz 3647010 RMD160 db4761f14b146c233426fa1afe49782e64f0c9e0 SHA1 49ef711c80b5a3434258ab24ae00940932503e80 SHA256 f8ed6c98bf5058c363da936a8034c64cee38ca67110e9212491de862116e1c17
 DIST postfix-2.8.6.tar.gz 3647498 RMD160 1f85ff0e9432109342436144f6963d39b79910e1 SHA1 32613ad01cad10ae04aad626f9a69ac9126b3d28 SHA256 8b427a5dfe95da98918fcafce4032bac5d6190603fbc090da3c5c3a22c74dae5
 DIST postfix-2.8.7.tar.gz 3647643 RMD160 ab0700f8f340fad11bf2a294a36ff1d70a1a8783 SHA1 81c87aceff4d9af67a304354bab9c99ac98fc8a0 SHA256 5c13465ab47414e9aa2e857851eff1a3f020cebd056e0dde6094ece3552806e5
-DIST postfix-2.9.0-RC2.tar.gz 3767961 RMD160 8a74a9b31e00cb528e0f692cac986f27368c6a77 SHA1 b01b7cc00ffed07c7836a320d6b69513bc3963cc SHA256 a06e12064a56f9df2568a5a961588ea7c62e62a99a0a4ec932811aaba98104e1
+DIST postfix-2.8.8.tar.gz 3648317 RMD160 eb71b542af2a00da5f12220946731560ff20377d SHA1 b712b25a105c132b40b63aef49268ea117b86f03 SHA256 77dc98e21da48901d326e98f918ea50d6cad66ee5812033b5aab342c9578328c
+DIST postfix-2.9.0.tar.gz 3768091 RMD160 0454dce2e82edb11f7e61f8038154c32a47bc605 SHA1 a04a72a8b9436279a30b7d1b62197be63124a132 SHA256 aed9b360eb74f46bfd6c6efe4eb724ce013cb8c6d4ad43888dd940aa2d33e6ec
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 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_pre20120124.ebuild 10087 RMD160 61b7d10a41b4c433eafa50b84f5132fb4911382d SHA1 627e5676f3c3d056e9aeb27653e0b0aa6e09b2f7 SHA256 36f6ba7495d00aa1540486fa74a2753ee84f7bed5ba2fb9ff95c2c5db491f529
+EBUILD postfix-2.10_pre20120130.ebuild 9357 RMD160 65dac6b64a5308179f3fee862a03e4c6d142b8d4 SHA1 2d79f2bdffc60b3a66b16954eec741c01669d81d SHA256 f6c12604d4b9e1bf1e07bcf7e3c19471b01b6e4dd4809dee3cfad6b374cc69a3
 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
@@ -33,23 +34,24 @@ 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_rc2.ebuild 10077 RMD160 832acef292200f4acf85484754364ba23a28d5f0 SHA1 8873af00e5ae85a933f6c6866081f2f8f95bf9c6 SHA256 8a28559008db670f33fd952c8e82aed40485b542da5540b3a36a07b5d5de798a
-MISC ChangeLog 76331 RMD160 ec31e35514d18e53fea6739d8a89af714d6104a4 SHA1 aac487b8b39c67776438e9910bde4eb7de8eaf45 SHA256 97cf9fcb66a945176fb94c209b8856726f195f4b34143026ac67543dfc2bf7b4
+EBUILD postfix-2.8.8.ebuild 8433 RMD160 a1670cca48ff09cb8ec6243bda4c14fe6c2baad8 SHA1 051e023f04cc06bb87448ce2307cc94ca0b79469 SHA256 bba214631e160d68020f83b1f8fbadffb45e5d2e1d097c2a6de75f3bf9de39e6
+EBUILD postfix-2.9.0.ebuild 9343 RMD160 fb0151eadae0fd66e6427dd85c14326021bb8c4e SHA1 47ab4b9b722f1fd81d82f12f29c15b2ba0150fe2 SHA256 fd0b6be59a66f5cb81200d5c2abedea116301634f4e916d53cccfb0b3ac8e00f
+MISC ChangeLog 76635 RMD160 cb7b831f34efa75add474442112b3b5d6782ff2c SHA1 482d9621f4bb45bf37a1d2d19871be748f518ede SHA256 b0efd73125432ff039239cc242a12c6220314e67d91be878b7a20dd72ea884e7
 MISC metadata.xml 610 RMD160 095d8cd529350f58c64d6d2eb40e8534d3dddfae SHA1 d53048933e7490f3f342ccf8972c191ee8030ccd SHA256 00b7ef524664b20a9df7642573745b1d17b0b51f005ffd150ac6dccba38dee88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPH58pAAoJEHfx8XVYajsfyz4P/3e5fUxOfcGonHF/IYyhucCq
-LoLv8uxRv9Mdm9rdh6TzE/UZjrDHqgjPVlB2zsgppmP9zdlOwEn/ugRJC7LIpwHm
-8Gpv+x7HHdNhfOpRHMBg0AXu2j1HXVH0AW2lGxBMIJmEQdSFFYmFkD31J3Nk5+s8
-KPrnU6IfS7T22YDQRZrTljPewRCMoM3Z+8EoCKNTOVhLPjEbar7zz/MgpE1ll4Hi
-hFoxsWGXUdHC8ZiinhJUYOIiPZEaNmEGdhLwhg/C9Q8G3AbjjOiytSLuO5M+xsrb
-Vqsf/Pk7p3pTfS8JjT0n8LkIRieCtk7DckPb3NMQrbniADUX+DCFvSsrzaQcnQbe
-Xyzl/mTNUW/FrbOJ55umRFzy8tM1kYcsJxUxb4FOcNb3fNMPQqxQWlU6DM3lm9d5
-L3lp2aJXnN25FvAeh5LBRJy2D3xNnhL99TfTTj04UPuq68OfvxDO3mLcL83kctWe
-AAKPsVT1vu5Qa4TH/qBfVEqg/UXJ0hpwwCqeRVSVHNfT0i907LBqtQsyq8+dEmlj
-D1EVDlufUluvHycyIerm7hOBUMOM7Dq2Sj96l/YX+sHueKXbbLd06CS+v/CUwKQM
-O/mVbALlpwUjTL8mdWZ2/yVPaaFgWtpOLB9kSMpPxtwNqJ5/PmQ1o6hgvAlpkP8i
-ans9CgW/ZNnf+lHE4xqo
-=sW7W
+iQIcBAEBCAAGBQJPKcDmAAoJEHfx8XVYajsfCKEQAISu+rV3MfwYNgNIN/i/LPsV
+2/lRA6O9MT7Qr7LY12JFwrxibVrxVKUAQTZOozEkeT5BQ0pKmsmXhpA3tz/8mVOO
+n3EDW3P8gDRqbgkS84hFsTkoLo2J0Tr+dPvhudPeItFd7yHzHspB0JGTyFq6byie
+Yp4KWA+g8TkoxFjecRggGLSV0EDsOmgjqLwhVrV4kiUmjhBhuAhxYWNEawVPPbdk
+eOjXV9NAcPh8FtIrx4zJdlRBA2ucU2n4f7d/HI1x1GAAv2OEdiqMqnbjYf4OjwZX
+95cmYiSljNaH87FIGh++J0ZjqMKrAAh5cXQtt9DCjsIfuddHDinaQx414Fxt8017
+eaqCUphyC+7DK5u7LVeqpaijDx4gC9s2IXOkZpHpqYehdUwE0bHiHLlXb15snIuu
+7Tx8uXASkEITpGNcymt0gNBM3i0NVfyNzKsJup182ASpaOgnMfMZDbCI6PEd0KWl
+Zvur+SbCfVTSna8UmKR2MjPh5PMSKCv71ZE2SDzxyq3LYAFjaFp+3BvJs7//8Asy
+Nl4LUBoIGb1tmt6hxW13hTNqeLFgcslfS5ArMscKsW3cayttx5Aa/t8iD5yRmkg8
+CM2tjpxWbStnMbIAdyCR3/u1/Rnr1KsaGevdmqU0w6eQ/LnIB41ZiX2D3WkmRHz9
+nLrQnHsdzi0YpRcbuKpF
+=ai5y
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.10_pre20120124.ebuild b/mail-mta/postfix/postfix-2.10_pre20120130.ebuild
index efae3f18bec4..1824f9627245 100644
--- a/mail-mta/postfix/postfix-2.10_pre20120124.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20120130.ebuild
@@ -1,10 +1,10 @@
 # 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_pre20120124.ebuild,v 1.1 2012/01/25 06:20:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120130.ebuild,v 1.1 2012/02/01 22:46:56 eras Exp $
 
 EAPI=4
 
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam versionator
 
 MY_PV="${PV/_pre/-}"
 MY_SRC="${PN}-${MY_PV}"
@@ -163,20 +163,6 @@ src_configure() {
 		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"
@@ -310,7 +296,7 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	if [[ ${REPLACING_VERSIONS} < 2.9 ]]; then
+	if [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; 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:"
diff --git a/mail-mta/postfix/postfix-2.8.8.ebuild b/mail-mta/postfix/postfix-2.8.8.ebuild
new file mode 100644
index 000000000000..4d5ad2b43e75
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.8.8.ebuild
@@ -0,0 +1,279 @@
+# 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.8.ebuild,v 1.1 2012/02/01 22:46:56 eras Exp $
+
+EAPI=4
+
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.8.5"
+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/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}"
+
+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 INSTALL 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.0_rc2.ebuild b/mail-mta/postfix/postfix-2.9.0.ebuild
index 32acd2dade22..92bacbabdcf9 100644
--- a/mail-mta/postfix/postfix-2.9.0_rc2.ebuild
+++ b/mail-mta/postfix/postfix-2.9.0.ebuild
@@ -1,10 +1,10 @@
 # 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_rc2.ebuild,v 1.1 2012/01/25 06:20:10 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.9.0.ebuild,v 1.1 2012/02/01 22:46:56 eras Exp $
 
 EAPI=4
 
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam versionator
 
 MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
@@ -163,20 +163,6 @@ src_configure() {
 		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"
@@ -310,7 +296,7 @@ pkg_postinst() {
 		ewarn
 	fi
 
-	if [[ ${REPLACING_VERSIONS} < 2.9 ]]; then
+	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:"