gentoo auto-resync : 23:02:2024 - 11:40:30

4 files changed, 14 insertions, 8 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 6ff52534e50e..05c023f6c2db 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 02ca4fe5214f..4c0214daca45 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -20,6 +20,6 @@ AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076ae
 DIST exim-4.97.1.tar.xz 1919308 BLAKE2B ea41bf851185c7330e648c7757f2bf0b0aea3133e399630a40d220f5f542e9055e3ed0cd67c9ee5dcede281ccc17919a4ac328abd8f05d4d828e0381f10df0b8 SHA512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc
 DIST exim-pdf-4.97.1.tar.xz 2139688 BLAKE2B baadbb6ca7b88b11ea88f6b5ce0c96d9d713a1f5b358e4dfb52647ccc2bb1a9a6f74e75341839a8ee7df327f2f5645dbf223e4e5923631b02aa53a777701b436 SHA512 6aa733b1d48b6237f458939ff53e484e702f47a0c10ba781ba101db404d39667bd2ddc876af4f597deda1991e534d5b8b874c549e6a86b5325ebd624a6713183
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.97.1-r5.ebuild 15278 BLAKE2B cddf310530897026a229e90a13233735eb66a1f35baeee6639808a851268c49dd6617525d751ae8b18b3cf962ae0c1d6036029dacc9d0c9d5cf66b0bb06b7618 SHA512 295c92b931956056c111fb8567b5c0fa3e47430865f75b9e2c918f94c7b9814accac6b4b468aa733bda1786334a151f8364387a932e59fd0621f51e503ed031c
-EBUILD exim-4.97.1.ebuild 15198 BLAKE2B 70f91735480772c11ad7134b7cdb92a114b2ae39a51268f5ebae52f74c8d81cea5b26d2d27e562048c11b5a23aa7845cf07a2a13463912fdd9c8e689420a9728 SHA512 3f58ad80687cb6e19f5184603705e34ec90749666b903ae400ae0d0ec8838fbd5bf063507cd544a7c2bab208a3af24ffed5795ac39bf9b23749f56f87d2ca551
+EBUILD exim-4.97.1-r5.ebuild 15412 BLAKE2B 4fffb048e575b336d64d00b4daf7e75a59d2aa4f490ad1271b03372e85425d4994062766d9dc5380966dc24a7457db113089283d481c226c62dcebda413d80a9 SHA512 9ea0d5f896c2549e790030e2cd4a3697945fccb101186be9f220b4871a78d9188e01f770703e8a6d0b2da031eee2555bbd2a03b7366e10e55e612da248fa6dce
+EBUILD exim-4.97.1.ebuild 15332 BLAKE2B b3a3e571a09f421f15b6d4b4e7b0cb1158392b6108e9c6c04b9736f4e8cf71d469a8e750a45673334bbc2f55bc8049f3374d043df55b6a09c7f0a4ef34d131e5 SHA512 180f59ccac10d630fcb36d58183236ad6959d185f1eb3044ab8110679aa10a25266285a02ce69f43b9a79820c30a4815c7f181b1d56a28ce319917d4af2740e5
 MISC metadata.xml 2488 BLAKE2B 2b6eee3c45210da4bb79ed1a01801cabbdf2be353652602b60cb7c512426197eb14defb2382dd71bcbf0101685a8e5d2f58d52fbee402894f2d86e51329d2165 SHA512 1b3f9fe9cbff738595101b32179f5c8230b5afefcce5266e06db97a3a07a73ad842f0a8be44f421a71e120cdff11e262ba1893f1c7117a0a4c42cf5f37a44d7b
diff --git a/mail-mta/exim/exim-4.97.1-r5.ebuild b/mail-mta/exim/exim-4.97.1-r5.ebuild
index 8ac924524bb1..797f5ff6b84b 100644
--- a/mail-mta/exim/exim-4.97.1-r5.ebuild
+++ b/mail-mta/exim/exim-4.97.1-r5.ebuild
@@ -12,6 +12,7 @@ socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
 	arc? ( dkim spf )
 	dane? ( ssl !gnutls )
+	!dane? ( ssl? ( gnutls ) )
 	dmarc? ( dkim spf )
 	dkim? ( ssl !gnutls )
 	gnutls? ( ssl )
@@ -19,12 +20,14 @@ REQUIRED_USE="
 	|| ( berkdb gdbm tdb )
 "
 # 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
+# for x86 and amd64 only (probably due to unbound dep)
+# Exim supports it but we cannot express the dep 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.
+# incorrect, but b) is the only "correct" view from dep-pointofview.
+# Bug #925108 showed that DANE is basically non-optional with OpenSSL,
+# so we make -dane mandatory to use gnutls.  Bleh.
 # We cannot express a required use for berkdb/gdbm/tdb correctly because
 # berkdb and gdbm are both enabled in base profile
 
diff --git a/mail-mta/exim/exim-4.97.1.ebuild b/mail-mta/exim/exim-4.97.1.ebuild
index 4c9425c5df01..01c2c81116af 100644
--- a/mail-mta/exim/exim-4.97.1.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -12,6 +12,7 @@ socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
 	arc? ( dkim spf )
 	dane? ( ssl !gnutls )
+	!dane? ( ssl? ( gnutls ) )
 	dmarc? ( dkim spf )
 	dkim? ( ssl !gnutls )
 	gnutls? ( ssl )
@@ -19,12 +20,14 @@ REQUIRED_USE="
 	|| ( berkdb gdbm tdb )
 "
 # 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
+# for x86 and amd64 only (probably due to unbound dep)
+# Exim supports it but we cannot express the dep 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.
+# incorrect, but b) is the only "correct" view from dep-pointofview.
+# Bug #925108 showed that DANE is basically non-optional with OpenSSL,
+# so we make -dane mandatory to use gnutls.  Bleh.
 # We cannot express a required use for berkdb/gdbm/tdb correctly because
 # berkdb and gdbm are both enabled in base profile