| 1 |
commit: d8d984f9b7ae1acb54b709483281f06bbf78f9c8 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 4 17:28:00 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 4 17:30:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d984f9 |
| 7 |
|
| 8 |
x11-plugins/enigmail: bump to v2.2.4 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-plugins/enigmail/Manifest | 1 + |
| 14 |
...{enigmail-9999.ebuild => enigmail-2.2.4.ebuild} | 30 +++++++++------------- |
| 15 |
x11-plugins/enigmail/enigmail-9999.ebuild | 30 +++++++++------------- |
| 16 |
3 files changed, 25 insertions(+), 36 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest |
| 19 |
index d82ff32e9fd..e5be4a82cea 100644 |
| 20 |
--- a/x11-plugins/enigmail/Manifest |
| 21 |
+++ b/x11-plugins/enigmail/Manifest |
| 22 |
@@ -1,3 +1,4 @@ |
| 23 |
DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74 |
| 24 |
DIST enigmail-2.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41 |
| 25 |
DIST enigmail-2.1.8.tar.gz 2867390 BLAKE2B 8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a SHA512 b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb |
| 26 |
+DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d |
| 27 |
|
| 28 |
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-2.2.4.ebuild |
| 29 |
similarity index 68% |
| 30 |
copy from x11-plugins/enigmail/enigmail-9999.ebuild |
| 31 |
copy to x11-plugins/enigmail/enigmail-2.2.4.ebuild |
| 32 |
index 7369918278b..b990489fba0 100644 |
| 33 |
--- a/x11-plugins/enigmail/enigmail-9999.ebuild |
| 34 |
+++ b/x11-plugins/enigmail/enigmail-2.2.4.ebuild |
| 35 |
@@ -1,8 +1,8 @@ |
| 36 |
-# Copyright 1999-2019 Gentoo Authors |
| 37 |
+# Copyright 1999-2020 Gentoo Authors |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
EAPI=7 |
| 41 |
-PYTHON_COMPAT=( python2_7 ) |
| 42 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 43 |
|
| 44 |
inherit python-any-r1 |
| 45 |
|
| 46 |
@@ -33,7 +33,7 @@ RDEPEND=" |
| 47 |
app-crypt/pinentry[qt5(-)] |
| 48 |
) |
| 49 |
) |
| 50 |
- !<mail-client/thunderbird-52.5.0 |
| 51 |
+ !<mail-client/thunderbird-78 |
| 52 |
" |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
${PYTHON_DEPS} |
| 55 |
@@ -41,30 +41,24 @@ DEPEND="${RDEPEND} |
| 56 |
dev-lang/perl |
| 57 |
" |
| 58 |
|
| 59 |
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch ) |
| 60 |
+PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" ) |
| 61 |
|
| 62 |
-src_compile() { |
| 63 |
- # Required or parallel make fails |
| 64 |
- emake -C stdlib createlib |
| 65 |
- |
| 66 |
- emake ipc public ui package lang stdlib |
| 67 |
- emake xpi |
| 68 |
+src_prepare() { |
| 69 |
+ default |
| 70 |
|
| 71 |
+ export MAKEOPTS=-j1 |
| 72 |
} |
| 73 |
|
| 74 |
src_install() { |
| 75 |
- local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json) |
| 76 |
+ local build_dir=build-tb |
| 77 |
+ local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json) |
| 78 |
[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf" |
| 79 |
|
| 80 |
- mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' |
| 81 |
+ mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' |
| 82 |
|
| 83 |
# thunderbird |
| 84 |
insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}" |
| 85 |
- doins build/"${emid}.xpi" |
| 86 |
- |
| 87 |
- # seamonkey |
| 88 |
- insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}" |
| 89 |
- doins build/"${emid}.xpi" |
| 90 |
+ doins ${build_dir}/"${emid}.xpi" |
| 91 |
} |
| 92 |
|
| 93 |
pkg_postinst() { |
| 94 |
@@ -78,7 +72,7 @@ pkg_postinst() { |
| 95 |
esac |
| 96 |
if [[ -n ${REPLACING_VERSIONS} ]]; then |
| 97 |
elog |
| 98 |
- elog "Please restart thunderbird and/or seamonkey in order for them to use" |
| 99 |
+ elog "Please restart thunderbird in order for them to use" |
| 100 |
elog "the newly installed version of enigmail." |
| 101 |
fi |
| 102 |
} |
| 103 |
|
| 104 |
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild |
| 105 |
index 7369918278b..b990489fba0 100644 |
| 106 |
--- a/x11-plugins/enigmail/enigmail-9999.ebuild |
| 107 |
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild |
| 108 |
@@ -1,8 +1,8 @@ |
| 109 |
-# Copyright 1999-2019 Gentoo Authors |
| 110 |
+# Copyright 1999-2020 Gentoo Authors |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
|
| 113 |
EAPI=7 |
| 114 |
-PYTHON_COMPAT=( python2_7 ) |
| 115 |
+PYTHON_COMPAT=( python3_{6,7,8,9} ) |
| 116 |
|
| 117 |
inherit python-any-r1 |
| 118 |
|
| 119 |
@@ -33,7 +33,7 @@ RDEPEND=" |
| 120 |
app-crypt/pinentry[qt5(-)] |
| 121 |
) |
| 122 |
) |
| 123 |
- !<mail-client/thunderbird-52.5.0 |
| 124 |
+ !<mail-client/thunderbird-78 |
| 125 |
" |
| 126 |
DEPEND="${RDEPEND} |
| 127 |
${PYTHON_DEPS} |
| 128 |
@@ -41,30 +41,24 @@ DEPEND="${RDEPEND} |
| 129 |
dev-lang/perl |
| 130 |
" |
| 131 |
|
| 132 |
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch ) |
| 133 |
+PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" ) |
| 134 |
|
| 135 |
-src_compile() { |
| 136 |
- # Required or parallel make fails |
| 137 |
- emake -C stdlib createlib |
| 138 |
- |
| 139 |
- emake ipc public ui package lang stdlib |
| 140 |
- emake xpi |
| 141 |
+src_prepare() { |
| 142 |
+ default |
| 143 |
|
| 144 |
+ export MAKEOPTS=-j1 |
| 145 |
} |
| 146 |
|
| 147 |
src_install() { |
| 148 |
- local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json) |
| 149 |
+ local build_dir=build-tb |
| 150 |
+ local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json) |
| 151 |
[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf" |
| 152 |
|
| 153 |
- mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' |
| 154 |
+ mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID' |
| 155 |
|
| 156 |
# thunderbird |
| 157 |
insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}" |
| 158 |
- doins build/"${emid}.xpi" |
| 159 |
- |
| 160 |
- # seamonkey |
| 161 |
- insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}" |
| 162 |
- doins build/"${emid}.xpi" |
| 163 |
+ doins ${build_dir}/"${emid}.xpi" |
| 164 |
} |
| 165 |
|
| 166 |
pkg_postinst() { |
| 167 |
@@ -78,7 +72,7 @@ pkg_postinst() { |
| 168 |
esac |
| 169 |
if [[ -n ${REPLACING_VERSIONS} ]]; then |
| 170 |
elog |
| 171 |
- elog "Please restart thunderbird and/or seamonkey in order for them to use" |
| 172 |
+ elog "Please restart thunderbird in order for them to use" |
| 173 |
elog "the newly installed version of enigmail." |
| 174 |
fi |
| 175 |
} |
Archives