gentoo resync : 24.12.2018

4 files changed, 49 insertions, 36 deletions

diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest
index bf32a5ab0671..66e50e662f92 100644
--- a/x11-plugins/wmudmount/Manifest
+++ b/x11-plugins/wmudmount/Manifest
@@ -1,5 +1,6 @@
 AUX wmudmount-2.2-perl_brace_regex.patch 417 BLAKE2B cada3b139df63f9cc78c2d6bdb3f243c3fac5d4517c166de6cfc166439beedf7398510ab9ff76596316db6b3ad6dd8fb234e42d55614e89bfaed671614e0ed18 SHA512 93afa7793d64cf0d3f2e7be5a112fbf8c8823006e97f8d7c654d5aed91e8578012558b8cafce43c73b09c6279ca3a9741214bd851899c63f3eb5cd0641862c73
 DIST wmudmount-2.2.tar.gz 181700 BLAKE2B f375aca9da44b5cba1483b70c36bbed81d897a691ce91ca5d3e11f8bbbbe1cc46685480d41144d6cca0bd10f625e46b5eec2ffc573ec7dd90b9b241dde7605a2 SHA512 6bc08b60430bbe66710ce183f0e7693a7818cee68cefac3a3bc191104663dd3649f8cdb62c7f214bdf4ed377b01fef250fe388f14645690aab7993c6071ceffe
+DIST wmudmount-3.0.tar.gz 189435 BLAKE2B e04c0bedfd4d0f4deed88f3acc87e4f2871890d6d12811404ec6c884107ae6bd9df17e724100068b08ff31ae557a02cd20bfc86222111939984fcc7916466c06 SHA512 dd12354d281ab04255e4ecf600d05c661168ed69b48439bba4ee6e61f2c93507e35e45c6f6671426c26df2fcf17ba5e851a6a3a3d757a5016a49bd8f76893eb9
 EBUILD wmudmount-2.2-r2.ebuild 913 BLAKE2B ba78be7d9870e82c11d622b141e824717336b4c319e46add3a4aeabdac7df059f291df8faad2f7a777abff50a683dfd4f98435f55af32c49a3020e8703156b8e SHA512 35cdd7552465185f61632233bcedee4584bbdcfd1b7407a23420e15fac7d43e40efcb39a80f52f69ba24aefb662260b8b9765c602a81e814e60d7810b8f68818
-EBUILD wmudmount-2.2.ebuild 902 BLAKE2B 56afc5aada175b7623c238146fc74c68ba12779e5c9df60b1f3e043a6b9753e83e6bff4dce4f2e9f1831490f312e41f6b900d4249731f352f5a33599849b3e0a SHA512 c99a70da25007efcac2c16eec30420fba944dd43b1a54a43c84370bf45d7d67668acf0f41d859474e378103652a2eae1ad02e1c92438f4aa704bba63404a8689
-MISC metadata.xml 331 BLAKE2B 17327d6a39e4d1bc33e46b0e3e958713aac557a46aa2d478d455abdd9911531d6292c044604ebbdece25adb283fd80ed90538ebe18e910b4bb24ccd39a290cef SHA512 c930e5cae4d2478d607c0e1c21c4979cb49ec11140cddd5789844cce0bab5c48922f69306f26e98ca4c6d95939c93d2d5dcd99326a74886228839d9e30edc3c9
+EBUILD wmudmount-3.0.ebuild 890 BLAKE2B 45bc69eeb97827668d7264039e9c22700c60d9b9a1ec719295a64d7bc24244104538a4a52be8d39f3ac9c981f06f7401e50946e14ee3934654208ba146e16514 SHA512 4069af02d388550fb3053e223a835168b23bc0daa9741aa50346e206a30e97116714a96fff43c512808118b357f50a8bbc96146a32793f0380b2b592d5c06ad7
+MISC metadata.xml 534 BLAKE2B 78e714f2a755ed296605508da6d108981d3748cf63a5858a92157d60a8dfc27926a64ade1475737b78b2743d389dc5223df2ebe22969f8202a0cc5609e1ff5a9 SHA512 cec2ed0232a608f12d33b6f986210f09c14fc2c4e21c249ead8b2bcbe286e398e2cedf19548a6f6b1d1ec893f6bf1c2820f5908f841693e3bffca6fff25389eb
diff --git a/x11-plugins/wmudmount/metadata.xml b/x11-plugins/wmudmount/metadata.xml
index f78dad9d13a3..658d5857f5dc 100644
--- a/x11-plugins/wmudmount/metadata.xml
+++ b/x11-plugins/wmudmount/metadata.xml
@@ -5,6 +5,10 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<use>
+		<flag name="gcr">Enable support for secure memory with <pkg>app-crypt/gcr</pkg></flag>
+		<flag name="secret">Enable support for secret service with <pkg>app-crypt/libsecret</pkg></flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">wmudmount</remote-id>
 	</upstream>
diff --git a/x11-plugins/wmudmount/wmudmount-2.2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2.ebuild
deleted file mode 100644
index 19b97bee0ef5..000000000000
--- a/x11-plugins/wmudmount/wmudmount-2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils
-
-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-3.0.ebuild b/x11-plugins/wmudmount/wmudmount-3.0.ebuild
new file mode 100644
index 000000000000..9b83e5ecdee5
--- /dev/null
+++ b/x11-plugins/wmudmount/wmudmount-3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+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="gcr libnotify secret"
+
+RDEPEND="sys-fs/udisks:2
+	>=x11-libs/gtk+-3.16.0:3
+	gcr? ( app-crypt/gcr )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	secret? ( app-crypt/libsecret )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	virtual/imagemagick-tools[png]"
+
+DOCS="ChangeLog"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2-perl_brace_regex.patch )
+
+src_configure() {
+	econf \
+		$(use_with gcr) \
+		$(use_with libnotify) \
+		$(use_with secret)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}