Gentoo Archives: gentoo-dev

From: Rolf Eike Beer <eike@×××××××.de>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH 5/3] qmail.eclass: retire qmail_tcprules_fixup()
Date: Fri, 13 Aug 2021 10:44:45
Message-Id: 2076718.irdbgypaU6@eto.sf-tec.de
In Reply to: [gentoo-dev] [PATCH 1/3] qmail.eclass: support EAPI 8 by Rolf Eike Beer
1 This has been in all ebuilds since the move of the portage tree to git, so
2 everyone should have already moved the files.
3
4 Signed-off-by: Rolf Eike Beer <eike@×××××××.de>
5 ---
6 eclass/qmail.eclass | 22 ----------------------
7 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 4 ----
8 mail-mta/notqmail/notqmail-1.08-r3.ebuild | 4 ----
9 mail-mta/notqmail/notqmail-9999.ebuild | 4 ----
10 4 files changed, 34 deletions(-)
11
12 diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
13 index c25950cc303..7f4d1f77e42 100644
14 --- a/eclass/qmail.eclass
15 +++ b/eclass/qmail.eclass
16 @@ -374,28 +374,6 @@ qmail_rootmail_fixup() {
17 chown -R alias:qmail "${ROOT}${QMAIL_HOME}"/alias/.maildir 2>/dev/null
18 }
19
20 -qmail_tcprules_fixup() {
21 - mkdir -p "${TCPRULES_DIR}"
22 - local POP_FILES=
23 - use pop3 && POP_FILES="pop3 pop3.cdb"
24 - for f in {smtp,qmtp,qmqp}{,.cdb} ${POP_FILES}; do
25 - old="/etc/tcp.${f}"
26 - new="${TCPRULES_DIR}/tcp.qmail-${f}"
27 - fail=0
28 - if [[ -f "${old}" && ! -f "${new}" ]]; then
29 - einfo "Moving ${old} to ${new}"
30 - cp "${old}" "${new}" || fail=1
31 - else
32 - fail=1
33 - fi
34 - if [[ "${fail}" = 1 && -f "${old}" ]]; then
35 - eerror "Error moving ${old} to ${new}, be sure to check the"
36 - eerror "configuration! You may have already moved the files,"
37 - eerror "in which case you can delete ${old}"
38 - fi
39 - done
40 -}
41 -
42 qmail_tcprules_build() {
43 for f in tcp.qmail-{smtp,qmtp,qmqp,pop3,pop3s}; do
44 # please note that we don't check if it exists
45 diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
46 index aef1ed5b4dd..e1f20404872 100644
47 --- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
48 +++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
49 @@ -173,10 +173,6 @@ pkg_postinst() {
50 elog
51 }
52
53 -pkg_preinst() {
54 - qmail_tcprules_fixup
55 -}
56 -
57 pkg_config() {
58 # avoid some weird locale problems
59 export LC_ALL=C
60 diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
61 index 382f241e719..6afc55ac3bd 100644
62 --- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
63 +++ b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
64 @@ -173,10 +173,6 @@ pkg_postinst() {
65 elog
66 }
67
68 -pkg_preinst() {
69 - qmail_tcprules_fixup
70 -}
71 -
72 pkg_config() {
73 # avoid some weird locale problems
74 export LC_ALL=C
75 diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
76 index 8673f74908f..224aaed0628 100644
77 --- a/mail-mta/notqmail/notqmail-9999.ebuild
78 +++ b/mail-mta/notqmail/notqmail-9999.ebuild
79 @@ -168,10 +168,6 @@ pkg_postinst() {
80 elog
81 }
82
83 -pkg_preinst() {
84 - qmail_tcprules_fixup
85 -}
86 -
87 pkg_config() {
88 # avoid some weird locale problems
89 export LC_ALL=C
90 --
91 2.26.2

Attachments

File name MIME type
signature.asc application/pgp-signature