gentoo resync : 25.11.2020

4 files changed, 23 insertions, 35 deletions

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 9834e62855bc..41a70dac40aa 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,10 +1,10 @@
 AUX enigmail-2.0.12-enable_seamonkey_support.patch 646 BLAKE2B a7c16bcc7f220997fec4309aaccc6e5ee62ec4ed1c82698a1aa7fbeb6badd0e972b8adcceaa1697d454c3f1d63bb913dce86fe5d85b184d78e3616c34d6c0122 SHA512 f775f3608b6078e51ba335eacf5858f03956c592f31fd9184341f773fd13376e8216cf05e762f83f04e47e251b2485657eb1f7cd8779cafbc8d2a321cb42b851
 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.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41
 DIST enigmail-2.1.8.tar.gz 2867390 BLAKE2B 8908705a05277b018d40260ea095d2a2d9dee9300c7c4b06a708846e93a68242f60599fd92a2dc4c6d53026723433b7548b55e9fc97fdbe667af38a526f03f8a SHA512 b21867c08b5e51af4e82a9ecc6e0a7fc056fb165e6cec8fc11d8ed54fd97b30ca5597b5a23243da0803d08aa04a4a3732d56eae9454db89ecd10fcd750b0b1fb
+DIST enigmail-2.2.4.tar.gz 432157 BLAKE2B e6d5eab4cba2cd66669ddf38f8152511606c48ce995be331551a7b403ecbd06967c22702a06e06aa89219b5c905e835ddb4d146c0fc2cb11e1a647e46854dd1f SHA512 bf23f52ed61002b05e2e432a0abd1f576fe6eb97d94ab2241e17be86138cee153d668747f5759b967d9a4977be3dc901ee78ddb168347bdbbfed9229d27f786d
 EBUILD enigmail-2.0.12-r1.ebuild 2181 BLAKE2B 50b69ab4765ae278d6222b45663bc1869d46142b7eb8f9fc89dbbd414b65857d49d836de6bee8fab65694b989a696bf2ca9b28e62ddc97a55ff72a1c443e770e SHA512 cad36763177ebcc2d40e57eb3c80143c08dfcfe0cbd3d8d7968bc0cbf6f0767c0503a1c4acee37e199ea52d562588031bed24e99dbb25e0f2963ce1d8c7a4937
-EBUILD enigmail-2.1.7.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
-EBUILD enigmail-2.1.8.ebuild 2254 BLAKE2B 901ad5c969a2b82c8be8d683323258981ca28f260642761e7ff94df6c76e8b4b81afab67c321f106be414ffdc17b5fdc08336fca53cbacb2c198a5611e1e0967 SHA512 238a2aee1fd06d61d99c495a625cc191b404ff0efe631b79b031882ff774752221e4ca58c445d958b9d167dbb0199ab9647caf7b8cd7642b9bafaa869802bce3
-EBUILD enigmail-9999.ebuild 2188 BLAKE2B ed979ec62c674c60769027d73ced5a402894b3240be4ea93fcd5f1808b8066791836f019ecb497b236d9702efd0c4b01f1e30e65720b243cc1407615e32ebeb8 SHA512 ef2b530bd9cd0cd7e8a002b6e01bc21fd4d8331ee074ef676c12c37a315744dcd7fb2f24c49622fcb91cca9aa42067a17fbfbb825f94c016bb742df920f764b6
+EBUILD enigmail-2.1.8.ebuild 2250 BLAKE2B 3fcad1fa9f86151aee49b7ba52267270751e0876d52455bd0ae9ea0201d472a21cddf844633aa125626a1420937b9786fdab95d7fddb6c187717c5f3af97f9ca SHA512 468f86c4c4a6e69fc0579a440793850dac9f9f29d2b9b05c930364da3063c2283c89d5768199d68f49f17ec42cf6ae895688c3a3088c27b863a6355eff56a0c0
+EBUILD enigmail-2.2.4.ebuild 2019 BLAKE2B 78a2e43af9cfbfe128313aa6cfa0575aeb15248a850c62cbe902e3fc05b4396f5c187f675640ad610e00330ddbeaa652a2ddf7276caf14ca8e35e82bb7b59094 SHA512 e13cf5623532dc6f58b1c33be8d1d373edb829bfd2bd55fa7f0d773edc0909ba7848dc473ed6e8a8d9b45dbdb90f965c6b521122ce409c406870ed3623973e72
+EBUILD enigmail-9999.ebuild 2023 BLAKE2B 4d060acb5ba2aa75037f191f775ef673e50946b3435c4a63c1b21e3e9db67499908f1cfc0a290afca47417301716832991a4301c03d7664eea4e0303ef0b2e58 SHA512 7a6e2fa7e3ac1fbb1de05c8045efc9f7987c17bb06f1935e72aae79bef78bced0cea04534ccc8165d065b35330a17c9f2e1ec75f650380e84378f12525098aa2
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.1.8.ebuild b/x11-plugins/enigmail/enigmail-2.1.8.ebuild
index 665dd902895c..53f90a93be8c 100644
--- a/x11-plugins/enigmail/enigmail-2.1.8.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.1.8.ebuild
@@ -21,7 +21,7 @@ else
 		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"
+		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 	fi
 	S="${WORKDIR}/${PN}"
 fi
diff --git a/x11-plugins/enigmail/enigmail-2.1.7.ebuild b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
index 53f90a93be8c..3d4a1620e642 100644
--- a/x11-plugins/enigmail/enigmail-2.1.7.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-any-r1
 
@@ -33,7 +33,7 @@ RDEPEND="
 			app-crypt/pinentry[qt5(-)]
 		)
 	)
-	!<mail-client/thunderbird-52.5.0
+	!<mail-client/thunderbird-78
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -43,12 +43,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
 
-src_compile() {
-	# Required or parallel make fails
-	emake -C stdlib createlib
+src_prepare() {
+	default
 
-	emake ipc public ui package lang stdlib
-	emake xpi
+	export MAKEOPTS=-j1
 }
 
 src_install() {
@@ -61,10 +59,6 @@ src_install() {
 	# thunderbird
 	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
 	doins ${build_dir}/"${emid}.xpi"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins ${build_dir}/"${emid}.xpi"
 }
 
 pkg_postinst() {
@@ -78,7 +72,7 @@ pkg_postinst() {
 	esac
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "Please restart thunderbird in order for them to use"
 		elog "the newly installed version of enigmail."
 	fi
 }
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index 7369918278b0..b990489fba08 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.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,9} )
 
 inherit python-any-r1
 
@@ -33,7 +33,7 @@ RDEPEND="
 			app-crypt/pinentry[qt5(-)]
 		)
 	)
-	!<mail-client/thunderbird-52.5.0
+	!<mail-client/thunderbird-78
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -41,30 +41,24 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
-PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+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_prepare() {
+	default
 
+	export MAKEOPTS=-j1
 }
 
 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"
-
-	# seamonkey
-	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
-	doins build/"${emid}.xpi"
+	doins ${build_dir}/"${emid}.xpi"
 }
 
 pkg_postinst() {
@@ -78,7 +72,7 @@ pkg_postinst() {
 	esac
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
 		elog
-		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "Please restart thunderbird in order for them to use"
 		elog "the newly installed version of enigmail."
 	fi
 }