1 |
commit: fa75f947334521b7ef673889119b4ff1cea6358a |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 30 08:44:22 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 30 08:44:22 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa75f947 |
7 |
|
8 |
x11-plugins/enigmail: Removed gnupg-1.x dependency |
9 |
|
10 |
Closes: https://bugs.gentoo.org/646990 |
11 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
x11-plugins/enigmail/enigmail-2.0.12.ebuild | 12 +++++------- |
15 |
x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild | 14 ++++++-------- |
16 |
x11-plugins/enigmail/enigmail-2.1.2.ebuild | 12 +++++------- |
17 |
x11-plugins/enigmail/enigmail-9999.ebuild | 12 +++++------- |
18 |
4 files changed, 21 insertions(+), 29 deletions(-) |
19 |
|
20 |
diff --git a/x11-plugins/enigmail/enigmail-2.0.12.ebuild b/x11-plugins/enigmail/enigmail-2.0.12.ebuild |
21 |
index 8af2ce693d9..917dd0d55c4 100644 |
22 |
--- a/x11-plugins/enigmail/enigmail-2.0.12.ebuild |
23 |
+++ b/x11-plugins/enigmail/enigmail-2.0.12.ebuild |
24 |
@@ -26,14 +26,12 @@ else |
25 |
S="${WORKDIR}/${PN}" |
26 |
fi |
27 |
|
28 |
-RDEPEND="|| ( |
29 |
- ( >=app-crypt/gnupg-2.0 |
30 |
- || ( |
31 |
- app-crypt/pinentry[gtk(-)] |
32 |
- app-crypt/pinentry[qt5(-)] |
33 |
- ) |
34 |
+RDEPEND=" |
35 |
+ ( >=app-crypt/gnupg-2.0 |
36 |
+ || ( |
37 |
+ app-crypt/pinentry[gtk(-)] |
38 |
+ app-crypt/pinentry[qt5(-)] |
39 |
) |
40 |
- =app-crypt/gnupg-1.4* |
41 |
) |
42 |
!<mail-client/thunderbird-52.5.0 |
43 |
!<www-client/seamonkey-2.49.5.0_p0 |
44 |
|
45 |
diff --git a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild |
46 |
index ad90c83498c..020a1504a74 100644 |
47 |
--- a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild |
48 |
+++ b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild |
49 |
@@ -1,4 +1,4 @@ |
50 |
-# Copyright 1999-2018 Gentoo Authors |
51 |
+# Copyright 1999-2019 Gentoo Authors |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
|
54 |
EAPI=7 |
55 |
@@ -26,14 +26,12 @@ else |
56 |
S="${WORKDIR}/${PN}" |
57 |
fi |
58 |
|
59 |
-RDEPEND="|| ( |
60 |
- ( >=app-crypt/gnupg-2.0 |
61 |
- || ( |
62 |
- app-crypt/pinentry[gtk(-)] |
63 |
- app-crypt/pinentry[qt5(-)] |
64 |
- ) |
65 |
+RDEPEND=" |
66 |
+ ( >=app-crypt/gnupg-2.0 |
67 |
+ || ( |
68 |
+ app-crypt/pinentry[gtk(-)] |
69 |
+ app-crypt/pinentry[qt5(-)] |
70 |
) |
71 |
- =app-crypt/gnupg-1.4* |
72 |
) |
73 |
!<mail-client/thunderbird-52.5.0 |
74 |
!<www-client/seamonkey-2.49.5.0_p0 |
75 |
|
76 |
diff --git a/x11-plugins/enigmail/enigmail-2.1.2.ebuild b/x11-plugins/enigmail/enigmail-2.1.2.ebuild |
77 |
index d2c798ea503..ae81d72b24d 100644 |
78 |
--- a/x11-plugins/enigmail/enigmail-2.1.2.ebuild |
79 |
+++ b/x11-plugins/enigmail/enigmail-2.1.2.ebuild |
80 |
@@ -26,14 +26,12 @@ else |
81 |
S="${WORKDIR}/${PN}" |
82 |
fi |
83 |
|
84 |
-RDEPEND="|| ( |
85 |
- ( >=app-crypt/gnupg-2.0 |
86 |
- || ( |
87 |
- app-crypt/pinentry[gtk(-)] |
88 |
- app-crypt/pinentry[qt5(-)] |
89 |
- ) |
90 |
+RDEPEND=" |
91 |
+ ( >=app-crypt/gnupg-2.0 |
92 |
+ || ( |
93 |
+ app-crypt/pinentry[gtk(-)] |
94 |
+ app-crypt/pinentry[qt5(-)] |
95 |
) |
96 |
- =app-crypt/gnupg-1.4* |
97 |
) |
98 |
!<mail-client/thunderbird-52.5.0 |
99 |
!<www-client/seamonkey-2.49.5.0_p0 |
100 |
|
101 |
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild |
102 |
index d2c798ea503..ae81d72b24d 100644 |
103 |
--- a/x11-plugins/enigmail/enigmail-9999.ebuild |
104 |
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild |
105 |
@@ -26,14 +26,12 @@ else |
106 |
S="${WORKDIR}/${PN}" |
107 |
fi |
108 |
|
109 |
-RDEPEND="|| ( |
110 |
- ( >=app-crypt/gnupg-2.0 |
111 |
- || ( |
112 |
- app-crypt/pinentry[gtk(-)] |
113 |
- app-crypt/pinentry[qt5(-)] |
114 |
- ) |
115 |
+RDEPEND=" |
116 |
+ ( >=app-crypt/gnupg-2.0 |
117 |
+ || ( |
118 |
+ app-crypt/pinentry[gtk(-)] |
119 |
+ app-crypt/pinentry[qt5(-)] |
120 |
) |
121 |
- =app-crypt/gnupg-1.4* |
122 |
) |
123 |
!<mail-client/thunderbird-52.5.0 |
124 |
!<www-client/seamonkey-2.49.5.0_p0 |