gentoo resync : 06.04.2022

5 files changed, 7 insertions, 12 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index b91e09d75306..5182b538de02 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 3b2b09c15500..9bedbc3c4311 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -4,6 +4,6 @@ DIST msmtp-1.8.16.tar.xz 375372 BLAKE2B 4567c323bf2f53fa878ed315dc4a2c524918de22
 DIST msmtp-1.8.19.tar.xz 383100 BLAKE2B 4a24fc63f8d1057bceaede09050bd2fa81ae9cfe20f5663dd1766b261634af580a190fdbbff36a0373e804fe2d6b357268d349bf78a4c8c47ec87b63e03f7798 SHA512 0be193fc0a415824e311f88b57521898caaed49737370b6ae688c7f75e3ff5bc3dc9d87d9d08289b46a1b9650b2a48fb3cd40fb156f894b3fe805136d124f1bd
 DIST msmtp-1.8.20.tar.xz 385696 BLAKE2B cf75715538a65ac0f6fb3b8407e5b7cec865d552b6ecc5a450f5e35d4e42581cfb9f15bb7edc67dae1846018a834769d4e3be5da60ae0e52390cb61531a29a87 SHA512 cc5ad4ab21d05f24bac75ab25607d1ede50f5ac24ce40d72cf1b61f9cdfc48e9af477f9975d799a93f1990d0c2e24b651e5a3b3aa6b71279b37a4a43fce11f11
 EBUILD msmtp-1.8.16.ebuild 3295 BLAKE2B 9dcf98f1472fcbce1de4ee38115179f85bba01fb1c807a1159d657f2d4e52cb7fb1e6a4df380d446481fea19052f27080da0e9cd70a2e5eb1164d2b932c0fa23 SHA512 58d31fb4cecbdc3c54491cb32d2012d2cba31a418689cb124e5d5bef3f862ee0a101f32ef77e27245e9f4b526dcd079d1c94a9243e9578ddb6cad373ba10a589
-EBUILD msmtp-1.8.19.ebuild 3299 BLAKE2B 124794fa326657a26837572cd41abc3e30fdd5da52a2ce0353583274f4752c2412c096f2d6bf8a36f88eac7db4dcfe0e4faefd1af240ba753d83a30e4ed4f96d SHA512 cb332cf18439942410a535d6a8b195a4b1509ecf85e6f2e9ecd764e36480f4907138a6a28e3d252961fbada7376ae4bfe646deb0093443ce9a866e9395dd3d60
+EBUILD msmtp-1.8.19.ebuild 3295 BLAKE2B af1dd33dc889c181bb7d2bedc672ff256a601c35b5825e737d543bf90f668af587f6bc5aeee482f26b5f20dd5bf198d7cb9448cc7d28617cc2e5c6461db0ee16 SHA512 35bbc8225ee6c393efad2d1096a30f4ef4ba72c98b3f5ce1ccc63b1d35ada68fd99c25b957c64aab68d519bda73f68c71048b314e0b194af161a52b3fb1f439b
 EBUILD msmtp-1.8.20.ebuild 3300 BLAKE2B 0e264e5cba8d1c45b8a648e022b79570f47a36954e3f5d108a3005e4e1a91b4951f3cd6f94505d6f25c8d2b7ad488b4764a4a14f72b756c6cd2aedd33f2d065c SHA512 2b0def7bce8f14d8c707d3324f6530cfade6cfa204eb2e086c75af0b9e222cb1300493709bf6efb0e877f3d5fcbe102f6b2460159be693d7eacd2aa6fee2ae15
 MISC metadata.xml 471 BLAKE2B 2f73e5ba3eb891844f14bcd4792a4a1df6f2bc90839819a4489fca29128d4268962e6f4cc781b99942e0f54b85a99554293e50f8be4680c58df38fb90f199916 SHA512 22bf1461c446daf3c854cccce644cf6647881878c346f2bd6390f69eb397dfa608d15cfca75bdc3a58fa4c86b2f69e1224bab181c336e883726d9564a358db7a
diff --git a/mail-mta/msmtp/msmtp-1.8.19.ebuild b/mail-mta/msmtp/msmtp-1.8.19.ebuild
index 468bdb943971..8eb6da2b8159 100644
--- a/mail-mta/msmtp/msmtp-1.8.19.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax"
 
 # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index ff4a4c561ce1..73278f3d949a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -4,8 +4,8 @@ AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac
 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
 DIST postfix-3.6.5.tar.gz 4751485 BLAKE2B 7d53ccf76d978db269fe0ab8641abcb3ba91a72c97fa739a2c8ea80c45bb3ecdaca51d08f7db03582887a0cdcdf96be423e3e35b4f2ab2fbb0fbe4e98dd60758 SHA512 510c7b387b38c8683bda33371468c1c1209285baca7d8f237fdb668b313fa4b4d6727f7e4eb79fc81c4155f0839b4e95995dff186e62621b26e5b8b31cff15d5
 DIST postfix-3.7.0.tar.gz 4823087 BLAKE2B 7388ad49862c97e20179a2d3ed26069f21e8a578790fcb8adc9f5b648202269bd4c07905931237dab905d991002bcfd9f03d11e6a85b46fcf0e3b72412d852eb SHA512 f2fb5c0399100c19e428b68728a8ce62b1fb74d365038373f22ed698c1d0fece506b3f1335c322b949875a4a9fa96fa0a7680b12641d596d09615e8fef061da4
-DIST postfix-3.8-20220220.tar.gz 4821731 BLAKE2B 1d09dd29de8b888c1466019096cf0f4120c3fae30b2812fc621842387b77222b41ae32ce66b3430d7540b3de1e07a72d531544d016fc668e099d3d6598ee06e2 SHA512 21f2cc192213b22ba3a36a225ad7cfc0ec36f25e16a155c814eb2682db6a9eed81bad2223c2af5c1764a2b943a70bab85140c7e3e722aa0f4351cef26fd8fe59
+DIST postfix-3.8-20220403.tar.gz 4810556 BLAKE2B 2859729ad7094136575ad866005340a7616814efcbf6724680ffb010f933c357eaf7f957f72efcdc4df2fc0a81ba5fc40f9fc6b5efc11d475d347f935cab0ed0 SHA512 b19a907526ae1ef60816a8ad623b91e923c8d00a2da70ad667b405a2d3eb71bb9ea936019176bbbdac88d6335f698b97c87fbf8688ca9eea9cc13f2c99dcef05
 EBUILD postfix-3.6.5-r2.ebuild 7919 BLAKE2B a88bc775ef810df0889974c9048cac9d44246bee07619eb4149324565c32214441792a3a840ae812210404b6e821851a3e3855469d14c9d53c3d7cf712464cc6 SHA512 3568560769a1781721182fb9ae5fd4518e3a70e23db1fd539ee032778cd6bf6c3361c10b3d65f17b0c88d6d05ef8e577a7041722d57c1f39ba78cda398d71720
 EBUILD postfix-3.7.0-r1.ebuild 8067 BLAKE2B ce219a3680e65c6c8d63950765357b893576c8572149d01e04656a91070cc3dfd5a5a1da1c60d05c89ed40d805281c6c0a5c8aa8945cebf2213e45b55e19ecda SHA512 b1d6c5951db3cad2c2ca9487d24bd26bf4faf92c4b9ca6908f35ead42db50d82f6e3de432674009ce99bb9daf359ff588131784a95e3dc56fa055533ea39d4cc
-EBUILD postfix-3.8_pre20220220-r1.ebuild 8070 BLAKE2B 4e7e2a9d2c87156f654ec8214d67c2ac8c6203115122b517af8d6ce5751f1f1a450dc80d7c4532b9093efdde6acb0493524a098277cc3b1f0b3b783570e05949 SHA512 42ab250f9c56d6aeb4e9788b9661d2c300421a8524967c1f7fe7a1159c06edfb6f1864c2c03eb68dba58eca54b4683e8e3432edf8b22b56109d96886b4872637
+EBUILD postfix-3.8_pre20220403.ebuild 7934 BLAKE2B a2f53f8c8d42c3cb4c2a8ca267855afd6fa81db2c1fab638f1dc967262feb1cd8f0bf0a2ff3cacf9b0a426b08eec4f642144a5e79f6ecab6845d492a0b17bb95 SHA512 0844058b5e2ee32d1bdb93ee409a630722198159f45925b22cf82711364af9ce1b6be25b007e056f9342152901bbd9f65af7be1ed2a796b4173a759dd6cdda60
 MISC metadata.xml 867 BLAKE2B 1839d35c91007bb07e1a722b6b4751e9f7754e00109859efe5850df16486bafbaeb019326d006438471678553aca9474462fa32eaba445362113ced6927bf4ab SHA512 ff898bdce2b60bc52a0d326f8f8221bd474cc4fa31def2ccc5526ba59ad396b0b26f22cc98ca4e1181e3c38e5476615e53bde2db1e643ae5b9209ac581ecc1fd
diff --git a/mail-mta/postfix/postfix-3.8_pre20220220-r1.ebuild b/mail-mta/postfix/postfix-3.8_pre20220403.ebuild
index 8c42346cf6f5..d0b51c08b7fd 100644
--- a/mail-mta/postfix/postfix-3.8_pre20220220-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.8_pre20220403.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	acct-group/postfix
 	acct-group/postdrop
 	acct-user/postfix
-	|| ( dev-libs/libpcre2:0 dev-libs/libpcre )
+	dev-libs/libpcre2:0
 	dev-lang/perl
 	berkdb? ( >=sys-libs/db-3.2:* )
 	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
@@ -75,13 +75,8 @@ src_configure() {
 	local mycc="" mylibs="${LDFLAGS} -ldl"
 
 	# libpcre is EOL. prefer libpcre2
-	if has_version dev-libs/libpcre2; then
-		mycc="-DHAS_PCRE=2"
-		AUXLIBS_PCRE="$(pcre2-config --libs8)"
-	else
-		mycc="-DHAS_PCRE=1"
-		AUXLIBS_PCRE="$(pcre-config --libs)"
-	fi
+	mycc=" -DHAS_PCRE=2"
+	AUXLIBS_PCRE="$(pcre2-config --libs8)"
 
 	use pam && mylibs="${mylibs} -lpam"