gentoo resync : 11.07.2019

7 files changed, 16 insertions, 10 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 307028c91280..e29b686e3cd9 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 733c6da6de90..7b11a802df0b 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -24,5 +24,5 @@ DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 EBUILD nfs-utils-2.3.3.ebuild 5494 BLAKE2B 1da519c6135e9fd70d88bede60e19479dca05e80645a04a4a57ee21be978589d86a6adb3bc1f1881fbaff8839685da6fa1b1e37212a36ced856f60220b6bd5d2 SHA512 39b5e83e3140d203d3b7d411a81d8341ffc55fc1f72d81a4b2ea2be0b2398607fcd7fb3b45ed7dfdc71a4ef13f6c28fa2d3139543fa65553fa8855e943e4d79e
 EBUILD nfs-utils-2.3.4.ebuild 5234 BLAKE2B 0beca63652f9b6bc82afbcd09b1d2a3b1d7c139317a5c41468c2ea0a98f2eb85fe81734cc4243cb6f1cb32fd6167960ca7ad50fe8b5cb07495c78c27a7aa7f5d SHA512 0f6538a18a71a137a277c5c6bf9b525d8ccaa880e85f4c32389d616acd398e12fbb45f11a4c39106cc4ae14f6d711ac3df7a3e3d02527fadc6316951da8ffc67
-EBUILD nfs-utils-2.4.1.ebuild 5234 BLAKE2B 0beca63652f9b6bc82afbcd09b1d2a3b1d7c139317a5c41468c2ea0a98f2eb85fe81734cc4243cb6f1cb32fd6167960ca7ad50fe8b5cb07495c78c27a7aa7f5d SHA512 0f6538a18a71a137a277c5c6bf9b525d8ccaa880e85f4c32389d616acd398e12fbb45f11a4c39106cc4ae14f6d711ac3df7a3e3d02527fadc6316951da8ffc67
+EBUILD nfs-utils-2.4.1.ebuild 5241 BLAKE2B 9d2eacd2a2cea755425ed58b740bdb98b6cb48627307bb135d37e4e801284b9f1ff2a2c0207d8b07dda347bb73224e175242bed4691df83f71ed19b6bae7d9ab SHA512 8bdd7a46a2f2d887024c14636adf4ea502676fdd7284c80c44de2f9186ebc6ca763230dec1b4486e47ccd848bacc1e7b296343d0d09b8f737aa9b2a275db432f
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
index dafe5f83ce34..2691baaa27ff 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 988f8109c809..a8458c2d5aa2 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -17,23 +17,23 @@ AUX smbd_at.service 145 BLAKE2B 729dd189fc69ff33930ec96a68cff42438645ff7f3cf0a88
 AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
 AUX winbindd.service 240 BLAKE2B f0b96a5a1d93a3c04bb2a2b2b500718b41fc907a3c551827a459c5d8184abc3caed0ac5edcf16032650dc2d58c38b779473c7a619047956f1381415e3de4dd93 SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
 DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
-DIST samba-4.10.4.tar.gz 18289224 BLAKE2B e5e416ed9ab51ed8294023619c6a4b8a6d41b0962cab7b9788d8d8b21706bd93a1d6a3833712377839d6112b67ce6fbd0d9be93f64c0bd603800624b130b780a SHA512 10799f866b896903baaea5141af89cf442f3892d9c6f74b7acf217dd95abfe77b09f2bb001273cccf2e433bd2e845fad90651970952b4e18e8cd37bde956cf4e
 DIST samba-4.10.5.tar.gz 18290612 BLAKE2B 731ea29b02db5158c5cc564d5663e3f9552d7e1164ed8a41738dba8656692b685cc9a7ba57e8cd32fe9a1cb24eed5373929d2b805bf3da3982c0f4b1246883d0 SHA512 82961791a43511aa42f0d648edd13f0533cb20e1d673903e6a1f6235b0df19dfc0755ab0c8e6d4518ca19c188968a38a6c8e8c80d05a20141c097fb0b3e2b795
+DIST samba-4.10.6.tar.gz 18306135 BLAKE2B 236598c26294e1b7b23e48eba7d6429eec01e65a4a73a45fea16ef0e0b7cf1c7b861d824e860bc178d358c298400e829577525b0438e0384fca7bf4409bd69f0 SHA512 6c06a55ac686210965cf52f79190700a3d3a5cba8ea54b32e5bdb4d6b6167f1fa9aef308c3d5fdc7078496aa78b46d5cea3c623438d3a049b11fc58d334f8d0f
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
 DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a8920ce9bc6dda84f20698245c3c5d472a5f79984efc81f9c32d1d1e72b1fcdffb137e3a27634f4c521a1d46a48 SHA512 951dfc0ea7130da9d9aa3069ca276e630d67171a1995dba368459e0cdf00337d0f6271827bffec694371010614a1a7ce2349840ddedd0231315f6a56dce2fcac
 DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
-DIST samba-4.9.8.tar.gz 18081493 BLAKE2B 026c166ec10c799be0e7e8790b8285671884ae42435895a3f33219ad4a3dc42bb8681c0b2e683fcf6955cf6d27fe3f150ee589fdfb2570a98863045c927d26da SHA512 80d93f10a415960b758c7fd26c91c27eeb9e8371eb82681aa287e139f9388b6131c9ab5460d39b912a22a79bbad9de210753ba01fd55fad8b2db91190ce3f286
+DIST samba-4.9.11.tar.gz 18095745 BLAKE2B d06a15608f71e73e26dbb15ddfb3512a0cd6f6ce5cffe663451cdf1552473c28cc5a66fc5e28d0e3fbfc80be8524903bd42d75050b664e713efdb09855175bdf SHA512 3d1cd7e3f1ffbfa6bb44fe0cb12be47dd17c9b614b6509ecec20210ac734fa1ab90ea5d2d2180fe7c80bd4eb5bb9a73a09183edf70bdd28dde2d33e092c9e71a
 DIST samba-4.9.9.tar.gz 18080757 BLAKE2B 3cfe741d21584d74654607d6c1450b67f80524f5809607b0c796fad501c06b34ddfb8eb7ef639cca70e8bc54f53805be4c45d78eeb2760aa7728ba907e99589f SHA512 636fc7073cf9dc9ff9bfe46403d35d7a058024708d090bd0ecc7e900a8468ffb7c9a8d564b2df85758c4ef3d184ed3f2c8fa3079ece13d6b9afa816136f0b608
 EBUILD samba-4.10.2.ebuild 9070 BLAKE2B 80a704b0a82cbe4a720cfb8418da6c5b6245f54da0689ff704ec579f38a05894d7a5474977b2802432670a9424c4efa8fff3f234782a551d54b5ac247db8075c SHA512 ea1422a0eb843444d7ab232d85fd1e5be1022aaf2ff785ee67edbe65516acc7d6d40ecff4a767de2f18290c8f91710c90aba19c2a19b91c32c98be61fe57a3a7
-EBUILD samba-4.10.4.ebuild 9115 BLAKE2B d0d8c4b014098218e7dc30b5169c5ee474ceada2e774e78b7e8a3f76d61703553da7c6ab298dadee21db500124858089497711783307f801c1d92443411204b9 SHA512 4c1c41e3e4cefce8721d07f29894dbb64825f1d514fbfd964285a9509986aafc2aa8819bc6db4fda24b864e3412a620323bfbf5d437803f9a907f5f4b400eeca
 EBUILD samba-4.10.5.ebuild 9115 BLAKE2B d0d8c4b014098218e7dc30b5169c5ee474ceada2e774e78b7e8a3f76d61703553da7c6ab298dadee21db500124858089497711783307f801c1d92443411204b9 SHA512 4c1c41e3e4cefce8721d07f29894dbb64825f1d514fbfd964285a9509986aafc2aa8819bc6db4fda24b864e3412a620323bfbf5d437803f9a907f5f4b400eeca
+EBUILD samba-4.10.6.ebuild 9266 BLAKE2B 206634d5aca6854b6e94d05fb86d02e7313f9261c4adfa41f5ffecb68e109d90fcc379d2aa96bdf493877bde09a2da55b4753183808cdc0b68601a461c44cf22 SHA512 6fd185aa69cc59031aeda035563e00a84392a8a73a70cbf499aa3e4e5ad76ec857ff06356a74de061e76a37dbdaf3b7e39674316880eafd616fc36c3bf62e59e
 EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
 EBUILD samba-4.7.12-r1.ebuild 9188 BLAKE2B 458197bbc0248729c819bcd347fd6fe6a31acf4e858d6b7d204c91f528bc029901a7a30004e16146baf789b4aae1a82d2eadae8e257a1a89fe320220bacbe2b5 SHA512 9bbc844a9cd1883eb6097e12482641c83ec140caf1870cca8879b9d3f3392a462fa11084ff285c547725661747432c0c9a327f83d2da1997709eafe5c133dc52
 EBUILD samba-4.8.12.ebuild 8901 BLAKE2B f01720de64da1ed13c6f717891919c2ccfad0221d1e0f6a612e620d7de8bcea57fdec4c10bed8e9842c31a412a1681b2e0376e7ac628646d121584de54220944 SHA512 deed37996e47a8889f783898fd0c99c63feb20a4d6b811384b8a964cbc4363c3e63d8c404de4a3bf9cd310cbdfd0f440434cd86d7c7426cb8a4bc6f5c88ea9fb
-EBUILD samba-4.8.6-r2.ebuild 8468 BLAKE2B ea775e87c570e11fccb3b6ae981a0a225fcf53de14b039f6316c76e43be48a31e52cf11ad188e1ff6105a73a94d9b7cbd406fd54f0e533715085af34787e520e SHA512 e716c4efd922f22b7246da3367be0f85f1afc4ac43440010ea8c4f3c2ea5a2c45dfbc5580896d0b4ae595f43b0f93301a2ab9d6eedcf3802a97a9d218e46eada
+EBUILD samba-4.8.6-r2.ebuild 8467 BLAKE2B bb9806f40f062f742e5e82778fdb82e1a9366c2f53fb977be373ca2dd54d3fbf49632c4f424acc12eb73847ce2d944d02fb54951bbbc6a02c11b42a521c05e2d SHA512 71a940ea88b17096512e160236dbebb9d82603c19262e2b955212b4a361d0c0f51466eb1150f501c0e13e2fcce0f29c1f480d1c38fd32bc27ebae0207e40dd79
 EBUILD samba-4.8.6-r3.ebuild 8862 BLAKE2B 23eea9d9f1e1aa4b5812b10a190a6c6d609dc9d7ce48a5052eb0505289aabc7644090e15bc72c7bbc2d79a42707d16fa36c3e41a58cdcec0c292b50d20ec7905 SHA512 d98d4a73c0404912a6946b0b9b793542158d061a72a1979e4e8aa7a8d378c818e29f3049daa07db71f4b3ccd550ce9325b85d5beab3d13204957912ac99cc4e7
-EBUILD samba-4.9.8.ebuild 9060 BLAKE2B 966a27c76b743bf6548e5a8e794344c100dc65031d42aca9351e5d9f56e5fb66fe150b4e22ef5c5701d70dcc845218bebd28e276aece5d8b81b7bb247e45b2dc SHA512 5fb312a2f176e7f4fb928411ff9d212c21aa004837fe5e81aea43cd8d78c5c96c6f81b7dae1763913a82488550d989219aac12b73324925b3f9aaddf7e7258d8
+EBUILD samba-4.9.11.ebuild 9060 BLAKE2B 587779d9c3aced71a77202fd5d34eea51db1b506bf15ea9bc6fb35cb5525f09facaedbc52464cf2c4807976d1e7bd41b7de404e1adc4706e623674232a089605 SHA512 ffcf5c86d8fdc19b03abc4840c22060b291368ddbebef0e60a6414c7ab456303e76f2dae3ec38fa359560b89c0303e79cb670283b300f51a898bf50b67761d3d
 EBUILD samba-4.9.9.ebuild 9060 BLAKE2B 966a27c76b743bf6548e5a8e794344c100dc65031d42aca9351e5d9f56e5fb66fe150b4e22ef5c5701d70dcc845218bebd28e276aece5d8b81b7bb247e45b2dc SHA512 5fb312a2f176e7f4fb928411ff9d212c21aa004837fe5e81aea43cd8d78c5c96c6f81b7dae1763913a82488550d989219aac12b73324925b3f9aaddf7e7258d8
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/samba-4.10.4.ebuild b/net-fs/samba/samba-4.10.6.ebuild
index 9abce7be82cd..3d065562f7cc 100644
--- a/net-fs/samba/samba-4.10.4.ebuild
+++ b/net-fs/samba/samba-4.10.6.ebuild
@@ -50,7 +50,7 @@ CDEPEND="
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.5[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
@@ -291,6 +291,12 @@ multilib_src_install() {
 	keepdir /var/run/{ctdb,samba}
 }
 
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
 multilib_src_test() {
 	if multilib_is_native_abi ; then
 		"${WAF_BINARY}" test || die "test failed"
diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r2.ebuild
index e259498d82a5..99a93526abd5 100644
--- a/net-fs/samba/samba-4.8.6-r2.ebuild
+++ b/net-fs/samba/samba-4.8.6-r2.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~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.9.8.ebuild b/net-fs/samba/samba-4.9.11.ebuild
index b254b52dad44..c983eaa51e3e 100644
--- a/net-fs/samba/samba-4.9.8.ebuild
+++ b/net-fs/samba/samba-4.9.11.ebuild
@@ -50,7 +50,7 @@ CDEPEND="
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.7[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]