1 |
commit: 476573cc2c55c78812da922595ed5da7eb31b7ab |
2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
3 |
AuthorDate: Sat Dec 31 21:27:48 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 22:39:58 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476573cc |
7 |
|
8 |
Revert "mail-mta/notqmail: Remove USE=pop3" |
9 |
|
10 |
This reverts commit 24dcd3918e1ac751ff9c8d868509ea1fd6390f78. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/889216 |
13 |
Bug: https://bugs.gentoo.org/889218 |
14 |
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
mail-mta/notqmail/notqmail-1.08-r5.ebuild | 5 ++++- |
18 |
mail-mta/notqmail/notqmail-1.08-r6.ebuild | 5 ++++- |
19 |
mail-mta/notqmail/notqmail-9999.ebuild | 5 ++++- |
20 |
3 files changed, 12 insertions(+), 3 deletions(-) |
21 |
|
22 |
diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild b/mail-mta/notqmail/notqmail-1.08-r5.ebuild |
23 |
index 7c324e45672e..9717aa7f830d 100644 |
24 |
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild |
25 |
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild |
26 |
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI} |
27 |
|
28 |
LICENSE="public-domain" |
29 |
SLOT="0" |
30 |
-IUSE=" gencertdaily highvolume qmail-spp ssl test vanilla" |
31 |
+IUSE=" gencertdaily highvolume pop3 qmail-spp ssl test vanilla" |
32 |
REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )" |
33 |
RESTRICT="!test? ( test )" |
34 |
|
35 |
@@ -78,6 +78,9 @@ RDEPEND="${DEPEND} |
36 |
acct-user/qmailr |
37 |
acct-user/qmails |
38 |
sys-apps/ucspi-tcp |
39 |
+ ssl? ( |
40 |
+ pop3? ( sys-apps/ucspi-ssl ) |
41 |
+ ) |
42 |
!mail-mta/courier |
43 |
!mail-mta/esmtp |
44 |
!mail-mta/exim |
45 |
|
46 |
diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild b/mail-mta/notqmail/notqmail-1.08-r6.ebuild |
47 |
index ea86d4a9ade7..8e5a4d4b1b99 100644 |
48 |
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild |
49 |
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild |
50 |
@@ -64,7 +64,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc |
51 |
|
52 |
LICENSE="public-domain" |
53 |
SLOT="0" |
54 |
-IUSE="gencertdaily highvolume qmail-spp ssl test vanilla" |
55 |
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla" |
56 |
REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )" |
57 |
RESTRICT="!test? ( test )" |
58 |
|
59 |
@@ -89,6 +89,9 @@ RDEPEND="${DEPEND} |
60 |
acct-user/qmailr |
61 |
acct-user/qmails |
62 |
sys-apps/ucspi-tcp |
63 |
+ ssl? ( |
64 |
+ pop3? ( sys-apps/ucspi-ssl ) |
65 |
+ ) |
66 |
!mail-mta/courier |
67 |
!mail-mta/esmtp |
68 |
!mail-mta/exim |
69 |
|
70 |
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild |
71 |
index bfa7c200a49a..f07147afa4d4 100644 |
72 |
--- a/mail-mta/notqmail/notqmail-9999.ebuild |
73 |
+++ b/mail-mta/notqmail/notqmail-9999.ebuild |
74 |
@@ -61,7 +61,7 @@ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/notqmail.asc |
75 |
|
76 |
LICENSE="public-domain" |
77 |
SLOT="0" |
78 |
-IUSE="gencertdaily highvolume qmail-spp ssl test vanilla" |
79 |
+IUSE="gencertdaily highvolume pop3 qmail-spp ssl test vanilla" |
80 |
REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily? ( ssl )" |
81 |
RESTRICT="!test? ( test )" |
82 |
|
83 |
@@ -86,6 +86,9 @@ RDEPEND="${DEPEND} |
84 |
acct-user/qmailr |
85 |
acct-user/qmails |
86 |
sys-apps/ucspi-tcp |
87 |
+ ssl? ( |
88 |
+ pop3? ( sys-apps/ucspi-ssl ) |
89 |
+ ) |
90 |
!mail-mta/courier |
91 |
!mail-mta/esmtp |
92 |
!mail-mta/exim |