gentoo resync : 15.09.2018

7 files changed, 9 insertions, 211 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 9ef42a46b91d..785e9c86edc2 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 09fc8ac50310..70259999fd45 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,9 +1,4 @@
-AUX enigmail-2.0.5-fix-missing-missingMdcError.patch 1059 BLAKE2B 70b247f23be20df0dc9b5edb77eb48f56a2538f53af50f29b11ef0ca5c0b196e80b7adb3f1687d6ee3a1246935cc0d299f4c2f74f5a6fab89be5620ade66da1d SHA512 fa7ec8a1390636af1380a9a25f4b8b8cf23c13f82fe5bd1ad555d4a88b5cbef28d89e8dc706d738a5ec54d1d4fc439f630aa660e91509efb7709e6b2ce3013ff
-DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
-DIST enigmail-2.0.7.tar.gz 2537431 BLAKE2B 44088c12afaf285a8a1d735e02b54998af14b9990f1ab75b9f20a63c3b6fcd5b115bad18601876bd00d6910fa6da5d37e41c4b9a34102f5c1f4157bc7929d3bd SHA512 37572dbc2d5df549c3e1d5bbb8a78ce41af66072eabf4d340d98656e89be6fa1bd68fc2591827ec13cb0e32333f2e54f16b08f28dca5d7b576f9c16701f6f960
 DIST enigmail-2.0.8.tar.gz 2525691 BLAKE2B cd69efe72b661bb103837c987937e1cee64a5888795bda7126c59cf99a39c0245f505cdfd6538d54cec5dc3fc95c64bbeca3aebc4b0823249be4c0465d4d68a1 SHA512 9d2e95c2eae6ca22897eb8b2961964d96fd633e7d33a8c0c04a29b4cbc8585777598578abfb0484b96827ca165fe9c8b873e5e7f7cb3ba8cd0779ddc4f10e305
-EBUILD enigmail-2.0.5-r1.ebuild 2238 BLAKE2B 9516c87fd4eac167cddc7a56aeaedbe6b6246073f5ff0aa0fdaf8f3fdc4269145acc4047fd5a237bc920311900cd231022666e14c56fbc06add0e02d7d9df492 SHA512 f2a995dcc145b558ea642c7eaa05f6bc71bec1b5e20ef9d871357495c16c11da2b445c3cf3f57d1592bca3e414f27178c44f37258ca04560057cea47226efbef
-EBUILD enigmail-2.0.7.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
-EBUILD enigmail-2.0.8.ebuild 2145 BLAKE2B fb0219dbaf4167de4e12bfc9a556b879b9eecfed12c4c4ec1f0d4135674afff9d5805f1350207c800508efca766afa7f1198001bf875c42077744555df1ac249 SHA512 c4e1beef4e1514fd107585a3c9b5bf3948e179500d5eb0b3af36b33e08294dfa756d831c6a22769980737f9f39903e745bec3bcfcdcc8b775522d17aa70e00cc
-EBUILD enigmail-9999.ebuild 2145 BLAKE2B fb0219dbaf4167de4e12bfc9a556b879b9eecfed12c4c4ec1f0d4135674afff9d5805f1350207c800508efca766afa7f1198001bf875c42077744555df1ac249 SHA512 c4e1beef4e1514fd107585a3c9b5bf3948e179500d5eb0b3af36b33e08294dfa756d831c6a22769980737f9f39903e745bec3bcfcdcc8b775522d17aa70e00cc
+EBUILD enigmail-2.0.8.ebuild 2144 BLAKE2B 9eb9bffaccac6d4f95191c86a0318b81a206f2ece0c3a85035b738944f7222a4118b3b7a220635e3feee1bdd402fc75c5f9b6525f1602826c41055925126f5c5 SHA512 298973dc1ea6659cea0acbf368ec3c86d2f558fafdfae3332402b7a43be93a88698ee3bd80aeb99438062f1359d5849208d82c37962298dab376aa1ae94807be
+EBUILD enigmail-9999.ebuild 2148 BLAKE2B 532d31b61db1afe4e693270121290ed89ba0c7b9147b5629ede083959708cde75e2f7cf12a2abca025d684d2065f83da3ebcc755f655aba558d741ffd5f60024 SHA512 47d7bf2c26ea8e27aba644cf893d72018e307800ab19029631f06e847768f2ef22061e98e0b43ae11fe2221f945cbf8f1b9896df6ad181493368d313081bda27
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
deleted file mode 100644
index 6b528c6bff44..000000000000
--- a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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
-	PATCHES=( "${FILESDIR}"/${P}-fix-missing-missingMdcError.patch )
-	S="${WORKDIR}/${PN}"
-fi
-
-RDEPEND="|| (
-		( >=app-crypt/gnupg-2.0
-			|| (
-				app-crypt/pinentry[gtk(-)]
-				app-crypt/pinentry[qt4(-)]
-				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-2.0.7.ebuild b/x11-plugins/enigmail/enigmail-2.0.7.ebuild
deleted file mode 100644
index 9e8d0cbb3958..000000000000
--- a/x11-plugins/enigmail/enigmail-2.0.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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[qt4(-)]
-				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-2.0.8.ebuild b/x11-plugins/enigmail/enigmail-2.0.8.ebuild
index 7f808de531ff..bf24ee1477be 100644
--- a/x11-plugins/enigmail/enigmail-2.0.8.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.8.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
+HOMEPAGE="https://www.enigmail.net/"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-3"
@@ -18,10 +18,10 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}"
 else
 	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+		SRC_URI="https://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"
+		SRC_URI="https://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
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index 7f808de531ff..752b1acb8637 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
-HOMEPAGE="http://www.enigmail.net/"
+HOMEPAGE="https://www.enigmail.net/"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-3"
@@ -18,9 +18,9 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}"
 else
 	if [[ ${PV} = *_beta* ]] ; then
-		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+		SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
 	else
-		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+		SRC_URI="https://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}"
diff --git a/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch b/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch
deleted file mode 100644
index 8b7a1fb54de5..000000000000
--- a/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gitlab.com/enigmail/enigmail/commit/f196a31a9e56b8a0bd7b4ebe9af08f6e78d78e2d
-
-From 94fb482e3463e756d76f9309cdc2fb7560822eb0 Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Mon, 21 May 2018 15:55:03 -0400
-Subject: [PATCH] Use correct mdcError string
-
-Without this change, the build process fails with:
-
-MISSING PROPERTY: missingMdcError
----
- package/errorHandling.jsm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/errorHandling.jsm b/package/errorHandling.jsm
-index 8173fa72..bc8bdcb3 100644
---- a/package/errorHandling.jsm
-+++ b/package/errorHandling.jsm
-@@ -309,7 +309,7 @@ function decryptionInfo(c) {
-       c.statusFlags |= EnigmailConstants.DECRYPTION_FAILED; // be sure to fail
-       c.flag = EnigmailConstants.MISSING_MDC;
-       EnigmailLog.DEBUG("errorHandling.jsm: missing MDC!\n");
--      c.retStatusObj.statusMsg += EnigmailLocale.getString("missingMdcError") + "\n";
-+      c.retStatusObj.statusMsg += EnigmailLocale.getString("mdcError") + "\n";
-     }
-   }
- }
--- 
-2.16.3
-