gentoo Easter resync : 12.04.2020

6 files changed, 12 insertions, 228 deletions

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index ee5ed21bed4c..34bfe51756fe 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,14 +1,10 @@
 AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851
-AUX enigmail-2.1.2-mimeverify.patch 1581 BLAKE2B 843262a1bfadc1d0eaf6218bb121e4e93c5f21cb7874986951967f6ac7a5181ed48c2757d9e631217999d7adbc4d52002cd3d92334df21ba179dfa6f42b70a5d SHA512 1d09ab0807a776b6f5543359905a6801140a78722e71f70be894f30cc525224a4b99785def6b5b4634a9790c6bde12772006d09aee792ccdf6fe1f90a9cfcee9
 AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de75130372343b7118ea3dc3c0a421d04a8a8b12a9695ba515b7dc3d566b4a0686c2bf4d12fc72b722ceb0d4dc9985eaeedaf67c90210 SHA512 1b5ff31a7ed8d17224ec915d56ee61e817dd41d035445d16a2b0caedd315215c37d2f98e42597fc599c60a39ba4d276a57c644268d12c2929a89f8802164a3d2
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
-DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
-DIST enigmail-2.1.2.tar.gz 2819073 BLAKE2B 335c7569e2c46dde645c8992cd7017dc57a0174e109ddada2719cb60de010c8ca3691c1d31e8435986b459936bd1602153e462fb5f93d7ffd1244ea867d8d3bc SHA512 c76dcdb0561ee6e94ab19c2ed8cddac71297ffc9ad14ac3d37cd8966cc4111cbc74d1b01ccaa044acef699de27a2cc7ba1ade7a31db8ab930095722ffc62be93
 DIST enigmail-2.1.5.tar.gz 2838286 BLAKE2B e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5 SHA512 0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea
-EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 0150813e0d922005cd14090d8e8d606f97ad221d3edf76735876a035ff83530d4d48ee83231ab5ed59af47eabb116fc2831ca71dbb65e672d37cab3131087b64 SHA512 2161b176ab8969dfdfe0855ecf9c867e0f166eead45babe994c150e3654ae2714763e93729d06e5260dce66f87a2c677d98df44c9e1a70026040c520c9aefc40
-EBUILD enigmail-2.0.8-r1.ebuild 2119 BLAKE2B 216169136a95855c09d57aec54cac5b2a68b43690b51465928b60c4908f5e1fa341b0ddc301df6278392d3dfb9a8945923fb602c66eb3871080bcb2d439c42c8 SHA512 a265935f53db8e66e258f8e668f13cea844048f24c21b5992ceb7d3d38be5da31df657e2e9d6fe992b53e3217fec0bb71da72e1f9ebb1017f8cf5dc714ab8546
-EBUILD enigmail-2.1.2-r1.ebuild 2232 BLAKE2B 525442d4031db46716f70b2085eecd108a3b296b673dfa88822f891e2252c9ab674062cd9a6c16ae24616ea788c8473da4f7ac6c70cd90c69fb51d25385e6184 SHA512 4dc947b28e5273056a229083dab6bedb08b4215bd2cbce3c3441e0fdd300dd88174d7649f481e662e0e4c132c6abe7c090f9a9340ab8e704facf35cf2b4ffd73
-EBUILD enigmail-2.1.2.ebuild 2184 BLAKE2B 869c794ed93bc2b5bb315df73601b65ae3339f58ffde5b7ba7ab1d150ed1ae3ee01678233e437e0fc7f75975c717a0ee258933139f2b0524effc95c2502ec1c5 SHA512 abb9f0d138f3cb7777a376b9026795774d7d7947f216fba7467a41747922e06f426efbbd77ce38089979737c21372fbf1650f4de5eb82f168d03a4cfdd634b17
+DIST enigmail-2.1.6.tar.gz 2838221 BLAKE2B e95569dcd58f16e64079436a24b152e7d5e3cfbc2067fe909b0f714a8acbcf80db7b1c288302c0ca11b2536fb2ff4f4376bd5de582f3b65fd01938182c9e8f9c SHA512 72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919
+EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 50b69ab4765ae278d6222b45663bc1869d46142b7eb8f9fc89dbbd414b65857d49d836de6bee8fab65694b989a696bf2ca9b28e62ddc97a55ff72a1c443e770e SHA512 cad36763177ebcc2d40e57eb3c80143c08dfcfe0cbd3d8d7968bc0cbf6f0767c0503a1c4acee37e199ea52d562588031bed24e99dbb25e0f2963ce1d8c7a4937
 EBUILD enigmail-2.1.5.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
+EBUILD enigmail-2.1.6.ebuild 2254 BLAKE2B 901ad5c969a2b82c8be8d683323258981ca28f260642761e7ff94df6c76e8b4b81afab67c321f106be414ffdc17b5fdc08336fca53cbacb2c198a5611e1e0967 SHA512 238a2aee1fd06d61d99c495a625cc191b404ff0efe631b79b031882ff774752221e4ca58c445d958b9d167dbb0199ab9647caf7b8cd7642b9bafaa869802bce3
 EBUILD enigmail-9999.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
index 231c774dd69d..be2ff9a0c6a1 100644
--- a/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
deleted file mode 100644
index 0840602005ed..000000000000
--- a/x11-plugins/enigmail/enigmail-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
-	S="${WORKDIR}/${P}"
-else
-	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="
-	( >=app-crypt/gnupg-2.0
-		|| (
-			app-crypt/pinentry[gtk(-)]
-			app-crypt/pinentry[qt5(-)]
-		)
-	)
-	!<mail-client/thunderbird-52.5.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-no_pEp_auto_download.patch"
-)
-
-src_compile() {
-	emake ipc public ui package lang stdlib
-	emake xpi
-
-}
-
-src_install() {
-	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/enigmail/enigmail-2.1.2.ebuild b/x11-plugins/enigmail/enigmail-2.1.2.ebuild
deleted file mode 100644
index 934957dbee79..000000000000
--- a/x11-plugins/enigmail/enigmail-2.1.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="https://www.enigmail.net/"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-3"
-IUSE=""
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
-	S="${WORKDIR}/${P}"
-else
-	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="
-	( >=app-crypt/gnupg-2.0
-		|| (
-			app-crypt/pinentry[gtk(-)]
-			app-crypt/pinentry[qt5(-)]
-		)
-	)
-	!<mail-client/thunderbird-52.5.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
-
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
-
-	emake ipc public ui package lang stdlib
-	emake xpi
-
-}
-
-src_install() {
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
-	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
-
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-
-	# thunderbird
-	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
-}
-
-pkg_postinst() {
-	local peimpl=$(eselect --brief --colour=no pinentry show)
-	case "${peimpl}" in
-	*gtk*|*qt*) ;;
-	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
-		ewarn "You may be prompted for your password in an inaccessible shell!!"
-		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
-		;;
-	esac
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}
diff --git a/x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild b/x11-plugins/enigmail/enigmail-2.1.6.ebuild
index 596a08529286..665dd902895c 100644
--- a/x11-plugins/enigmail/enigmail-2.1.2-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1
 
@@ -41,8 +41,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
-PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch"
-	"${FILESDIR}/${PN}-2.1.2-mimeverify.patch" )
+PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
 
 src_compile() {
 	# Required or parallel make fails
@@ -50,22 +49,22 @@ src_compile() {
 
 	emake ipc public ui package lang stdlib
 	emake xpi
-
 }
 
 src_install() {
-	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
+	local build_dir=build-tb
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' ${build_dir}/dist/manifest.json)
 	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
 
-	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+	mv ${build_dir}/enigmail*.xpi ${build_dir}/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
 
 	# thunderbird
 	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-	doins build/"${emid}.xpi"
+	doins ${build_dir}/"${emid}.xpi"
 
 	# seamonkey
 	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
+	doins ${build_dir}/"${emid}.xpi"
 }
 
 pkg_postinst() {
diff --git a/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch b/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch
deleted file mode 100644
index 8d3830c14586..000000000000
--- a/x11-plugins/enigmail/files/enigmail-2.1.2-mimeverify.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 745d8a0e6929e61a66b0e6c1474175d4b0a84cd6 Mon Sep 17 00:00:00 2001
-From: Jonas Witschel <diabonas@gmx.de>
-Date: Sun, 29 Sep 2019 22:07:52 +0200
-Subject: [PATCH] mimeVerify: fix incorrect newline treatment in PGP/MIME
- messages
-
-RFC 3156 specifies:
-
-Upon receipt of a signed message, an application MUST:
-
-(1)   Convert line endings to the canonical <CR><LF> sequence before
-      the signature can be verified.  This is necessary since the
-      local MTA may have converted to a local end of line convention.
-
-The code in this commit was originally added in
-ab1b9a2d1c023c5bdf9c058681b93da99ee95465 to fix SourceForge bugs #209
-and #4, but was later accidentally removed during refactoring. This
-commit restores the previous state so that signed messages created by
-MUAs such as alot or NeoMutt can be verified successfully.
-
-Fixes: c36bef32a70ee9f2eac1b839cb8644e2fddb32ca
-Closes: #1020 (SourceForge)
----
- package/mimeVerify.jsm | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/package/mimeVerify.jsm b/package/mimeVerify.jsm
-index 7cc1b228..a6e01d86 100644
---- a/package/mimeVerify.jsm
-+++ b/package/mimeVerify.jsm
-@@ -497,6 +497,10 @@ MimeVerify.prototype = {
-         mimeSignatureFile: sigFileName
-       };
-       const cApi = EnigmailCryptoAPI();
-+
-+      // ensure all lines end with CRLF as specified in RFC 3156, section 5
-+      this.signedData = this.signedData.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n");
-+
-       this.returnStatus = cApi.sync(cApi.verifyMime(this.signedData, options));
-       this.exitCode = this.returnStatus.exitCode;
- 
--- 
-2.22.0
-