[gentoo-commits] repo/gentoo:master commit in: x11-plugins/enigmail/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     fa75f947334521b7ef673889119b4ff1cea6358a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 08:44:22 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 08:44:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa75f947

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 <AT> gentoo.org>

 x11-plugins/enigmail/enigmail-2.0.12.ebuild   | 12 +++++-------
 x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild | 14 ++++++--------
 x11-plugins/enigmail/enigmail-2.1.2.ebuild    | 12 +++++-------
 x11-plugins/enigmail/enigmail-9999.ebuild     | 12 +++++-------
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/x11-plugins/enigmail/enigmail-2.0.12.ebuild b/x11-plugins/enigmail/enigmail-2.0.12.ebuild
index 8af2ce693d9..917dd0d55c4 100644
--- 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 ad90c83498c..020a1504a74 100644
--- 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 d2c798ea503..ae81d72b24d 100644
--- 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 d2c798ea503..ae81d72b24d 100644
--- 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