gentoo auto-resync : 13:07:2022 - 19:37:38

3 files changed, 3 insertions, 82 deletions

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index b679ee79e8a9..b7712d3f2a33 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -3,6 +3,5 @@ AUX enigmail-no_pEp_auto_download.patch 1356 BLAKE2B 1e3c440e3bcaeed42b3de751303
 DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
 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.2.4.ebuild 2017 BLAKE2B bc2603dbc22df36296796287758f1990aadf75b7caa0b45369b6bc3541192160d0ae06c6b3fffc24300ae03b4f0ca09b2eebad3d89453bd29663e57c95f65256 SHA512 bd02f132dee39027c53945741f9df27b97afd95338387eee554f14b6bf8b67894097d984ac5fbced6c121e681ab71425b847326887369fc6c1a945f595487e5b
-EBUILD enigmail-9999.ebuild 2021 BLAKE2B 7e87588190d19241bf86688d4ae46276ed9d821a8fc3bf2a1bad4803036476eeedc809854781f334229546d66d80c04223aa471293529116b513214c706e6d60 SHA512 b4808139150437ba82caf53727cd6ff929bcb6fd0de21fe00dbe854de571fc26d0be2e7817297bb369c856b38d6aca155fb6996003629faad4cabf01f25dadac
+EBUILD enigmail-2.2.4.ebuild 2017 BLAKE2B 661fc6ae7810069126effb2f88aaa716a5a91e5ead76d7a8ef9ae62666009a4267767811b92cfb0af4111b285a1b7e2722ecb9c19eea6a4c797d8450c4c264b2 SHA512 e2e57abe0bb3ba167c4f51d1d43ca02bddc0802954a3493e042c1d6e1a8142cb3b233dc806369683d6240dce586da892472dfa7fbd607651c9015937925e53a7
 MISC metadata.xml 251 BLAKE2B 1f211fdc565c8904700df0e738cc47048bc2c6d26030f9a3aa25391909aba71bc63175bf5b9a375a9721410b1eb4f604ccbcfc84e85dcaad2a15fb5a804caa80 SHA512 8d132cc9d2349cc1d47bb50fb5d8e083debf9a55914e2596e3ac98dbdf2d24f17ff9b85a7f16d7574ef99247c08f7c9940a13b15e7b49b5455b86463ddc6a5c4
diff --git a/x11-plugins/enigmail/enigmail-2.2.4.ebuild b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
index 016d8fd4ed1a..e8f165edec4d 100644
--- a/x11-plugins/enigmail/enigmail-2.2.4.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-any-r1
 
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
deleted file mode 100644
index b312a52459c0..000000000000
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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-78
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-PATCHES=( "${FILESDIR}/enigmail-no_pEp_auto_download.patch" )
-
-src_prepare() {
-	default
-
-	export MAKEOPTS=-j1
-}
-
-src_install() {
-	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_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_dir}/"${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 in order for them to use"
-		elog "the newly installed version of enigmail."
-	fi
-}