fix sloopy mount option which break other than nfs, bug 545258

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

7 files changed, 626 insertions, 17 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 22b2725dd87f..148507412025 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/autofs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.176 2014/06/14 15:29:00 dlan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.177 2015/04/21 02:21:50 dlan Exp $
+
+*autofs-5.1.0-r1 (21 Apr 2015)
+*autofs-5.0.9-r1 (21 Apr 2015)
+*autofs-5.0.8-r2 (21 Apr 2015)
+*autofs-5.0.7-r5 (21 Apr 2015)
+
+  21 Apr 2015; Yixun Lan <dlan@gentoo.org> +autofs-5.0.7-r5.ebuild,
+  +autofs-5.0.8-r2.ebuild, +autofs-5.0.9-r1.ebuild, +autofs-5.1.0-r1.ebuild,
+  +files/autofs-5.0.7-sloppy-mount.patch:
+  fix sloopy mount option which break other than nfs, bug 545258
 
   14 Jun 2014; Yixun Lan <dlan@gentoo.org> autofs-5.1.0.ebuild,
   +files/autofs-5.1.0-fix-missing-stdarg.patch:
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 45f1cff53d5c..57c04a251bc2 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -9,6 +9,7 @@ AUX autofs-5.0.7-libtirpc-link.patch 423 SHA256 8093e021c4bdb3f876f57f5496a4ed3a
 AUX autofs-5.0.7-parallel-make.patch 1424 SHA256 359f57bc828edfdaca8c66edd3c821e4b7a9d355ebccadbd20390aed928b822c SHA512 8489a71e22c5711bc76d3756b4c3a375984392f821a58c5f28db82c0134a8dcb009905a64fdef56ca3553eaff8be883e653a36d6acf72a724b90a946408aa8cf WHIRLPOOL 4fa8e26f46c6fb3bdf233c2213578d827e0025ea0e19df0bfa1a2ae1802dce5df4628977f503b1ed94142388381c60c0af896d5b549736088f892fb810dace4d
 AUX autofs-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch 3883 SHA256 e2c15afb788421c4231eacb7830ff4694c306acddb95f8258dc2a34845aed8c2 SHA512 7332d440b583cdf88be95a4f01d0832a5807e5e807564d135fd47c08886d3abb90bc9df0c88bfa5b2a910ebf1ca3ee37ade78afb02ce6e57a4468c03b6ddbc84 WHIRLPOOL b96cbfc284c0caab12c4ac6c53ccd57a9247f25d1b0f22b45899181cf3e72a9c419472dc26252f3dfcf029a59d02aae3f713826268f62cd7300587c8315e05c0
 AUX autofs-5.0.7-sasl-def.patch 1114 SHA256 bcaa9a826d7a936d1510f4ddb914a314bf37eeab9edc24dcf9b73cdbc6cfa79a SHA512 a6b1b75079f4651ef9886d8315c8fb6894c5800eb6a4f614fdcb205365e805ba6e4f95146ed95b283e361339eb5b0b723956b3344e50856223ae79aec7c6ca09 WHIRLPOOL fcea83e33989315a87a983972d7c6cc155346c7d901f63e9aa8a18f300cc5b109fa247b617acc9f97aa20100e4d4e95b901f24fd9ac3af6ef8530dee2b1e2b11
+AUX autofs-5.0.7-sloppy-mount.patch 3375 SHA256 e5901ee729202d6b6ac9cea99dc0457986875c546a3b0d684133b25bed22ba8f SHA512 2c5cf35c9ea4258c406be629b99fabe953fca63209dfa93a74b1b8441ae92b58677bb52e408556a05be0492871ac98849baf6c8aba7429efc97e38b4a9b1fb45 WHIRLPOOL b13e2c494f224e0e244ec7b3a030835d3c830660203e691117f355a078b719cd64ec312c3809f1ff1410b5b9e9b34914a4ce0dedc3c4db609ba5cd4ddaec9248
 AUX autofs-5.0.8-ldap-wo-sasl.patch 706 SHA256 4f50c263b47e0341d153871e7c418d7fe6298729b7ff6b58f58cb5208f02eb71 SHA512 8dc4b5bb07f11dc1b473ddd5cedf23a3ea914c385283d4bdbe8bbdcb4c5013689474295d4fdd7c1c4d3c6e60009b8be707d338abf8fd4dcd07ab43d74aa82d10 WHIRLPOOL 809883fec00b8dbb3e36631fbaa545cf69c3f3019e668302d9957996d25fffd657310fd8657b17f60c61474b25889ff4a448cf8c0840a9dbb8eeb52982350b00
 AUX autofs-5.1.0-fix-missing-stdarg.patch 1415 SHA256 3f00f52126da9a125958587ba19472403d07be5fc796ccd255d191d6d9a32d3a SHA512 f4828ce4ab0a9a8253cf6c045cf0e2fa7153bdcb836e8d35ba176a50366fce6a4215b0f557bef033ddaa112c73432c0204127bbfff8819b225ae0ca7fb689e65 WHIRLPOOL b48b8bc2157cf7669e380df96e73026921e26bde3903b752b18046f0951de205ef6473254a51a4c3381afebc0e2df59ec6cd47a646ed4136c3eb91335aeb083b
 AUX autofs5-auto.master 756 SHA256 8651b42b338ffdb8be24ed88893ca90f95d0221f2684274957de154fd89df5cb SHA512 3c6e6dab6beb595f4bfa3af7be3c1f5343a80ea81bc9fb26e073e96ea1b75bf2fd304c4e54dad9ec1c233e01c62310bbdbc7f97a2370e82bc31138855819d3b2 WHIRLPOOL 2c5a885f76d6e2adfc6c3b5a739c7bf820ba48adfca28cd7a2a50b81ec150011b93f283b8bb5058a427bfd5c701b1da8cbd31fc9a15b121d310d3048dacfba72
@@ -19,25 +20,31 @@ DIST autofs-5.0.8.tar.bz2 328559 SHA256 2e0e42c654b7762b1235ec0131317224c57fdc67
 DIST autofs-5.0.9.tar.xz 256680 SHA256 81ab99ee1656a10ecaffe7933c26e8fc720f0b639ed47ab52adc66cdd868fd5c SHA512 36ecc38fa5108766069d5bbfcc22b186481d2e8aaa1b101406b389787280ae5e87ee21aab697f7ed0c9c9705278e8cd8b0143aee5fc2affd1becd85535dd9d73 WHIRLPOOL 915486d725e0a3b0d939b28dfd030d79c4fd71b7ff12c3f09bbbe558f00a8560141b9483263a5a04e84cc84eb0f92c90b1bb18df747aa5746046470b0f18bc00
 DIST autofs-5.1.0.tar.xz 288288 SHA256 f4b343797e6df03627a9fd41bda6fd85acb84aa3fdd15694eec03ec90a52bc27 SHA512 a455df8d93bc29aa87c3f928edea5bb3f91ab9c7bd7bbca8eb1370fdcc4c32b3a30d7f2c0d79800f65ac08716634f118c81ede7e816ef567048e4361aafac476 WHIRLPOOL ed265b1a9e697c08e802f0a17c0de482e5f1f292aecf8ab42cd7cf7177a605b0337ff6ab81b72950fc38687d31c47f9c01ff68cd0a8f10952a59b69a590e19ca
 EBUILD autofs-5.0.7-r4.ebuild 3908 SHA256 64a534f0111393aa0855566495a0f8eb443de81651d4e0c98d95b73918080d90 SHA512 c210c4abc422afb834c6890f934c5d9cfc645ec6021c9538c78b0b081ad9296d5464e1303301bfe1e14d62aec0db8f06ecd07aea820c05ff7092729b29655856 WHIRLPOOL 20f1bb8241c97a580e4965f8e9e3db6b4570e55436ca9e92242a0e7ad0b0d8107244ec58d3484dfa3ad27ed470f51ab5aba17ccaf966da30a1d93b0aeeb95450
+EBUILD autofs-5.0.7-r5.ebuild 3970 SHA256 1120a4650c5bb940e956d6bf3690e0b42f8eba987b6e50b5d0fcf678e22487f3 SHA512 bd0e539b9c98e9462bb8cddbe50dca8b734f806e441a8eabddca76d1fe00b8fff09a16fcac92c93936b296eeb2d8794312e34ac2673065b5dd543bac242b78d6 WHIRLPOOL 6ca49ca8e95006f9a2e6fdb4f656319cd18c1abb9741760910ab887b7b0a45423cdf93fc386688ac76b1b86f79f9ed93fddf2d1855c409dcacc36aa2c57f0d23
 EBUILD autofs-5.0.8-r1.ebuild 3218 SHA256 cdfa2bbb244545c49d44d02d6e08af6018b80a97ee90d5cff47950efb2a256b1 SHA512 0bfb0f0382b2f93560239f5c8d78748adfa6d58d1b1c05423e5e6169c76a4863020ab8cedd20dce668ebe576495d0a463c7cf1858385a6917ecc83380343f7a7 WHIRLPOOL 953c97c9bdce180539399415b2f30bce67b3c79927540dd9b3019c4d55f29055475aaaaa024a0c96389f7d28c6edfbf3cae12617363dbbe509ed9cf01ddbb1e3
+EBUILD autofs-5.0.8-r2.ebuild 3285 SHA256 8c71690dfa2a0e3138aa9659052244e456f680aaf0bf0fdbe4686272a93b2d3f SHA512 b0ee0f7854d28ba77ba5891d230a8bc040181c0bde36addc9962a2466c57143b0fa4cf9d85aca2c7330af11f4c64d0c80e9bb9c005e5cf01f112bf01683102df WHIRLPOOL 9ef2f619d07fcd6a0ca7d210e8e091928e18442235e6469d02f5a4323f9baf369364b21a8017410b79ab9c30ad67c47a4deb5422ad9ced51f5e6d23719c22a20
+EBUILD autofs-5.0.9-r1.ebuild 3226 SHA256 dbed8de6d0190f44a3e9801a92a0b885f1fd9f05f52f9564894c30c697621698 SHA512 09e968d47651c2294c53aef722acb7c3779d13c257f1c77e41fbb7b47b61f697a6cc164bf4807f1af8ba70225e167a3a23554b5c760e1ffb1530f9e244a8281a WHIRLPOOL 24e4424e2c48f54365d94df13717c7a1d8b8055aec9e057f8e47360633757e83c6cbd63d2fc24a2850728319909b365730a1e76a9f4dc9c201748085181bd7c3
 EBUILD autofs-5.0.9.ebuild 3156 SHA256 e594765a08fc2248d4df3a2d9fe6dd444ce16b545e0690777bf8813f2b12d6a5 SHA512 4d4c5cd3497ed8edeaad0f1daa7e02fa033f039bd5350ed85f8d4c0017177e632b22089a7130f46dbd515d4d1087580694cef30021f6776a55b51539abae78f9 WHIRLPOOL 07e69ee2438402e0b0de18879e356bfc496e4cd822f57d9658560b333e585457316317ebab4bf7999e1be28eae567bc87ec45406a929158cff26b6d0f5ffc61c
+EBUILD autofs-5.1.0-r1.ebuild 3271 SHA256 cef62bc7aa035958f77c0e28bdd118e4476697d444fdd94359f4382a42df0a51 SHA512 73420d8d5297b88c231ada263a9b2f0a146bdcc83537d6587df2c06af02d2683f63b84af8fe99539b167e49adb8566fb56eeccd7a3f595f96d38bab4f8aad492 WHIRLPOOL a8479d458f99984a474354ad271ee4f65b545a1a56d758ac64b6f693192c8d0760ed86044fe0badfb552ae9559c6264bff236e62d0c8edaa08e7740f43dcc1f2
 EBUILD autofs-5.1.0.ebuild 3214 SHA256 5387e4d77cef3d5adaafe5b78ef389321f2680b85e79c092dc57ef5d8c854fc4 SHA512 d1d25de99252ea48142d10b9ef13630c4f74fcb80ab3e0329b61fb471acfbdd310adbd8cdbcb52a65099dddd19202a1f472587562c7d1b24178a5a265e570508 WHIRLPOOL 463630ad8566f456bbaaeb48091b199d60df164c3d91073276e1e338e5bc6f6c459ea9bdf00a5417d33705710b1c04aaa7c9af927e3c48a118ee0fc31d972e96
-MISC ChangeLog 30118 SHA256 3346d7f25a5c1d6689222a13eec35f05441b9105cd4bd5675e399277c33954fd SHA512 7db70762cc7a1693282ca7b40715149f1e97aa960ba0059b36c7802b5f41f70eaaa301db98867cf720ef3d0f807cba5460adaebebdf940ab2e0cb077dd1e4d0b WHIRLPOOL 65703c835417dc21aadd4704211f04353ae137e51fbdb5e0639521c69318fa4a13ce7b29a462e7a95dee06beb60263e006b1163e1af5d733e40449f0c128d781
+MISC ChangeLog 30496 SHA256 9571a6208430d0d32ba3d7b94689a8751973a812123cf865679365102c8e2906 SHA512 4abe53a0ddc4928ad352b441642965aece893586e6921f12f5421126e0a71db8961bf426a1ad39d196bf5e27a79af56a3340869d4acc6373b1ced443688213b7 WHIRLPOOL 8f7629489df0e0a1a79704cb3f2fa815148cec84b1bbb3814219ed77a1126c0b7e20bf9fb3f9a7001874966c91c07c6013c4462145d104eddc8437df69efb90c
 MISC metadata.xml 864 SHA256 85699c5552f9fcdeaf7a5eb8ae1d000277863908bc2c28d79b96a9f12337cfd1 SHA512 997856ca87958ea4e1abf292ed1b73a7a1ee8a36af92193b1ad779be8332a31600230272b4b27c9703e3e46bf4c1676369a1a371a2a197777b4f0799a4e35729 WHIRLPOOL d8eff00fcb0f55d2aef4c47665343dd6859faf820e14027cb2a3d975e97ef56509455ceb01a775dd7c807db5cf52d3d91b7f3a25e65102fb24924ffa220942f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTnGpxAAoJEJIMDbyqvv1Vc08P/jxC50258cPV8f3a1nPwr1Rw
-iioxzuu+qJHk3n7Rh5B9tUPFu4hUJZJv8Ja78ZfpSTbo5yaLVTNlBSMaqSS5woYj
-FWoEjbZv8uPDEvEJYTrDSJsRKXUnKN7L+Yh4IHyhjFayzfHoZtHeMyqQkYvFW01Y
-h2k+nJDA5VlyETEERHAUzmQ3wjYMLcgg7lUfkMehrHHjXt1zMupBRgtFbtr6MguW
-qU7ycOOHzBL+Ct1vU14y702E7F/K4HvF5bVTuOiwIck7eWHsahkWNFRpdgXnAgdK
-v3MXfqGE1oe+eP6ZciuqCI5BiMDGFXyKEBaINcplWcJo6JdA79VGUvL3vWu/igpu
-lsq0YZP9tPKGLk/Ft0Wi/oR8rqQu916nI+37qv44PCQOw1mEBc0QBpQvP/jZoS0s
-p+p0SLViazv26+7/r1QprLpXltIrqfBO5fuhBb3q6sJ7Lk/ska3Md/t/l9ihOESY
-3ZKeuFmsluNKkqhC6NRT9Iz8f0XDaH5ab7plaFRdZMYkFOWpQuGi835SPtjVJeL8
-7dU/yjW/TEsJS1MCbeA7o5GaTfBDQxN5Gf6R3YvGCTUf6DooC8MXhL8z9UToLAcm
-mMpvXyXBt4GuxDHZdOwSceTCI/F+u5W+CZyaUFoZcECvQxj4OMGSsztd4kR+jzlV
-0L9k6JNRzxTCuoPmx55c
-=xALy
+iQJ8BAEBCABmBQJVNiHiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCNUJBQjhDOUMzMUI3MTE1NjcwMjIzREMz
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtWtQP/2ZHnnxBtDzvmImidl5yOy0V
+oKP1/V3qNtq0F6M9MVYFW1+KIhxGGmjUom7HSbQ0ZJZjz1RG1AMSGUfgl8lXkybW
+NEDUxy2KYpufufWKPAV5M+hs1UsAmHRmaCel4ngWv1JaNjPOG8V2n3g70Hdl+hju
+8svl8Qg38yZxmcMortKkq9/WyU1zgaGSzat8UQuveQqULlwMpt2n89AYAyrqfDjR
+wcusQUxhw4PKn/4rZfo4UK32ZatBq7q8uO2yeWrt/xZ1jOLNj70ClT5Ov3eYSrDt
+dPCqm028pitr7xnsr6Y+To7vYPz6MvoAVmH6tol7n7P8+w9D1sVFjieSeQ0B9/XR
+rNE4wSG5xlvHPoxKmqwmO6Hpr/NIJeEmOQVgqy1hDhrh+f1X6Y1/P/41qKJJcfiR
+NqvYOgKQzsQm8ijsbLSYnmClvVLNo6778GNNbSGuYb6Au2hMqpvjqkf7dzER3qrg
+5g4j5i901gvSwUpoMhUhI21eKa+Sxopm95P0K1Ows0Ag9XxXY0s3r7T7Ry4RYj2j
+MxQG/RD/tvz7bvGqwRCz+I15rJ63pTlRvRVzOEAYOzCUTK/HLHhsTvQPorrMuPNH
+X1arIs86tG0HHJ9oWYmiKKz7+YgGxLfZxC6wgJce9pMHDbhHIw/zePBoijfO2E5i
+mkGSdC1nYYFOH518gwq4
+=sTjh
 -----END PGP SIGNATURE-----
diff --git a/net-fs/autofs/autofs-5.0.7-r5.ebuild b/net-fs/autofs/autofs-5.0.7-r5.ebuild
new file mode 100644
index 000000000000..99a82bd7c648
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.7-r5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r5.ebuild,v 1.1 2015/04/21 02:21:50 dlan Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils linux-info multilib systemd toolchain-funcs
+
+PATCH_VER=3
+[[ -n ${PATCH_VER} ]] && \
+	PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI="
+	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2
+	${PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
+
+# USE="sasl" adds SASL support to the LDAP module which will not be build. If
+# SASL support should be available, please add "ldap" to the USE flags.
+REQUIRED_USE="sasl? ( ldap )"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=sys-apps/util-linux-2.20
+	dmalloc? ( dev-libs/dmalloc[threads] )
+	hesiod? ( net-dns/hesiod )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)
+	libtirpc? ( net-libs/libtirpc )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+CONFIG_CHECK="~AUTOFS4_FS"
+
+PATCHES=(
+	# Fix for bug #210762
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203
+	"${FILESDIR}"/${PN}-5.0.3-heimdal.patch
+
+	# Accumulated fixes for bugs
+	#    #154797: Respect CC and CFLAGS
+	#    #253412: Respect LDFLAGS
+	#    #247969: Link order for --as-needed
+	"${FILESDIR}"/${PN}-5.0.7-respect-user-flags-and-fix-asneeded-r3.patch
+
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
+	"${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
+
+	"${FILESDIR}"/${P}-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch #361899, #468606
+	"${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch #381315
+	"${FILESDIR}"/${PN}-5.0.7-sasl-def.patch #469324
+	"${FILESDIR}"/${PN}-5.0.7-libtirpc-link.patch #464120
+	"${FILESDIR}"/${PN}-5.0.7-parallel-make.patch
+	"${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
+	)
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${PATCH_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+			epatch "${WORKDIR}"/patches
+	fi
+	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# bug #483716
+	tc-export AR
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	local myeconfargs=(
+		--with-confdir=/etc/conf.d
+		--with-mapdir=/etc/autofs
+		$(use_with dmalloc)
+		$(use_with ldap openldap)
+		$(use_with libtirpc)
+		$(use_with sasl)
+		$(use_with hesiod)
+		$(use_enable mount-locking)
+		--disable-ext-env
+		--enable-sloppy-mount # bug #453778
+		--enable-forced-shutdown
+		--enable-ignore-busy
+		--with-systemd
+		systemddir="$(systemd_get_unitdir)" #bug #479492
+		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if kernel_is -lt 2 6 30; then
+		# kernel patches
+		docinto patches
+		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+	fi
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/autofs/autofs-5.0.8-r2.ebuild b/net-fs/autofs/autofs-5.0.8-r2.ebuild
new file mode 100644
index 000000000000..86a1da679582
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.8-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.8-r2.ebuild,v 1.1 2015/04/21 02:21:50 dlan Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+AUTOTOOLS_IN_SOURCE_BUILD=true
+
+inherit autotools-utils linux-info multilib systemd toolchain-funcs
+
+PATCH_VER=
+[[ -n ${PATCH_VER} ]] && \
+	PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI="
+	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2
+	${PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
+
+# USE="sasl" adds SASL support to the LDAP module which will not be build. If
+# SASL support should be available, please add "ldap" to the USE flags.
+REQUIRED_USE="sasl? ( ldap )"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=sys-apps/util-linux-2.20
+	dmalloc? ( dev-libs/dmalloc[threads] )
+	hesiod? ( net-dns/hesiod )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)
+	libtirpc? ( net-libs/libtirpc )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+CONFIG_CHECK="~AUTOFS4_FS"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
+)
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${PATCH_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+			epatch "${WORKDIR}"/patches
+	fi
+	epatch "${FILESDIR}"/${P}-ldap-wo-sasl.patch
+	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# bug #483716
+	tc-export AR
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	local myeconfargs=(
+		--with-confdir=/etc/conf.d
+		--with-mapdir=/etc/autofs
+		$(use_with dmalloc)
+		$(use_with ldap openldap)
+		$(use_with libtirpc)
+		$(use_with sasl)
+		$(use_with hesiod)
+		$(use_enable mount-locking)
+		--disable-ext-env
+		--enable-sloppy-mount # bug #453778
+		--enable-force-shutdown
+		--enable-ignore-busy
+		--with-systemd
+		systemddir="$(systemd_get_unitdir)" #bug #479492
+		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile DONTSTRIP=1
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if kernel_is -lt 2 6 30; then
+		# kernel patches
+		docinto patches
+		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+	fi
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/autofs/autofs-5.0.9-r1.ebuild b/net-fs/autofs/autofs-5.0.9-r1.ebuild
new file mode 100644
index 000000000000..be988bc4349b
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.9-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.9-r1.ebuild,v 1.1 2015/04/21 02:21:50 dlan Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+AUTOTOOLS_IN_SOURCE_BUILD=true
+
+inherit autotools-utils linux-info multilib systemd toolchain-funcs
+
+PATCH_VER=
+[[ -n ${PATCH_VER} ]] && \
+	PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI="
+	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
+	${PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
+
+# USE="sasl" adds SASL support to the LDAP module which will not be build. If
+# SASL support should be available, please add "ldap" to the USE flags.
+REQUIRED_USE="sasl? ( ldap )"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=sys-apps/util-linux-2.20
+	dmalloc? ( dev-libs/dmalloc[threads] )
+	hesiod? ( net-dns/hesiod )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)
+	libtirpc? ( net-libs/libtirpc )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+CONFIG_CHECK="~AUTOFS4_FS"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
+)
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${PATCH_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+			epatch "${WORKDIR}"/patches
+	fi
+
+	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# bug #483716
+	tc-export AR
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	local myeconfargs=(
+		--with-confdir=/etc/conf.d
+		--with-mapdir=/etc/autofs
+		$(use_with dmalloc)
+		$(use_with ldap openldap)
+		$(use_with libtirpc)
+		$(use_with sasl)
+		$(use_with hesiod)
+		$(use_enable mount-locking)
+		--disable-ext-env
+		--enable-sloppy-mount # bug #453778
+		--enable-force-shutdown
+		--enable-ignore-busy
+		--with-systemd="$(systemd_get_unitdir)" #bug #479492
+		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile DONTSTRIP=1
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if kernel_is -lt 2 6 30; then
+		# kernel patches
+		docinto patches
+		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+	fi
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/autofs/autofs-5.1.0-r1.ebuild b/net-fs/autofs/autofs-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..063b94e5b16a
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.0-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.1.0-r1.ebuild,v 1.1 2015/04/21 02:21:50 dlan Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+AUTOTOOLS_IN_SOURCE_BUILD=true
+
+inherit autotools-utils linux-info multilib systemd toolchain-funcs
+
+PATCH_VER=
+[[ -n ${PATCH_VER} ]] && \
+	PATCHSET_URI="http://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI="
+	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
+	${PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
+
+# USE="sasl" adds SASL support to the LDAP module which will not be build. If
+# SASL support should be available, please add "ldap" to the USE flags.
+REQUIRED_USE="sasl? ( ldap )"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=sys-apps/util-linux-2.20
+	dmalloc? ( dev-libs/dmalloc[threads] )
+	hesiod? ( net-dns/hesiod )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)
+	libtirpc? ( net-libs/libtirpc )"
+
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+CONFIG_CHECK="~AUTOFS4_FS"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-missing-stdarg.patch"
+	"${FILESDIR}"/${PN}-5.0.7-sloppy-mount.patch #545258
+)
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${PATCH_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+			epatch "${WORKDIR}"/patches
+	fi
+
+	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# bug #483716
+	tc-export AR
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	local myeconfargs=(
+		--with-confdir=/etc/conf.d
+		--with-mapdir=/etc/autofs
+		$(use_with dmalloc)
+		$(use_with ldap openldap)
+		$(use_with libtirpc)
+		$(use_with sasl)
+		$(use_with hesiod)
+		$(use_enable mount-locking)
+		--disable-ext-env
+		--enable-sloppy-mount # bug #453778
+		--enable-force-shutdown
+		--enable-ignore-busy
+		--with-systemd="$(systemd_get_unitdir)" #bug #479492
+		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile DONTSTRIP=1
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if kernel_is -lt 2 6 30; then
+		# kernel patches
+		docinto patches
+		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+	fi
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch
new file mode 100644
index 000000000000..86e02bce5558
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.7-sloppy-mount.patch
@@ -0,0 +1,99 @@
+From: Ian Kent <ikent@redhat.com>
+
+Historically autofs added an option to mounts, called the sloppy
+option, meant to allow mount(8) to ignore invalid mount options.
+This was done so that mount map entries for sites that needed to
+use different mount options for some machines would still work.
+It was needed for nfs mounts in particular.
+
+Recent changes to mount(8) cause the sloppy option to be passed on
+for all mounts when it is given.
+
+Previously mount(8) only passed on the option to nfs mounts so now,
+for other than nfs mounts, the mount will fail if the file system
+doesn't understand the sloppy option.
+
+Since the option was not passed on to other than nfs mounts before
+it seems sensible for autofs to not add it for other than nfs mounts
+now.
+
+Signed-off-by: Ian Kent <ikent@redhat.com>
+---
+ modules/mount_bind.c    |    9 ++++-----
+ modules/mount_changer.c |    6 +++---
+ modules/mount_ext2.c    |    6 +++---
+ modules/mount_generic.c |    4 ++--
+ 4 files changed, 12 insertions(+), 13 deletions(-)
+
+--- a/modules/mount_bind.c
++++ b/modules/mount_bind.c
+@@ -158,13 +158,12 @@ int mount_mount(struct autofs_point *ap,
+ 		if (!status)
+ 			existed = 0;
+ 
+-		debug(ap->logopt,
+-		      MODPREFIX
+-		      "calling mount --bind " SLOPPY " -o %s %s %s",
++		debug(ap->logopt, MODPREFIX
++		      "calling mount --bind -o %s %s %s",
+ 		      options, what, fullpath);
+ 
+-		err = spawn_bind_mount(ap->logopt,
+-			     SLOPPYOPT "-o", options, what, fullpath, NULL);
++		err = spawn_bind_mount(ap->logopt, "-o",
++				       options, what, fullpath, NULL);
+ 
+ 		if (err) {
+ 			if (ap->type != LKP_INDIRECT)
+--- a/modules/mount_changer.c
++++ b/modules/mount_changer.c
+@@ -103,12 +103,12 @@ int mount_mount(struct autofs_point *ap,
+ 	}
+ 
+ 	if (options && options[0]) {
+-		debug(ap->logopt,
+-		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
++		debug(ap->logopt, MODPREFIX
++		      "calling mount -t %s -o %s %s %s",
+ 		      fstype, options, what, fullpath);
+ 
+ 		err = spawn_mount(ap->logopt, "-t", fstype,
+-			     SLOPPYOPT "-o", options, what, fullpath, NULL);
++			          "-o", options, what, fullpath, NULL);
+ 	} else {
+ 		debug(ap->logopt,
+ 		      MODPREFIX "calling mount -t %s %s %s",
+--- a/modules/mount_ext2.c
++++ b/modules/mount_ext2.c
+@@ -116,11 +116,11 @@ int mount_mount(struct autofs_point *ap,
+ 	}
+ 
+ 	if (options) {
+-		debug(ap->logopt,
+-		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
++		debug(ap->logopt, MODPREFIX
++		      "calling mount -t %s -o %s %s %s",
+ 		      fstype, options, what, fullpath);
+ 		err = spawn_mount(ap->logopt, "-t", fstype,
+-			     SLOPPYOPT "-o", options, what, fullpath, NULL);
++			          "-o", options, what, fullpath, NULL);
+ 	} else {
+ 		debug(ap->logopt,
+ 		      MODPREFIX "calling mount -t %s %s %s",
+--- a/modules/mount_generic.c
++++ b/modules/mount_generic.c
+@@ -97,11 +97,11 @@ int mount_mount(struct autofs_point *ap,
+ 
+ 	if (options && options[0]) {
+ 		debug(ap->logopt,
+-		      MODPREFIX "calling mount -t %s " SLOPPY "-o %s %s %s",
++		      MODPREFIX "calling mount -t %s -o %s %s %s",
+ 		      fstype, options, loc, fullpath);
+ 
+ 		err = spawn_mount(ap->logopt, "-t", fstype,
+-			     SLOPPYOPT "-o", options, loc, fullpath, NULL);
++				  "-o", options, loc, fullpath, NULL);
+ 	} else {
+ 		debug(ap->logopt, MODPREFIX "calling mount -t %s %s %s",
+ 		      fstype, loc, fullpath);
+