x11-plugins/enigmail: Removed gnupg-1.x dependency

Closes: https://bugs.gentoo.org/646990
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/x11-plugins/enigmail/enigmail-2.0.12.ebuild b/x11-plugins/enigmail/enigmail-2.0.12.ebuild
index 8af2ce693d92c10c2be01ccf2a812746ffc3eb9c..917dd0d55c4889242a6910c94af2c03f76112bd5 100644 (file)
--- a/x11-plugins/enigmail/enigmail-2.0.12.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.12.ebuild
@@ -26,14 +26,12 @@ else
        S="${WORKDIR}/${PN}"
 fi
 
-RDEPEND="|| (
-               ( >=app-crypt/gnupg-2.0
-                       || (
-                               app-crypt/pinentry[gtk(-)]
-                               app-crypt/pinentry[qt5(-)]
-                       )
+RDEPEND="
+       ( >=app-crypt/gnupg-2.0
+               || (
+                       app-crypt/pinentry[gtk(-)]
+                       app-crypt/pinentry[qt5(-)]
                )
-               =app-crypt/gnupg-1.4*
        )
        !<mail-client/thunderbird-52.5.0
        !<www-client/seamonkey-2.49.5.0_p0

diff --git a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
index ad90c83498c2cffe0ca6e4990cf5cf75b31570e7..020a1504a746471c38fd8a9cadc7b69f5530b23c 100644 (file)
--- a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,14 +26,12 @@ else
        S="${WORKDIR}/${PN}"
 fi
 
-RDEPEND="|| (
-               ( >=app-crypt/gnupg-2.0
-                       || (
-                               app-crypt/pinentry[gtk(-)]
-                               app-crypt/pinentry[qt5(-)]
-                       )
+RDEPEND="
+       ( >=app-crypt/gnupg-2.0
+               || (
+                       app-crypt/pinentry[gtk(-)]
+                       app-crypt/pinentry[qt5(-)]
                )
-               =app-crypt/gnupg-1.4*
        )
        !<mail-client/thunderbird-52.5.0
        !<www-client/seamonkey-2.49.5.0_p0

diff --git a/x11-plugins/enigmail/enigmail-2.1.2.ebuild b/x11-plugins/enigmail/enigmail-2.1.2.ebuild
index d2c798ea50305203329b191c2c532f3036be3dce..ae81d72b24d9d959e37053f8ebc34ea7a7e4ea56 100644 (file)
--- a/x11-plugins/enigmail/enigmail-2.1.2.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.1.2.ebuild
@@ -26,14 +26,12 @@ else
        S="${WORKDIR}/${PN}"
 fi
 
-RDEPEND="|| (
-               ( >=app-crypt/gnupg-2.0
-                       || (
-                               app-crypt/pinentry[gtk(-)]
-                               app-crypt/pinentry[qt5(-)]
-                       )
+RDEPEND="
+       ( >=app-crypt/gnupg-2.0
+               || (
+                       app-crypt/pinentry[gtk(-)]
+                       app-crypt/pinentry[qt5(-)]
                )
-               =app-crypt/gnupg-1.4*
        )
        !<mail-client/thunderbird-52.5.0
        !<www-client/seamonkey-2.49.5.0_p0

diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index d2c798ea50305203329b191c2c532f3036be3dce..ae81d72b24d9d959e37053f8ebc34ea7a7e4ea56 100644 (file)
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -26,14 +26,12 @@ else
        S="${WORKDIR}/${PN}"
 fi
 
-RDEPEND="|| (
-               ( >=app-crypt/gnupg-2.0
-                       || (
-                               app-crypt/pinentry[gtk(-)]
-                               app-crypt/pinentry[qt5(-)]
-                       )
+RDEPEND="
+       ( >=app-crypt/gnupg-2.0
+               || (
+                       app-crypt/pinentry[gtk(-)]
+                       app-crypt/pinentry[qt5(-)]
                )
-               =app-crypt/gnupg-1.4*
        )
        !<mail-client/thunderbird-52.5.0
        !<www-client/seamonkey-2.49.5.0_p0