gentoo resync : 16.04.2018

2 files changed, 6 insertions, 6 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index e8f8f4ec29a3..dd095e691bef 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -25,16 +25,16 @@ DIST exim-4.89.1.tar.bz2 1828699 BLAKE2B 21b3acc73717319c58341f28463d0fd576c7252
 DIST exim-4.89.tar.bz2 1844430 BLAKE2B 255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7 SHA512 1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
 DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01 SHA512 ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
 DIST exim-4.90.tar.bz2 1873037 BLAKE2B 5498886560f85fba94a5055d9e72eece959cde6db20a589e6567e89b9c7669c4bb421d6a48f3c5d676381aa008088f391007be5de30e033f64e8e6a128059e62 SHA512 0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b
-DIST exim-4.91_RC1.tar.xz 1738460 BLAKE2B 0a973c097adad9c322afd634e6b7a53bb7746ad32ee5c7c68b3321429e881475a3c26f5706623c3624e4beb71bcee80ba411e6b60bc17e39e56507119ba982d5 SHA512 fefb3955ce1267e15f929edad36579eb15a6230bd885d1e15e57a570a584209b48421f204669d7c83fe630bee688a27126de7056c918a041262acef093dcd493
+DIST exim-4.91.tar.xz 1744660 BLAKE2B 8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51 SHA512 35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
 DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9 SHA512 0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
 DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2 SHA512 b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
 DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146 SHA512 9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
 DIST exim-pdf-4.90.tar.bz2 2025099 BLAKE2B 9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b SHA512 4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
-DIST exim-pdf-4.91_RC1.tar.xz 1967968 BLAKE2B 0caae1d8371dd2d90b24c84d4636c1721570f70edec20f9e078d4a70c0e5efbcd5b5052224b6290b48409a3a4898ff4eadadc3bbf0ffaa837861c88091faffa3 SHA512 4c1a490a2dd7870a632f5d777ae9e2ba6c75cd97654c6c064b4d515f85e87d2249e03dcd058dcb9b9270d17503415ad5433d18e224bc65690eb6d0ea8f295289
+DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980 SHA512 82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.89-r5.ebuild 12585 BLAKE2B 4ab8179cf41e847edcc23214e149e5af9270ebd9367cccf233c17ed3406299f810a195ccbb75368f8a2921a717814e2d4e33dcbe4525cba2d7ff76384138eda3 SHA512 fdd78249ade5e6d1d11a47a71283d47940709d8292b6129722d63f91d422067f4850c350edf28dfce88b7513785f0f0f764bf98a9155be62af404343153c144b
 EBUILD exim-4.89.1.ebuild 12309 BLAKE2B 03cb1d877ccc0057c3242efe64979621c6455aac6371f2ea5cb7eff13b71bc9858cd427d3335269543e03591b2d8b9cb128ede714ef58611b60cdb98e5036adb SHA512 03c237f71fd4d5ede14c02314f2ffce98ccc04337b49ea089d7abf1bceb457eef2baede38d047a75d43d76ec367c0e0f21adb524db0dd8429c6d23dc4f9dbe5e
 EBUILD exim-4.90.1.ebuild 12233 BLAKE2B c89aca30fd9de8eec5ab1fc82a6ba1ad9d77c604122d3641921d8e0f2e5647a7d615674569b1419c22ac7d614ea21f0969ca2c6f23ce780e379bb4f229800b1f SHA512 d6d922d545f3c7950be992dc70740f43b76296dfcbf28045a92fe7aa56a3a8e56bf2d899406aa21d2c994379d581728e95f2d9fdd58d7a02154c46ab0df9b9a6
 EBUILD exim-4.90.ebuild 12241 BLAKE2B 62d34f83130e91e4feee5468b1088ef78d23f7fed201b652c13b3c9d22330200cf8b01e745dec0fd4ebc80c4f44614cad744e9944d2c4376f719bf1d20c0a720 SHA512 f3f6ebe42fa81f5527ffdd786a6ab76704bd2bb2caa7263d3931dc1a234fdb27bf2c4c5459d1c2339ad0904906aa2463368135b61b8194c19d3cdda1ac260540
-EBUILD exim-4.91_rc1.ebuild 12451 BLAKE2B 08d93459c37c4eaa5e3270a3a981cabde59476cd898b78594404122f369a5a0f0373d45e605b575b08ea2bce9ac12a19c4aa2a06d20956ad097f5d451e387da3 SHA512 e6a0db7206181e58f1141e64f851b79d3cc70ae6ace0e6ced0656ccd897bd430fd6b2e489ceb530d31e235fdb5514269db0d390c3a8725301574fee84e6483fc
+EBUILD exim-4.91.ebuild 12473 BLAKE2B ea36d42e53d2d59cc1a856a6f17432002a63f17860c0bdd5634b0f80465f24f8ddb0ae72676ea35c8c3cf4db2f49fe4931090cf842cc5e88db29f0f691c48b19 SHA512 a6f0f22ba8b8792a01b3cd6eca9ee8d310515ae31f118da9acd27ee237c103d04c8c4729af6e1525b0adf1a7c25757175d39b20c7d080958e4ab5d460bf72acb
 MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.91_rc1.ebuild b/mail-mta/exim/exim-4.91.ebuild
index 6007c7afe3fa..ff66e6daa531 100644
--- a/mail-mta/exim/exim-4.91_rc1.ebuild
+++ b/mail-mta/exim/exim-4.91.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	srs? ( exiscan-acl )
 "
 
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
@@ -29,7 +29,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
-	>=sys-libs/db-3.2:=
+	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
 	dev-libs/libpcre
 	idn? ( net-dns/libidn net-dns/libidn2 )
 	perl? ( dev-lang/perl:= )
@@ -519,7 +519,7 @@ src_install () {
 	systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
 
 	diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP}
-	dodir /var/log/${PN}
+	keepdir /var/log/${PN}
 }
 
 pkg_postinst() {