[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, eclass/, mail-mta/notqmail/

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, eclass/, mail-mta/notqmail/

[Sam James]

commit:     9e1bcf7d0aa3975961de47467ed2185b3330c348
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Dec 31 21:32:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 22:40:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1bcf7d

mail-mta/n[eo]tqmail: drop ucspi-ssl dependency for pop3s

Bug: https://bugs.gentoo.org/889216
Bug: https://bugs.gentoo.org/889218
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/qmail.eclass                        | 10 ++--------
 mail-mta/netqmail/netqmail-1.06-r14.ebuild |  5 +----
 mail-mta/netqmail/netqmail-1.06-r16.ebuild |  5 +----
 mail-mta/notqmail/notqmail-1.08-r5.ebuild  |  3 ---
 mail-mta/notqmail/notqmail-1.08-r6.ebuild  |  3 ---
 mail-mta/notqmail/notqmail-9999.ebuild     |  3 ---
 6 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 67069087376d..b647ac5d8e3a 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -240,7 +240,7 @@ qmail_tcprules_install() {
 	insinto "${TCPRULES_DIR}"
 	doins "${GENQMAIL_S}"/tcprules/Makefile.qmail
 	doins "${GENQMAIL_S}"/tcprules/tcp.qmail-*
-	use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
+	rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
 }
 
 qmail_supervise_install_one() {
@@ -263,7 +263,6 @@ qmail_supervise_install() {
 
 	if use pop3; then
 		qmail_supervise_install_one qmail-pop3d
-		use ssl && qmail_supervise_install_one qmail-pop3sd
 	fi
 }
 
@@ -344,7 +343,7 @@ qmail_rootmail_fixup() {
 }
 
 qmail_tcprules_build() {
-	for f in tcp.qmail-{smtp,qmtp,qmqp,pop3,pop3s}; do
+	for f in tcp.qmail-{smtp,qmtp,qmqp,pop3}; do
 		# please note that we don't check if it exists
 		# as we want it to make the cdb files anyway!
 		src="${ROOT}${TCPRULES_DIR}/${f}"
@@ -371,11 +370,6 @@ qmail_supervise_config_notice() {
 		elog "To start the pop3 server as well, create the following link:"
 		elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d"
 		elog
-		if use ssl; then
-			elog "To start the pop3s server as well, create the following link:"
-			elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd"
-			elog
-		fi
 	fi
 	elog "Additionally, the QMTP and QMQP protocols are supported, "
 	elog "and can be started as:"

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index e1f204048728..b97074ac9ce7 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -67,9 +67,6 @@ RDEPEND="${DEPEND}
 	virtual/checkpassword
 	virtual/daemontools
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index 3a8a3899566f..eac15c056ce8 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.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
@@ -65,9 +65,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 	sys-apps/ucspi-tcp
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 9717aa7f830d..e46c90306906 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
@@ -78,9 +78,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index 8e5a4d4b1b99..55cc84b9f590 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -89,9 +89,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index f07147afa4d4..3b797f2022b1 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-9999.ebuild
@@ -86,9 +86,6 @@ RDEPEND="${DEPEND}
 	acct-user/qmailr
 	acct-user/qmails
 	sys-apps/ucspi-tcp
-	ssl? (
-		pop3? ( sys-apps/ucspi-ssl )
-	)
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim