gentoo resync : 22.10.2018

12 files changed, 129 insertions, 32 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 9abb6a829cac..4d12cfb0856b 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index 0db116af9ea1..3aa149e491e1 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -3,9 +3,11 @@ DIST mc-0_pre20180325.tar.gz 1367439 BLAKE2B 4c4a78bca067647b16d4ae0f142d78adaaf
 DIST mc-2018.09.06.23.26.56.tar.gz 1724855 BLAKE2B 6a100fd117830db096afd6b44b268e9dbe25185eb7ede56e300c6a4ac34e70a87f9184c77d54d52eda3eaece32bb6664bbeaac834624bab36d8c66e1bc31805d SHA512 2eafb9f9043d4931011c6b50cda5f8e9f794d56095de1f1cb4fb8110e109830ea6067f33b386ae2b1e8a7012f005fc0d0b0580ef70e3673c049ce81522635dc2
 DIST mc-2018.09.10.23.39.12.tar.gz 1725434 BLAKE2B bee959661fae0fccc9af655f84fab3ae4c900978b2fcfaf63287f717221065fc382f41618511c511dbe18f405b3fadfbbb2a66f1ed4a4b1c4db5d40f45b24f07 SHA512 c1183ed1499c4b3e24cf6494bd8f3b35e4d7aa9fb32d85b55d0464ef10eea25e4dd98730363d3b4d36d7cf288d652b7c2cf5738d2d3b82062f1d6f567a511af5
 DIST mc-2018.09.26.00.42.43.tar.gz 1727396 BLAKE2B 6f446229619e9116d9e8f62fc21d82aa5325b1d10d3786232741cf072fab18e5bccf14b1d49118532db5f6b0b4c2a792f15c28979af058cc75355e92fde88132 SHA512 e6be63004c0600b6e85ebd09033ebf3b7237f9829114b8b4e86c418015a94f465c26287221ddcf6371d5d414d2c037dc21a6136e1f6c8f1c27e363e0c67a1854
+DIST mc-2018.10.16.23.25.25.tar.gz 1749339 BLAKE2B b712b5111582b513c10ab1a39a9d7d5f0100fb1f6beb5e899f5e838ecd4428de4f3eda420e7c288e93b44a384c86fe65255ae086cb5adb99ffe19f8f364c09df SHA512 6d44a17fb469b2770ed9b278dcb72c9a8f3e738a4dfa4b9af888469b4228401639b74fb4891dc504fabb3def7319c367ffefb16897f6ea1d39af71c408c86af5
 EBUILD mc-0_pre20180209.ebuild 1188 BLAKE2B bc79dfcfdf898d0a0c3317c74dc4e787f5229e4b147221dac9a2284dbec6a7a74220c489eab490951c2253ec983ce9775ad6aac9470cecd5f97afe1d8131523a SHA512 a16cf03488aa12e5253e97811e4acd30d0f408af0a2b2254f80237e6c1408863651ea7a9ba24b9c5c3e3b380e615e7b8bcbc0fcaf71ab38f2ba3621a46e3d176
 EBUILD mc-0_pre20180325.ebuild 1188 BLAKE2B 66a6bb946e6a4037058cf3ce89f225e80bbb9e3e9cc7ab578288804443ad2cf6cb9320a36a58142b21979423e1e324cf2e4e1e356e30bec84199a69c94e19c5e SHA512 ece1f16ba709d123ad02e2c67ca315ec65df0aa92415c86f23a973107bab036e405d4d6403843abacbba9d34545d9e38d4857381255f8a43d85c203f67da5d1b
 EBUILD mc-2018.09.06.23.26.56.ebuild 1178 BLAKE2B 30e3b7ef2c39f0d0e930b7a1127ef9544077add85260ebe73251edf81f681934e85fa1dcdb2bb131f41b14a5fa12c8f627e54ef408f7b23f2dcea4fb78e390ac SHA512 19111a0ca521095705c8f09df126aa50325f99488c968a415f60874f63f370eca0f8043803464ffe9ca9753b0e445a809a2ed41fdda1f8fddcf93b00ab4bad29
 EBUILD mc-2018.09.10.23.39.12.ebuild 1178 BLAKE2B 1828f65d44b115d8a52690dbbdd6d2a756aec8b4ddd5e7ca4da0dc5c678d336adac6b7f4d78fd9118abf3c4293b879e4e584e913d3e5e6a262a965b21ca8a342 SHA512 f456334d9eaf2d41a2b8ffa3c50933fa8e8ec624ad02885eb63a0abe3d726fb890ded0d57059180157ff4aeabaa4b3849ed43497a6dc39d8648bc217c5454ebb
 EBUILD mc-2018.09.26.00.42.43.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
+EBUILD mc-2018.10.16.23.25.25.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 MISC metadata.xml 316 BLAKE2B a9702a517ffa52bc439add8a4712f3835bb9b7200fcc0d0fba23c23e91387a185295198a80734c79dbd4cc0146f4b393f3396495830ecf0122cbbb334a5fa651 SHA512 630bdebb37c4df4255b8dd7dd28566e9f484697e1ff50981a743b94593ef56484b20aec86a0109458a0e88b7c357da78afa8ed946ba3bca2a7db5bf006747913
diff --git a/net-fs/mc/mc-2018.10.16.23.25.25.ebuild b/net-fs/mc/mc-2018.10.16.23.25.25.ebuild
new file mode 100644
index 000000000000..28574278fd8c
--- /dev/null
+++ b/net-fs/mc/mc-2018.10.16.23.25.25.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
+
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+
+EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
+
+EGO_PN="github.com/minio/mc"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="!!app-misc/mc"
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MC_RELEASE="${MY_PV}"
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md docs
+	dobin mc
+	newbashcomp autocomplete/bash_autocomplete ${PN}
+	popd  || die
+}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 376e064a7d22..e69ab032a205 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -5,10 +5,12 @@ DIST minio-2018.08.02.23.11.36.tar.gz 8381976 BLAKE2B 4081dcb34af05e6643ac64648b
 DIST minio-2018.09.01.00.38.25.tar.gz 8731636 BLAKE2B 4332d97d63c0e113de6e88ff9a4b1fc2db9b3e9b23caff19651641fcf08b5fd86c04155a30e84228433fd76160b70fb6e774421ec85a03df6fc94bdbde545ac1 SHA512 f445153be70c7370d8c96c3d7504ab4cb067fe8d36e0e0a8c014a026cf96fb3bddc9fb9b312a954a1c505e0ee7a36e33f67f3a460f8db58105d9880ee4a8de05
 DIST minio-2018.09.12.18.49.56.tar.gz 8743369 BLAKE2B 8f7f2fdb75a0130348a6e06182a1d24d8e6463543fad8d21f2aeab0e1d550b257d124cb13d0012b9f2864f8743c4ee3791605eb1614d8adf5d6008c9d67de685 SHA512 2f33e406f8be22ccb74c7d90a76d6a48699c7e1c95c3adc10f26e6945b56b8648626ce0cfcd255ecb56985f9e849c81a0dcc4c79f772d33804774a5fe65ae4b3
 DIST minio-2018.09.25.21.34.43.tar.gz 9187452 BLAKE2B d60567a90b95c86293cd34533cf65ced42ca11219963e2f6c843ed7d6988a9df160be3afda9cdbac4f5158f46b7daddb8c79e47e6a8ff54530725ada8fb14226 SHA512 2e70e09455ba56fc4230fbc836d2eb988315f0a43109cfdbaf49c57ef2ff126db4ba836473df3c9b6e7f3e69852fa44b894bcb8a7b49b688b0df73f2e7499fe8
+DIST minio-2018.10.18.00.28.58.tar.gz 9153624 BLAKE2B be2b9db53f0256bb7db1a1917003051ec0484d876702a54ea81ed38ae2853de296129a0ac1e5fbbf6e056bc5ac82e7ba389008001195f4b20daa8545275c9215 SHA512 64abcd10ade42f9bcecf498b2855426b8fbd2be428aa5aaa134295709849f8ebb57aede1d67a7302c7d05b8a861d5076a04ad126bc66d1fc9d4c45368e5e9cf1
 EBUILD minio-0_pre20180516.ebuild 1319 BLAKE2B 192bc1fde1b2178b9c2d345de0e3ec8972af76d1cf0ae24e40b9d45de244b4bb25c39b73b93093a5fb4008ed3f2af875137fdbbbd882b159428c8171b5383699 SHA512 b0fc2c4bcad2cddc98dd0fa5a8142ed5a256fdadc53cd79234b636d8e0225ac3d67f55a7a5c74d755b9f8236e350711b1e97a029af01ba393a0958c4f4cbc593
 EBUILD minio-2018.07.23.18.34.49.ebuild 1355 BLAKE2B 96d20da0ec42fa260e914184526c474a3fad01f8bebff80e83d67361ef43429c076b120a604ee40a5f0bb80dcd315f2cd8b2c6f12f8feadf7155fa6d953a68d9 SHA512 c76ecd7a552e916bce25cea4d3284e581f8ea02596a9c9949e4284b4638bba193d320ffc33ba529aeeba65b42bc5a6e9c8acc9a41f8777afb8422f403d4ee600
 EBUILD minio-2018.08.02.23.11.36.ebuild 1355 BLAKE2B fc3585902532d8e1486ff3fea62d48946b3db44843a947dab27a1a77fee39830bad3d49e83996d9ca0c2c1c59fdac23d4ed7a5799d11056b588bc473f6e6524a SHA512 84f8839313af5a5a26043f9cac138e94442436e5207c94622f96aa4836ba8193bc72a096b84fd1308350014f356de92d0fd5bb7d535119e842eb147545e425ce
 EBUILD minio-2018.09.01.00.38.25.ebuild 1355 BLAKE2B fc3585902532d8e1486ff3fea62d48946b3db44843a947dab27a1a77fee39830bad3d49e83996d9ca0c2c1c59fdac23d4ed7a5799d11056b588bc473f6e6524a SHA512 84f8839313af5a5a26043f9cac138e94442436e5207c94622f96aa4836ba8193bc72a096b84fd1308350014f356de92d0fd5bb7d535119e842eb147545e425ce
 EBUILD minio-2018.09.12.18.49.56.ebuild 1348 BLAKE2B d27c700e8025bbacdb36bc4c0e42e273f4846312fa8320bfdcc0c5b4e85b92dd01608d124f7b32a4f1511ec48f3247dfaf864c53693a74782b26c471f8f3b282 SHA512 00be7fc9ec88e3bc36f0de276a924dc5e4b304830b75a5bae7c4f41bd96f4ecbf2512ea20a47388db44647d7c6f20d577953158f81db7a371383df79339cb7f8
 EBUILD minio-2018.09.25.21.34.43.ebuild 1348 BLAKE2B d27c700e8025bbacdb36bc4c0e42e273f4846312fa8320bfdcc0c5b4e85b92dd01608d124f7b32a4f1511ec48f3247dfaf864c53693a74782b26c471f8f3b282 SHA512 00be7fc9ec88e3bc36f0de276a924dc5e4b304830b75a5bae7c4f41bd96f4ecbf2512ea20a47388db44647d7c6f20d577953158f81db7a371383df79339cb7f8
+EBUILD minio-2018.10.18.00.28.58.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2018.10.18.00.28.58.ebuild b/net-fs/minio/minio-2018.10.18.00.28.58.ebuild
new file mode 100644
index 000000000000..9adcc45356de
--- /dev/null
+++ b/net-fs/minio/minio-2018.10.18.00.28.58.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user golang-build golang-vcs-snapshot eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 8dc7b6ae78de..b856a79cc170 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -16,11 +16,11 @@ DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
 DIST samba-4.7.10.tar.gz 16911799 BLAKE2B e8ee8763c9843d048589cb17c1b78a3e3983ff8766b2981a7da0c2e6f8425a85c97f2619a9a8259a94ccd07d7aa55bb9bf928261959c04eb0b7fdfe318fc2433 SHA512 4165cf9ec1c6355d0832fb4e17939f8f1544802e6e144d51a4f6030ad54660bb468b586d3db488f5e13f3d451fe4e2af94b748d2432da62ce256eb2467d3a51c
 DIST samba-4.8.5.tar.gz 17715401 BLAKE2B fc1aef2f5362fff1870abe40eebfe932f5ca347e65d1a2502ee19c9fce8cbf71e3f4181a18056d8d6b3e92d2515f946e3dc746b00f2398d91f88b1172e91cd43 SHA512 23a88c48214c3bf4cbc135cb84873bb8d12f32187ccbda47b02495fa4a12458f103de5e968e8f9a5958c116f618332cfffbf54d084e4f1e363fbf079b897e3a0
-DIST samba-4.9.0.tar.gz 18014609 BLAKE2B d91eca23402d9e4940f806c2bf81a28d9739f9a3c054be2776c923ea75d1a837a14d932fa080bd1ef1ac07b8cab92ea4e4b652a66c645873921fffca973cf673 SHA512 436743aff6415dbdd3495dff8a5264df16833fc5678539c4294a0de755f34661b660ce7a7b4bbb02a808ff1ca046f34072a30b9e89391034f2f391d3884ea630
+DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.1.tar.gz 18018259 BLAKE2B 783423098864c391f08b30e05b70308e922bdb4dad08b8b0b4d1112808357b9bb96aad7a094d0fe2e308f84a143d5f90be523b9c3551a3068ecdcad7347613f6 SHA512 267673b6d6ab0db59063480c20f02e5864ef96e9ad1097c23a99b2ab4b5fd2252193d7a152729b40cae0751fb9b0b108b087a190f5db11eabbd075224bd6e663
 EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
-EBUILD samba-4.7.10.ebuild 8790 BLAKE2B 49fe86981456c824a8182a8f1260ea4b2124870cbf53cc4b805b55085a28a2b3ec872e770474838055c393658dd1538f59456da67887a11663d77911a55440f9 SHA512 8e941b52a13cbb45928667c7e8fdb76ede7ff3f67fc69a9278c9ef88a37118f2a79da0eeb99102c86d349804e7db18dfe16782cfc798133687e99bd97401a331
-EBUILD samba-4.8.5.ebuild 8401 BLAKE2B d3883005a9911fc3fd634c6c61cba2e84e13e58295455efc436d9aea589eecb59083a80888ac76cf75b15190af41c7ffd4bedf81c047a3eac8ed868429444d16 SHA512 50ee59a96250d45e37edd78bc1f0aced43a7a4ba17438e8a7f78d4b5162837d124b5954f2c4173847f0ecceeec9286bcb08823fdb01279d02ebb756b840d4b67
-EBUILD samba-4.9.0.ebuild 8485 BLAKE2B 519d2213dde7e94c4e05f4a3fd6dbd1e3f5996c620dfc0b8f365a96288ac2d37d6ec6ffa318b1dea82f98c7d4556bcab5b7ecbf643980c9fb16fa1680feb61e0 SHA512 f8c5c70745c7f84c7cba6ca519360997ddce78593b26e541cd9b00c7104035667707808377ce69be788b3035f56d8b830f8c2cbcdfa7ccec07acd1f89a6f6628
-EBUILD samba-4.9.1.ebuild 8482 BLAKE2B e06128ad3571bc3242e2cf9e233fca32dbc97a654bac5b256ab426610a9070d7dc19db770ccae2d2241cc94acba8374d5ec6f956deee0bd54a2fa4da27924185 SHA512 c1e4cbf37be8aac9aa1c16dcc5359e4173a80812d974a77923ab78f79d04addd0e362ab233ff8e2b9ee30e738331efcfda80f0672ca0d761f3ee23142b7258b5
+EBUILD samba-4.7.10.ebuild 8797 BLAKE2B 55cd5751599f69205abb9c6db4c575db7956dad63c1c74502d2249b88c480d21011911ea8d70cc47c7eb42304b4b20c04a3b9ab3f549726633c3514476b4fa8f SHA512 4c53c7748ad3acd4f4fc687eaa9d40808f5ec1b5bb02d97df46d3517ae4727343af29cf689065c483addeca86109561696156f77cdcb7edb5a835c17c7b96f62
+EBUILD samba-4.8.5.ebuild 8408 BLAKE2B 518354a225c001dbc3153e7fcb7f071b56e78108fcee69454bc04d92ef1c43e9b16703118e5926bf7ee3a189f19f2c0a02a2e1d251e909c73b8222cf5b326136 SHA512 b169a47c7b5967988874e549566102b18794c031b353dd5f7dc6ed47f4c5cfa36b5afc236f3c95a2937af8c76206c83ed4eb4297aa7202945aee9e62eaad6abf
+EBUILD samba-4.8.6.ebuild 8398 BLAKE2B 1ef857e09c2362a517a9d17438f2e4c6274c8fa9189f1910a70ace3cba3c1259c0afeac670341cc0bc01fae30fac9d89961c6f29ae918d417db4af0c44928e93 SHA512 355d1e4e8d99c762c3114719a6f983cb879f76ad515512338327d80c2582bc1b84558dce1737b6e5b1947a5201aace0158f49a24c8d29a13d1a764502e72f4a1
+EBUILD samba-4.9.1.ebuild 8489 BLAKE2B 597bb03e025bd209f80717b558d66c2ec53ad83508cb1f1b8ad79f84614b25f339d112bd4b015b439759e2e150a4feda3f751ab26d4103825134be38a2b6ed3a SHA512 d969ba1ec0b4f5b830fb57a9a44cbe870fcaba080c5df5d9be505b39298b348036e02af12e0fdb9e3ad127712ed779fc9b9aceb5f6912c22c227fa68c681d56e
 MISC metadata.xml 1673 BLAKE2B 56bdd566235a3db45ebcbb546a11c12b035b41f54bd00df2fbb65f47ff29c7a2ab5466cdaff8fef6fd72a7b5fc9af2bac1e4050bfd6db3220c32ac383eeeeb1a SHA512 2436c4c24de5cebee90c6fb49d52dd9228a3f0deced53701d229f1afa3bb7eb29621864678325381dfacd1d221142368b27d4800ebd2412b18595ab106ddff01
diff --git a/net-fs/samba/samba-4.7.10.ebuild b/net-fs/samba/samba-4.7.10.ebuild
index 7d60b913219c..f58bdca93404 100644
--- a/net-fs/samba/samba-4.7.10.ebuild
+++ b/net-fs/samba/samba-4.7.10.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.8.5.ebuild b/net-fs/samba/samba-4.8.5.ebuild
index 0fe80b5fd005..62ea2b0c9abd 100644
--- a/net-fs/samba/samba-4.8.5.ebuild
+++ b/net-fs/samba/samba-4.8.5.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.9.0.ebuild b/net-fs/samba/samba-4.8.6.ebuild
index c95e2c0c1bd3..9befc0e21193 100644
--- a/net-fs/samba/samba-4.9.0.ebuild
+++ b/net-fs/samba/samba-4.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,8 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -49,14 +49,14 @@ CDEPEND="
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( virtual/pam )
@@ -79,7 +79,6 @@ CDEPEND="
 		>=net-libs/gnutls-1.4.0
 	)
 	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
 	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
@@ -111,7 +110,7 @@ RDEPEND="${CDEPEND}
 "
 
 REQUIRED_USE="
-	addc? ( python gnutls json winbind )
+	addc? ( python gnutls winbind )
 	addns? ( python )
 	ads? ( acl gnutls ldap winbind )
 	cluster? ( ads )
@@ -200,7 +199,6 @@ multilib_src_configure() {
 		$(multilib_native_use_with dmapi)
 		$(multilib_native_use_with fam)
 		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json json-audit)
 		$(multilib_native_use_enable iprint)
 		$(multilib_native_use_with pam)
 		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
diff --git a/net-fs/samba/samba-4.9.1.ebuild b/net-fs/samba/samba-4.9.1.ebuild
index 89382226c0f1..752d6d250598 100644
--- a/net-fs/samba/samba-4.9.1.ebuild
+++ b/net-fs/samba/samba-4.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/tahoe-lafs/Manifest b/net-fs/tahoe-lafs/Manifest
index 769ae1854850..bc1b674831bc 100644
--- a/net-fs/tahoe-lafs/Manifest
+++ b/net-fs/tahoe-lafs/Manifest
@@ -1,3 +1,3 @@
 DIST allmydata-tahoe-1.10.2.tar.bz2 1378204 BLAKE2B bfbd36861b8f868ee0bf667a5b64b1a47d7a0fb255ff19a9f5c2db020988397a8ea57c7dadfd1fb8edbb94d55e247a78a8f61d0e66af56129aea4c528b0c6c84 SHA512 79d4e3395aa7ef8e1e7c97eebdfcb75b3b36edb75aa5d5f805c568b842b9b2f4ea5f8529dbf32fbdd9cc467cf82f153aca09310bc3b69fa00efae7be8a7bc198
-EBUILD tahoe-lafs-1.10.2.ebuild 1474 BLAKE2B ffd268f2c9e8319aa6efdd9d3961641d10d15478f54ff436216083b528e68d38c32435322b2b2fb1f5865e043890b0811a2efb514271d4bad7d5886a358a3bdf SHA512 02dc2ccede27e1445878bebfce270dfb4023ae9d131121208b6136a82b8724a2557f79f2acfadf7f0e390020560bcc31bc286b9522fa95d562ec50bc8bfa84b1
+EBUILD tahoe-lafs-1.10.2.ebuild 1352 BLAKE2B 1aa21cb2629604af7dde472e0314cc27a73a3f3f82755306b2d4f1ed93e8856f0ee5551098fb5645a25fc28d0226abc3377f1fd6c0fa6069d371b1dafbb31dfa SHA512 2397c34bca1c5a47542539a6a6a5729f6c0761457594312ecaab3461705ada73bb83babcbfe641e6cf9b64984bb0ebdda78d0e18c7df7ed4953b52c1df76c1e6
 MISC metadata.xml 736 BLAKE2B 7578baf99b5e3c54252c63cbc5793397a76de9926d7f389934174ba0d48f376e447e214573cc7e745051827dfbd822a35ef631c4bdb44acb16181de6c0c43c3c SHA512 52ad1244425d834c155be80945160903a0ed07d580be29fa31414edc0e53f9271c49eb32f864d07073e6870bc8f9a30db19f270d716387e0ed2faaef5a3285e2
diff --git a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild b/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
index bb0f4bca8131..031d09ff8c46 100644
--- a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
+++ b/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
@@ -26,19 +26,19 @@ RDEPEND="
 	dev-python/nevow[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
 	dev-python/pycryptopp[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
 	dev-python/pyutil[${PYTHON_USEDEP}]
 	dev-python/service_identity[${PYTHON_USEDEP}]
 	dev-python/simplejson[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-13.0.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
 	dev-python/zbase32[${PYTHON_USEDEP}]
 	dev-python/zfec[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	rm -r setuptools* setup.cfg || die
@@ -49,10 +49,3 @@ src_install() {
 	distutils-r1_src_install
 	use doc && dodoc -r docs/*
 }
-
-pkg_postinst() {
-	elog
-	elog "optional dependencies:"
-	elog "  dev-python/twisted-conch (for sftp access)"
-	elog
-}