gentoo resync : 04.05.2019

4 files changed, 14 insertions, 16 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index b1d9998b4cef..b3bd6c659189 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 38d753fedc9b..f71c90d5854a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -15,13 +15,13 @@ DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
 DIST postfix-3.3.4.tar.gz 4429964 BLAKE2B 58812a75e7f8e2e89dce3dd8cb8b779c4b90995ce9d1885cec0fc475c8dc267741ea6c7af6e82fc80e3f71244964df9a5fe776c3b09e5e0cad1f59424dfab6b3 SHA512 fccc524167ea3b85f4fe0fc4ad8312f6d684c1900e7c5c355d4522513f74b588bbfcfd28074a8b69ce038982fcaa359abf585a296df4046184c7da6d0405d0ee
 DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
-DIST postfix-3.5-20190330.tar.gz 4596058 BLAKE2B 0710881919361e6307902f287fb10fd26d27e2e51293b4a297191cd69687477e9e5e3e7bbe1c15ec2e440629eef78574705eda8fbf3e0b7f7440bcfe5ef33366 SHA512 d6e8e7bbc1a47aaa86105c3281c00ed3806e29cb33a27f062a25b92bbb557e8d022f873fb77be65dcf7c8c10c73ed91c61625641649d99a45dbf77c01eac3f85
+DIST postfix-3.5-20190427.tar.gz 4600362 BLAKE2B 2e77228fecaba606b4e5a7bf00f8a3b03a193f0414a42d613c08aa8a829dc13a9f7ea0b8563b0168c603deae37fca15865ee4294a74d635d4074f42466745fcc SHA512 267bfe09d3f5e4a38fbfdfbe8ec8d5a0ce5037eb1cea771b8dda1bcc0495d0ac6ac941ee3f67982169dfcb10cde2b40e9691175b9ac0f8e30416946caa280ad0
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
 EBUILD postfix-2.10.9.ebuild 8728 BLAKE2B 6170156f1dded2c727b6e2979e45d9d8e6ad77ef456e4e7da8491b03cfabe7fda627f77dc6090ca7285891619f77c5d3546c45536b25356641f5fa37c23f27d4 SHA512 e59ed518a63a41937e1ff8e68fe811bb13abbefbb6c0ff8ab7655434e8f297a18e7da0adb61442f46e8cee87dcd680909be148f1d5f1f75525f2080819eaa75e
 EBUILD postfix-3.2.4.ebuild 8656 BLAKE2B 7c22ee0de6b4a85784f0b35144fc68b45581fe2a276203cd0c409eeb255c0d9661aff4b236223e8193083678a0d7f1e8953b9b0bcc2d860a39ff73410fc2ee92 SHA512 de2c2a2be293bce34e5714fc7b875cc1cad31cb3076ca7661bded16d1a6ff6ca47f793278929d67b05b9e5a61dd15dcd7acb490ab629aac6c63987e92785c70b
 EBUILD postfix-3.3.1-r1.ebuild 8406 BLAKE2B 0242059df542da99a0cf2c4d5e4e54da5cd2b714b0f3d826179d827d13d3d548c59aa7e9ae0a0ff0c9eed864553fcbda1c460d4b6f8f9fe68e135facd028ab5e SHA512 dd62306944ffc38a7fc3e8cd1020638176ea66ba3c80acbd0528ca87c332a34045e1480cb3866a7865a009c834056979188566cf9c93339fc38a463b542b5faf
 EBUILD postfix-3.3.4.ebuild 8773 BLAKE2B b2c44e759c9776ae2dcba5f39f6f792d7ed51a5761c8f6997e61c633460f39c22a5804895d47bf1d37b04ebc464d82f91ff763937942c6dc973adca24e1802b6 SHA512 cb8a5d0b2976c9f45f400e7b0930d8c96c02e077096ad9d8488cfde6a0a16c35642a0ffc03fed072ab25ff5931d8353a468e7b2a67f877e56786157d63ce8542
+EBUILD postfix-3.4.5-r1.ebuild 8992 BLAKE2B bccae1f7a1b8253c92e8896d846c7854620eb01a3dbb0ff603fe92327407640a8e2a4c738e1626e0cbc9dc9b76ab3fd1a74d041e54f0824fe279a1afda9f7e0b SHA512 65c32e17e0166ec1b0aa4f3c49d85eb105474bf4aafffcb19a13851faac2af6ef766642cba35f3b0d045363393f01942fa15056f1ec043cc021f9068ebaeb40f
 EBUILD postfix-3.4.5.ebuild 9226 BLAKE2B 050b4e4adf5fd36e1c5a08e5f1d2fe552e6552168b007bc65b61db7cbee5f7e177f2ca61833cf08cb6fc64873809c556695db0868040c4c47cb06201906924ef SHA512 f89b281fb6cbcdf4293ad66cc6f99a60ddb9e92d1f3d15c581e3a5a6222d0cbec2c8a8bceb1264c3d941964340834b7577b7cc9992f521c2331292ed099674ff
-EBUILD postfix-3.5_pre20190330-r1.ebuild 8991 BLAKE2B a7f7bc2bec018dc0878c8ab569c3fc79a695e1f3b197f471fd0c60e90337ccddfd03665cd1db98ab49b7c9ca9cf7927b39c7ad4ff7b8c383cc835294c074ef9c SHA512 00b6ad64f5945e685444e77ba44d402d0b6ccc3e741c37984fa53b245096f718047a02c2e2ea1488865120a38685dcbf06908eb43c77117f1bdf47dda201e348
-EBUILD postfix-3.5_pre20190330.ebuild 9231 BLAKE2B 208584694f14bedb37197a88b49a0d25cbc6fb5998a0c648bfb083c39d42d1dfa5cb1fd5592a5e0828e2b50764db29d6d9665b35ab588d7d1ce1f14dfcfe8df4 SHA512 831978dfe34d1dfe954ab5cf5d1cf2fee87989630d4743f47a23591476d98d2a6e37118ff2317aa087ca2a6bfa63ee45890714a5d0997e218faf7001caf26a81
+EBUILD postfix-3.5_pre20190427.ebuild 8995 BLAKE2B f303147b08931c3c8f35e2092351c807869af012e5e494934ebd911c7153c8506f79101b919d292ba215e3f3eed1060318edfcd41dc158ca530fb0ff587be3fa SHA512 fbb4587b734ba20cb6ea006da1e633d38a6358f192da75f2f43cde5e01a788f2b212e60b6b5a5157caf0069fd55c6f3c349bbbf1512165954951c1b72d622746
 MISC metadata.xml 1023 BLAKE2B f0bcd846c18bf1459ac85c75b6e41c90857d800d49b3efdffdd0106616e453869f43004c9a38395c71e2766b9b7f83b25a702b3b39d6264d83f79481b6cbba43 SHA512 2511ca5d5cc134afa04d1f596084eb2f7102c45e883edf3290c00b2f733b8a1a74ecddcd6b182381ac86da2616097c86a8acedeca199747b33e403b8488067b4
diff --git a/mail-mta/postfix/postfix-3.5_pre20190330.ebuild b/mail-mta/postfix/postfix-3.4.5-r1.ebuild
index 719df87d4e80..8d51f25b96f7 100644
--- a/mail-mta/postfix/postfix-3.5_pre20190330.ebuild
+++ b/mail-mta/postfix/postfix-3.4.5-r1.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 inherit flag-o-matic pam systemd toolchain-funcs user
 
-MY_PV="${PV/_pre/-}"
+MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
 RC_VER="2.7"
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail"
@@ -35,7 +35,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
+		libressl? ( >=dev-libs/libressl-2.9.1:0= )
 	)"
 
 RDEPEND="${DEPEND}
@@ -60,10 +60,12 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
 
 S="${WORKDIR}/${MY_SRC}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-certkey.patch"
+	"${FILESDIR}/${PN}-libressl-server.patch"
+)
+
 pkg_setup() {
-	if use libressl; then
-		die "LibreSSL patches are not yet available for postfix-3.4 releases."
-	fi
 	# Add postfix, postdrop user/group (bug #77565)
 	enewgroup postfix 207
 	enewgroup postdrop 208
@@ -76,11 +78,6 @@ 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"
-	# libressl support needs work for >=postfix-3.4
-	#eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
-	#	"${FILESDIR}/${PN}-libressl-runtime.patch" \
-	#	"${FILESDIR}/${PN}-libressl-eccurve.patch"
-	#	"${FILESDIR}/${PN}-libressl-session-tickets.patch"
 }
 
 src_configure() {
diff --git a/mail-mta/postfix/postfix-3.5_pre20190330-r1.ebuild b/mail-mta/postfix/postfix-3.5_pre20190427.ebuild
index a9a8032fad57..4df478ad0871 100644
--- a/mail-mta/postfix/postfix-3.5_pre20190330-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.5_pre20190427.ebuild
@@ -35,7 +35,7 @@ DEPEND=">=dev-libs/libpcre-3.4
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( >=dev-libs/libressl-2.9.1 )
+		libressl? ( >=dev-libs/libressl-2.9.1:0= )
 	)"
 
 RDEPEND="${DEPEND}
@@ -60,7 +60,8 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
 
 S="${WORKDIR}/${MY_SRC}"
 
-PATCHES=( "${FILESDIR}/${PN}-libressl-certkey.patch"
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-certkey.patch"
 	"${FILESDIR}/${PN}-libressl-server.patch"
 )