gentoo resync : 15.12.2019

6 files changed, 13 insertions, 89 deletions

diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest
index 20517b27d26f..5342ab061bd9 100644
--- a/net-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
@@ -1,10 +1,5 @@
-AUX sshfs-3.5.0-rst2man.patch 341 BLAKE2B fd58d59ee5a2ee02465ce94896a6cc99892a8365a442fc7c59809e9801b25a50697157822f22410e2bd362af6dd59cc538d718aedb6e04dd948d320c9047594b SHA512 d162169bda8a542d39324eb2ae2738385466f8cd1ae059bf6c9fcd07f5c0b9158539411318758b63c9cabc2c6bda0b645c4b6fb1610d72dbd0cf5f4a2af4a3f7
 DIST sshfs-2.10.tar.gz 163076 BLAKE2B e443b3bb65c432d8d8e3d6d198e3e41363ff506dbc19a215b8606317fb02ef3ea370d0f3fbbe01e6f5c49581c74faefbceb9f50ab44bb3791c82e0a633d86655 SHA512 8887eb634edc4c64cf7a0c1a1be4d9ef72d5080eec687d187898dc31bb841ed730850bae8467247a05e56c2b4ef7e9d02fdc0812d48876e145c9826a7406d9ff
-DIST sshfs-3.5.0.tar.xz 47564 BLAKE2B 9a6fb1cb347de2903fb67900253f8b28ecf3dd4c972210d4839d0ed7bbbe2dff1be2d847dbfc1727cdeeef74d4b32856aa6e3041b603dc1e3f865269524ddff7 SHA512 6ba7be4bcad401d99fb864f105a6c8fc8b7c832d5b25f18cba27eee422fe65ee7bda8982466d624792a1fb21528c0cb078a59db48e93da4880a36aad7b506b0c
-DIST sshfs-3.5.1.tar.xz 48424 BLAKE2B 5d80de9e71e6f5c71e9302fde065855e495dfb276583baf335c8ef022fc28b1c5907fe735f15765b460d10e75a84d6d97495da81b1e03cdb69b7a69a31624197 SHA512 bda7aa0a7a69a0ace355ed755f454402ce7bdd0d66456dac8654a3eb76b6fcfd0ddee9cfc5bcd80485880f47262c72bcbaeeadc7db7d652e864fbbbff6728b76
-DIST sshfs-3.5.2.tar.xz 48744 BLAKE2B 4ef287605a1d08729a29998935125f8d71f719e0d7014c999bdf3b242b4663ae8e93dd527108a650f1bd16b59175b7e2db2cdcb57a5bd2cdcd24110fc29b6a9c SHA512 52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272
+DIST sshfs-3.6.0.tar.xz 49860 BLAKE2B 5486c41a710a635e6e35fc5235d8ea713aa58ed69a648d7872e2235a56ba0eec7337cdc1d65ac72c58aaea9ad079652599a619778d7fb14a20537ac8817a3ff1 SHA512 fe34d7bbb76bea6aedf96b4ce7500ad6d81230cca9a43b831302159e5926797a243b7d1675d23ba101057ef247f64ad7df18a73d20578e84b9524218d9ff97bd
 EBUILD sshfs-2.10-r1.ebuild 543 BLAKE2B 90bd833157115a7b005c395b17ae2dda010e7bf005883005178f75ff0e5020bf3e4ed9277360bb294e8df4ad359072e5a309f2d65842317889ee2813863a9bfb SHA512 35f73359d4e4efcaf09fda132a18d9f05e67c75e8d5f1d355a31545fce3748c6c846622f32fd491f30916e2f878269ea8d03db670f97296f0ea632466ecabec8
-EBUILD sshfs-3.5.0.ebuild 736 BLAKE2B 0c996df054eeb7858494dd39ca2fdd9ce6411ebeb09ab1f3de5247a3d891a5b07a949c12c71ac1748c0ecb9f8dd3b84020daa415725269e1274fb6b1ae6222e1 SHA512 536867549cdfad957bb1813683dc0f52d989b2a4c7ba4420d45a679466e5c82b91f3f7ec55edbe6684ca1641a7bd7a4f49b6014231149da8bccf66f3fcd8db7a
-EBUILD sshfs-3.5.1.ebuild 687 BLAKE2B 1e6d6509e69619d5c6edbae12c7095b60047b58e605f066ea57f7ec9b60a2a6d512de505f8b1831763d816f871de3624bc40cd4fff72ac6b88b1dc0d35332db2 SHA512 7e6e087e0339c73b37c33970ce9ba88a97f852f902e1ef4439b00a06fb8ca06ad41085dfc1899470b63de56a3dbdbf7b3427a4368348c0d4efccdadd31d82e75
-EBUILD sshfs-3.5.2.ebuild 687 BLAKE2B 766de9593655c2444350977fcb5622393a79a2a74fac0172fa8e49a11d3f6f85201c33ef1b6acb48f58aabf6417d4e69054702ba6dc50482e5c3b7058522f6ee SHA512 e3fa0b53fa7f4b93ebeff4f0ba2f0cce02dc462c2b07c372c74bb7d41b8b1932ff8d6dedf0a8cc46aff9c1c7671760485ffab134b96def313f1e74e4d560f057
-MISC metadata.xml 334 BLAKE2B efe6b250e6679987941b578fc0dabd47bad1ab687eb08d99bcedabb5064ea87fad7e2fc36657f0cea0ebd42489c92d85bc9c44d65fc6abc1451622584fb4a766 SHA512 17d120fe909408832fcfcae2cc074316fb1c1952f92b8ad1d395ac2b44f99a38cee499116b976b2326cea3778e01c2cd7b31dd82d05a11d97b95585a32071cec
+EBUILD sshfs-3.6.0.ebuild 674 BLAKE2B d6255f1265d08fdceca9ebf8e2619c168a7fe53eb24bbaba2363eca3fa15740224e718f05511c873c7a46eb8e35452f14599b7048e6b5f23a9155a5d8b0523b3 SHA512 3c7383f5e4415fa02d9afb8f714139e9885fea852368164a619f29caa03576ac293597cb543596ed268b3a619a3bc8fe6f267895c492f88f0c262556662933c3
+MISC metadata.xml 321 BLAKE2B 63f619f047201cf5745c86bf111c8a427189ebffa8ca4e5fb4a94ecc671003aab278e0c04f24aaf17e0f3054b36099fa0d7efe07433b70d79a860656ff5952a2 SHA512 a76a76e6ec67e739a91c4a6055bae77923eff18c6e32512d22f091f8d13707c6c263212fac2f2caf2dd62bb5ef2410ac844c7efbcef51e0dced817ec9ec041bf
diff --git a/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch b/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch
deleted file mode 100644
index ad58de4e5054..000000000000
--- a/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fallback to looking for rst2man.py executable as that's what docutils upstream
-defaults to installing.
-
---- sshfs-3.5.0/meson.build
-+++ sshfs-3.5.0/meson.build
-@@ -25,7 +25,7 @@
- endif
- 
- 
--rst2man = find_program('rst2man', required: false)
-+rst2man = find_program('rst2man', 'rst2man.py', required: false)
-   
- cfg = configuration_data()
- 
diff --git a/net-fs/sshfs/metadata.xml b/net-fs/sshfs/metadata.xml
index 1dde05c3d522..a23ff0249f74 100644
--- a/net-fs/sshfs/metadata.xml
+++ b/net-fs/sshfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">libfuse/sshfs</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libfuse/sshfs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-fs/sshfs/sshfs-3.5.0.ebuild b/net-fs/sshfs/sshfs-3.5.0.ebuild
deleted file mode 100644
index 51bd27551eaf..000000000000
--- a/net-fs/sshfs/sshfs-3.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="Fuse-filesystem utilizing the sftp service"
-HOMEPAGE="https://github.com/libfuse/sshfs"
-SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-CDEPEND=">=sys-fs/fuse-3.1.0:3
-	>=dev-libs/glib-2.4.2"
-RDEPEND="${CDEPEND}
-	>=net-misc/openssh-4.4"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-# requires root privs and specific localhost sshd setup
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-rst2man.patch )
-
-DOCS=( AUTHORS ChangeLog.rst README.rst )
diff --git a/net-fs/sshfs/sshfs-3.5.1.ebuild b/net-fs/sshfs/sshfs-3.5.1.ebuild
deleted file mode 100644
index 82799664d23c..000000000000
--- a/net-fs/sshfs/sshfs-3.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Fuse-filesystem utilizing the sftp service"
-HOMEPAGE="https://github.com/libfuse/sshfs"
-SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-CDEPEND=">=sys-fs/fuse-3.1.0:3
-	>=dev-libs/glib-2.4.2"
-RDEPEND="${CDEPEND}
-	>=net-misc/openssh-4.4"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-# requires root privs and specific localhost sshd setup
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog.rst README.rst )
diff --git a/net-fs/sshfs/sshfs-3.5.2.ebuild b/net-fs/sshfs/sshfs-3.6.0.ebuild
index e6ff7b984dfe..2bf50acbf8d6 100644
--- a/net-fs/sshfs/sshfs-3.5.2.ebuild
+++ b/net-fs/sshfs/sshfs-3.6.0.ebuild
@@ -13,12 +13,11 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
-CDEPEND=">=sys-fs/fuse-3.1.0:3
+DEPEND=">=sys-fs/fuse-3.1.0:3
 	>=dev-libs/glib-2.4.2"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=net-misc/openssh-4.4"
-DEPEND="${CDEPEND}
-	dev-python/docutils
+BDEPEND="dev-python/docutils
 	virtual/pkgconfig"
 
 # requires root privs and specific localhost sshd setup