gentoo resync : 29.10.2017

4 files changed, 16 insertions, 36 deletions

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) \