--- autofs-5.0.6-r5.ebuild
+++ autofs-5.0.6-r200.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.6-r5.ebuild,v 1.1 2011/12/17 03:45:15 pva Exp $
+# $Header: $
 
 EAPI="4"
 inherit eutils multilib autotools linux-info
 
 DESCRIPTION="Kernel based automounter"
 HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-PATCH_VER="1"
-[[ -n ${PATCH_VER} ]] && \
+
+if [[ ${PR#r} -ge 100 ]]; then
+	PATCH_VER="${PR#r}"
+	PATCH_VER="${PATCH_VER%??}"
 	PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
+fi
 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="hesiod ldap sasl"
+IUSE="hesiod ldap 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.
@@ -81,6 +84,7 @@ src_configure() {
 		$(use_with ldap openldap) \
 		$(use_with sasl) \
 		$(use_with hesiod) \
+		$(use_enable mount-locking) \
 		--enable-ignore-busy
 }
 
@@ -111,4 +115,9 @@ pkg_postinst() {
 	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."
+	elog "Since autofs-5.0.6_p2, the behavior of autofs has changed to"
+	elog "follow upstream's suggestion to allow concurrent automounting."
+	elog "This might cause a corrupted /etc/mtab in rare cases."
+	elog "Please report any problems arising from this. To restore the old"
+	elog "behavior, enable the 'mount-locking' USE flag."
 }