gentoo resync : 26.08.2021

12 files changed, 22 insertions, 12 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d1e3da7fb517..c176774f7d8c 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index c7e309a6465d..c2f729657a85 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -2,5 +2,5 @@ AUX popa3d-initrc 368 BLAKE2B ff43e20de31313409b7e9930c397cc4585a500ea6d2372206b
 DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b701231fdff0f18f9cfec4c732e2c2b1b857a01c12671afc510e24860554157bd990be917662ab5dadb9512683da831b4c6 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3
 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a
 DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906
-EBUILD popa3d-1.0.2-r1.ebuild 4923 BLAKE2B 1171c9a00ef7093036bd9a5da62510bac62244b9eb5d9c0841776426fdcbdf46e24abe956e93bf25b87e9da21196cbb4a4ff07bfea34db3cae5c506647c27244 SHA512 16fcd58001b5ab6cffcdae8848f9202628bc8d7ef3e1691205f24d87aa6097bd2444f2f2b4f235f9ff9d68389e810b552c4cc4f4b624233b0c83410a61e48334
+EBUILD popa3d-1.0.2-r2.ebuild 4943 BLAKE2B 19802ac3c4fc3b3f877a4e84260801e823dda144ef0c48a8f914314e63312d8d8983ae7b018f510b145fb20a37c5675c274f45e4f83a6158fb4d5c54a190024e SHA512 add1fe6d090cc35f58ad202092f9a7cc28979938f750b661a13fd212b9233b946cefcd0961c3ca2558164b60d2109ee900e087364dbbb9d492e36523ecb5c013
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
index 3211b59858e1..47383afa0c2f 100644
--- a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild
+++ b/net-mail/popa3d/popa3d-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,6 +21,7 @@ REQUIRED_USE="^^ ( maildir mbox )"
 DEPEND="
 	acct-group/popa3d
 	acct-user/popa3d
+	virtual/libcrypt:=
 	pam? (
 		>=sys-libs/pam-0.72
 		>=net-mail/mailbase-0.00-r8[pam]
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 1610268be61d..2bd3c22aab28 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -3,6 +3,6 @@ AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d
 AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.15-r1.ebuild 2249 BLAKE2B 00937339b99da654aec25bce4fa8aa7d33cf85f8d55701fc8de8131f7fe1f1843133bfb0f9ca8330442693b5b27098e0ed57ddbd20ea2dda1284b3ca73041a6c SHA512 91c6d9985b30586d7d55e044da958866a838f23772b6cc7993d73d6edcdc46eb15b17a60e063ab881274f64fda72eb6213fca609890f8c3b939286e9111ae8c6
-EBUILD qmailadmin-1.2.16.ebuild 2676 BLAKE2B 19f14a7b388a3dd782934b6a584f8c6ee017a8ef0b4a33ea6125fe8d3dfc0f93a8fc5bb76f70a8c1083dabc512e212ec9d208e8398ff19cdd68eed3104b29218 SHA512 f822e34d6ac09062ce5e5799dc38f0a0c3dd889cef96e6e67e0d6bc51b140a7394830607eeac8231648138f506b88be57164ac86277e56ff89926eb84c0d66b7
+EBUILD qmailadmin-1.2.15-r2.ebuild 2269 BLAKE2B 62cfc635fdb1a4c31c4f6e6ccd5decd086bffaf40b202e08fd53f79c9400bd274349572d676383fddc53dda2257bd9666cd7236c82624f326ced18392343376f SHA512 5143af2fc638d996bd6a01baaaa925eea66eca47d1071887f0a8735be02e72847dff8ace49a4c1e95398073e1059e7cf7359480d841a81f15b9a0460eea887bb
+EBUILD qmailadmin-1.2.16-r1.ebuild 2696 BLAKE2B b0dd1f5fc396d4104c74b28ac929c05c2a7b9eb2258a9ab7e9d9c0237e00c1f3adc6f8a3c75509c6b2f11b20156e24b4b7b150f851a0eb3f362205d90c352d3e SHA512 7250ee0d3107326d121ef9ca33718293395388b468428b97528ed94b832f3fafb849ace5d680b45564c3b35717e75d6d6f7a490568a62e6e6e80d1e30e150b34
 MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
index 20bdc0db0cff..fd7cf19b1cd9 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r1.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
@@ -23,6 +23,7 @@ RESTRICT="userpriv"
 RDEPEND="
 	net-mail/autorespond
 	>=net-mail/vpopmail-5.4.33
+	virtual/libcrypt:=
 	virtual/qmail
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
 DEPEND="${RDEPEND}"
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild
index e8d3f27890b4..e5cef4ce9568 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.16.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.16-r1.ebuild
@@ -20,7 +20,8 @@ IUSE="maildrop"
 # and non-root can't access them.
 RESTRICT="userpriv"
 
-RDEPEND="virtual/qmail
+RDEPEND="virtual/libcrypt:=
+	virtual/qmail
 	>=net-mail/vpopmail-5.4.33
 	net-mail/autorespond
 	maildrop? ( >=mail-filter/maildrop-2.0.1 )"
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
index 08500ab0b80d..a8f791ddf855 100644
--- a/net-mail/vchkuser/Manifest
+++ b/net-mail/vchkuser/Manifest
@@ -1,3 +1,3 @@
 DIST vchkuser-0.4.tar.gz 5890 BLAKE2B 2b48f085fdc6acd86cce3c1e12ad2e445ef1059e6f1446719cbfb3649cfe67df36255cc220ef063fbd699d7f26bb1cefde20a0759cc45e0e92ea93c6711f1015 SHA512 3c33a1c26abeaf45ca90ac1f1c9cf7b1ae6eba3f6e5a8d0d8d0d12dce98fbada4209cd916af7af69d7682c174d88741b1140e5c758a08e0d196e73f2b6145699
-EBUILD vchkuser-0.4.ebuild 914 BLAKE2B f68298426cd955378da25604aa5062a2b1e34ca2d27d985de904d3d0a6af3e77ed7531535c3e1c71317cdad6e990762f5654d34e37c4e131bcfcf1da8cc5e2ca SHA512 828d951ae6a76d0af85a4d8fc626f2cc500aee7a78142d0aa2e3affe42919427be9db599153075e82d89fc6b1a7132d89634a3adcbf06c9813d6614670817a4a
+EBUILD vchkuser-0.4-r1.ebuild 958 BLAKE2B bc52b3e10e828746462bbf35178655b1b05ad2d4c4ce06b7fe9c9703738f6b5f3aeb6dd26e57d9c98f333a312ed20291094c2eb6d7684c9c414687323e7524d3 SHA512 2a1d11aef90048da5777b36abb3d0beb8ee733fbc0808c69ed4c3159065f5ca9278ca7025533606af127b3bd71fbb507277d5839f62b07598c0ee401ab336912
 MISC metadata.xml 323 BLAKE2B 0147c79382994634fde3cc6fdc43872a95cb5bfecd3290720dd604f48453a1e842edead7ad408b08b59f4393f902c997bbd3db259d34b13ac9ad3a5be9cb4f09 SHA512 9e86c9f10fa850b949b9ca13118399625310655314b607015cf7441c59432b6bbe9f6b3282d090d55de08ec07415b1c5f79b58c40d99f92173d4e59a02920f29
diff --git a/net-mail/vchkuser/vchkuser-0.4.ebuild b/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
index 93faf978ed0a..d243ea098800 100644
--- a/net-mail/vchkuser/vchkuser-0.4.ebuild
+++ b/net-mail/vchkuser/vchkuser-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,12 +15,14 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
+	dev-libs/libpcre
 	net-mail/vpopmail
+	virtual/libcrypt:=
 	|| (
 		mail-mta/netqmail[qmail-spp]
 		mail-mta/qmail-ldap[qmail-spp]
 	)"
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/hollow-${PN}-8a048f7"
 
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 2257c354edfc..75bc605b09be 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -15,5 +15,5 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r7.ebuild 7581 BLAKE2B 902160dfa9cdcce24270508ada8a266f5304bd47af73655c10ac305d081860a2c750fdd2c73783d9b1e1bb75f0c3abd3d6bbcf58865ec275ad7be7cb98dbebde SHA512 380158bc3dfc7bf34d96e7f2438fc3d24ed5e288114607cabbc762639255ee154a1f9b4cca852a788fb11e58b06fb5c1b54812b2cec1c4b53cffd4eb5ae2e5e7
+EBUILD vpopmail-5.4.33-r9.ebuild 7739 BLAKE2B ea3aac8a884fe1e8d23c9bef072dc610e1c0328028f82773040aecc2d347de11d0166c4482ed4ee0fb27ff9bdfb2eded758e3e03b389c266c1d9e2397e1f7572 SHA512 9b0a5926580beecb63d43a9ed462a3cf2f1b42464bf7e193b7b9fd74bc6e3939192eead6f33454b99519cd2b9df801a8ebac03a91d765b3b557f96373b8b32eb
 MISC metadata.xml 828 BLAKE2B 4c54578d11e0a74817c10edd0ea3314aad1f53703367a4baa89f0c5b53a1b9df6753452db9e2da7f2fa2771b91713c40b02cf93535890671eaff8fcd12b11718 SHA512 43330581de8b5c94a5240f70a6f78117808c4b6deef386daf68d531cfaf3e29888ed1c3c70f0560d22a7569f0c29dce4eb9f63676528783a9cf6f7b275f2eb4a
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
index b5f30d5092db..b70518ef1783 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -18,6 +18,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 DEPEND="
 	acct-group/vpopmail
 	acct-user/vpopmail
+	virtual/libcrypt:=
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( dev-db/mysql-connector-c:0= )
@@ -137,6 +138,9 @@ src_configure() {
 		$(use_enable maildrop) \
 		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
 		$(use_enable spamassassin)
+
+	sed "s|'ar |'$(tc-getAR) |;s|'ranlib |'$(tc-getRANLIB) |" -i cdb/Makefile || die
+	sed "/^AR =/s|= .*|= $(tc-getAR)|" -i Makefile || die
 }
 
 src_install() {
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index 5a532a5d1342..6225bff1b8fb 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 291 BLAKE2B 2d02039a95ecf734d6dd284fcd65911c9f38db8a2165d1bd4289a9927a3a3c847a99991c1301a5d6d9d485ccd06794dddf73f57dabee47dcb3ed01ff9a0f7f72 SHA512 27c4b4314b29547e3a485340086186c31d0d5ede249631738227ffdecd64c500baf7c3ee6852b02e18176376f0717c35ad3445b5a2bc684e82772eca27be2786
 DIST vqadmin-2.3.7.tar.gz 153678 BLAKE2B 3906c449d89e2747d10b9a4afdce14da7b41fdaca760d41b0374bfdd6a8dd2f756597b4bbdabb4d03b89806936e1550f069b7675dd2ef7486f235e497191bf94 SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88
-EBUILD vqadmin-2.3.7.ebuild 1283 BLAKE2B ff524234541acfd0a556512b075dfa90075002ada24ae36e91ef786f4d7875e813a438a054e82f199b2de1c5135900ecf55a54e4bc63f9fab058cc8984067268 SHA512 fbf17af20d0e77d6197f2245148a78bab01eb0722b7e43d6bd1be9ca01ce1fd42be07a6db0beb1daaaaf2514a314467362b67db9e553e8e85879007d1020d362
+EBUILD vqadmin-2.3.7-r1.ebuild 1303 BLAKE2B 5873980c5e12d79dc438e2c6d33b10927a90ac9708c21199e6fd537b2285fe9d41906416130cc3308b6e5a24da2a5da73b63eeb3daf91cca297d90fd533dfb46 SHA512 965c60fbaf4f57d678e11b21635881048942f46845204c8dac10e62585765db74ea6cf71568b055700f855ae2f9638547bb4e1da27e4eb38103bb32906ef225d
 MISC metadata.xml 357 BLAKE2B f681f656d61cbf1c78616f26f8746b29a5f76234344fc9b79e29b5f83c91829385751301bcde12dbb12e16e476ecc69e28ef4144c531829bc4432ca8e41fd667 SHA512 82473567cbefa523ec0fcee697d7b5d30b184dedc7a73fa6e49a7958a3355ba22118d572908c3ceffecf821b234053310e56e5f2b4f6e7fd66c9a23248974791
diff --git a/net-mail/vqadmin/vqadmin-2.3.7.ebuild b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
index 3acb964ec3b8..a89f49b9d5c3 100644
--- a/net-mail/vqadmin/vqadmin-2.3.7.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,8 @@ WEBAPP_MANUAL_SLOT="yes"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="virtual/qmail
+DEPEND="virtual/libcrypt:=
+	virtual/qmail
 	>=net-mail/vpopmail-5.3"
 RDEPEND="${DEPEND}
 	net-mail/qmailadmin"