commit:     8d6ff4eacc0478b6e4a8eef1afbffb61868cdfb4
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 25 09:27:06 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Nov  5 08:03:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6ff4ea

mail-mta/netqmail: drop USE=authcram

The net-mail/cmd5checkpw no longer exists in the tree. It was
treecleaned in commit 5fb2f02da424 ("net-mail/cmd5checkpw: treeclean")
almost two years ago. Therefore, authcram USE flag is no longer working.
Time to remove it, it is already masked anyway.

Bug: https://bugs.gentoo.org/833292
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 mail-mta/netqmail/metadata.xml             |  1 -
 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 11 +++--------
 mail-mta/netqmail/netqmail-1.06-r16.ebuild | 11 +++--------
 profiles/base/package.use.mask             |  4 ----
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 820d3ed01222..ca38d08ccf20 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/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 netqmail for high volume 
servers</flag>

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index f779b272749f..70a541a281a1 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -41,7 +41,7 @@ SRC_URI="http://qmail.org/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc64 ~s390 sparc x86"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -65,7 +65,6 @@ RDEPEND="${DEPEND}
        sys-apps/ucspi-tcp
        virtual/checkpassword
        virtual/daemontools
-       authcram? ( >=net-mail/cmd5checkpw-0.30 )
        !mail-mta/courier
        !mail-mta/esmtp
        !mail-mta/exim
@@ -134,12 +133,8 @@ src_prepare() {
        qmail_src_postunpack
 
        # Fix bug #33818 but for netqmail (Bug 137015)
-       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 "Disabled CRAM_MD5 support"
+       sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
 
        ht_fix_file Makefile*
 }

diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index ba4d2c5d1026..97130b5fa0e5 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
@@ -41,7 +41,7 @@ SRC_URI="http://qmail.org/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sparc ~x86"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -63,7 +63,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        sys-apps/ucspi-tcp
-       authcram? ( >=net-mail/cmd5checkpw-0.30 )
        !mail-mta/courier
        !mail-mta/esmtp
        !mail-mta/exim
@@ -135,12 +134,8 @@ src_prepare() {
        qmail_src_postunpack
 
        # Fix bug #33818 but for netqmail (Bug 137015)
-       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 "Disabled CRAM_MD5 support"
+       sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c || die
 
        ht_fix_file Makefile*
 }

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2ee6ff976613..fd25e0163eb2 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -341,10 +341,6 @@ net-libs/gssdp man
 # Needs long-EOL dev-lang/spidermonkey:60 (which also needs python:2.7).
 media-libs/coin javascript
 
-# Michał Górny <[email protected]> (2022-11-19)
-# Requires packages masked for removal.
-mail-mta/netqmail authcram
-
 # Matt Turner <[email protected]> (2022-11-16)
 # gnome-music and gnome-photos have not been ported to libsoup:3.0, while
 # other non-slotted dependencies have been.

Reply via email to