gentoo auto-resync : 20:12:2022 - 19:52:06

5 files changed, 14 insertions, 33 deletions

diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index a90b1b521678..7dd94b01efa9 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -7,7 +7,7 @@ DIST notqmail-1.08-tls-spp.patch 64223 BLAKE2B d2337017dacd41d975a9ebd4650cce584
 DIST notqmail-1.08.tar.xz 179500 BLAKE2B 6c774037b257849aea65e7761a6f6c9918079faa490c0ed027d73a8b32de5d5907a54a59162b9b68479229c4b92a23fe28cd2f334123cfe674a94502b90a3635 SHA512 c18d09e28c2e580522eea144e5344e814811108b12f3272b4cf10ad58d9d3d8e666616dcfea2f369e226b68db4fe8cf67cbae994b242d36e9e07c289a0539394
 DIST notqmail-1.08.tar.xz.sig 195 BLAKE2B 0edf3758d24c22e69139a57804b5b39da6c5868c178af511ff5105cd45bf105f5bb903d94093d400c54126e359a259f32d8c8b25c2fb87233efd74fdb05593c1 SHA512 2d5e68d1f3d7330b8b58f54235ec22a94adc0811e23f4863fac806c7a3e0110e6388920c3089c68fa3bb438398d64ea6e37240d002225b1cab20460797487604
 DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a SHA512 b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
-EBUILD notqmail-1.08-r5.ebuild 4334 BLAKE2B 2b1b9369b3ce11e42b1c113b0bdd65c32fda0e2de2f61d3e4175ccef5967c0d87deb7642ae906b804c3d25cd353e61d1c3353f66225c283482419e1028c748f8 SHA512 a25241b37373d686665d9a5bbbd7344d314a0175831fa003d5ae096806199bd56c3c6c7a8a1ff9dc011c977fcf19da9a196ddabe207b62190c87829a7121f95d
-EBUILD notqmail-1.08-r6.ebuild 4728 BLAKE2B 3d14b08335dcb8ac56391a687d2f69266d9b5d2b3498e49524cbe3ed25feaf516121cf601edb2a853c42f8af7c11ba9a37c9f955fcb08249fbd3d0ba5434c93d SHA512 35bc54f23af995596597257d0d9de0efcb3640fbef809f8e9bc20250a04a30df8448e4dc55ed1028f88d1dd62b1a40665cf9cc41360a29341642018f7c3b6947
-EBUILD notqmail-9999.ebuild 4601 BLAKE2B 93a521ea72c4ea5155770a3e5193ee0fd1a631229165af9f3d7bdc8685c5343ffd2fc4df426efa4907f01250aafe81bbb6078ef13ddd82745190e83316d0aabf SHA512 8c6c79f4a98e993e4376c56e0804cfb8f0860df5e8154c4d2f38f49e32c849987780cdad30e0c7ce8f86ceb436527ddfb0643f74bcd3fe63842c4135c9cb44d9
-MISC metadata.xml 808 BLAKE2B cc8d44eab1a8ceb2d0c46fee94d29b3fa631497d833c2404951a47c01898d33484db1f2c05571b66ef40d0293fbe396d8eb95b3249e85fa5c1fb0e0b320157bb SHA512 33bad8403da1c2fc99bc3fb73f4209fa297645b6abbe323bd3aabfc8b8b5fa809281ebd325742344a9b2d252a1f6c68dd518f9cbe63086ecf6d0e340ba6a7ea8
+EBUILD notqmail-1.08-r5.ebuild 4131 BLAKE2B 8aeee72909ed9fb414e16ae761f3ebb7c023df4aa90505f0db0e08d45590a19344941b3bf4c79f7111e580b1bb03722b21d7da10ef2431df7b22f765571b3679 SHA512 2f324c80ad37c606ee8c629f60a2d73090a88e18871d70d58cef4a0d59da2f81316e914d16f7d8262358388559dc0cd1b35276ef55164012299e79f623706670
+EBUILD notqmail-1.08-r6.ebuild 4524 BLAKE2B 31b5cf9acd19cf68c8ed9220c6c28c6bb499fe70dbfad55b47062a71f9d85ae41f7bfaf77bce8a36a72f0b14afa46ca17f26b5a59009b9b71e8172aa9223bef2 SHA512 a257b1121b0426db9498ee6a74613cdf85c542540ea22c851e919871a200e3a5abd67828e3fa689a39b9727fad6b8a74819a0dcd964fdad03ce83aded8c4d1c7
+EBUILD notqmail-9999.ebuild 4397 BLAKE2B da75b6b18951a8d8f2e48c77b48b7253883b24e4e64df7934467934c749acf4d73a8dc3096fb0baa3c7f0f8c777c8bf48912196b5dffcd3e32bf86d9ac602406 SHA512 abe481ad33ea27b07bc79c396acf79c388e9ce0c1ee63890894573ad606152dc355cd4f78ff85b5b9370007e51d0991764fdde3e5464d5a8888e6f7ee5980fba
+MISC metadata.xml 753 BLAKE2B 86a0b2db6a95eb9035137a11dff5eca3280c427311af8ab9986392fb001707897723a582f4f0627a9a8e2add6c1ac6b3f842198c6e96abf49b15d340962779d6 SHA512 577360801e0a48aff8216a61c5351100369c4094aade0c1e21d6749965fcb9c8cfaf0c32ea6c8e28300cc5b78a75f2e58d4e1f5713e5c7c26d574830e0a486f9
diff --git a/mail-mta/notqmail/metadata.xml b/mail-mta/notqmail/metadata.xml
index b0dda7e29117..dd95c000ec99 100644
--- a/mail-mta/notqmail/metadata.xml
+++ b/mail-mta/notqmail/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="authcram">Enable AUTHCRAM support</flag>
 		<flag name="gencertdaily">Generate SSL certificates daily instead of
 			hourly</flag>
 		<flag name="highvolume">Prepare notqmail for high volume servers</flag>
diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 62f982fa263e..9717aa7f830d 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -56,8 +56,8 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -78,7 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -133,12 +132,7 @@ src_prepare() {
 
 	qmail_src_postunpack
 
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }
diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index f8fec34a0f00..8e5a4d4b1b99 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -64,8 +64,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} != 9999 ]] ; then
@@ -89,7 +89,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -149,12 +148,7 @@ src_prepare() {
 
 	qmail_src_postunpack
 
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index 6ce036b2f82c..f07147afa4d4 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -61,8 +61,8 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} != 9999 ]] ; then
@@ -86,7 +86,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	ssl? (
 		pop3? ( sys-apps/ucspi-ssl )
 	)
@@ -142,12 +141,7 @@ src_prepare() {
 
 	qmail_src_postunpack
 
-	if ! use authcram; then
-		einfo "Disabled CRAM_MD5 support"
-		sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
-	else
-		einfo "Enabled CRAM_MD5 support"
-	fi
+	einfo "Enabled CRAM_MD5 support"
 
 	ht_fix_file Makefile*
 }