gentoo resync : 07.04.2018

5 files changed, 85 insertions, 33 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 57acd0b53155..8a83c149e8cc 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index c2d077227f10..f1945f193dcf 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,6 +1,8 @@
 DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
+DIST enigmail-2.0.1.tar.gz 2527950 BLAKE2B 4abb734b23cd6ae2be149d017d3ccc36881b7cc82e3551ca5506cb25f22c1023f7329a4d7e1139b9e1a4e2eed5f3b12e444e0e88801dfd4aff547d5f6bc7bab3 SHA512 1795e7e15d8388990fbe1c8aed1747e190c319e8d30dc8d08110714f3fa64dd86aadddcfc1d0644e1f1f915396fe85237e976796a7089b24b7644cc049f8ac80
 DIST enigmail-2.0.tar.gz 2526788 BLAKE2B ee41681bba5874b0e8dac5362f49304101567a8dd5da4a8d31c7db353ca61adbe09a5e622a1d69e77a61e82f060266a8644a8c05a241a0f332e4955aed72fff0 SHA512 bbf7c743d51d6010e8dcca575e1530561944b552dd940119cda874c4b70109eedaaee437c108b1ead17a8414935f48083e2bde8020f3504f927bf9e01fb7b4ae
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
+EBUILD enigmail-2.0.1.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-2.0.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.1.ebuild b/x11-plugins/enigmail/enigmail-2.0.1.ebuild
new file mode 100644
index 000000000000..9e8d0cbb3958
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.0.1.ebuild
@@ -0,0 +1,83 @@
+# 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/pidgin-xmpp-receipts/Manifest b/x11-plugins/pidgin-xmpp-receipts/Manifest
index 3c02b6d14678..377a93ec052a 100644
--- a/x11-plugins/pidgin-xmpp-receipts/Manifest
+++ b/x11-plugins/pidgin-xmpp-receipts/Manifest
@@ -1,5 +1,3 @@
-DIST pidgin-xmpp-receipts-0.6.tar.gz 15946 BLAKE2B e611f2eb5a69db9447f0e14188b624a37d85a24f5e2abdbafe280f3d22b69197daa1bd29dd960317a7d35c0aef8bd03de03d4c542b3191b33cd534b35d23b61b SHA512 160270206d0d6394bddaa15ca59896756ab3a546f7c74cc9e3d4ec634f70b829ae3b013ee6086a5d4a5376b7d2b81341c44c3ef0ecab2a66d612b96fd37dfeff
 DIST pidgin-xmpp-receipts-0.8.tar.gz 16021 BLAKE2B ba6eb7cb49ec75981e2c15f8aa471e6169ca4f9e6b03061248ff99669b7e31c838c466b1b476fed20bf3c1321954de13b053bbdd599f1ac4f58defacebabf383 SHA512 04113236d46066211d7e0f3c66f4bf1b6fb8a33ac675203f3cff15300eb97ffd3ee627e03fcc3ab3d1e9431fc107a9f7e9fca319f3debb773603d311b167b5a8
-EBUILD pidgin-xmpp-receipts-0.6.ebuild 925 BLAKE2B 81d54cc3df2c5f0e99f0e4a79a37b741ce43aa85046e9a82f567b347e586913608af2e2dadd93a2bf74428a08939711e1debad8f97a9d5b6bd54ceb28ffebfc5 SHA512 1c997e27d85d4f97b65b31efdfd9e9667fc5ef6645214fc445c2760f5ce3222979f1f95e0db7d62702842b4d050c04df5447443c2a9cad78400a32af816a7072
 EBUILD pidgin-xmpp-receipts-0.8.ebuild 886 BLAKE2B 0c3225f3ea6febf81693970007271c84a1ab8712f384aa5d125d000af7a6d43ca5b56c29ffadf0b757d8c6603ddacc47c67e4d4df9b200d0e6fe5470249bd652 SHA512 e263e4dd770d7b4605837d59bc8f909127ce1c1fdd3e5d123cb9ca0cfa277ab4ab0877c8b8f9e1b39cdb43373b89259b9fae5f5a896c86066c4819e06554b4c5
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.6.ebuild b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.6.ebuild
deleted file mode 100644
index 1d538ae464f0..000000000000
--- a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Implementation of xmpp message delivery receipts (XEP-0184) for Pidgin"
-HOMEPAGE="https://www.assembla.com/spaces/pidgin-xmpp-receipts/documents"
-SRC_URI="https://www.assembla.com/spaces/pidgin-xmpp-receipts/documents/ckA6jCV5Kr4OkjacwqjQXA/download/ckA6jCV5Kr4OkjacwqjQXA -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="net-im/pidgin[gtk]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	GTK_PIDGIN_INCLUDES=$(pkg-config --cflags gtk+-2.0 pidgin)
-	$(tc-getCC) ${LDFLAGS} -shared ${CFLAGS} -fpic ${GTK_PIDGIN_INCLUDES} -o ${PN/pidgin-/}.so ${PN/pidgin-/}.c || die
-}
-
-src_install() {
-	PLUGIN_DIR_PIDGIN=$(pkg-config --variable=plugindir pidgin)
-	dodir "${PLUGIN_DIR_PIDGIN}"
-	insinto "${PLUGIN_DIR_PIDGIN}"
-	doins ${PN/pidgin-/}.so
-}