mail-mta/notqmail: Remove USE=authcram

Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>

4 files changed, 10 insertions, 29 deletions

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*
 }