Diff samba-4.8.12 with a samba-4.9.9

/usr/portage/net-fs/samba/samba-4.9.9.ebuild 2019-06-21 11:09:00.000000000 +0300
15 15

  
16 16
SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
17 17
[[ ${PV} = *_rc* ]] || \
18
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
18
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
19 19

  
20 20
DESCRIPTION="Samba Suite Version 4"
21 21
HOMEPAGE="https://www.samba.org/"
......
24 24
SLOT="0"
25 25

  
26 26
IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
27
iprint ldap pam profiling-data python quota selinux syslog system-heimdal
27
iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
28 28
+system-mitkrb5 systemd test winbind zeroconf"
29 29

  
30 30
MULTILIB_WRAPPED_HEADERS=(
......
50 50
	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
51 51
	net-libs/libnsl:=[${MULTILIB_USEDEP}]
52 52
	sys-apps/attr[${MULTILIB_USEDEP}]
53
	>=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
54
	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
53
	>=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
54
	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
55 55
	sys-libs/libcap
56 56
	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
57 57
	sys-libs/readline:0=
58
	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
59
	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
60
	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
58
	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
59
	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
60
	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
61 61
	sys-libs/zlib[${MULTILIB_USEDEP}]
62 62
	virtual/libiconv
63 63
	pam? ( virtual/pam )
......
80 80
		>=net-libs/gnutls-1.4.0
81 81
	)
82 82
	gpg? ( app-crypt/gpgme )
83
	json? ( dev-libs/jansson )
83 84
	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
84 85
	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
85 86
	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
......
111 112
"
112 113

  
113 114
REQUIRED_USE="
114
	addc? ( python gnutls winbind )
115
	addc? ( python gnutls json winbind )
115 116
	addns? ( python )
116 117
	ads? ( acl gnutls ldap winbind )
117 118
	cluster? ( ads )
......
132 133
PATCHES=(
133 134
	"${FILESDIR}/${PN}-4.4.0-pam.patch"
134 135
	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
135
	"${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
136
	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
136 137
)
137 138

  
138 139
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
......
158 159
	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
159 160

  
160 161
	# unbundle iso8601 unless tests are enabled
161
	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
162
	if ! use test ; then
163
		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
164
	fi
162 165

  
163 166
	# ugly hackaround for bug #592502
164 167
	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
......
201 204
		$(multilib_native_use_with dmapi)
202 205
		$(multilib_native_use_with fam)
203 206
		$(multilib_native_use_with gpg gpgme)
207
		$(multilib_native_use_with json json-audit)
204 208
		$(multilib_native_use_enable iprint)
205 209
		$(multilib_native_use_with pam)
206 210
		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
......
211 215
		$(multilib_native_usex python '' '--disable-python')
212 216
		$(multilib_native_use_enable zeroconf avahi)
213 217
		$(multilib_native_usex test '--enable-selftest' '')
214
		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
218
		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
215 219
		$(use_enable gnutls)
216 220
		$(use_with debug lttng)
217 221
		$(use_with ldap)
......
231 235
	waf-utils_src_install
232 236

  
233 237
	# Make all .so files executable
234
	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
238
	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
235 239

  
236 240
	if multilib_is_native_abi ; then
237 241
		# install ldap schema for server (bug #491002)
Thank you!