gentoo resync : 13.10.2019

4 files changed, 34 insertions, 13 deletions

diff --git a/net-fs/smbnetfs/Manifest b/net-fs/smbnetfs/Manifest
index 84dc92823ed6..adb264a75b02 100644
--- a/net-fs/smbnetfs/Manifest
+++ b/net-fs/smbnetfs/Manifest
@@ -1,6 +1,6 @@
+AUX smbnetfs-0.6.1-docdir.patch 432 BLAKE2B e58dd4835d816b6908fb4f0198bf1f6a7a9de8bbedb1736f5137c6ea7ae2f271420c3afceda6b30739403a010c0c917153a82233873cdf8a4b301cdbfc910c8a SHA512 3c75db469adad6d6e69fd7406a17fbd7d60d1ee43371a1f9b4780dbaa51c0e893cd3bcbcd3c96c5c5a81c8616267c4fbc921f04bf2bd14368f47c5c93bfed598
 AUX smbnetfs-0.6.1-use-proper-xattr.patch 609 BLAKE2B b05b18598ea00a6337276a85de485af54c9453427d5b7f4736f551151277caa12c09de9dab8edbfc094a9fa30b25922eed3d152c2b3b61676042f09d83f8eb5c SHA512 ddd31c147bd65bde5ea9f05abc9b08b5630f293e4641d996d2571b99933969b7985da82040098547490e158f283cf04df475a966186f3f29c7239493b0755101
-DIST smbnetfs-0.6.0.tar.bz2 147946 BLAKE2B dc20ba86e8280365eead7cd540370e727e47f9ba54c24ec4f4174c28eafdf373d716f259a6cff129e88ea1c47f4c3aee83cc6cb8009f232af94168e5c3232be0 SHA512 5bc5327b1087d051cbedda40ea1183c2515e3a42b2027812c6528bbbcb736b7f92f95b3c7b9cc53da99c2138c945ceb517042359029cbe0ab8cd887839711ced
 DIST smbnetfs-0.6.1.tar.bz2 171032 BLAKE2B ac263c963318ac01d6acef0247c0cb2149b25d991770be5c717a5d0e8baae1a6df5f9d3bf1019bc2d3fb43c728b89828225047baf4bb82c708ff051957bbcf6a SHA512 b74e979e30075243e859b8b02918b7d379eaf92e61f0fc6d6375864cf12c31c6601719026d96a24e6ac82b572338cfea4b7e0d89fe2d9dc17fd9a1a81e7f7ebd
-EBUILD smbnetfs-0.6.0-r1.ebuild 779 BLAKE2B 2f13c6e91a94e054ae99fdab828dbf01829a214ff8970efe6872c5e14d993727ca37b7ecb2a17f7c104bfc5a92565a35062519ab88eca76945eead6645e81a38 SHA512 46a2557c4c2c3af40f5cc68742cd024040cc0d6728cee205191c83c410a8b3248370f98903271faba214e6766aa6525d217e970dc540d5181428cb4d6a57e526
+EBUILD smbnetfs-0.6.1-r1.ebuild 877 BLAKE2B 3d6f2f99738f9f62e38e644c74f56c095b4313fe4be2657204030b9b6701b95399cbc3ad5e7dbb577ac31749afb0dbd4868653daec8aef081fc7dc3799730a73 SHA512 03be4910bffcdbd0eddc35b25ec5a777a25ecf238f0a3a2a31c52fa458cd79c3f48d87d0aa8d41f3a350a2f7e9a014c15b00dcc84e3eacc83a6f8bde5fec7b56
 EBUILD smbnetfs-0.6.1.ebuild 848 BLAKE2B ce2e0635744099a1b3ab701bdd473ff45c3c38f304dad09a248a88a2a9ece76d640b015454d6bed7994f78a103d38fe53697dba495dfff2f66a50d4d8ace31dc SHA512 2eaf37edd50621d3946cf414161dc9fa04429052cb8727dd0e855ff9a8cd1d14eefd51ba0ca1f03030e36018f6e23bb93f74f23630b25764c1e4852f17df7b6f
-MISC metadata.xml 1261 BLAKE2B c1182020f6216b78ce934bf8a12a08ab2e26b83d153a1425691ca30c71cacb1f4fef4cf558df843c1c94008a88a4bedd4985d3a4bcbb18225272e779fe269ec5 SHA512 aecf5c54f76b710c7c2f098a00ac25a4b1d7488915192f3340a600f6925b4029c711fae2d8c57c6a44ca9908127a94c08f234f18c6247fc97f2bda7ef496ed13
+MISC metadata.xml 1149 BLAKE2B 420bbe890fc54b92ac4a3bb91e45649c775b3a1f7b593e78f3b9afb6e3f765369da3d0460fa10a336b542f94024961bd2c2954cd7ed6517b4671d240ed236c70 SHA512 1984bb9a158582347cd4ec4ab6a0277848db9c5e2c2d59a6f0e63301f3cc0fd86439c9be1eb3dc2bfd18d400712350573010a16b333b9675425ccc5da1e73544
diff --git a/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch b/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch
new file mode 100644
index 000000000000..e5e403e31198
--- /dev/null
+++ b/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,3 @@
+-docdir = $(datadir)/doc/$(distdir)
+ doc_DATA = \
+ 	conf/smbnetfs.conf \
+ 	doc/ENGLISH.FAQ \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -296,7 +296,7 @@ build_alias = @build_alias@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/$(distdir)
++docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index da1a096c82b2..0b271c50ccec 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/metadata.xml
@@ -19,9 +19,6 @@
 		- command "cd mountpoint/username:password@computer_or_ip" allows you to access "computer_or_ip" as user "username" with password "password" (this is insecure, but usefull)
 		- the program is multithreaded, so simultaneous access to a file/share is possible
 	</longdescription>
-	<use>
-		<flag name="gnome">Use the <pkg>gnome-base/gnome-keyring</pkg> for password management.</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">smbnetfs</remote-id>
 	</upstream>
diff --git a/net-fs/smbnetfs/smbnetfs-0.6.0-r1.ebuild b/net-fs/smbnetfs/smbnetfs-0.6.1-r1.ebuild
index 15ded1593d01..a3eace2ad0c1 100644
--- a/net-fs/smbnetfs/smbnetfs-0.6.0-r1.ebuild
+++ b/net-fs/smbnetfs/smbnetfs-0.6.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils readme.gentoo
+EAPI=7
+inherit readme.gentoo-r1
 
 DESCRIPTION="FUSE filesystem for SMB shares"
 HOMEPAGE="https://sourceforge.net/projects/smbnetfs"
@@ -11,16 +11,21 @@ SRC_URI="mirror://sourceforge/smbnetfs/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="gnome"
+IUSE="gnome-keyring"
 
-RDEPEND=">=sys-fs/fuse-2.3
+RDEPEND=">=sys-fs/fuse-2.3:0=
 	>=net-fs/samba-4.2
 	>=dev-libs/glib-2.30
-	gnome? ( gnome-base/libgnome-keyring )"
+	gnome-keyring? ( app-crypt/libsecret )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-use-proper-xattr.patch
+	"${FILESDIR}"/${P}-docdir.patch
+)
+
 DISABLE_AUTOFORMATTING=yes
 DOC_CONTENTS="
 For quick usage, exec:
@@ -29,11 +34,12 @@ For quick usage, exec:
 "
 
 src_configure() {
-	econf $(use_with gnome gnome-keyring)
+	econf $(use_with gnome-keyring libsecret)
 }
 
 src_install() {
 	default
+
 	readme.gentoo_create_doc
 	dodoc AUTHORS ChangeLog
 }