gentoo resync : 29.10.2017

11 files changed, 59 insertions, 40 deletions

diff --git a/x11-plugins/pidgin-gnome-keyring/Manifest b/x11-plugins/pidgin-gnome-keyring/Manifest
index 913523f53604..e42370ef1d9e 100644
--- a/x11-plugins/pidgin-gnome-keyring/Manifest
+++ b/x11-plugins/pidgin-gnome-keyring/Manifest
@@ -1,5 +1,5 @@
 AUX pidgin-gnome-keyring-2.0-plugindir.patch 793 SHA256 d1238323cda83c0674181c663bc2285266c7989624e1ea18425a8329ce737098 SHA512 70c4580f79d339c40a47ec8b8ff636649430f14627a9c88478f330c978781ac9252642c793eb155b26f366eb90cc00cf69e144a5cbf9903ae7be1a67441b59be WHIRLPOOL 460a9ae51b08d0d84e8e393d49b1c78fa088e63955359d58970fa9400f72d08c4054e12fc15c1007034d4d19f383e65d74e4555c0acfa055246e320aaeff54ca
 DIST pidgin-gnome-keyring-2.0.tar.gz 12066 SHA256 f75bc1a859226a5ad7cf3012925835a4d70b83dcac57a95d452194601b03191c SHA512 b1f83c107631a7105aa517312f13d745922b8033afc15069cba1c515caeee9e6ad89c4c7a5f96c561713d7f7a6ca3f03cff8fb11566a8ea0d8980f10e85d4610 WHIRLPOOL 84549c2240121400c46be51e4562df1db27cd900e6170aabab9d18761b93af1b5b1b60dac4ea7124cadf22325e6b79efcae569573edb36458c2d8fe673962d23
-EBUILD pidgin-gnome-keyring-2.0.ebuild 858 SHA256 02ab71f1c43cafc1ab5a73fce33e8e92a97e8e038dc8e8e778fba1034706ec82 SHA512 5c8fc8dcee977c0bc5eb6eea8c38264ad2218d43ab01d7be6a68b2623c92c4a7c4a5341e7bced62bce98f9727a0085fbefaed6281aa4a339c5a5fce75fe0127a WHIRLPOOL 21be10590ead402b8010ae4c7bcd5ec15fc01c9f214e03b56d298d6cff8bee78ad2fdf105b5d74d8858b9cc486fdb132e4c329daabfc7918f191f03b061ed46e
+EBUILD pidgin-gnome-keyring-2.0.ebuild 857 SHA256 bebadbd479c92ad2ed824cf21aea2aec9dca1b99e0ba95dc651ede20b6c07d83 SHA512 b80bf78c54a8b66449176940e9aaa17eb3569875fb6ff3fd06ecc045b392b9d2527b89ca58dea4153e7f54bb928b266bcca23ce60228ecece282fc5de67eb160 WHIRLPOOL f3d5eb86be92c2f502338f961169c69a12f89614e8b5a8e74e359f06887e2b4df3e14b0c2d721e86071fc965525e8f75e444c020a875701089d3f6ab174157e3
 MISC ChangeLog 959 SHA256 01a47eb3bafbe7cb27bd0539ae8e43f4491103859a1f79a29cabd665dfbeaa8b SHA512 7d44377f46f1b8939834c20035b056df6a38e067b365a7b884613b2f7c343834d5fcb96ae1bfccbbcbaa7dbe7991794165cc3ca4cc728f115419517dbc239bc1 WHIRLPOOL 2d05eb1ef9f3044ffd4f21b4de7758dc1eddfdabefd51dd0d3d982f9a0c8f19e2dce013d7de94afb0aea6d865b1da5faeb10192970d2ebaeb2a6cffc9f3a8a59
 MISC metadata.xml 601 SHA256 6dac1278486f358405c529ee8bf193105abaa7f0b35addc8d996991ed06a85a3 SHA512 8c30a86da0a41a8e47009cfafecae861d6389c6dbe0d14c68200d1b2a6c83b047befca74f70ac8652ba22fd2c738a1ce41fe63186fc7a2e5762d348c08635970 WHIRLPOOL 7ef143c347f5414b65403d5398f7613af04581847c451b8ecf75bc3c57927e30bd8da9d04630ecfc0441f6d584f42716a763f07077f60eabd6a0570876467384
diff --git a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
index 02b193c1dd78..221d0975bdde 100644
--- a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
+++ b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/aebrahim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-crypt/libsecret
 	net-im/pidgin"
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 5b7a8087bd3b..b6d8282efcb5 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -2,7 +2,7 @@ DIST pidgin-sipe-1.21.1.tar.gz 1212621 SHA256 92cc5bc581e7b500ffcce51707e003608d
 DIST pidgin-sipe-1.22.0.tar.gz 1255851 SHA256 1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3 SHA512 4135bbf526659663b0b053592d889588574ed2a1bc9346e6ba62960203409e2604552ffb02ed32e2b4bb46c4f40f62089302b301344b9f7b45657e64a585f7ed WHIRLPOOL 5714beb478b19b8378faca5ddd04573c2f0996287523fefb51219731817b237f77c98ac3ac027ff45a155b51f49c6ea420a4572f8a020e8edc715e82ef9290aa
 DIST pidgin-sipe-1.22.1.tar.gz 1265440 SHA256 f6b7b7475e349c0214eb02814b808b04850113a91dd8e8d2c26e7179a3fd1ae8 SHA512 1fff886b32f7f8cb99a0af710b3a1502f62d27dedb541a9e2d8ae9eaf5eb7be0983216e730ccc912c20eee3d940ed1f789f704ee21736db76d141efda66ec018 WHIRLPOOL d93e88d111871425ed5c2e36fd359d7f082497482d2865eaabb41cc867aac7ddea730d413aa123fafb3be605ddeb8f59cb89da98b50cddee4b1d1800d8f3c17a
 EBUILD pidgin-sipe-1.21.1.ebuild 1311 SHA256 ec0da0d06e6d4f65681dffcbb8b5865c6e047a60c4f70414b7a88667307ea5df SHA512 349bd4adff488c0cdc94230cee7112818eb1a99dbd56ea36f351e66b6a7215d72623fb1aaef7b6a0d3bf8b6364f293748adabf793ebae51da2f6356dc387927c WHIRLPOOL e3f5a36d1013f495af4fe2531ecabc4317f4fdb5ca6d775841fa8632e5837b9d37fdb33d3e5b47545448b8b022013d6a60a67ce560aabb6043f1d48a030010ee
-EBUILD pidgin-sipe-1.22.0.ebuild 1343 SHA256 7c535d8c2410b815d81568fc8ca3886b5d7c867e3060c3b60fcab3c3217552ef SHA512 43baf3436eb8e9728c09cf2b99565e73c7e69ab0d93708ac03039d785ac280110ceec8ccfa42beaa59e1998ef0dad63a39b268ed34cfa71ddc7a6ca1574b172d WHIRLPOOL 2e6372adccf01d293667a61d1d31ee9706a39924a7950786483e51893a0aeefc393ca189b5e74c04ede24cce0483350c94778f6efb29fe8c2794a7522641636e
+EBUILD pidgin-sipe-1.22.0.ebuild 1341 SHA256 b7c6c6cd1eb56e0a288f6dabe8267c77240a6313c89ed7945c791f5cc248b5f2 SHA512 eff9f421b21e3f108ba85c8f6f3ba22420c262cd1df01f3a5c6ffce5a56bd2c79e4641279dab12c54fc40a6733868a105835f8fecac3440a179c3e8aa519e46f WHIRLPOOL 7f624e1ab394998ae2f1793c2f6bb959a5d862433ae67093845660ed503f44cb49b074f79dc41aa4a6b2fe72d2a222f7a65d094286563b74d0407e194e1e1184
 EBUILD pidgin-sipe-1.22.1.ebuild 1343 SHA256 7c535d8c2410b815d81568fc8ca3886b5d7c867e3060c3b60fcab3c3217552ef SHA512 43baf3436eb8e9728c09cf2b99565e73c7e69ab0d93708ac03039d785ac280110ceec8ccfa42beaa59e1998ef0dad63a39b268ed34cfa71ddc7a6ca1574b172d WHIRLPOOL 2e6372adccf01d293667a61d1d31ee9706a39924a7950786483e51893a0aeefc393ca189b5e74c04ede24cce0483350c94778f6efb29fe8c2794a7522641636e
 MISC ChangeLog 3587 SHA256 4de49e8a5ed8000d0813e7b62865748f06da4b11838cb7aad7b107ff885eb537 SHA512 1b83c49cb3abdbeed78585db88b1e0f037bc74cc73dfe520bcb44bec0b457da35a9e70bd42fee4f87b50cd1a1cc502b1070eb6b8c83f1fa7c05c75327305bf4b WHIRLPOOL 3780a5fddf48b244b21df485d484d97eded705446eaf2692767c185c69869c402f7877c17fcc2814b32b5166fdb8cf1e29df4908af30c3d0c21aabef3b983ef5
 MISC ChangeLog-2015 6300 SHA256 3eb031f630abcde9014e8e645088a8e6f0316c0ad5dac4d2c83b2b5ab5bf39f8 SHA512 61ca33432d93f819e789eb81fcdc351de85b79700de90b942bb312a947643dc47171baafe467f141abf727f18485f28b34c26186b98b8eb52b814e62ecfd9058 WHIRLPOOL 6f32b82a8242484f9c5eb2619cd5b96aff1ce4e21f3f3d992b2f2f765b83d7b16d07642ababf5b731fe45cf12e48f08844f683403349daf2d1ceda687ef4e605
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
index 8b7372dda468..9891f280612b 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.22.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
 
diff --git a/x11-plugins/purple-mattermost/Manifest b/x11-plugins/purple-mattermost/Manifest
new file mode 100644
index 000000000000..d4341b1ab02b
--- /dev/null
+++ b/x11-plugins/purple-mattermost/Manifest
@@ -0,0 +1,3 @@
+DIST purple-mattermost-1.2.tar.gz 65402 SHA256 2484c68fcc3c57a176991c143346dc8cc6a0aaf37d5ecd0ff2c0ec201ca094ae SHA512 75e80c1021393c5fe78404a4439b5454f8a4495c1510bf8a3a449acdf1807b8620ac19680607de29bd1599eb0f1354f93c6fa7b21b4294b36649b6e1455760d6 WHIRLPOOL 0f29872e5c8a76d37767433a22d4bee8c903aa55ed0fd80da7d38ae24e2c1a049eb4779008ead8be4a297816e4c359293fe1bbfbd13c0ec687e84b73d64de0b0
+EBUILD purple-mattermost-1.2.ebuild 545 SHA256 673b8102983fe945dfdf9170512308e3d3a7367c049e4e6195152dfb32a0653f SHA512 69f0bc46614406ef868f9246ad5591285a79c1f8ad476fa9cf78e5145564b2a0bd6b250c8107172b127545ebd229688a8d4d54dd0d2345b8ca2cc376f96bfff2 WHIRLPOOL 6bfdde3d60d2a1a59dbbdce1b12e8181475ac19407350cd0a14e80b9db28b6767c05fed1d6a6d35786b4fbdf0c916b6d37a77fb4097d576c614e851ec429e36d
+MISC metadata.xml 342 SHA256 51dd156ab421bba4844d7378297e9dd5b31be4748178a5b0156ba05a2d1bb41b SHA512 ab1ddf1a079239ac490e856785f73650a4b3e32d3f24a798d771347645899b23799f0eee76df8363858fb2f13e23769f0cf552ba12a276ce9ea68aa50ceef0e4 WHIRLPOOL 431e22b131cd63c03f621ecd7b8e53942fb0233d3c696f0a2504ed5accd4face04f5bbe2ab10c3496eca0376f923ff56b0072a5c8888e05e601f39ead199022d
diff --git a/x11-plugins/purple-mattermost/metadata.xml b/x11-plugins/purple-mattermost/metadata.xml
new file mode 100644
index 000000000000..711617a4a147
--- /dev/null
+++ b/x11-plugins/purple-mattermost/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">EionRobb/purple-mattermost</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild b/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild
new file mode 100644
index 000000000000..d4b6347b6757
--- /dev/null
+++ b/x11-plugins/purple-mattermost/purple-mattermost-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A libpurple/Pidgin plugin for Mattermost"
+HOMEPAGE="https://github.com/EionRobb/purple-mattermost"
+SRC_URI="https://github.com/EionRobb/purple-mattermost/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/discount
+	dev-libs/glib
+	dev-libs/json-glib
+	net-im/pidgin"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest
index 06181b7e85ee..131268301543 100644
--- a/x11-plugins/wmudmount/Manifest
+++ b/x11-plugins/wmudmount/Manifest
@@ -1,6 +1,6 @@
+AUX wmudmount-2.2-perl_brace_regex.patch 417 SHA256 bd898667de0cb465ab1924935c711bac4ab910d51b9122a3c70d221d070ee791 SHA512 93afa7793d64cf0d3f2e7be5a112fbf8c8823006e97f8d7c654d5aed91e8578012558b8cafce43c73b09c6279ca3a9741214bd851899c63f3eb5cd0641862c73 WHIRLPOOL 5362b748eeefd91b2a3a83db7fd6333a39a93c7efc9d1e6ddf961b663863cfb545d3358f88d61eca63ade4fd38f897021f1be7ed425e62711894fcef7b08ed74
 DIST wmudmount-2.2.tar.gz 181700 SHA256 6402d215e5ad7619f588651bcc30041ff3fae13ec2e844088443c855aa3fb805 SHA512 6bc08b60430bbe66710ce183f0e7693a7818cee68cefac3a3bc191104663dd3649f8cdb62c7f214bdf4ed377b01fef250fe388f14645690aab7993c6071ceffe WHIRLPOOL 83600c9767e4ca1da3fda5503af8583dcb8bf5fe8931db181de8dd6b0e4458526441e08c688dae6e9baf255798ab0a4e380ea23b2b383743edbf4a7247f506c3
-EBUILD wmudmount-2.2-r1.ebuild 908 SHA256 a97c2d0f89bc6e475894c995a41c33d9d12789da55c77db47d32adf03c121e8e SHA512 9e0c0b4b9d5975a2070827ca611fcfe223ee0b6c54d8d2862a2bd02a6bc1c2ee9fb2a21ff0bf9346862904dc4877c47a8cfd931d6df92484fdf25b17ca45fe0b WHIRLPOOL 4eda7a59cb3a0e44075d92e2d947f12e685da352d715394bfc2d44f5c989c5a1d14376d3b8675a540fb54ce4878b514548bf5540f16b9eb4d02faa09e11a7aa0
-EBUILD wmudmount-2.2-r2.ebuild 863 SHA256 735842366b9affee5bb8379c5a363622cccf5beef892db56c8f36ba576a18544 SHA512 150a8a439365059bb516632d3b5aec82f3f561824499d130d4f759c24ea72a954cd6dd8f7c98ab903abc8eb27498155785ecd35a5718c9769bab8be4c51de115 WHIRLPOOL 8b121ac800963bde06de85a6b4950efc924dd3a82d984daa9010a3d019df1f67398b0c722d82eec75bd07a78590c7d160af1ffe6a57a0e4f5efe57a5efedfb86
+EBUILD wmudmount-2.2-r2.ebuild 918 SHA256 6faf4f299b9a9e7fb5e3fede81577db56e7fb26764d02a2f2fa1c7e6383a600e SHA512 9bca785f6798b180832e762f03dfc78e8d0ebb343ba2270d1c594368fd394a4c9333e61ccbe8f7e8fb89e5f58a7a4036e191a641c34cd6fcdc70147ebf03137c WHIRLPOOL 9bcfc4168e73228dac78fd2cc0da32ba965643ae2fd628d0b4e3513e82e796eba130e13091fd123c9150e1e15bd64f6e8eff7bd6ac808121475e3f1fd14bc2b4
 EBUILD wmudmount-2.2.ebuild 902 SHA256 ca6d95406501b21e774773e089cf9e8328b1d41270aa1318f39426629e5596e1 SHA512 c99a70da25007efcac2c16eec30420fba944dd43b1a54a43c84370bf45d7d67668acf0f41d859474e378103652a2eae1ad02e1c92438f4aa704bba63404a8689 WHIRLPOOL 8323b4a05fa9df8e714973d6e00f5bda52ede37a80959c6789b6efb0b45132ed1be0cc4e9f6f1acbcf334d75e9a650a8a51aa9ad9044532342f335fcaac38acc
 MISC ChangeLog 3994 SHA256 14acb5db58ff7fecda4a6e1c991a32624673f9a78c1c20adc79fd6d7a7cf5d68 SHA512 9cace8d22f25b73f9dd6b07a5c98e07dc32dc45b15f9ef3248d91f04e62d3df51c754498e2ee7b4bff48f9c09edff98fc02e422110fbd603303ed919899663d2 WHIRLPOOL 48d66d31cb59700c8822dd591e5aad05a45eaac87d4f9452f1bc0b5300165e69962d62ffaabbb96fc2afad41beb49fa13c43c0de3bb2e6aceaf1cdd6f6b6ab09
 MISC ChangeLog-2015 2690 SHA256 74dc746108b1b58d0ac947b1af2c0ba43fc7f0d81063723ac32cdee6a1df67cc SHA512 f956a14cc4aae878dfbc2cd62a98fbe63e962b14af7facfd5fcfc10e3644129edbbc5a299394a96dd3a55945aa8a44db84e486f62d6f53aac49a327a8db3928f WHIRLPOOL ec1c6ddbdbdc5a37d505b92003b79ab40b2f926b21028ae2997e3fc5a4b050dd1d615408ee336ea461c72968e2e35c4f7a7d824a74e162b69b79a72ca23df97a
diff --git a/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
new file mode 100644
index 000000000000..4730b2d64b9d
--- /dev/null
+++ b/x11-plugins/wmudmount/files/wmudmount-2.2-perl_brace_regex.patch
@@ -0,0 +1,12 @@
+diff -Naur wmudmount-2.2.orig/make-chars.pl wmudmount-2.2/make-chars.pl
+--- wmudmount-2.2.orig/make-chars.pl	2014-02-03 06:41:59.000000000 +0100
++++ wmudmount-2.2/make-chars.pl	2017-10-22 21:13:22.555748713 +0200
+@@ -52,7 +52,7 @@
+ 
+ while(<IN>){
+     $head.=$_;
+-    if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = {/){
++    if(/^static char \* ([a-zA-Z0-9_]+_xpm)\[\] = \{/){
+         $name=$1;
+         last;
+     }
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
deleted file mode 100644
index 10f32669f521..000000000000
--- a/x11-plugins/wmudmount/wmudmount-2.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils xdg
-
-DESCRIPTION="A filesystem mounter that uses udisks to handle notification and mounting"
-HOMEPAGE="https://sourceforge.net/projects/wmudmount/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring libnotify"
-
-RDEPEND="sys-fs/udisks:2
-	>=x11-libs/gtk+-3.8.0:3
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )"
-
-DOCS="ChangeLog"
-
-src_configure() {
-	econf \
-		$(use_with libnotify) \
-		$(use_with gnome-keyring)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
index 58882b144a2c..c919f691e419 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 
 DOCS="ChangeLog"
 
+PATCHES=( "${FILESDIR}"/${P}-perl_brace_regex.patch )
+
 src_configure() {
 	econf \
 		$(use_with libnotify) \