gentoo resync : 22.10.2018

5 files changed, 17 insertions, 19 deletions

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/"