summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-08-30 10:44:22 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-08-30 10:44:22 +0200
commitfa75f947334521b7ef673889119b4ff1cea6358a (patch)
tree17f07c1764dcc8a4e9f9b4bb290b7caed73688aa
parentmedia-sound/qmmp: Bump to version 1.3.4 (diff)
downloadgentoo-fa75f947334521b7ef673889119b4ff1cea6358a.tar.gz
gentoo-fa75f947334521b7ef673889119b4ff1cea6358a.tar.bz2
gentoo-fa75f947334521b7ef673889119b4ff1cea6358a.zip
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>
-rw-r--r--x11-plugins/enigmail/enigmail-2.0.12.ebuild12
-rw-r--r--x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild14
-rw-r--r--x11-plugins/enigmail/enigmail-2.1.2.ebuild12
-rw-r--r--x11-plugins/enigmail/enigmail-9999.ebuild12
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 8af2ce693d92..917dd0d55c48 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 ad90c83498c2..020a1504a746 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 d2c798ea5030..ae81d72b24d9 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 d2c798ea5030..ae81d72b24d9 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