summaryrefslogtreecommitdiff
path: root/mail-mta
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-08-04 08:53:53 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-08-04 08:53:53 +0100
commite3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree9cb29a544215119b5c5538e37211b994ce1c87ae /mail-mta
parent480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
gentoo resync : 04.08.2018
Diffstat (limited to 'mail-mta')
-rw-r--r--mail-mta/Manifest.gzbin2552 -> 2553 bytes
-rw-r--r--mail-mta/exim/Manifest2
-rw-r--r--mail-mta/exim/exim-4.91-r2.ebuild15
3 files changed, 12 insertions, 5 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 70bd83055426..1debb6203bcb 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
Binary files differ
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 356e086dca17..ca06afba7d49 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -23,5 +23,5 @@ DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ec
DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
EBUILD exim-4.90.1-r1.ebuild 12215 BLAKE2B 24752c4aa059d967300f5ab90f647e1f4b35e8e475bb3a436e6669aff6b552b78b290705658840ae1f4828d3f3a7c7a0114c7c4790421220c71e569d33f1175a SHA512 c33b0998024ecb9e25e95d4c22a474f8819c634d189736e8c9d8605d27bfba80275fb80c12db4be04ce67a3e2646c670a8c7f68c0aadf9937d626ad1fa0528be
EBUILD exim-4.91-r1.ebuild 12582 BLAKE2B 40a2a61532589db358ed6ca235e46a024d51c27af18458219369d4ca1a6cbbf33eca8b18b369303629441485a621753fd14c681737b198172c360feab88c5f83 SHA512 0a2cf3be8f22bf0b16a496ee4de78ddcb645b0abfcfa696e18de6506b7cbf3ccb292089e9c5475b4813c105ebdd81ec2ec0f8bce3195cb2bd936cf58ae04c662
-EBUILD exim-4.91-r2.ebuild 12670 BLAKE2B 67f4110962d7825cc0793a201412099da968971023dfeadfdc82fb46436e03461c78e810728e2e9b31ff9d2539f88fc6af1e68639f67bb3746c9255c9d5af749 SHA512 f0723d348e675f829946feb76000e20a51f81a11905035204bfc61462114fa539e389feec77d0a8492f02ef7c7211665c510878f0eb82be3a9a0b54b7a828f3a
+EBUILD exim-4.91-r2.ebuild 13167 BLAKE2B 5a6730816d721c32a6bf8ad17b103d8e1974ea5229e459c3d5f77414fcf4d32e38ab93f674545288ae6675da7b38106abee539f92d77162c5abdd7fb895864ce SHA512 34f0a8aff149e5ed597272946ab1035f53ed2f5e83c54352e803c8d6a0c1b9502d4e33b5f80d6322210b21573130a936c6d9b01ccace6f6d726038f084ac2169
MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.91-r2.ebuild b/mail-mta/exim/exim-4.91-r2.ebuild
index f9c38b2c7137..a854a56cf373 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -8,13 +8,20 @@ inherit db-use eutils toolchain-funcs multilib pam systemd
IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X"
REQUIRED_USE="
arc? ( dkim spf )
- dane? ( ssl )
+ dane? ( ssl !gnutls )
dmarc? ( dkim spf )
gnutls? ( ssl )
pkcs11? ( ssl )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else. Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls. Both are
+# incorrect, but b) is the only "correct" view from repoman.
COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
@@ -26,12 +33,12 @@ HOMEPAGE="http://www.exim.org/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+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-6:= )
dev-libs/libpcre
- idn? ( net-dns/libidn net-dns/libidn2 )
+ idn? ( net-dns/libidn:= net-dns/libidn2:= )
perl? ( dev-lang/perl:= )
pam? ( virtual/pam )
tcpd? ( sys-apps/tcp-wrappers )
@@ -40,7 +47,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
libressl? ( dev-libs/libressl:= )
)
gnutls? (
- net-libs/gnutls[pkcs11?]
+ net-libs/gnutls:0=[pkcs11?]
dev-libs/libtasn1
)
ldap? ( >=net-nds/openldap-2.0.7 )