gentoo resync : 08.08.2018

4 files changed, 26 insertions, 16 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index e3c9ef0ed8d0..4ea3aa2d5ad7 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index c8e52f69ca33..09fc8ac50310 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,9 +1,9 @@
 AUX enigmail-2.0.5-fix-missing-missingMdcError.patch 1059 BLAKE2B 70b247f23be20df0dc9b5edb77eb48f56a2538f53af50f29b11ef0ca5c0b196e80b7adb3f1687d6ee3a1246935cc0d299f4c2f74f5a6fab89be5620ade66da1d SHA512 fa7ec8a1390636af1380a9a25f4b8b8cf23c13f82fe5bd1ad555d4a88b5cbef28d89e8dc706d738a5ec54d1d4fc439f630aa660e91509efb7709e6b2ce3013ff
-DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
 DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
 DIST enigmail-2.0.7.tar.gz 2537431 BLAKE2B 44088c12afaf285a8a1d735e02b54998af14b9990f1ab75b9f20a63c3b6fcd5b115bad18601876bd00d6910fa6da5d37e41c4b9a34102f5c1f4157bc7929d3bd SHA512 37572dbc2d5df549c3e1d5bbb8a78ce41af66072eabf4d340d98656e89be6fa1bd68fc2591827ec13cb0e32333f2e54f16b08f28dca5d7b576f9c16701f6f960
-EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
+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-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
+EBUILD enigmail-2.0.8.ebuild 2145 BLAKE2B fb0219dbaf4167de4e12bfc9a556b879b9eecfed12c4c4ec1f0d4135674afff9d5805f1350207c800508efca766afa7f1198001bf875c42077744555df1ac249 SHA512 c4e1beef4e1514fd107585a3c9b5bf3948e179500d5eb0b3af36b33e08294dfa756d831c6a22769980737f9f39903e745bec3bcfcdcc8b775522d17aa70e00cc
+EBUILD enigmail-9999.ebuild 2145 BLAKE2B fb0219dbaf4167de4e12bfc9a556b879b9eecfed12c4c4ec1f0d4135674afff9d5805f1350207c800508efca766afa7f1198001bf875c42077744555df1ac249 SHA512 c4e1beef4e1514fd107585a3c9b5bf3948e179500d5eb0b3af36b33e08294dfa756d831c6a22769980737f9f39903e745bec3bcfcdcc8b775522d17aa70e00cc
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-1.9.9.ebuild b/x11-plugins/enigmail/enigmail-2.0.8.ebuild
index 91af46035151..7f808de531ff 100644
--- a/x11-plugins/enigmail/enigmail-1.9.9.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1
@@ -9,17 +9,27 @@ inherit python-any-r1
 DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
 HOMEPAGE="http://www.enigmail.net/"
 
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-3"
 IUSE=""
-SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+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(-)]
 			)
 		)
@@ -27,17 +37,15 @@ RDEPEND="|| (
 	)
 	!<mail-client/thunderbird-52.5.0
 	!<www-client/seamonkey-2.49.5.0_p0
-	"
+"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	app-arch/zip
 	dev-lang/perl
 	"
 
-S="${WORKDIR}/${PN}"
-
 src_compile() {
-	emake ipc public ui package lang
+	emake ipc public ui package lang stdlib
 	emake xpi
 
 }
@@ -67,7 +75,7 @@ pkg_postinst() {
 		;;
 	esac
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog ""
+		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
index 66f465afa7c6..7f808de531ff 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-any-r1
@@ -30,12 +30,14 @@ 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