gentoo resync : 11.02.2018

14 files changed, 81 insertions, 19 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index c3bb2234a285..f353fbed7e53 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 1cd275690f6d..4a20fd42d792 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -3,4 +3,4 @@ DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
 EBUILD openafs-kernel-1.6.22.1.ebuild 3838 BLAKE2B ed86c39e18e34f9ca71b5f117f6c60952517c16fa1158019287abec1d3c6dbd19abf7cec3664598296099e2ba19884816f5160748538e55de5e69350f1f95f81 SHA512 f9047dfd42213e8b8d728e75db4ae72c50f89a80195a56f37f2f70a377264b0ae5120aad0fb89204323304d2087af1688213e8aa1c3bc56bbeb392b54662bf48
 EBUILD openafs-kernel-1.6.22.ebuild 3836 BLAKE2B 06888ae8ce414b601b53ce1d436f26e642b62afc8fe0d5caaece748488b29f0bbb955c7125227b98556c44ffcacfc2ed1d893a9572d6e486ef735be13cf719cc SHA512 26f8796203f7af9a96cefb8f6a2b46b7551e0156b3312622ff25fc78ef3efd85500ef9be51643fa44ba85c35e1be4a324ab2a34d030c32c2bb0724f3d714d2b4
-MISC metadata.xml 421 BLAKE2B 2e5fd5921a8f8671c6ca80a648f87abe75fd77d554c7bdfa8814c3112f585ed4a0a60555d014efdbbc1bdb94ef143e38d8fcd87facc1f15e4132e3382516c41e SHA512 66972c2fff54dc80eae78500b81957e2a2ca1516feb747172055cc44c288e6d0ecd25a3b0a9b179e84c4da68f857094d4936b0a9b836b5b9fafdca5489edb864
+MISC metadata.xml 325 BLAKE2B d173efd11e6fdc79eafa352e60e091bf539ceda665d052395047f255cb7682a72c7b839b6e3db6005e23ad38fa5cb008228f8971ef0622d801bb41f248c52c31 SHA512 60554e65e28506ae082618d223c5b00615f26c849f799a3077294430a1e23f9e5cc4d69aa115dcbf247d5805dfaaa06e3533e576434abe13426022f6776d9947
diff --git a/net-fs/openafs-kernel/metadata.xml b/net-fs/openafs-kernel/metadata.xml
index 20e8e259583a..e76fe2c4c443 100644
--- a/net-fs/openafs-kernel/metadata.xml
+++ b/net-fs/openafs-kernel/metadata.xml
@@ -3,11 +3,9 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>NP-Hardass@gentoo.org</email>
-	<description>please assign bugs to</description>
 </maintainer>
 <maintainer type="person">
 	<email>bircoph@gentoo.org</email>
 	<name>Andrew Savchenko</name>
-	<description>please CC on bugs</description>
 </maintainer>
 </pkgmetadata>
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 2ac6eb54913d..4671ee740c54 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -5,4 +5,4 @@ DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
 EBUILD openafs-1.6.22.1.ebuild 7027 BLAKE2B a1c4fc676f871605a2e4909666bad89182c55d690151284b37fbad593d2a0bb24265dc90e7bd80ea64512b8eb4bef0be0fec31256c621a1dbda4b3c2e5dfa8c4 SHA512 bb058ead9fc46b8cfe19eaeff73bc1fe213e11ccfb0bb837753b3748810d72963925bcbdcf1c1311aef4992cbfe422d14a652273c5524bb4276b2969817a032a
 EBUILD openafs-1.6.22.ebuild 7025 BLAKE2B a99844715433a7645bc4a8d9793a3116fa8797429c84b3ea20fca58732f4bfcbf81588ba98213b184f29552fe08769cfe70b4e5247d9a8ba6ad0b502c49441fd SHA512 b635c9e39e1034f35ccf90e843ca8e61122e8a6692fe9a7074b0a16ad738c5160886209bcf362a3bbee673506395e3eefa95e70e3db82e662788eba22e4fd176
-MISC metadata.xml 895 BLAKE2B a4b319002867999c6da30251eb0408991bcc5ba727d975cd190f9064feb8c291343a60d4f305d7e98ad3cad443c15bc554971ed518b0566b85a172805d08d558 SHA512 5117449a47343db76f8d88a91beb18a2aade828fcbef6133f2307225b8160418fa407faaa550728d8916a5ff06e610198ccdb6fec1f975e7cc892a38fc590534
+MISC metadata.xml 799 BLAKE2B caf76c428f163ce06736336ed8fc7c3904704007802675062940b4f2b0c249118085536253274f01536be1753f68438308b7dc2209e306f0062d678c9b9c1a76 SHA512 c18b15cf358b99aae5e2cd7fa8c2e6255b70e71586c42479da411890795b052a161698ec8cccb0beac000e3c60b7e1d569decd54a599b6bc8b570f8664a9a3c1
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 82ce0265d313..4e38bd3d43bd 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -3,12 +3,10 @@
 <pkgmetadata>
 <maintainer type="person">
 	<email>NP-Hardass@gentoo.org</email>
-	<description>please assign bugs to</description>
 </maintainer>
 <maintainer type="person">
 	<email>bircoph@gentoo.org</email>
 	<name>Andrew Savchenko</name>
-	<description>please CC on bugs</description>
 </maintainer>
 <use>
 	<flag name="bitmap-later">Enable fast startup of file server by
diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
index ed046fa76be0..324ae1b3e46d 100644
--- a/net-fs/s3ql/Manifest
+++ b/net-fs/s3ql/Manifest
@@ -1,3 +1,5 @@
 DIST s3ql-2.24.tar.bz2 773766 BLAKE2B e780bc7d3376241d9b04ba0b09b064050f1ecaf22a44eac6e793ac4a01cc0ae7c44f1c40d39cc2984bb62f52dac9b55be22cfc63309dc4af4a1f93784303865f SHA512 20f32fcde425e2e5f07f1b52a5399bc6c1aaf8d6ad866e3496f7608a590f6a9bfa2ccf7c0ee18be7e8d6e374d1a2679ae72c5438775ca3b0b0c214735d26c9dc
+DIST s3ql-2.25.tar.bz2 770189 BLAKE2B d0d3c7656f93b7bdac97ab7b9afdb6b53c6e909a5fd4e5a1cf9e5c153d81349dfb809409f79ec45768297e7c7eb89a590338cb9726b2eda51b3ca02734fa1001 SHA512 e2aa9f5d68a00b36ae33a7d36bf4aa42f761fb7e2cfb8370c914a78d0ed54edab85dd224fa7ef08e9e240161f5c66e46c0cbe99b6c5451cab3a50f33c78bde36
 EBUILD s3ql-2.24.ebuild 1259 BLAKE2B 70fcff067f9dd5ecb42d8ee4487017ad17151407dbf88c78c0e18233955e9efefe1b414f94a2fdb256d7064a3f1ae11d8c64c0ae494c8cdfbb9411988f6b82d3 SHA512 56629a8387e72e4b345f57174f1ad722c012b86655f0e4a6fead7dfc800430859f84799dd6de28e2035d280abd18d6fd58fe41887ca83af9eaf20bfb907d89cb
+EBUILD s3ql-2.25.ebuild 1259 BLAKE2B 8c56bd4dbfc07a7bac09d0a73bfe9fb8cf33cae5660b0c0b796d420e2c19587553e21d86f69e65eba98471f590d9761aa285537d45d16a7b65d8275b142c3c0f SHA512 0043faf3590e5a771c7506f246b6d7b715904e922ab14a349351524b101d4ab4c62b68b16becbe813c6dfadebf8e0feeafb691e7b38d00847900c9ccb9dafabb
 MISC metadata.xml 463 BLAKE2B e1b6d823fd6696f0c18592981f399b884e4aa2987cfebbf4c3f071d815d3d3260fbf4b1e68a8de80ce8135a8f593ed3fd40bbcbf8387cbf9658c2f0a9334e073 SHA512 7021866874fac865898c724916b0b455f3416351aba40ce8eeef55436e93c8616786be656101bcc693ec0762626e60b44814f9dba788ff5e17b2b22f3daf5f88
diff --git a/net-fs/s3ql/s3ql-2.25.ebuild b/net-fs/s3ql/s3ql-2.25.ebuild
new file mode 100644
index 000000000000..ef6ddc58a267
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.25.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured file system for online data storage"
+HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
+SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib doc test"
+
+RDEPEND=">=dev-db/sqlite-3.7.0:3
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
+	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		net-misc/rsync[xattr]
+	)"
+
+RESTRICT="test"
+
+python_test() {
+	addwrite /dev/fuse
+	py.test -v tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use contrib ; then
+		exeinto /usr/share/doc/${PF}/contrib
+		docompress -x /usr/share/doc/${PF}/contrib
+		doexe contrib/*.{py,sh}
+		doman contrib/*.1
+	fi
+
+	if use doc ; then
+		dodoc doc/manual.pdf
+		dodoc -r doc/html
+	fi
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 41fd21513198..e220b05b3f30 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -24,17 +24,17 @@ DIST samba-4.5.15.tar.gz 21020181 BLAKE2B 0d113c4d3147102e2cc192a14d145c46930b8f
 DIST samba-4.6.11.tar.gz 21157318 BLAKE2B 7784b898fdf5bf96f3d0b0d3786be20aab55b05a76f4ccafe77c8882aa980e74a39a8747ef68d80965010c6bc316e3c271c942594a8874801f9358721c8fdbe9 SHA512 8acb0620cc7fa87692edfa1b42883384b1ae88c6b9d75432169d53c1c6f20415ed4980b2ba9d023cc69a8a1b457bcb25ecea9bdf427accfe9fc05431c3480283
 DIST samba-4.6.12.tar.gz 21160637 BLAKE2B b12046423f103883fd2d9b5ce12af2bea25c2b26bf8c039619359b789e675f963aec044e11443a8f6a865ea8564d58fe12d5268f00d71c9544e1abd27e9647f7 SHA512 e45a6ee43bcb2fba224bf38771d30daace46ad92b05f580a261aaacf7de9eca3d71cb4f4b2f956d83d84df489cb6f015b3b7abb42702ed2936bf92faa945340c
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
-DIST samba-4.7.3.tar.gz 16845436 BLAKE2B d38f58a944d19f4475ab636f09a4f9b97b92897b1d8d041efc07e1d2724d07fafa3686b5d38b847b896c4f024f5cf7330eaca4b6eb4cd34da73a32fe94e8c69e SHA512 3fd9d5f208201e3137c5966e10878ba2fc00fa80b3468e8b402e08f941b5508edd7181720033aaa25fcff0ee0ae5438619423d41a9b9b3d14dc3743fbe3f902f
 DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
+DIST samba-4.7.5.tar.gz 16862398 BLAKE2B dd5fc044e70483dc04e423ee8221afaeb90b1bfaf4ace434000b89d28248b4d9c73a11c15acca31e4b81d27b89f789b59de3da4e27faa4fa5eb025cde112e824 SHA512 1cd70ebbe59e467701e6607147d19492c3fdad99371aa182ded9e4e2f37a53c76c04e796725bd747e5e1fb882bfb73d82a0d26f25de5ef135266d33be9f7fb61
 DIST samba-4.8.0rc2.tar.gz 17619396 BLAKE2B 3fc9a7f696df012ba1e1c9d131d650aaec27296b50a2a56d7941b066d164252b34bf9dad3119bb4f99b5a09eb11501a39bfb23d64e33c72e245fa825b418b573 SHA512 215c093b2144a858e646a075eeabfdd90790c7e6eeaed39cede98b254a68fc74dd93e3be314659d60437cbcdfc604b74f3b7faa75088bcf858e23a4a34dfb105
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
 EBUILD samba-4.2.14.ebuild 7106 BLAKE2B ceb6f147af5299d1a6b5edfe1f3bfc0b8c47853496a998779d1cbf12a2739c5e704ca5b6310d109565d8dd62882525ae5282cb00058040c25f6a1a88624b7335 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e
 EBUILD samba-4.5.10-r1.ebuild 7815 BLAKE2B 2384b9e62e8a876cf208cae2f6245c00a92c8e04dfdd25652e8de706c8d08282505d3d3b84aaa2a594bc25b6420333b605387223c25d5356fa8709806f8f92db SHA512 d0c613f8de60ab50b3d48626ec00f57e28265d385e157bb54845f5e77304dde1ba6384446a8415884b263715991c44ba7c6ec059dd5863b6acc70e97ed25b79e
-EBUILD samba-4.5.15.ebuild 8078 BLAKE2B 2d2dadac94370b98430bc608b14b2e34b9d44c55662fec3672f80064afdd8dc1cfb81920fc2bca83eaf23b139ce5f3f1972e0508ea075ca5f7b65d7aa5ee9fb5 SHA512 3e03a2351511f07c3fb92172230ae943293bb420b21cfa3eb5c4fae95fc89978a7e809e8cafda9871e2f590dcc97316e4370dee92a908d0dec6983c0bac3cca5
+EBUILD samba-4.5.15.ebuild 8077 BLAKE2B a37b8af2f093ad59e8a9e8368504e1c308a3f8e48dea0486eea3d7a5d1a76bc746cfedd2cc450c81ca99b3e06ad3cfebe6ea32a6674ef1cb176d57f90e9ed815 SHA512 5bb13acbec1f4105bd0a383eaad0c110033aeb55b22b54d6ea5e1cebca0d551e80ed3b826b46b6e46516eeb32d94ed38544d7b94d4f9f2c06c966bb87a1d134a
 EBUILD samba-4.6.11.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
 EBUILD samba-4.6.12.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
-EBUILD samba-4.7.3.ebuild 8543 BLAKE2B b0a27da26793c0d740df166accadeba7737a025166815694f6b4de21957f5ecc724f0897abda4081b6a26ff0c4c2655918f4c46f1f1dc26a4acaeda528c847a0 SHA512 c94b897fd42f8acd4c069ba7b30a0c969024bc08c22962f273d4d1dcf1642147b93c238fd280d9a496ad0188e1fd09911631feec564dd9b35e94270ee6b0adad
-EBUILD samba-4.7.4.ebuild 8576 BLAKE2B d7984124f1f0afab7b5870d207f2b532cc03faad0160e569681312f363475f5ecdf4aa10008c3d20b22e1e96a70f15526b53fe3545644ae59fd1e3e9a6e37fb1 SHA512 09ba72839aa22463427b9e3a42e626bf8ed312b6294369b8167ad63a5bedb511e7181d3108200ecb73fdbffeb67d108b5b30cdcaa340811908b5165db59e3a4c
-EBUILD samba-4.8.0_rc2.ebuild 8204 BLAKE2B 4d6bc1fa225090a4566d0c421477d7dbc58d48767b2bcd2bd3ce62aec61e55e947425be6ce04fbbef3a098767e995a0b7a1f91b12c16a4b3affec3385492bad4 SHA512 71aa87b597b21afd7a69f6778883fbd4cd25fe0882a98229e86a0e77630911b96db07dce11031dab32f6956c78e62375d440385e8b2b8d11e74dbfb6b855051d
+EBUILD samba-4.7.4.ebuild 8659 BLAKE2B 91e4f49ec36cf05e9c316e945beabc27deb63c696e2e047b7a07d35ea177019edbba5b49cf755aac7a17cd50ea63662a6beb73270cffab98325423a6115a2de4 SHA512 2308064a16a9e250d839e5e7abf5fcf46fb488d9fb9b4877c835c75ce399a0597f2af3c00c1806fd4521d8d9ef2084c199bc49e9a9688f9b2735b1d195a9b457
+EBUILD samba-4.7.5.ebuild 8613 BLAKE2B 739244d4d2c06fdd0db31b3690c69babb28cdc74a443d48a187c051577f036a0800f30973ae2808ab7057e896fadd1a490345c7eb5bc4af179c6f008fd7b0014 SHA512 1ef26b480618a0ae38bc63c36fe3706e716f395dc8f67198bc1dc2d14c63472b51f7986e116cea1a702f41f85647a9c4dfc8d4e865e200d3ea5157d968131b2a
+EBUILD samba-4.8.0_rc2.ebuild 8223 BLAKE2B f0ffd0cf3f0ea82f95c10c0dbbbdd023d8b2bd061c1755f2eb97fdbe362d3c8dd24d58aa8183333539bd2310758bbd97ad4f9b7a6122295bad20eeafff80ea79 SHA512 5f3725cf4ad9b80df6039216ad0c1ffa6c8eb0220508615f81693c47717ba6b329d57e95b3c72d730096cec3244d7d301fca307db9621dd2c0ccb44598affa8a
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild
index 05538c6aadf3..c862e90001eb 100644
--- a/net-fs/samba/samba-4.5.15.ebuild
+++ b/net-fs/samba/samba-4.5.15.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="http://www.samba.org/"
diff --git a/net-fs/samba/samba-4.7.4.ebuild b/net-fs/samba/samba-4.7.4.ebuild
index 13fa3acc76c3..477428fd681a 100644
--- a/net-fs/samba/samba-4.7.4.ebuild
+++ b/net-fs/samba/samba-4.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,7 +48,7 @@ CDEPEND="
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.2.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
@@ -83,6 +83,11 @@ DEPEND="${CDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
+	net-libs/libtirpc
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
 	test? (
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
diff --git a/net-fs/samba/samba-4.7.3.ebuild b/net-fs/samba/samba-4.7.5.ebuild
index 96bd7cdf5f9a..981e4b7d1549 100644
--- a/net-fs/samba/samba-4.7.3.ebuild
+++ b/net-fs/samba/samba-4.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,7 +48,7 @@ CDEPEND="
 	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.2.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
@@ -83,6 +83,11 @@ DEPEND="${CDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	virtual/pkgconfig
+	net-libs/libtirpc
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
 	test? (
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
@@ -118,8 +123,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
 	"${FILESDIR}"/talloc-disable-python.patch
-	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
 	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
+	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.8.0_rc2.ebuild b/net-fs/samba/samba-4.8.0_rc2.ebuild
index 28420233a0a4..f0c7f58ce66a 100644
--- a/net-fs/samba/samba-4.8.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.8.0_rc2.ebuild
@@ -82,6 +82,7 @@ DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
+	net-libs/libtirpc
 	virtual/pkgconfig
 	|| (
 		net-libs/rpcsvc-proto
diff --git a/net-fs/smbnetfs/Manifest b/net-fs/smbnetfs/Manifest
index 33e78a6cd446..de183b1f9a38 100644
--- a/net-fs/smbnetfs/Manifest
+++ b/net-fs/smbnetfs/Manifest
@@ -2,4 +2,4 @@ DIST smbnetfs-0.6.0.tar.bz2 147946 BLAKE2B dc20ba86e8280365eead7cd540370e727e47f
 DIST smbnetfs-0.6.1.tar.bz2 171032 BLAKE2B ac263c963318ac01d6acef0247c0cb2149b25d991770be5c717a5d0e8baae1a6df5f9d3bf1019bc2d3fb43c728b89828225047baf4bb82c708ff051957bbcf6a SHA512 b74e979e30075243e859b8b02918b7d379eaf92e61f0fc6d6375864cf12c31c6601719026d96a24e6ac82b572338cfea4b7e0d89fe2d9dc17fd9a1a81e7f7ebd
 EBUILD smbnetfs-0.6.0-r1.ebuild 790 BLAKE2B 294a2d81d3a2ffc3bc6698ca8097e6f9fd7f7b5d703b9d45c7b2d35f13c99f3a3b1d8fe71d34bdf75f4e2123a70607809cef8cde31d24fa6289beb854c3aac8d SHA512 d0c7bc5c5933e7f007b4e873696c8d029ae775ac4fa3e9babe7080f8a821113b005e6e9fee5c2d3ad2d7cd7ff914aae16c10ca7e8f2cf36d1bbd39a405a7ca5f
 EBUILD smbnetfs-0.6.1.ebuild 806 BLAKE2B f6deaf302fcae5140e4c9a927d411cb8bf0eac6a4f7f66ba58a754150f6dd728789a80e279afd39c1050dedda78ea2fe749dda9e885656ae995ef0cf61265956 SHA512 b1e4b8a8f5e99a80dffc841c11232aea4dbe16d276ef795eeac5f2ec13d6c43279daaddc842e48df14c0a84f8c359a1d97dd2a0159b3d072634118e9647e481f
-MISC metadata.xml 1309 BLAKE2B 0eaf7359403b79b1e160152dad5286f97c222a7ccbe16a781870d93878fd9a76faf3be6a67e03679903b43f901a37ce13950d124ba766417f2a21dfaca1e6022 SHA512 f9e5d81ab83f85ac02f984d4f2d54df99122c717500dfeb56c31bbbf04e4236c40e4612b2f0117320432076fb20b9d839aeed18fa34e6bccfd94bacd236bda2a
+MISC metadata.xml 1261 BLAKE2B c1182020f6216b78ce934bf8a12a08ab2e26b83d153a1425691ca30c71cacb1f4fef4cf558df843c1c94008a88a4bedd4985d3a4bcbb18225272e779fe269ec5 SHA512 aecf5c54f76b710c7c2f098a00ac25a4b1d7488915192f3340a600f6925b4029c711fae2d8c57c6a44ca9908127a94c08f234f18c6247fc97f2bda7ef496ed13
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index d3fcbbae2c7a..da1a096c82b2 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/metadata.xml
@@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
-		<description>Primary Maintainer</description>
 	</maintainer>
 	<longdescription>
 		SMBNetFS is a Linux/FreeBSD FUSE filesystem that allow you to use samba/microsoft network.