gentoo resync : 12.07.2021

5 files changed, 10 insertions, 9 deletions

diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 64ec45c58f74..eaf5b0eb622d 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index f0acad28087d..8903cf05125e 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -5,5 +5,5 @@ AUX nullmailer-2.2-disable-smtp-auth-tests.patch 2383 BLAKE2B 07f2fc7517df280fac
 AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70c6aedbe0471f042c2c2e611eedf768071715b7f42a94b2b41e814a87dd87777810cbb823d20138d40f6aa3aba93ebaec89ebb6d9e2f3 SHA512 10873e538dbc89e8899047e732515d30108b25fd0ff6bb2fc695f5790a94ac32629f41c470a2fec951357169fead36ee4512f543ad0e02c52f09799334b815c7
 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354
 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268
-EBUILD nullmailer-2.2-r1.ebuild 4309 BLAKE2B faa371033303a70a5b9b4233babaf616277468e0c872dc1c50b04f9ecb91a0ae80b1a373b9e28f844a6eada0668fc498c84d2209e8f511348874aa150fa9ac5d SHA512 cc4496d69d121b01c30164228954b32df22d894d426f33c835b8dc7d98061393c82a2ad1372c59d0bb434dbac9e4c76594b6b57e2e24a945a61b04383d6ca345
+EBUILD nullmailer-2.2-r2.ebuild 4274 BLAKE2B 25aadfd70f1bb616cd1d9e78c2a374982545532c42632f955fad99d3de2e0fd518900065f419e66922d787dfc5b98390e9650c10cc034ea2533ff1e33e6aac24 SHA512 35d6c711a4430424ce2a778b90455a23e3dff8b29f2e40e88cca5fc8840e0a09a404ac1bebc311816285056c91bd2655b69696c1515eb5d8d599c991c665cc74
 MISC metadata.xml 342 BLAKE2B ac05adbff1c06a41efb8b6c01995d7061302e3e829fa07008538aef00de9ef00e8e665a2d45e51e0886d092a9f492ac1cb194f9ab614b944147f9a8235608c71 SHA512 bde55b4d0d452321cab14b1f38dcf2f27caa6586acc1748b9be1cb6981c0e4e90e909129d3700f49a7405f8baba80c3182d6ce84c75260a87019e8be593bc091
diff --git a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
index 53c1cabc06ff..3ea8f8fe0a92 100644
--- a/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild
+++ b/mail-mta/nullmailer/nullmailer-2.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib systemd user
+inherit autotools flag-o-matic multilib systemd
 
 DESCRIPTION="Simple relay-only local mail transport agent"
 HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer"
@@ -15,11 +15,17 @@ KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x64-cygwin"
 IUSE="ssl test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	acct-group/nullmail
+	acct-user/nullmail
+"
+
 DEPEND="
 	ssl? ( net-libs/gnutls:0= )
 	test? ( sys-apps/ucspi-tcp[ipv6] sys-process/daemontools )
 "
 RDEPEND="
+	${BDEPEND}
 	virtual/logger
 	sys-apps/shadow
 	ssl? ( net-libs/gnutls:0= )
@@ -43,11 +49,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-c++11.patch"
 )
 
-pkg_setup() {
-	enewgroup nullmail 88
-	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
-}
-
 src_prepare() {
 	default
 	sed -i.orig \
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 0793446e41cf..f5a486d11653 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,12 +8,12 @@ DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b317
 DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
 DIST postfix-3.6.0.tar.gz 4748506 BLAKE2B f4692500cb78e82cede48d750eb86db61dc67ba1d69d220d24c965b57941402a5bf157b4a69d65133d37ce3d9e1341260d07ebd4477184b3caa56b22fd13b4f5 SHA512 af326472333935de111d7f7025af53a1dfd84382c2d2891e91624ce665c258831f28d92fd73d1ab68f82192d9848025bd30d16eb48b3912b46e3fb50dbf194bf
 DIST postfix-3.6.1.tar.gz 4748754 BLAKE2B c64d8f4c12cd7cb39bd15c371c20db4aa61b39120b6c078eda7c48c94d65e181b51ac8f74f3231791fc3ad6c0d04f74975f50776f984ffa9b9f8a4c5c99cbade SHA512 6f83a6aa55bd442fe005b35c7470483ff5ba6781121f783b07ef454580354fc5c85d0d5106936810d6bef0f5592937f0863eec3b82e138caac7694e2a3bb7bc3
-DIST postfix-3.7-20210627.tar.gz 4749370 BLAKE2B df6e8e6bbf67129259a24c66d587288252d4c4e2e2429dc7720cc09cbdf62497af087e83dc69b5e903c49231b75c9537744535cb929cf43782c0357224b49caf SHA512 0ce219a3e46d28a59b7fa85d900d0b4cd0ca8c059ebda3dec4251ab32dd579d5b1d8a0d3249433b8ae39deda5c03e1714e5063d021f1ceb93d14c5506aead9e3
+DIST postfix-3.7-20210707.tar.gz 4749553 BLAKE2B 97c6bc141ec39c5e64a3155067e29a06947c0396cf69948f90a1886198a4dd2b9c3431d282a8b9d0a6df38fb2e07c6e7f02c05f7f2079437416546d4cd374858 SHA512 b42a9c4343eed7e836eb2210b969f49aa8b9293c12c555923e61023f55be3f5ff0c7c2c07fcbee599fe5b77c16d854c8d5b8dcbc2f3a1fff2710884b44b4a509
 EBUILD postfix-3.5.10.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.5.11.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.5.8-r1.ebuild 8693 BLAKE2B e0ca3baeabcb4b0e703115c6839b4b0e0d75c789421c8fbd0aaeccff22630f797f11e5b8cc5ae1f09d21773f257a5edc117392b377d9c743e5de62cf42289540 SHA512 7ff76d64ab024375f4d015634898f1f8475d349ed9718c40e02ffad2abddfb32676b076168bc0bdb35f78b4e95df596d1fd286b95b9d5a7fb57d4c8188dd46b2
 EBUILD postfix-3.5.9-r1.ebuild 8698 BLAKE2B 40aed4bdcc1a9eddec5e0660999adea5b8f31a04dcbd0494155940c8b9545ba232796ec059632d0c863b306a32deeac109e93c6bd3c4a1d2c19facb26e59ff56 SHA512 603e713ce215b54ff9726f27cbfa70d5f09d35e892f21ea8644ba3c1e8164f4c520922078f2e24284543791369fadee52b566d75fd5fdf9d7027c7e4af428a13
 EBUILD postfix-3.6.0.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
 EBUILD postfix-3.6.1.ebuild 7984 BLAKE2B 30ccb9c5339e0cf795b97e6228a5190d0bbce455d1a254b536fc684f767e82ed54d80f3291847ea0dc52f5c05d9c0e5e0309f5f4fad05bc8fa49de98c48c3e11 SHA512 5cefa9c8a1a6b83f0158e704f69fd2f6a9633c801e3051c5abe6fcff5c4213c514b93629c0f620823d0166c329126967b10fb51206e43b0cda03e0f145966634
-EBUILD postfix-3.7_pre20210627.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
+EBUILD postfix-3.7_pre20210707.ebuild 7917 BLAKE2B 504cae64c2c323d844e355600f1d5daee40524a940b54d2a4d28e3a870a0d3628be5cbb1cb1c471544764cc1db4ab49378bc54feb1f9c84214aca1c3a0b28ed1 SHA512 f0011add1c12ae383a03ac9f3989509cbc86aa820680151854e0f783ec387fc571345a0f1a2b78966838bfbdb2f225584d5ee3303bbc33f84729053fd08b25f7
 MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.7_pre20210627.ebuild b/mail-mta/postfix/postfix-3.7_pre20210707.ebuild
index 7badc66a67e8..7badc66a67e8 100644
--- a/mail-mta/postfix/postfix-3.7_pre20210627.ebuild
+++ b/mail-mta/postfix/postfix-3.7_pre20210707.ebuild