1 |
commit: 3a2f8ddaec09ebc439453016bb669627bf8a6d6d |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 31 20:40:20 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 20:40:41 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a2f8dda |
7 |
|
8 |
qmail.eclass: remove remnants of USE=pop3 |
9 |
|
10 |
Fixes: 24dcd3918e1ac751ff9c8d868509ea1fd6390f78 |
11 |
Fixes: bbc98bfdcbeb0d54f0a389eb7c92f1ffd64af7c6 |
12 |
Closes: https://bugs.gentoo.org/889218 |
13 |
Closes: https://bugs.gentoo.org/889216 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
eclass/qmail.eclass | 20 +------------------- |
17 |
1 file changed, 1 insertion(+), 19 deletions(-) |
18 |
|
19 |
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass |
20 |
index 67069087376d..12f7fa8375b0 100644 |
21 |
--- a/eclass/qmail.eclass |
22 |
+++ b/eclass/qmail.eclass |
23 |
@@ -156,11 +156,8 @@ qmail_base_install() { |
24 |
[[ -x ${i} ]] && doexe ${i} |
25 |
done |
26 |
|
27 |
- use pop3 && doexe qmail-pop3d |
28 |
- |
29 |
exeopts -o 0 -g qmail -m 711 |
30 |
doexe qmail-{clean,getpw,local,pw2u,remote,rspawn,send} splogger |
31 |
- use pop3 && doexe qmail-popup |
32 |
|
33 |
exeopts -o 0 -g qmail -m 700 |
34 |
doexe qmail-{lspawn,newmrh,newu,start} |
35 |
@@ -240,7 +237,7 @@ qmail_tcprules_install() { |
36 |
insinto "${TCPRULES_DIR}" |
37 |
doins "${GENQMAIL_S}"/tcprules/Makefile.qmail |
38 |
doins "${GENQMAIL_S}"/tcprules/tcp.qmail-* |
39 |
- use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd |
40 |
+ rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd |
41 |
} |
42 |
|
43 |
qmail_supervise_install_one() { |
44 |
@@ -260,11 +257,6 @@ qmail_supervise_install() { |
45 |
for i in qmail-{send,smtpd,qmtpd,qmqpd}; do |
46 |
qmail_supervise_install_one ${i} |
47 |
done |
48 |
- |
49 |
- if use pop3; then |
50 |
- qmail_supervise_install_one qmail-pop3d |
51 |
- use ssl && qmail_supervise_install_one qmail-pop3sd |
52 |
- fi |
53 |
} |
54 |
|
55 |
qmail_spp_install() { |
56 |
@@ -367,16 +359,6 @@ qmail_supervise_config_notice() { |
57 |
elog "ln -s ${SUPERVISE_DIR}/qmail-send /service/qmail-send" |
58 |
elog "ln -s ${SUPERVISE_DIR}/qmail-smtpd /service/qmail-smtpd" |
59 |
elog |
60 |
- if use pop3; then |
61 |
- elog "To start the pop3 server as well, create the following link:" |
62 |
- elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d" |
63 |
- elog |
64 |
- if use ssl; then |
65 |
- elog "To start the pop3s server as well, create the following link:" |
66 |
- elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd /service/qmail-pop3sd" |
67 |
- elog |
68 |
- fi |
69 |
- fi |
70 |
elog "Additionally, the QMTP and QMQP protocols are supported, " |
71 |
elog "and can be started as:" |
72 |
elog "ln -s ${SUPERVISE_DIR}/qmail-qmtpd /service/qmail-qmtpd" |