Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: x11-plugins/enigmail/
Date: Mon, 12 Feb 2018 15:55:00
Message-Id: 1518450778.c61159067a29778ab42fa45e73913479dad19ee3.polynomial-c@gentoo
1 commit: c61159067a29778ab42fa45e73913479dad19ee3
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 12 15:52:58 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 12 15:52:58 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c6115906
7
8 x11-plugins/enigmail: Synced with ::gentoo
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11 Manifest-Sign-Key: 0x981CA6FC
12
13 x11-plugins/enigmail/Manifest | 31 +++++++++++-----------
14 x11-plugins/enigmail/enigmail-1.9.9.ebuild | 4 +--
15 ...gmail-9999.ebuild => enigmail-2.0_beta1.ebuild} | 18 +++++++++----
16 x11-plugins/enigmail/enigmail-9999.ebuild | 13 ++++++---
17 4 files changed, 40 insertions(+), 26 deletions(-)
18
19 diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
20 index 8376b34..7c2d13a 100644
21 --- a/x11-plugins/enigmail/Manifest
22 +++ b/x11-plugins/enigmail/Manifest
23 @@ -1,21 +1,22 @@
24 -----BEGIN PGP SIGNED MESSAGE-----
25 Hash: SHA512
26
27 -DIST enigmail-1.9.8.3.tar.gz 1776756 SHA256 53d6b29061058d81a76db51c73d3bfa92425530e92f92b940ba2eca6b3dbfc38 SHA512 d8c08b1824352353c7596750b801604f7216bc5a138563b1fbd5fb890901e9c7c03cb2df099c9158d6bf3125fa17c900f65fb21bc40a8ced67a6812cdc0e02d9 WHIRLPOOL 97441938834ae60261adc4c621e9d3f567a645e4785818218b1112956a514ed11466f7caa46eb1dcad4e31fb4ac4ab685fe8be717f1087e3cc866ec2081a2145
28 -DIST enigmail-1.9.9.tar.gz 1787556 SHA256 e6993acf8b8745dc787f3506888bf22317ddab3741912aac0bb659d1631758e3 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb WHIRLPOOL 4ef48ec5ebf4b78d08f90fddd2ab52bdaf4c3694cc938ef1b7b933c79da55ab48c0a8e2b4d5d659a0326be40fef762ab75cb097d3fc06105a39616909e8d7e59
29 +DIST enigmail-1.9.8.3.tar.gz 1776756 BLAKE2B 3de3c81b5bd1c79583ea32f79c3654337417f42f1cd11ee7df5e6b1064144eac584ba8d7368834910b9e460deb9c2d150940efdcef61c5f67803067201049e6e SHA512 d8c08b1824352353c7596750b801604f7216bc5a138563b1fbd5fb890901e9c7c03cb2df099c9158d6bf3125fa17c900f65fb21bc40a8ced67a6812cdc0e02d9
30 +DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
31 +DIST enigmail-2.0-beta1.tar.gz 2116808 BLAKE2B a539e7bf97e12327ae2a7e9fafdc2ad4298f9dd602333aa6d414b4c6770b3279cc0c9e100cb3be6be86c49f17b4c76759676efc963fe04e8fe522a8aad345f47 SHA512 ddbf540c0d628c19c7ddbcd01686dcdec53385113367e9f3ef683e3ebc97e17cbdbe62e7623b7b1be41967f47cd430b4f2d2fba1d0a86773c836ffc6ceb8f548
32 -----BEGIN PGP SIGNATURE-----
33
34 -iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAlo5DoAACgkQVx3S0DQ8
35 -YDnkZw//RhwOh4pdjHBRlr/Ges7eQ8LCKw12FmdfqUjAHjaQ6/jol053bJobtGMx
36 -i/AOopsFXGKZlH7pWTmqn4wYUl6aMcWmaHCjBcu88ygvD9HOOZnjTgxaDCzqeIx9
37 -DhUDlUkWXh9dli8uLEuZjexvRsrD+e3Ltpj8A6NtNTn4MitrQIuznM4aQOI5AUl0
38 -iQrvwHiQDBAL+Rqa272L/jtLro8AB7QHCV7Sehammh3LpCdiXHcfzgZBLZW0E4FN
39 -H27HfXXm/Y3BQYntoKlWB33wFxFv0BNm5H2NaSmh6EJd1Akidw4Se9gF95gBhHfc
40 -ORgzGhApNninFgJSRuPxQwFckdtCBajxUgunI8yU9wsB6CLwhXk9AykY9Pf/azSy
41 -2g65LkG/dYoGFLFQC2IKlAHb54W16+7AGw+bZBYQsZpV68jB3zWpnbNr1sKA+7CU
42 -ljpNYS5pki9w3mn4dOXUOg1pQjZjGF1xaYmjyuYS/tDI659rvKGCEngs8m57Wxc8
43 -89e4Jii9IvIcEqDOm0F4kgWKvwhQDSi6Zs4Jb3Zdhg8f62TIuvETFqyf2yJmRckg
44 -hQ5WQpr0YxO7rvEZ3UOpq4hUOAVs9fMPOLuWBM2oWETllRd7fmLG6ZfCTlJK/xm6
45 -DFCF/vFUz75LVJafu2AAqWcGfgRCAwF+FivqT3tF/fofR/0/nVs=
46 -=K6Rm
47 +iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAlqBuFoACgkQVx3S0DQ8
48 +YDn/Xg/9GTvCLO8r+C2/qUHVoEY38IijJTFRqWtJd8YygX4/T7u/RU4ycsMK+dOv
49 +UK8JIaAlgQvHrJNLZcM98omu1+bSwmWeO0YhQuCagdAqxUhHq3N/IsCM99vn9xp4
50 +z1k5W37bc5nP30diOkc0wK3QqJkHm9jz2GvG7MW57AGJLJlaBqXMMU4EY5iFxunY
51 +PInypblj8zBWPuIR0TzlNK+D7UD8pMhArEyH60yu0wRgIt4YYqIX3xGIeoubjFTU
52 +VbQBfvgorkmnXDDzPUAbuv/ZxFVNkzV+f6nndbqUDHhETAtPjx5hRjZVxRXviEsl
53 +k0+sQaoUJ0ciA7IX2DUanXqZkjHabwzGcO6+kFIZMZDq4+BvjJon26LlAp5d7iBv
54 +bO6gYrGENjOprBS+C+WdxWc8GfzVUUawNCEiSilhEm4LgWsCubod2nJjpY0hrxU+
55 +xNChjnFt+kGcxHfrEpGDBMdZg37sCCzH/F1pPBMa22zmtqzPVO9b4MCePSZ2X+Ox
56 +Oq/78HLW9XgXnzXVbAnzCaor782blfW2PNljSZgU0UZji/SarbOH0i/tWdGG/9TI
57 +VXZ37zppNnUGn8p9Nzas3MWKlO6xgbE2GJ7I6vIdkoOKNtyHo2MYLxuIc+ZpRFlZ
58 +/40xWbJDabbRY+Jnjlh1mHToQPAAp85PQXECVxSQkbxN4zpQvfM=
59 +=PlWY
60 -----END PGP SIGNATURE-----
61
62 diff --git a/x11-plugins/enigmail/enigmail-1.9.9.ebuild b/x11-plugins/enigmail/enigmail-1.9.9.ebuild
63 index f51f9c9..33df43d 100644
64 --- a/x11-plugins/enigmail/enigmail-1.9.9.ebuild
65 +++ b/x11-plugins/enigmail/enigmail-1.9.9.ebuild
66 @@ -1,4 +1,4 @@
67 -# Copyright 1999-2017 Gentoo Foundation
68 +# Copyright 1999-2018 Gentoo Foundation
69 # Distributed under the terms of the GNU General Public License v2
70
71 EAPI=6
72 @@ -9,7 +9,7 @@ inherit python-any-r1
73 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
74 HOMEPAGE="http://www.enigmail.net/"
75
76 -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
77 +KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
78 SLOT="0"
79 LICENSE="MPL-2.0 GPL-3"
80 IUSE=""
81
82 diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-2.0_beta1.ebuild
83 similarity index 81%
84 copy from x11-plugins/enigmail/enigmail-9999.ebuild
85 copy to x11-plugins/enigmail/enigmail-2.0_beta1.ebuild
86 index ec95bc9..9e8d0cb 100644
87 --- a/x11-plugins/enigmail/enigmail-9999.ebuild
88 +++ b/x11-plugins/enigmail/enigmail-2.0_beta1.ebuild
89 @@ -1,23 +1,28 @@
90 -# Copyright 1999-2017 Gentoo Foundation
91 +# Copyright 1999-2018 Gentoo Foundation
92 # Distributed under the terms of the GNU General Public License v2
93
94 EAPI=6
95 PYTHON_COMPAT=( python2_7 )
96
97 -inherit git-r3 python-any-r1
98 +inherit python-any-r1
99
100 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
101 HOMEPAGE="http://www.enigmail.net/"
102
103 -KEYWORDS=""
104 SLOT="0"
105 LICENSE="MPL-2.0 GPL-3"
106 IUSE=""
107 if [[ ${PV} == *9999 ]]; then
108 + inherit git-r3
109 EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
110 S="${WORKDIR}/${P}"
111 else
112 - SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
113 + if [[ ${PV} = *_beta* ]] ; then
114 + SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
115 + else
116 + SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
117 + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
118 + fi
119 S="${WORKDIR}/${PN}"
120 fi
121
122 @@ -30,7 +35,10 @@ RDEPEND="|| (
123 )
124 )
125 =app-crypt/gnupg-1.4*
126 - )"
127 + )
128 + !<mail-client/thunderbird-52.5.0
129 + !<www-client/seamonkey-2.49.5.0_p0
130 +"
131 DEPEND="${RDEPEND}
132 ${PYTHON_DEPS}
133 app-arch/zip
134
135 diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
136 index ec95bc9..66f465a 100644
137 --- a/x11-plugins/enigmail/enigmail-9999.ebuild
138 +++ b/x11-plugins/enigmail/enigmail-9999.ebuild
139 @@ -1,23 +1,28 @@
140 -# Copyright 1999-2017 Gentoo Foundation
141 +# Copyright 1999-2018 Gentoo Foundation
142 # Distributed under the terms of the GNU General Public License v2
143
144 EAPI=6
145 PYTHON_COMPAT=( python2_7 )
146
147 -inherit git-r3 python-any-r1
148 +inherit python-any-r1
149
150 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
151 HOMEPAGE="http://www.enigmail.net/"
152
153 -KEYWORDS=""
154 SLOT="0"
155 LICENSE="MPL-2.0 GPL-3"
156 IUSE=""
157 if [[ ${PV} == *9999 ]]; then
158 + inherit git-r3
159 EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
160 S="${WORKDIR}/${P}"
161 else
162 - SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
163 + if [[ ${PV} = *_beta* ]] ; then
164 + SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
165 + else
166 + SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
167 + KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
168 + fi
169 S="${WORKDIR}/${PN}"
170 fi