gentoo resync : 21.09.2018

4 files changed, 12 insertions, 13 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 7db4acaff6e5..5d01b92e998b 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index fff0d769fa3f..f9def9063b09 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -11,13 +11,13 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7 SHA512 6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af SHA512 081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
-DIST postfix-3.4-20180826.tar.gz 4484669 BLAKE2B 9205b3f0c41067cd7365304b5831fabdde3dd5f830a110f0a7a133f4842213fe3bc0a46a8b3e406441fcad7e887b71b6cfd8f8cdd4bb201badc22c3eb9eb054a SHA512 f5172a09adf34dc3750846f88d0418618b76203583637aa58a018a41b63e6f7367f0c0444dbed825961b3840d5b502e5f4e706e22037ed56bfe82242c31996de
+DIST postfix-3.4-20180904.tar.gz 4484937 BLAKE2B 4c3b9582d306d4166ef89ee6312ac30fa7a1447bb6cb85dab16b83f3f4fa73c0f4ac338dd65ebe67711428b110b92c7cad6563636057d515a70f679dd08faf5b SHA512 27b3a9342c5c5c9314631d02189db48ef1a65d7c099b362266ee09de5c8741d7745fbdbcfed0a74cf490e10bc62df5c74ab87ce621fa205ac42e394aa24be97b
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8730 BLAKE2B d10ef4dc24141ad4fd6acc2bffa201d4925260a02710fd9281e237bcbe88ba1612e666cdda248f1519b1d8dbb1a0304ffc2028e8df1a8779dd3557e3bfe90e3c SHA512 ce0cbaea68ca10358370f58f65fe1cdacaa5ab63d644c930c13b2187398790c1249a2e9256adc1c73df3a971fc8cd15473426578c7414cef15b27739d19260b8
 EBUILD postfix-3.1.6.ebuild 8661 BLAKE2B 707f1822c7e8359adc8f0884237069cd2092385eb4a55c378d2918ed097b596755a533cdf297895a3651572996b5dce8603e3dce8bea172acee60471cfce32c9 SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d
 EBUILD postfix-3.2.4.ebuild 8659 BLAKE2B d35c9cf049e257ac3c0fb713fc0059001c545e5aace98892a1c19e63774ba76a8f92bd3223e4cecd66b3801423fd67f668eb9644bb0b29dca091fec09b0272a1 SHA512 188a72188418f415701b9718c2302deea0216caf25e998f1ca386dd83368ff508524dbeb60dd198036462fc260015f7e2c179a4b1d77e662ac3c051d447f58d0
 EBUILD postfix-3.2.6.ebuild 8418 BLAKE2B 57b1fb8ab09cac0c4279e395433020080e5e5eea8e5cfc8f3a0ecdfdfc2cc25cb149d6de18e93d0ee3fa5d515283d1c7762a6a7ac514dd7a170955b26ab7d0df SHA512 c00559620978de33368e4241b25e6ebe096a651d3052b7f9a25fa09060c7df8634dc95b6fffda6a983da3ed47190f78c2dd5dd40ae0fdfaaedf10f427b32f459
-EBUILD postfix-3.3.1-r1.ebuild 8333 BLAKE2B e82d83b35d6c9923b20454db7b1b92547f2e9468535db6bee1d5ee4460e6f5059f87236580b93cdcbca7837a4828f6e234cc6ea2ccb6acaaa2121ab41ea49e7b SHA512 636f2dd8d7256b068ed843b52fc0c1d0ccbc06e7f620f2eeced4f43f77574903117795333d7b3e062bbf1d27c20a4687f5efb13d0879415ed169d15a0fb0f519
+EBUILD postfix-3.3.1-r1.ebuild 8409 BLAKE2B 467ac83944650ee6c83fcb5fca5ee630f8871b1df86a46076cc688ae35a218b30bc35f42a34936393a9bdb12ff2f6e6d613fda153a84ff2f2e80719b79652a05 SHA512 c3abf369c4cf975c1b0a4af7bb7e1d274059855e5f055a5104d4edba467bc31104619db59ea61fbc7a2cc4e130e398f64a047623d2454ac062a0089908eed688
 EBUILD postfix-3.3.1.ebuild 8425 BLAKE2B f3d19606dfc65e1cc50ca2c7fd15bb036194fd7e8076a10b1568249da34b8a5c3332a4ca401d7922d7a54a461d74102cdc75c5f32eee6db36dd6cacca78403f2 SHA512 997e9b1a332b686fe51d5ffca62af4c797a7741f2a4e36e2149e55ccd17a4e2a40640ddea00ebc253e8017933ff36626ab20175b2a5006461577e75987572b80
-EBUILD postfix-3.4_pre20180826.ebuild 8428 BLAKE2B 5dce6823ea07c5236a90319d8ccd7c6f623802d529668ab75dbb3cba631baf1906fcc3afc148ed64dcfe8de89104931c7419061c7c385dd964d9ee81d9d7cb1e SHA512 4d07e6c905fea18f981a59607a32d14f6e2cac82d7a317bbcc37ddc829ed804222cd987803268c73e5820249479bfddf1b448a76883758b16ccfde82b7c72f57
+EBUILD postfix-3.4_pre20180904.ebuild 8342 BLAKE2B 5d1cf06b180435076cbe05beb6691e28b7969fde2b199ece777d3112ddf8a5f20b1c93af30aba03f19c86e7102e6a1e2b487254b487c196513e236e7d3e14bf3 SHA512 ea24bedef571e51ba456e33707fd9279e17c677f0559fe25b2b53027eb6c2c647fd48210217cd00f145a15bf5e3e47491ece7375d46c85f0a177a74891ea145c
 MISC metadata.xml 903 BLAKE2B ad36e98f33e0538aa2cec74a6c7342e42a0e65fea2898b93a9a2e7cb81bddad130fd0eec89e554a3e8ca5d9399ef21ea47d9e16d39f070d8e9d325c45ca95356 SHA512 3159041e80f1b045d9beda6f517be0acd5a5eaca4b979e7ae2d27f6d7cc07ad83ba55a9e78b718689c9d6fff780e77d9b0c8275a1dec96bd84d2cd184d86662d
diff --git a/mail-mta/postfix/postfix-3.3.1-r1.ebuild b/mail-mta/postfix/postfix-3.3.1-r1.ebuild
index 709c71b12f5c..5877435ec85a 100644
--- a/mail-mta/postfix/postfix-3.3.1-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.3.1-r1.ebuild
@@ -252,6 +252,8 @@ src_install () {
 
 	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
 	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	# postfix set-permissions expects uncompressed man files
+	docompress -x /usr/share/man
 
 	pamd_mimic_system smtp auth account
 
@@ -282,7 +284,7 @@ pkg_postinst() {
 	fi
 
 	# check and fix file permissions
-	"${EROOT}"/usr/sbin/postfix set-permissions 2>/dev/null
+	"${EROOT}"/usr/sbin/postfix set-permissions
 
 	# configure tls
 	if use ssl ; then
diff --git a/mail-mta/postfix/postfix-3.4_pre20180826.ebuild b/mail-mta/postfix/postfix-3.4_pre20180904.ebuild
index 3d763629f824..dfd2da80a1a1 100644
--- a/mail-mta/postfix/postfix-3.4_pre20180826.ebuild
+++ b/mail-mta/postfix/postfix-3.4_pre20180904.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
 	dev-lang/perl
@@ -72,8 +72,9 @@ src_prepare() {
 		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"
-	eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
-	eapply -p0 "${FILESDIR}/${PN}-libressl-runtime.patch"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
+		"${FILESDIR}/${PN}-libressl-runtime.patch" \
+		"${FILESDIR}/${PN}-libressl-eccurve.patch"
 }
 
 src_configure() {
@@ -195,10 +196,6 @@ src_configure() {
 }
 
 src_install () {
-	local myconf
-	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 \
@@ -209,12 +206,12 @@ src_install () {
 		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
+	keepdir /etc/postfix/postfix-files.d
 
 	# Install rmail for UUCP, closes bug #19127
 	dobin auxiliary/rmail/rmail
@@ -254,7 +251,7 @@ src_install () {
 	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
 
 	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
-	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
 
 	pamd_mimic_system smtp auth account