Version bump

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

3 files changed, 48 insertions, 50 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index ef45f0102102..d2a1ecc955a4 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.504 2014/05/17 05:03:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.505 2014/06/07 19:57:41 eras Exp $
+
+*postfix-2.12_pre20140531 (07 Jun 2014)
+
+  07 Jun 2014; Eray Aslan <eras@gentoo.org> +postfix-2.12_pre20140531.ebuild,
+  -postfix-2.12_pre20140516.ebuild:
+  Version bump
 
 *postfix-2.12_pre20140516 (17 May 2014)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 151fd22f446c..a6a7f087a065 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -9,30 +9,30 @@ DIST postfix-2.10.2.tar.gz 3828326 SHA256 f1a735a5a9ffeac8fca59046c437c3b76e7f92
 DIST postfix-2.10.3.tar.gz 3828808 SHA256 7815d8ad88af76e0962f18bf1e80b1aa5a0d096a00dac1d313fbab3e824b3f5b SHA512 f21ae36f9fa7fd8ad1727f5595e0f65fe49a3a5937269ad68b0a96e666e61d49cf6c72303d84c81ae7fc902146121443f9e27b876b447594557a756f239937d1 WHIRLPOOL b7a7c6f31a78a9ce92ca072c11e1ecc44c72cd5c37fb2067f91a4bcb2a92556e60f41ba23e065c31acd58a97f5497d4f62af01edd3003de5e6c6879a304a4a9f
 DIST postfix-2.11.0.tar.gz 4034741 SHA256 ca1d9d32d5662678dc4e3f700cce82f5d7bed6a614852b17b1a5166936330c38 SHA512 3bd98a6d573ee5f326ceb11546de28731c36f5e6671db30072b2ce3662956f0ba77cb165450a8d69f485b3ed9ac8b520c064775fdee35425a6e457ee31a1d953 WHIRLPOOL d3b1264c078091296f3da1ad0f715ebdaf3f234c9d29e453641a72d6de9b92c19a5a75d723e7d6e21a5fe6658ea244ec0f46d5ca0b6307c3761fea3210a111df
 DIST postfix-2.11.1.tar.gz 4035026 SHA256 487f98a73b95a5799409caf21ec065efea91c1dcdfb84c038a0e3a265d6489e2 SHA512 988659ed7f256fdc831c6a211c33aede922d5baf32da7129afe0ec2fe5011ac95dacb21e59c92f658323b6ea773ebf2bcd66a796d9271c1e7b949d5d9b9ee977 WHIRLPOOL 902eff1304b9d0d52a759f0a0804cd5e34d44b8f1acde26f60db6ddc69d84ff93c70c7b27b9c39318b124582b13d61685fc46c2513044fd4c7511370a33efde7
-DIST postfix-2.12-20140516.tar.gz 4034673 SHA256 d90b9a99d6f528537b1d00573b0280002f4173a13e3f64f8d009d9a054288018 SHA512 6e113e5cc4aa5cf40ef366bc4dd097b858e76b071083026a9850b38ae9d7ab6f7e6c4975949e822a4a9b1f6a3132915cff60a4c677dcd9dc896f3785965680c1 WHIRLPOOL 5410635bbfd0b6e7fe1a0086868f741c27ec2d41cb8d48a9c78c2782d53e50904c9fca477b202e93099755bb2c57f724bea255cce22d0caf9a7579a3abaf908e
+DIST postfix-2.12-20140531.tar.gz 4106342 SHA256 4ff3fac4255ed99c96d54fa411449709786b646f304961d6fc7e689091139a2e SHA512 8ad8aeef28fe9f725d3fb77243af8a082f2b2cd76e6201aeef184eb53d89bc5c2f887a1422aaf39a238f25684d506ed22f6ce4d5528fd7723988937425886619 WHIRLPOOL bdb2860793fb10d6018ab27d8f046bf2e82f6fa65164ae253e78cf1e06730110dc8aad897d817020230fa9b7e5fdb9fea16b226f1ce8c7c383fabd7fe61fda69
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
 EBUILD postfix-2.10.2.ebuild 9625 SHA256 fb54cd49a8ac2f55e17f4a996acc7cbe240d49a783d777fe5bfece4a95cf7c81 SHA512 6e7103715a5e115ba95a4b3d7a8937c120bce99a2a144f10f06167c892ea85db36a576e7344e5c45bc9a4177d811450f380a2473b79e428d43a3eb3b57c24c3a WHIRLPOOL dbab1c13c6cc69c4319adf63840225fe254d99114a625f83dcf5bf127589d35d74f41d2e10c5c2e7eda597347d239f35e21cc5a59d62644204d2a9fb6d29925d
 EBUILD postfix-2.10.3.ebuild 9633 SHA256 85802ec18416c850a1ab527caa0b64090a3b84c34a6892df132177f421e95588 SHA512 dbe4dcb3d6f08f2494e9b3d90d3ffdfdd44584435adf4cd6f99fb037fa17e7bed6ec8f588e42409fd94dff1aa4b70f9a24354c756ae2f5f12efae85fdf329503 WHIRLPOOL f1bb7a23d5399746b76a9def89b323e25bebeeaf6b77be4590e60c3466337372b587a7ef9698e7cf50e1c4d6742b3d3999b30938d0e1c987948cab9062735271
 EBUILD postfix-2.11.0.ebuild 9690 SHA256 4f96e4c0015aeb66564a612732efe15da6d799175d9454907539c6555784bd8e SHA512 8343dbade61d6b284ae099aa38120e0de9c855beb836d265fdd4f6684bf8c98736c0b1e3f4bdf4818c46f3e48eda953ea240ed1de426ad6acb2e8c0c469b1b06 WHIRLPOOL 5dc62d597b70f86d99681bdae483c1e3a166bc95c93d6453d798565fb5192716627fbe033ccb82f59e2570ee32e0b545005eb99ba07b007aacf40ddda252ffd8
 EBUILD postfix-2.11.1.ebuild 9690 SHA256 7d4f9ed098569547e64ad1af940982c7dcd238885cc1b7cba92a45752325aa2f SHA512 cdb7e54a36447561191bd069d6b019da8bf59fcbea0530d912241bdd6a2fd2e44671c40cd73454b60b9ba221732fc0ae90d747c9afaedc59e7c8cf86aa4997d6 WHIRLPOOL db6dbf280dd54a4fb510926b15a4c3bf3cf56729e7991cf7200540ce2b40ab5c0e36efb4e21737d051afdf208a63d79dc8d8dd458976f34dcfacfdc38b9d7cee
-EBUILD postfix-2.12_pre20140516.ebuild 9704 SHA256 35ef0901e653ddb4c2e3185a2c5548f0115740a4dbc9691af6a89ec14a13b79a SHA512 7761f5af2c26068ba8780ec4690ef507adcc80329ca24c397f24e309e4b78cf5d47e4bdf705de96d6b6f623ab4092f6f121d645eaac789bb00c5cdbe5b35c8e4 WHIRLPOOL d415bfd321a332e2423cff82ca1eafc89b562bc5a9952af87e748f4baf9b93d9e3e553d7142aba41096d1f4fd10c2cf818a8969b77df7534cb5239f7fb075c0a
-MISC ChangeLog 3110 SHA256 eda8b39648a0711dc5df0c810a040c5cd6a3251069eb22588ec3e13352be87f2 SHA512 d0ba2f4976f6708dfa5228ead869d47da55a2e33863b42982c08708b8ce27240b6abab7f7aefcef7c8f4803a127789cfa48abc13516dd70a465ff929157f0791 WHIRLPOOL c43470fbf278cb8c3b21636a5224f9547c06c1cd83efbe3a71c601a412feb39c262a0d543c6f8f9c2cbf262b0914a039827898ba1b8f6f0e438195a1869c9f95
+EBUILD postfix-2.12_pre20140531.ebuild 9312 SHA256 ccf675d7d797016ab25324e1f3dfa2e2e74e405c4b2c1b2849062c0516a89ea6 SHA512 b8d315a83ba7fe2882e1f8c1f5fd0f42707842f9d936a65a2f0760c86b9d60feed0755c833fb667f169595cfad993508b131875a06be5aef22cf82897b978bd3 WHIRLPOOL 72ae35e5047c40631d7d641643386c9f0d6466d1e82f5da658ecf6cae982e875dc1728c5c6d2c8c7d114f8e2266f6712c60b6a6fa006a5cddf232ecb1073e7d3
+MISC ChangeLog 3281 SHA256 4773af0bd0caba345cc9fdceaaab3bc6672f3202bfd809dce29c27565b74c522 SHA512 93aa1cd7aff83d5ae03c39970efa901d833589f3f8e0c97d175e5b7ecb70944a0567c25933d1fd4b6ef7803ead226c9674ac22cfbf647b37870fbc408f48fc43 WHIRLPOOL f7eb2359e794d24399420b0aed887be9914a67e58d258cd25161f2e1681d9849162bbcb293cd07b2d1909d1cafbd37da06232de1ba436f0905fa699570359499
 MISC ChangeLog-2013 100301 SHA256 439e93c3f6ea08471888157d2347da51181aa9031d4bfdeef2197a6b26680246 SHA512 c678433163e86def50d59e47d7a1a0e8f4c4af860f80932255a7c95544e1f5b55a70b68905b02a417b2332bcf3aaa59281814d8504d70085f0874a23faa2bf02 WHIRLPOOL 15a12897a576cf98d856c551157b72b47aa45fd61d05c6ed55033ce37ce247045c6bcc8143b7ccce4666900d85e0a04087c977a311e31c20f554a991bec74fbc
 MISC metadata.xml 707 SHA256 1b5bd2fd60bed0349973daf64aacc58442f8a6bded2670785a0291ebe8881eda SHA512 20a4578acd5a5ed18faa564f3be1e7fdbb91997b487911cca0d3013c3453d5a23b6e3fe281efd364cff676be2eee95356e61c0444b2d8b537356fc40a1828ce9 WHIRLPOOL 3b6c960f6198cc885244bf46afa98c13b02f3516ccbf846f34325b548cb49db9135807d6f5fae99375830ea513e100f318ab1960061bad154c9f5721c2551652
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTdu2pAAoJEHfx8XVYajsfJ10P/iCBb8cu+U4gF7o+/PVhmk5v
-/PqbzTNJXLs+QdRWWCdovW4GxXbbEUWXj7TUmRdLsE6ZqhxeTczNT3b/XGM7FCar
-GVhGfIlaRhs4ByEZwcX1JrTl2usA9uNhnjHyeS+CJIH6f2937TmtmMyuwgH4snS0
-1M6ggCTBg7dJXluYlxGfNDu+ErpzlWSVsIMzvDdQWbut5pEJrk339fuIKOWGbiZr
-4k1lAcyCf+F54y8o0onJgi3CCTtz03uliHCQIogOzslz6lA3JVj4SEQzDfSd8zTF
-gqjpPHkPQgZZrPDbkkmOigzBSiCh/AC7upPf32biG4EZABhIcYyyf6ioXFzT90gb
-GFGUdkBUQjueG8yZIbHvz72+D8qYE5lqC4XmkEvopMHDTdC14I8Mszdf7wraTRel
-mCL4TcVWQGWNNh5FY48050u/+tvSZ28Bttuk/F6HmamKqeDlASdMxvCgnuLjCpWF
-doKIOIZPQ7mtWM5NuMCtY8mVsI1GraZwzzwWXC8T7HT6TLN91TZdfFhC09Qs1nEM
-SGjxt3CPliOVthzdm7smN3u+MhMHJ+0i/pDs4jwWpBTDFHh/J1xQLC33G9E4H3PU
-1ehDNoULwKZwmmXTjdIPmsKOWBNGuGGuKUyyXSxiqkHPQR/tWv369yji3rAZ8jaq
-8hTke+sRFlAwuzcgqQZf
-=yLGj
+iQIcBAEBCAAGBQJTk27BAAoJEHfx8XVYajsfwR8P/16m/Nzp22MEgWUyrSttqOMn
+5QQRVGgS6fPSViNRGYGZhbEMTROaYzRJZO1DG01bvkNTnqrlNZZiGy9k+wFaq16Q
+/hxDcuypjfqz2nznatwjEV7cTq3gzpYIgRC7jf+pXBWIDDoYcFzGd8hbqePy2uXg
+Zw0on9RgWGchgjJJDy1z/HOaXs4FKj9oY82AL91Mg34IRO0+8ZUsgD3YvpQWkmRl
+oPXItNlp43aqN0KEQEDhSq7kMbwPy/+retVEkQ8qbO7GsKVMhjv+etO34ZHAdE6J
+mqkhIAAGBtzYjw7duB5TfPzWjdNc25BgTR0j76QoqWB9F4Fjn1NnvE8CXgd4Y3x5
+9jQssq1WfabwTw03abrvllplrmoHBv6mpm4FPQXRut4GbOGX06vagXu+qahKGatX
+gJT/z4HfsPE3s2Ijujw0gJzJKZnrMUPW9q4p51awOrXCGT+l5GEfSWMh0XPNVSwd
+HLYpZRuo3FzgLi0Mm/fZRf4ZndhsdslOiXSFXNzzDqmgUQ1ba4uKK+6mHv0uzvas
+7lcW9q+RUeAaCPdi79f70Qht3xElGGxvW7R0IEtVeFnezPSO0lOfsJ3ZAFUGJJAc
+azouXxm/p7uX/b3/JgiIOxMcHm4JGmoSKYZXO885x1OdGbAAowz9zjsvc3MInFld
+h9DpzVylcnIiuSt72hPD
+=kEwx
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.12_pre20140516.ebuild b/mail-mta/postfix/postfix-2.12_pre20140531.ebuild
index 3ba7f6fe2afe..4eaef350602a 100644
--- a/mail-mta/postfix/postfix-2.12_pre20140516.ebuild
+++ b/mail-mta/postfix/postfix-2.12_pre20140531.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20140516.ebuild,v 1.1 2014/05/17 05:03:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.12_pre20140531.ebuild,v 1.1 2014/06/07 19:57:41 eras Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
@@ -79,29 +79,35 @@ src_prepare() {
 }
 
 src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
 	# Make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
 
 	use pam && mylibs="${mylibs} -lpam"
 
 	if use ldap; then
 		mycc="${mycc} -DHAS_LDAP"
-		mylibs="${mylibs} -lldap -llber"
+		AUXLIBS_LDAP="-lldap -llber"
 	fi
 
 	if use mysql; then
 		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
-		mylibs="${mylibs} $(mysql_config --libs)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
 	fi
 
 	if use postgres; then
 		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
-		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
 	fi
 
 	if use sqlite; then
 		mycc="${mycc} -DHAS_SQLITE"
-		mylibs="${mylibs} -lsqlite3"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
 	fi
 
 	if use ssl; then
@@ -111,7 +117,7 @@ src_configure() {
 
 	if use lmdb; then
 		mycc="${mycc} -DHAS_LMDB"
-		mylibs="${mylibs} -llmdb"
+		AUXLIBS_LMDB="-llmdb -lpthread"
 	fi
 
 	# broken. and "in other words, not supported" by upstream.
@@ -148,19 +154,17 @@ src_configure() {
 
 	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"
+			AUXLIBS_CDB="-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}"
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
 			done
 		fi
-		mylibs="${mylibs} ${CDB_LIBS}"
 	fi
 
 	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
@@ -178,7 +182,13 @@ src_configure() {
 
 	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
+
+	emake makefiles shared=yes shlib_directory="/usr/$(get_libdir)" dynamicmaps=no \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 
 src_install () {
@@ -186,6 +196,7 @@ src_install () {
 	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
 		html_directory=\"/usr/share/doc/${PF}/html\""
 
+	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
 		install_root="${D}" \
@@ -232,6 +243,7 @@ src_install () {
 	else
 		mypostconf="home_mailbox=.maildir/"
 	fi
+	LD_LIBRARY_PATH="${S}/lib" \
 	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
 		-e ${mypostconf} || die "postconf failed"
 
@@ -266,26 +278,6 @@ src_install () {
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
-pkg_preinst() {
-	# Postfix 2.9.
-	# 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 -n 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 \