gentoo resync : 29.05.2018

12 files changed, 50 insertions, 35 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 8f3d13049a99..e2db44bf082a 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 578dd08d7403..923090d2f48f 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,8 +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.4.tar.gz 2533719 BLAKE2B 9c3a38233df2c05e4bbbdfa2fd762b6362cc0bbc143b7a417cdabee44b3873bd73747a7b8d50317987f5d1750acf7badfae631cc2827718ed5702c5df2d10709 SHA512 eadcd6bfe42c43d8dd569a8085d82b7acf94f77e5fc2c7632e4148b9cc21389552de687a81a3e88e9b2639adad677c85d6db9b14a39f994f79c0524500de0b3b
 DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
 EBUILD enigmail-2.0.4.ebuild 2174 BLAKE2B 8a2cc0d181c27dc6dfdfaf5e0d51983fe290b8b4fdaf7e3dcaba6401a1c874ff20d363a2b13ac14fac225c3d9aeb904e529de5945112a158ac6b32db37690e6c SHA512 be8c9b87f459bf006a2455d492190f5a4ad7a38ef3369c8408cb27fa65cfe36208175df1752cd5715c6f4592cafeec80b8f1e9535158cac771d74823d0d31afa
-EBUILD enigmail-2.0.5.ebuild 2175 BLAKE2B dfa49006af6629de4eebd328e552bf2b3f2fd31a1f849d8ad03a15826f5e6a3a117febf39d51dc58dc8f39c7efdef9d3be3f9289bb54e4238e4db19199762937 SHA512 61c86e0891c3dc92f09891c82ab515af584029b1c77592dee0d04e8297484b5a516eacc8a75d943ad3e60b772537b50c4cafaa5f621a3a09c376e8a1c22a4e5f
+EBUILD enigmail-2.0.5-r1.ebuild 2240 BLAKE2B 7a9cba65cf9cc571d6052e0bcdb474915614f2bfbc0a24c85df56979290fe7d51d96d9baa7d3faead6d20b21877021a93eac0b05971f02b97ee468632f6541b6 SHA512 72e9eccc842581b7b3c6827f57059919624535a804b265704f37b074dfcd853049a0384b91fa94f9fe3a1494defc8fabc3d64ef357e9c44ebe829e42d43bb40a
 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.5.ebuild b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
index 8d6d09bb3f6a..60cce5b8c71e 100644
--- a/x11-plugins/enigmail/enigmail-2.0.5.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
@@ -21,8 +21,9 @@ else
 		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"
+		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
 
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
new file mode 100644
index 000000000000..8b7a1fb54de5
--- /dev/null
+++ b/x11-plugins/enigmail/files/enigmail-2.0.5-fix-missing-missingMdcError.patch
@@ -0,0 +1,30 @@
+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
+
diff --git a/x11-plugins/guifications/Manifest b/x11-plugins/guifications/Manifest
index 004f7bba3ef6..22eacb60d4bc 100644
--- a/x11-plugins/guifications/Manifest
+++ b/x11-plugins/guifications/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-guifications-2.16.tar.bz2 543136 BLAKE2B dd34108210914386dbd2780b4f2a23cb615a51e8cabe39e16867721815b017b8f897906e06eb7cef1cb96e60e70ce3c02ad20d8a1a906159848cfaf64eaa7b76 SHA512 fee1741a37df102ed3620caed9024c1a2ac5919c1a9c4182bdb19685a4d3412a1ff72e5e58ce65fdc2689f1d90432ea22c3912a9ecda80a95af96d57c86c9cf0
-EBUILD guifications-2.16.ebuild 829 BLAKE2B 6f68ecd39afdbb416e7d25c22701a57d6b32e7eb58e5da8885b2b0ee43ffea6dae677b80e62a8385cb689c4dd5b8d24b2e9f40dd2ee28f2a2e1f898e1184c638 SHA512 dad8f3dd623d0df6abe5977b5556640c6311a9416d92f21948a33cfb669ee8384e50e0fd4465896bb687b5da89a54d49ce8fd0e576f5de55565985bfed9202dc
+EBUILD guifications-2.16.ebuild 645 BLAKE2B 46126eae4aed062cb30f4cc40f6f5f91bc13b4ad925fc5be945039e42e7f6805bea1cab02afda4f0ab73ed074fab891653c36f860b733e021bc1dd088bc7a0b2 SHA512 f169c81911559e12105a527661775fcaa262b1463fd760f169f1ea416bf58842ad902756073930910b919212c1e9964fae6932e00e0a08d092e8b9192813c16f
 MISC metadata.xml 296 BLAKE2B c1f1e3e2594aa042f53398bdfb81697c7b3ff9a9473f6f40be235924196bea0bb16ecb0849d35db20a33fd5b52c286568c42e9481600229d7cf228fa9e34cdd3 SHA512 e0c54608b40170468a0ea5526bf15b1202a3f60a5911f6695f89caae84d152316a44c4c3cbc6e059f80f5a69c7757ba78ca582b571088b13a4b5dcc0f2ac4f9f
diff --git a/x11-plugins/guifications/guifications-2.16.ebuild b/x11-plugins/guifications/guifications-2.16.ebuild
index 70ceda6a6a73..f50721872ac7 100644
--- a/x11-plugins/guifications/guifications-2.16.ebuild
+++ b/x11-plugins/guifications/guifications-2.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 MY_PN=pidgin-${PN}
 MY_PV=${PV/_beta/beta}
 MY_P=${MY_PN}-${MY_PV}
 S="${WORKDIR}/${MY_P}"
+
 DESCRIPTION="Guifications is a graphical notification plugin for pidgin"
 HOMEPAGE="http://plugins.guifications.org/"
 SRC_URI="http://downloads.guifications.org/plugins//Guifications2/${MY_P}.tar.bz2"
@@ -27,10 +26,5 @@ DEPEND="${DEPEND}
 src_configure() {
 	econf \
 		$(use_enable debug ) \
-		$(use_enable nls) || die "econf failure"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failure"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO VERSION || die
+		$(use_enable nls)
 }
diff --git a/x11-plugins/pidgin-hotkeys/Manifest b/x11-plugins/pidgin-hotkeys/Manifest
index 156486b50404..06a80ba2f66c 100644
--- a/x11-plugins/pidgin-hotkeys/Manifest
+++ b/x11-plugins/pidgin-hotkeys/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-hotkeys-0.2.4.tar.gz 341912 BLAKE2B fe4b6d841010df2bfc17febbbc54d0dc10eb65f3c414b17728a92afb856232df1a7a9996631dc2564102346236cb5e7ae2fb3b10f67679dbaed11f3d83b03372 SHA512 99897a47f91c5ceacabdec13859526f6af6270e171b94b49183ad5cc5118b5e3f5377d02ffd0bdbdbaafdd6f23f400deb604a8fe686cd29103187276f20aca86
-EBUILD pidgin-hotkeys-0.2.4.ebuild 557 BLAKE2B adfe70a8416554796dd0ee8e2d8736b8422fdb1c8bae92c54e5e296e3b751d574e97cb9a29ec95559b0b815c8ca2f76e0f39574b8cc25f6a44c28cecd012f624 SHA512 45fe81a9138ce923bf0f4528bc1280aaf769219538a24c9e3886edf9514246c4ab6a108764f44231ba529061ced0ca7dd3e2a3a4f2d3952bb93ba6ca7e322528
+EBUILD pidgin-hotkeys-0.2.4.ebuild 439 BLAKE2B cb346013d7694bf71735f682e131c03a96ae2c07f8c3e66a30c420c6f85467f395eba73aadd44584157b7e9659b35c0e0cea877cc4e4d31d0b8007235881fa94 SHA512 b77966c7410e5063110f8a10a424fd17895f6610ff0efc07606620392fa1dbac5a771d4d73905af4866e8e75165d754ec26bb4ebefe93e78ab711cd5df1ccff3
 MISC metadata.xml 251 BLAKE2B 99192664732f32e705cd16da0ea6202a2c41eac9b2f6abc69a094e94bffdce35792d531a08d19d5bb0ace3d8ad89f072ec455e601f66d4c4a8e790e00f145f89 SHA512 615ed628ead3eb359fe7bacd719a1d29798bdc41026cb26fa2100cc49e09df2b3ceccd529e929de39b53ac83cb173d2260b21f561808bd62234aaea55b2af878
diff --git a/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
index ba63fde3c455..f9dae97f4ded 100644
--- a/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
+++ b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Pidgin plugin to define global hotkeys for various actions"
 HOMEPAGE="http://pidgin-hotkeys.sourceforge.net/"
@@ -19,8 +17,3 @@ RDEPEND="net-im/pidgin[gtk]
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README NEWS || die
-}
diff --git a/x11-plugins/pidgin-musictracker/Manifest b/x11-plugins/pidgin-musictracker/Manifest
index 47503bc90bd2..152fa7ad7a67 100644
--- a/x11-plugins/pidgin-musictracker/Manifest
+++ b/x11-plugins/pidgin-musictracker/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-musictracker-0.4.22.tar.bz2 727051 BLAKE2B a9d265ca0305b9b80b2354e39469be585cedf0a0e0226fcd23b3c6c9250f9b01a7882c55dc74acc1ce05effb7af954777eadb2192bc14b3846b1152e745aa359 SHA512 5a39311c4b4c8ceb4d2535b4aacb1427d9e1b004d34bc342ae3da6c60bd50e0b58a89ef52d02f3a431e8839cc647e23082bdf18b250135e95da5e6ea78c7b790
-EBUILD pidgin-musictracker-0.4.22.ebuild 932 BLAKE2B a1b2de9fdd4d264b15244f7ed7b95512eed043ec3a2f878ab0c0029f03c859ad0e1252f5de2ed37f39f381d80aea7fbba5a3ea1acdcfd5f1d7a252bc1b2e6a94 SHA512 50f8d39e0c10fdbe7889a145bf951ea6dc77325b0963980ce6b8817e18a4dd44b819639238f63f23ed1a441ad62881301db9d992f4060e16fe168e43eec9c610
+EBUILD pidgin-musictracker-0.4.22.ebuild 819 BLAKE2B 32da00e6cceff4bc6987c2ed1ef8257cca472a715190924df0ea8d81265f751a717fa13b673ffb939397c73206041d42402fc9a0270d02e753ebbebc550a3263 SHA512 e5ac427b75a7b37e9a0feb52f48f25222d8503c2ea3c007d37ec507cf25d4d595ca520ccd3360de4ec7476143aed5b6e8cd69e2a4d5b11808cb6d6c37847f221
 MISC metadata.xml 256 BLAKE2B 5eb0f6ea34d849011bd22ef060f43a9a7eed95132388e430b0db91b1cb2b40e8ad870869cc1ef7924cdf11445fd424f545cb7c78c5521f6d35379aa839e5e426 SHA512 dcde2fd66ef9199ac5db90e70bc8fea45fa4b3551ba53cb19e8d31e5ff6af4b5ff2be7eb88fe936c32e5d7a4be22cfab843501a30d1ba9ba963bcf7d3d5d1a47
diff --git a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild
index c588abe41e51..e576da2c7f0d 100644
--- a/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.ebuild
+++ b/x11-plugins/pidgin-musictracker/pidgin-musictracker-0.4.22.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="2"
+EAPI=6
 
 inherit autotools
 
@@ -21,6 +21,7 @@ DEPEND=">=net-im/pidgin-2.0.0[gtk]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	sed -i -e "s/DOMAIN/PACKAGE/g" po/Makefile.in.in || die "sed failed"
 	eautoreconf
 }
@@ -32,7 +33,6 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failure"
-	dodoc AUTHORS ChangeLog INSTALL README THANKS || die "dodoc failed"
+	default
 	find "${D}" -name "*.la" -delete || die "error cleaning la file."
 }
diff --git a/x11-plugins/pidgin-privacy-please/Manifest b/x11-plugins/pidgin-privacy-please/Manifest
index 319293bfbb05..b51a5b7e5ec4 100644
--- a/x11-plugins/pidgin-privacy-please/Manifest
+++ b/x11-plugins/pidgin-privacy-please/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-privacy-please-0.7.1.tar.gz 346421 BLAKE2B 051dca780d11eb6c8e4fed65a0dc6d660185f6210fd5c76021dd80bfa89894ee3dfbc829344498f87b8af25dd048d19bcaa4070f669b723a9374fe62685b8acd SHA512 4acec4556c209b6ff5b059244d79894efba984cdebaaf5893c67ba384126127614aea676af6deb89561f6d5776abdbdc915061db9e1004c0fea3339d45a6646a
-EBUILD pidgin-privacy-please-0.7.1.ebuild 652 BLAKE2B a10d06b8a4f7cd30f2f7587e08f8026607c2c1dc8728f81a6431ae6ff3abb5c3a795ec0267248106f9cb6c2aa52cb606817a316f195cf78f72c8961f94f85485 SHA512 1a33142994937247796dbbf3e007c26231cc862da2532b00fe51bd02853c24a759fbac4c06a923cbaabf11cc3bdb03f7dd44f570191cbb295bdcbe8e60e1f16f
+EBUILD pidgin-privacy-please-0.7.1.ebuild 538 BLAKE2B 98f0123f94094f1adcbf2de495082e3588409d52a8655c89bcb112045eac00f5282d6141769c0db4f2c0db89b18705232e98a6f19013d5e8c944151cdaf733a0 SHA512 f9150376dd56b6069df66192e011881b96f0c84fac2973762ecf657ef66545312a6988bb6f1e11ef8ba7b1992f21c671a463d88af76a8ad3bbac698c115c6794
 MISC metadata.xml 334 BLAKE2B 892b9a2151c44706bb807b5170a162ecd40c79a50c886c0cf6330ad6156f779cb12cfd64f880b5aafb0296d7bc2c3276494054100d1bcfb4cc27c093148f3a5e SHA512 f0cf3b9a7247fb819ba9d9e2a872c6e2f07b61666c5339f3e55804d947231d85050f29a2bf269cf99a955e0fd659d864d3f0ecb4d7987ce5a8c123a94cfd75da
diff --git a/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1.ebuild b/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1.ebuild
index 68ee1c6cecfe..0af2b95d9d4e 100644
--- a/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1.ebuild
+++ b/x11-plugins/pidgin-privacy-please/pidgin-privacy-please-0.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 inherit autotools
 
@@ -19,11 +19,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
+	default
 	sed -e 's: -Wall -g3::' -i configure.ac || die
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" ALL_LINGUAS="${LANGS}" install || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}