gentoo resync : 29.08.2018

9 files changed, 9 insertions, 123 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b3b0ac6007b8..f7e360caee24 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 041bcddaa9a9..0a451260476a 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,9 +1,7 @@
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
 AUX cifs-utils-6.7-talloc.patch 857 BLAKE2B 3ffefe40f18db87992bf3a2816bba690251f3dc93f78e998acfebbff450c20072679e4ee7fdb9fe22e835d4a7cf8f3bb43cef887fa54d7a70d6bbbf7dd8ef1b8 SHA512 c1e64736ec7735213a66b9c2514667244e5dd78531c899b7e10ff93acfed8395ad970b9b2dac929d7894feff3cfc0f46c6693df244557dbb9d2f2f8939ccc8f5
-DIST cifs-utils-6.4.tar.bz2 392809 BLAKE2B 90d59cbc49e6d3cf427a43fd9deedc8ea8150e6c8a3ed93ff815445897e4a524785dd342e0547a651bd67de4495e09c6384d6b36c3ed01f9d532c6d533c9efd1 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614
 DIST cifs-utils-6.7.tar.bz2 363647 BLAKE2B 692c4b7de92c2cc5cb88591fb5b5b01ca7d925b105d10f7149e350d1b1661bb6447e71e0ca86095a9e294637d80126e54295413a685786b62c8e70cf26f893d0 SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e
 DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056ff4d995b3ed9f25a6c6c8d4c8d7437a3158d5c592d16cb6bfcd289b937d6ac1ef0573c346993d576a88aa1fcb118 SHA512 54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13
-EBUILD cifs-utils-6.4.ebuild 2974 BLAKE2B f469c0c94f3cba69c8847ffe956e23ed0525ac01360e4e966e73a83680d732251f0fb418df3f5b853bfa13ee1935e77eb6ea92220beca8939edf1437cff0d5c1 SHA512 c5c12c57c322a2a87f03426a2d08f1fe1e69213efbc4463b04b5d2b60ca1b06578a018336666b5a2f4213c3681d1d1ee3c35df4b0bdf802e4a1e564d423ee4e1
 EBUILD cifs-utils-6.7.ebuild 3238 BLAKE2B da996af82766a6655024468578c55981faadc683dbaadf6b20699e01e00bf8e9ef532959e0fcf421cefad64a57f1a58e66287b23b0c7536a1adba277dec921b0 SHA512 dc9efbcbdfcb4eca70b9c51f4b1bedcc3a8e5cbe79d43715f70a259a4f08725eca5d3eec32aa5f3825add1b645ff0e4c241fffe3eec0030b8acbad0b15c3c9c4
 EBUILD cifs-utils-6.8.ebuild 3230 BLAKE2B 73e27d0cd239fc82c440d299a3a3ef07e4a4ad244e2980f0526e2ee8aa12b46e70fd46f66eaa587674a1c9bc2d0b02ba98f9943d38fbcb5a2db5a57bf1d82852 SHA512 311e7213a58ddc8df71ecf9ced69af3014de41465f57b8b46dc6bbe334b1a78199afbf142a74869087fd5bcb78d98feb55704f004dec65b61da2f04eac15f26c
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.4.ebuild b/net-fs/cifs-utils/cifs-utils-6.4.ebuild
deleted file mode 100644
index fcce7f6b93b0..000000000000
--- a/net-fs/cifs-utils/cifs-utils-6.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info multilib
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="https://www.samba.org/ftp/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
-IUSE="+acl +ads +caps +caps-ng creds"
-
-DEPEND="!net-fs/mount-cifs
-	!<net-fs/samba-3.6_rc1
-	ads? (
-		sys-apps/keyutils
-		sys-libs/talloc
-		virtual/krb5
-	)
-	caps? ( !caps-ng? ( sys-libs/libcap ) )
-	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
-	creds? ( sys-apps/keyutils )"
-PDEPEND="${DEPEND}
-	acl? ( || (
-		=net-fs/samba-3.6*[winbind]
-		>=net-fs/samba-4.0.0_alpha1
-	) )
-"
-
-REQUIRED_USE="acl? ( ads )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
-		ewarn "You must enable CIFS support in your kernel config, "
-		ewarn "to be able to mount samba shares. You can find it at"
-		ewarn
-		ewarn "  File systems"
-		ewarn "	Network File Systems"
-		ewarn "			CIFS support"
-		ewarn
-		ewarn "and recompile your kernel ..."
-	fi
-}
-
-src_configure() {
-	ROOTSBINDIR="${EPREFIX}"/sbin \
-	econf \
-		$(use_enable acl cifsacl cifsidmap) \
-		$(use_enable ads cifsupcall) \
-		$(use caps && use_with !caps-ng libcap || echo --without-libcap) \
-		$(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
-		$(use_enable creds cifscreds)
-}
-
-src_install() {
-	default
-
-	# remove empty directories
-	find "${ED}" -type d -print0 | xargs --null rmdir \
-		--ignore-fail-on-non-empty &>/dev/null
-
-	if use acl ; then
-		dodir /etc/cifs-utils
-		dosym /usr/$(get_libdir)/cifs-utils/idmapwb.so \
-			/etc/cifs-utils/idmap-plugin
-		dodir /etc/request-key.d
-		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
-			> "${ED}/etc/request-key.d/cifs.idmap.conf"
-	fi
-
-	if use ads ; then
-		dodir /etc/request-key.d
-		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.upcall.conf"
-		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
-			> "${ED}/etc/request-key.d/cifs.spnego.conf"
-	fi
-}
-
-pkg_postinst() {
-	# Inform about set-user-ID bit of mount.cifs
-	ewarn "setuid use flag was dropped due to multiple security implications"
-	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
-	ewarn "You are free to set setuid flags by yourself"
-
-	# Inform about upcall usage
-	if use acl ; then
-		einfo "The cifs.idmap utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
-		einfo "This enables you to get and set CIFS acls."
-	fi
-
-	if use ads ; then
-		einfo "The cifs.upcall utility has been enabled by creating the"
-		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
-		einfo "This enables you to mount DFS shares."
-	fi
-}
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index be65d6c07b93..fc36c2d49c44 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,3 +1,3 @@
 DIST cvmfs-2.3.5.tar.gz 37771779 BLAKE2B 06366cc1bdc2e133b65ec6f348507ef0d5f752f69b87632b0b27bb5b29e0546922d5a12e406f733341e9c8b7d32f8bd32878e247d98a168d6985a620607720d3 SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b
-EBUILD cvmfs-2.3.5-r1.ebuild 3641 BLAKE2B 50f4e36a53478877aff025e80708f9ced7a9f5f0afa6c1a97667d443b66507ddbfeda54486422128b7fe20bae6944161a165b3d50bbb818b66ad171cc0550895 SHA512 6cd16f0c48e3b1e83ba0a742853bb953ca15d1aa004bd32d2b64fbfb81ffabd4f7ad961fa7fccc2a469b7548346286d67d1f0e485f4b3cb87e82e2643f052f4d
+EBUILD cvmfs-2.3.5-r1.ebuild 3598 BLAKE2B 37bd86039e8966d2b535803ba6388a71ef53bcb58deac5ac691dcadc02d8a06665296b336a1ccda51821b564ad2814ea04724b3d33c21a59d7096659077b3957 SHA512 5e5b4ab84442cb7047295654dcb19a26a24d70afb69ee2e7d1b051c3a8973300ab26cb56a83e4b42f8a3cd32f0781d2c6cce30f860a01a031e249be59cf08e0a
 MISC metadata.xml 1184 BLAKE2B 90621d313849529a259d07f913f8867c420b4f65cab5c958873ec455f26baac0ad7748902993badb03c5ff800a0f50af41023383fe4f6981e26d22e0c27ae36f SHA512 16c10f416575332edfb009cb58a1ef3f11165d7eecb739209a70a31c522768e92c78fe146324f5073094126c902de0232976d9d9431fe08832f8a955587ed76b
diff --git a/net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild b/net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild
index 05b2f3138849..375fdee6e324 100644
--- a/net-fs/cvmfs/cvmfs-2.3.5-r1.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.3.5-r1.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
@@ -40,10 +40,7 @@ RDEPEND="${CDEPEND}
 	app-admin/sudo
 	net-fs/autofs
 	server? (
-		aufs? ( || (
-			sys-fs/aufs3
-			sys-fs/aufs4
-			sys-kernel/aufs-sources ) )
+		aufs? ( sys-kernel/aufs-sources )
 		www-servers/apache
 	)
 "
@@ -55,7 +52,7 @@ DEPEND="${CDEPEND}
 		dev-python/geoip-python
 		>=dev-cpp/tbb-4.4:0=
 		|| ( sys-devel/gdb dev-util/lldb )
-	 )
+	)
 "
 
 REQUIRED_USE="test-programs? ( server )"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d7b9e4dd823d..618c366fff09 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -34,7 +34,7 @@ EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac9
 EBUILD samba-4.6.15.ebuild 8732 BLAKE2B 984e99c120299e958b69d749b84627c2a094d6f4a207e775112af2bcfe09918feb6cfe89cb999ea31c645dd59fd7edf2fee8e53f98ba664c331142044d3ec3ad SHA512 3f39c3320b0ef3b6d611827b103432726c7788cc9164ae5eb11b02b0eaa8fe1eecb1677cd9630024b5a6abc78f72d8abaa90f63e72df718a36462216e92f76fc
 EBUILD samba-4.6.16.ebuild 8732 BLAKE2B 984e99c120299e958b69d749b84627c2a094d6f4a207e775112af2bcfe09918feb6cfe89cb999ea31c645dd59fd7edf2fee8e53f98ba664c331142044d3ec3ad SHA512 3f39c3320b0ef3b6d611827b103432726c7788cc9164ae5eb11b02b0eaa8fe1eecb1677cd9630024b5a6abc78f72d8abaa90f63e72df718a36462216e92f76fc
 EBUILD samba-4.7.7.ebuild 8803 BLAKE2B 5fe9b941bd95067a7b7820677af872f2c1d3e8a6076e7f1428446fed81e37181b61716706e5ce09383dc2415e7df2fbd60f5ba9dc94ddb6cafb08a81e76607a1 SHA512 dc30f815d2631838322e8fd1233e54a336e4be71dc8c274bd6085278869cf82d8e12f773d14079d1ebbd845cf875e3a0165126ba21c50e5742f849cc97b49521
-EBUILD samba-4.7.9.ebuild 8765 BLAKE2B 78e77ed3b4d242063e10e1f4c25292549bf05c9b07cc33e65c9808ff263d5b9989c363bf0c52babce8357e510de54ba33f49d56888b5b5a0c509260674725f17 SHA512 e20fa5e8511687df4eef4fe8c7a8f92a65dce28ccf068f007dec05dd4605b6b97a5b35d1da809a0b20a832c3e657e127a7bf0f22504a9d55f2dd275f9e925c77
+EBUILD samba-4.7.9.ebuild 8772 BLAKE2B 5cbfaa5549751bf94f6a0735937db647179f5de0ca44b04bf3d25e071e3c4fbf47a3ed9779588271aafbe995b1198a3d65854a77f63f0ff44cd5e4b6fe45d2e0 SHA512 9420e47b8c16b4a14d26a0851e85665247d28c43701740fe2c31d2aed632d0124f208f76a3885876251c215d446fa26b3382bd6dc68061f8c4492dd3269b0dd8
 EBUILD samba-4.8.3.ebuild 8383 BLAKE2B f4abb5ea2efc4a15ddfc763290e0fc3d5328b1a02460a5490eafc7f4005202e2797154b4dc18ac6a61d9946a963b17471336b6cbe4b51932941f08d0c4e1df2c SHA512 377c4a72ea8eab9ef8bec96af6cfdeb07f43d3a430b93606c44f4a3b29ca9c23e1c2de8089d461994daf8baa983f979ed17727138f93e7093242704be6702dff
 EBUILD samba-4.8.4.ebuild 8383 BLAKE2B 486667153586d3729f864adead33ab9df40f9e7d450757cace31b19251229d3d6264c37e2d8a4a67842105c5e847874eaab5a968b3da1ad7b32b34a5dfba1efe SHA512 96ba0183c7a459b769cfa00ac23156ee5a0021ff409d29a5134e327018e4266775df27769784a2f91a7495455302086a9baec398f8bcf48d7145ef5469370e23
 EBUILD samba-4.9.0_rc2.ebuild 8467 BLAKE2B cb0438e359bf5281935c9d889f0da1b22b7f8dc954bc1b60e8a5489f9f6bdd2b36fde8fb1c18b1e094ad8956cd30aa6fc8f5548525364674214182c9b8dbec3a SHA512 cf764712ac0020ae598cb4c6e49657062a340f6ed1ebb6fcd451e254fd75f428c77bf2a453c3d480a1011de07cbd6905f8cb3ca303ba4608ca97c588c89cd01b
diff --git a/net-fs/samba/samba-4.7.9.ebuild b/net-fs/samba/samba-4.7.9.ebuild
index 372f23a31427..0c5a7e7cf6bd 100644
--- a/net-fs/samba/samba-4.7.9.ebuild
+++ b/net-fs/samba/samba-4.7.9.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/smbtad/Manifest b/net-fs/smbtad/Manifest
index 5cf8ee446214..abf853596883 100644
--- a/net-fs/smbtad/Manifest
+++ b/net-fs/smbtad/Manifest
@@ -1,4 +1,4 @@
 AUX smbtad.rc 493 BLAKE2B 9281ca9b3845edab48fe6d66ea54a1af2f40ee21887b888f83b48297916b91bde215bb8e1698c4799bbda71c01eac27c6fe521a7143a1a9e1bfcf2456c0b06e1 SHA512 8b5d8d717740692baf7f713b2e1d71d87bd0ef906269daf9c9ae78b010470b56495d8b3e756b95ad00055ef9cd6747fe9439750658de13e12e0c344038caf35f
 DIST smbtad-1.2.6.tar.bz2 82062 BLAKE2B fced362e6add2104fbd4815ee570bb0c21e0b47431cf8ba46d07f7ca73ad65ddb4b8762a1ff5d8e7f44fd39cad8409cb3bf6c2b85b9abdfbe6035c2963ef7f52 SHA512 fd3b370d973a42fb2dee48d2fec08e20af32386893ee67bc407decd001a76c944f3a17b3251e9d8d746feb1e87c69776986d600fd108450113835823f6313e2c
-EBUILD smbtad-1.2.6.ebuild 761 BLAKE2B 74c58f4c23694128e32da40f5a44646e0247d7e640f0ac5a8ec4f4d31f7fe52ff72ba1e6a468b6f2fac0a5fba4868435258a83f87d987cd46240881f9e3e4168 SHA512 c5c13920c69ae52afe4ba27f1488fbb0f45bf69206b7b80a5e045ae15c45811cfe000ca4a930a7abeccc35da05c80b01bcf130eda44c8575935df7306ecca97b
+EBUILD smbtad-1.2.6.ebuild 722 BLAKE2B 9e78c78594e946f52b58d8d76bbc4899083f5ac0188afd1ba3126ce193173430b69653a4638e9515cff55aca1b19a301917e25304a6e6640b82752ce40eeb067 SHA512 37e58f9d1fef49f22c907f6877af29c675b20cd9071978214d2e9c716fe415fb7212aa66489206169674b7bf696560a712ede19eab7a92ba604371a8e37c5692
 MISC metadata.xml 332 BLAKE2B d927c06e3831d3b32484a750adc46e1c475f5568fdf7ed299c2e5c8d0cff639a5cf6f5048b7cc859b704fc5cf5b0dce0382c24aefacf94991acc4389aca52583 SHA512 14edfec96bfbb5118d3b7b8e6ec58c7015bcd26f7c2f19b603557bc1849511f73e84cdd0b200bd782279aff282dcd01896abfda253ce71744cc9f859e6e0198e
diff --git a/net-fs/smbtad/smbtad-1.2.6.ebuild b/net-fs/smbtad/smbtad-1.2.6.ebuild
index 75980db51f3a..8a0ed2811e4b 100644
--- a/net-fs/smbtad/smbtad-1.2.6.ebuild
+++ b/net-fs/smbtad/smbtad-1.2.6.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
@@ -20,10 +20,7 @@ DEPEND="
 	sys-libs/talloc
 "
 RDEPEND="${DEPEND}
-	|| (
-		<net-fs/samba-3.6[smbtav2]
-		>=net-fs/samba-3.6
-	)
+	>=net-fs/samba-3.6
 "
 
 DOCS=( README AUTHORS )