--- autofs-5.0.7-r3.ebuild	2013-08-05 10:01:13.420000000 +0800
+++ autofs-5.0.7-r4.ebuild	2013-08-05 09:55:34.060000000 +0800
@@ -6,7 +6,7 @@
 
 AUTOTOOLS_AUTORECONF=true
 
-inherit autotools-utils linux-info multilib
+inherit autotools-utils linux-info multilib systemd
 
 PATCH_VER=3
 [[ -n ${PATCH_VER} ]] && \
@@ -21,14 +21,14 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
+IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl systemd"
 
 # 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
+CDEPEND=">=sys-apps/util-linux-2.20
 	dmalloc? ( dev-libs/dmalloc[threads] )
 	hesiod? ( net-dns/hesiod )
 	ldap? ( >=net-nds/openldap-2.0
@@ -40,10 +40,13 @@
 	)
 	libtirpc? ( net-libs/libtirpc )"
 
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/flex
 	virtual/yacc"
 
+RDEPEND="${CDEPEND}
+	systemd? ( sys-apps/systemd )"
+
 CONFIG_CHECK="~AUTOFS4_FS"
 
 PATCHES=(
@@ -81,9 +84,6 @@
 src_configure() {
 	# --with-confdir is for bug #361481
 	# --with-mapdir is for bug #385113
-	# for systemd support (not enabled yet):
-	#   --with-systemd
-	#   --disable-move-mount: requires kernel >=2.6.39
 	local myeconfargs=(
 		--with-confdir=/etc/conf.d
 		--with-mapdir=/etc/autofs
@@ -92,7 +92,9 @@
 		$(use_with libtirpc)
 		$(use_with sasl)
 		$(use_with hesiod)
+		$(use_with systemd)
 		$(use_enable mount-locking)
+		systemddir="$(systemd_get_unitdir)" #bug #479492
 		--disable-ext-env
 		--enable-sloppy-mount # bug #453778
 		--enable-forced-shutdown