[gentoo-commits] proj/mozilla:master commit in: x11-plugins/enigmail/

[Jory Pratt]

commit:     223785ff59781fbdb870e08a49e054726b7d076a
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 16:52:25 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 16:52:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=223785ff

x11-plugins/enigmail: Use from main tree!!

Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 x11-plugins/enigmail/Manifest              | 20 --------
 x11-plugins/enigmail/enigmail-2.0.8.ebuild | 82 ------------------------------
 x11-plugins/enigmail/enigmail-9999.ebuild  | 82 ------------------------------
 x11-plugins/enigmail/metadata.xml          |  8 ---
 4 files changed, 192 deletions(-)

diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
deleted file mode 100644
index d9410c7..0000000
--- a/x11-plugins/enigmail/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAltphwcACgkQVx3S0DQ8
-YDk72w/+IoDI6BEEeqDZ+Vm1vmtuFShVYqQ8xiKSB/bnxBEdpkAd2PEupys04isI
-tbbSBB1OTQ/vjNfuYA54f0zUZ+eao0gh+vMPSD+gjxN3jnuaeS22HbWW80FxfZOu
-mr/3nYH5E7ybOkJZoAO+kc3FJyQC3d0cNHzxlDZdKDAvYyYYg206kZEKa2I73n6P
-xf8kJBuY0i795ELJ4qTqymGlkERBp4ZGF5TYVL4R0HPvaafbN2Mm7qmzkt3dwyy6
-SxItwUXVqfonsD/YqMZOCw1qw4KrIku0kN3/54HZqImMDnjjouJtBoBxOb9vSOrW
-DgzVyyjF29x59HWkEdA92O3WoH5TXaUE7ZPBtGkd23aR/BvIK7bbV+eFxE8GLSo+
-IAo64PMgOxCtH/F3fBRr+02ZOTOECgxMprN/rm/PKSep9BkTUwQXn9Ooe6fiw2kr
-UfWX+I8bd4pHjw07yaI/iXch8o2T6N/Ngkf3BfJLwCjCIIosEupaNAM6i+6WrAyc
-WAFqZkTz55Zw6YhMIe927kKN/1B0GiqTjsf110I3p5gMbQgSEND8pj1NSYUPoWyC
-NjShrdVXyjpJhH53beeVadZ8S3R47FzX2tDQax16dVNz9P8AuvAaIj9hv7DmI/j3
-3P8QL342mvZa8ibzNH1AtfJTGX+19GTXdzi30+/cDS8nTe/Y7U0=
-=mx9j
------END PGP SIGNATURE-----

diff --git a/x11-plugins/enigmail/enigmail-2.0.8.ebuild b/x11-plugins/enigmail/enigmail-2.0.8.ebuild
deleted file mode 100644
index 7f808de..0000000
--- a/x11-plugins/enigmail/enigmail-2.0.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="http://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="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)
-	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-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-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
deleted file mode 100644
index 7f808de..0000000
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="http://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="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
-	else
-		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	fi
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt5(-)]
-			)
-		)
-		=app-crypt/gnupg-1.4*
-	)
-	!<mail-client/thunderbird-52.5.0
-	!<www-client/seamonkey-2.49.5.0_p0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-arch/zip
-	dev-lang/perl
-	"
-
-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/metadata.xml b/x11-plugins/enigmail/metadata.xml
deleted file mode 100644
index d9b367e..0000000
--- a/x11-plugins/enigmail/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>mozilla@g.o</email>
-	<name>Gentoo Mozilla Team</name>
-</maintainer>
-</pkgmetadata>