version bump

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

4 files changed, 257 insertions, 16 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 148507412025..f602b7982482 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/autofs
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.178 2015/04/24 08:14:42 dlan Exp $
+
+*autofs-5.1.1 (24 Apr 2015)
+*autofs-5.0.10 (24 Apr 2015)
+
+  24 Apr 2015; Yixun Lan <dlan@gentoo.org> +autofs-5.0.10.ebuild,
+  +autofs-5.1.1.ebuild:
+  version bump
 
 *autofs-5.1.0-r1 (21 Apr 2015)
 *autofs-5.0.9-r1 (21 Apr 2015)
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 57c04a251bc2..7c248f6193b4 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -14,11 +14,14 @@ AUX autofs-5.0.8-ldap-wo-sasl.patch 706 SHA256 4f50c263b47e0341d153871e7c418d7fe
 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
 AUX autofs5.initd 1670 SHA256 f2c44e5018719f644e194a4e8e43390bdc9926c533f79c41f0abf84879799d05 SHA512 5eaf6e2ae551b531a3989ff27bba2cab80ae4d494c9c77a0155c60277bfe70047447a63d141f977557893d3ac3e295380f9963c781f9f714e3a9ef3f3673844f WHIRLPOOL 58c5f29c23bb6f8aacbc06c8c312d9c456c074ccd454d5230bbae2c1f0e22a2b25404ae3012324f16242afb39accf0b144cf4519ce07845f05502249482bb8a9
+DIST autofs-5.0.10.tar.xz 258480 SHA256 98150c09639112a125a6d0ddc6aa1920ae4e6c41736e65d8a004c3171fcca70b SHA512 899d3b7040d1162312f9d595df0fd6c40489e4aefb7086893b51993446da78f10707d7e8caf8440ff24000d54794faca869aaf8564e5622caf8bb046af6fcf3b WHIRLPOOL 32c964a58f5125dfbfe589345e1fdf3da357fdadead790e3adbc840f0fc1b7093a0191224ac8d07ac792184914f6630ba08d572ffdcca0423e2a41bb2892ceaf
 DIST autofs-5.0.7-patches-3.tar.lzma 37967 SHA256 16de3486573a94d476f70f2c422656d6fddd79b3581ce05faeb5dd55748ba1cb SHA512 8cbb683a82d2cdc5e3c97921ba3a5bc5af5ab9fb45e4802de021a6161eaeaebb192790a351d281d48b68ed0f8ea6e3a0c0514a4f4a1c546191d8acca9e856ca7 WHIRLPOOL a42f6d609ee4160dfb2d84d94516667f41b8dbe9bf6bdef923f424f82ec00f6115f211dc2985170c45be53bdc45ea47026cc3750c61c7e14aa02ce3384bb9908
 DIST autofs-5.0.7.tar.bz2 319117 SHA256 08c4304d8076dc80c14df559bc5fd821b67ef3457b245f61068bd053d8f94ccc SHA512 672c53e0a5477097779088d8654edaad4cb01ab68ade2ee175d963c7d4895d1bdeeeabc87057ecca2f4f3a0f08014298dae40e5e8e862c20c0b1477d72431f84 WHIRLPOOL 220cbd618ee4f34c82eaad823312284cc787aa28a0a8b9638a4b495cf38a3a6f9da194e74722febe04ee2b5ac4e1e9eccccde1f562d0d554f1e8a5ff4b5faec8
 DIST autofs-5.0.8.tar.bz2 328559 SHA256 2e0e42c654b7762b1235ec0131317224c57fdc6757ec00c820b2aa86338c9f7d SHA512 72b01b4a45e70b651ab6f4cd63039bc3d7f389a21fde354a4ba1e0e172b5480abd9b12134b8a9c74284712c2d4ff0d46ad2b47ca1692b510b0d1be5d56bf3335 WHIRLPOOL 4d9cd57819930070d6741d174f61d7c99d00ff6af364e1f9ced3f4dc8eacdf3af4c1d843127e2d8d4e57238389542976379d8c009562fa51e3fdecf7f3db29d0
 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
+DIST autofs-5.1.1.tar.xz 290300 SHA256 e08ff0ef9ff365d87b6c33dca136d20e4e07675197a324f2816894cb437021c3 SHA512 37c0f10ee06bbfc76059ff9ae54d9b462f1c2bc39e8779e96dd5bfc2b07055606c0710f1c3de95e6f099edd2c5bb5a6f8a341be989d7554bf80011bfbe90c905 WHIRLPOOL 063e7bcabb3e93a17e8e7da75e6b42af59769e794e3b31240762a4617cc2ac626b4b4985a38455bdca56753fb897fed1a3173c633f1f9a594e79f891dc41f523
+EBUILD autofs-5.0.10.ebuild 3157 SHA256 cc57cd07ddae0c721782a429f0a3b168f335f918ce0f8b1db393fb5788a1944d SHA512 12f742f224e19c122e0bade03193f40a9f1d7a52ec7e0354a6dca014c328197c521355e4d87c17909a80dc90adbb4169b5b7107b211ffc780b237eddb85b2fec WHIRLPOOL 88e2ca4cc83ab239a37758c90094f72d8c6605b2d16e380a7431586919709abc0ac70250be66be0ed6c56f8d8f96b709d9d919c556527bb8916edc3902edb353
 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
@@ -27,24 +30,25 @@ EBUILD autofs-5.0.9-r1.ebuild 3226 SHA256 dbed8de6d0190f44a3e9801a92a0b885f1fd9f
 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 30496 SHA256 9571a6208430d0d32ba3d7b94689a8751973a812123cf865679365102c8e2906 SHA512 4abe53a0ddc4928ad352b441642965aece893586e6921f12f5421126e0a71db8961bf426a1ad39d196bf5e27a79af56a3340869d4acc6373b1ced443688213b7 WHIRLPOOL 8f7629489df0e0a1a79704cb3f2fa815148cec84b1bbb3814219ed77a1126c0b7e20bf9fb3f9a7001874966c91c07c6013c4462145d104eddc8437df69efb90c
+EBUILD autofs-5.1.1.ebuild 3156 SHA256 656085e523b030677a75e70e33bff4c147c87bbcc878c5e6ac4922c86c22abb5 SHA512 11a1c7fc916fce239e392615c167d00414019a502330d1d651d96e66d1f30ad3b938748095f03c68d21c17557f7031a7ca1e46d6364a467fcc240b92d0cd1413 WHIRLPOOL fe02a2585a5b73e958fefc5bf6dc7bd6836b47d286a09add863492f25656b9279b10c8523ef3dd3b86daaf6396531bc9005b4ef85f0719c6bb53ea48684bc1ae
+MISC ChangeLog 30660 SHA256 6c4db77e17bcf966502dfb7d61b3857d157aaf00b4871ea96ba5febf5e6e7b09 SHA512 2cd070f669c1891699e5b92e9dfe134d87d8bb31371738bcc228a653d39b852d4ba5b300aedbfd041aecb508eb62b3aa65cb4af43b8ecac7cb251de8739d3a17 WHIRLPOOL 495b89da795092fe7f03d69ac8d5cd3d90baeb488ab648bd5541f744fdc0fc10592c4b3d4596517b9de621d0d6b8c8946828c9c680fbd5885677f5f49fef985c
 MISC metadata.xml 864 SHA256 85699c5552f9fcdeaf7a5eb8ae1d000277863908bc2c28d79b96a9f12337cfd1 SHA512 997856ca87958ea4e1abf292ed1b73a7a1ee8a36af92193b1ad779be8332a31600230272b4b27c9703e3e46bf4c1676369a1a371a2a197777b4f0799a4e35729 WHIRLPOOL d8eff00fcb0f55d2aef4c47665343dd6859faf820e14027cb2a3d975e97ef56509455ceb01a775dd7c807db5cf52d3d91b7f3a25e65102fb24924ffa220942f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVNiHiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVOmhyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 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
+MUFBRUE0NzU5NERCQkVEAAoJEDGq6kdZTbvtBsgP/2EY1Kkfo4MZJT9qe0rVynFs
+hL3rlcZuANQnBdNU7u4BQVNp4JGFpHtL52giCD70BW1pKaUpfTOynQnLUQGkZdw2
+WdPJfJ/mnu8jdBcKi56Qa26OWXWVD+GMLKu4JU9IUpVg2uEsBzz7idEe2FjL8z75
+X8zP1jyvI24MyA0ZxAa04uDwr29COyk78Cz/xfk9VU5R8dGqNFK3pLazreiAjK7+
+EBotyCsyLVIm71TOfin2ovWoX8odvz74Baq06yMXM/LMphM40PgTRKf5OBSgVmx6
+wAQF4CoYGVJ4/gjMz9bp7BJrTf/5LdUk7htXFuP7ZoyklaCV1Ulk8Ih/EqDF20D8
+UPdx+vGf75g072Pn9ANl0QBz7wJdJr1RGtQWdPrcILLIdfdxLk9Jms3bGOCBl9sK
+p0fk7EyjvYkwQfspjdfsxX7IZm9LjDXk4LYUC6EjesCJNENwGlzXZm1Kfnt8iFPw
+MXwBeJhza7YPB1//5lMU26hduY7Zw8xyB7vla8wvrxx8GDekJUkkQPzGxPgdsQel
+Qx5vayTIrhk/6PINJiJB4hfNka+gGMLmtXpUMWaFdWpmODLm4L6H1X5IgQD4rL/0
+t11ARV8V4JkZcjRonVBBjFy9Wc7AhgjNhJWw1BGvXyD6YxWyqErVE1F+Jo/XUKaU
+Xih1hpYv4yMScmYpSQYK
+=SP6y
 -----END PGP SIGNATURE-----
diff --git a/net-fs/autofs/autofs-5.0.10.ebuild b/net-fs/autofs/autofs-5.0.10.ebuild
new file mode 100644
index 000000000000..054218a10a57
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.10.ebuild
@@ -0,0 +1,115 @@
+# 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.10.ebuild,v 1.1 2015/04/24 08:14:42 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"
+
+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.1.ebuild b/net-fs/autofs/autofs-5.1.1.ebuild
new file mode 100644
index 000000000000..0e9c8c53ea09
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.1.ebuild
@@ -0,0 +1,115 @@
+# 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.1.ebuild,v 1.1 2015/04/24 08:14:42 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"
+
+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."
+}