gentoo resync : 31.01.2018

8 files changed, 29 insertions, 438 deletions

diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index f343eefcb3e3..dcd650e576b2 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -10,17 +10,10 @@ AUX autofs-5.0.7-sloppy-mount.patch 3375 BLAKE2B 04b02e106bef614f0c9bb28490c6c68
 AUX autofs-5.1.2-libtirpc-as-need.patch 808 BLAKE2B a36fab796d78adff8cab4c10f8316d51809ef36781f7d95616b8c87ad093855a7c625c8cda907017c3000b3ee8a69cfc6ecfc60c655c32cd8dea0d2ede76ea0d SHA512 96441e4a040ceafd4bf323003d13170f419ea09c7d9cfdaeaf8675c945d28afde9b9ccf0ae3b0180d2038f5120e6d651c6657115658591093b778ed8f21b1bb3
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1563 BLAKE2B 6fa5e84a93a85f208be6c7dce170230a7cd8a3e098dcd0cf1a59e96f8da0bc4d1795f689e4591e230a1c3c8a898a41bbfbb4e308b7885aa9bc238ca3f9b2eaea SHA512 f8e1d38917b9c7048a4f6498fb987984306e15458eaf8cb73990a99d355d7f7ce3f1aa5450725283cbbc6f5c0e2f31048f1cd26eca7f136f1fe30a6dd8d31c43
-DIST autofs-5.0.10.tar.xz 258480 BLAKE2B a8b5656be4e7fe7330f56c5d6c3337f59e12c743ddf6421eda793eb933de5ffd9955239e4fd446d8a45cef86054ad9647bb93af300ed4286376b3e56ace77f05 SHA512 899d3b7040d1162312f9d595df0fd6c40489e4aefb7086893b51993446da78f10707d7e8caf8440ff24000d54794faca869aaf8564e5622caf8bb046af6fcf3b
-DIST autofs-5.0.7-patches-3.tar.lzma 37967 BLAKE2B 2aec4974f83bd15f1de4fd2a039a9cca177de71c9b0ff70d2aa0e3b994f547e43a7b6c723edbf49a5209f794850c67afe4ea41961aab7b9fe7039068af599117 SHA512 8cbb683a82d2cdc5e3c97921ba3a5bc5af5ab9fb45e4802de021a6161eaeaebb192790a351d281d48b68ed0f8ea6e3a0c0514a4f4a1c546191d8acca9e856ca7
-DIST autofs-5.0.7.tar.bz2 319117 BLAKE2B 7c5dcdd701740756abe25ef7a83c5de438676b981242ad983d15ebcfbd13b481df18edabfbcb3f0d675db85be983b3694982a790ea46ee3830eb840860f8de0b SHA512 672c53e0a5477097779088d8654edaad4cb01ab68ade2ee175d963c7d4895d1bdeeeabc87057ecca2f4f3a0f08014298dae40e5e8e862c20c0b1477d72431f84
-DIST autofs-5.1.1-patches-0.tar.lzma 41178 BLAKE2B 3e79f8f597b1a6e189d561d69923ff070d79edb1363e3134b28afb61772882d2290ecdf21e90ed09f882fbfaf68a00016e5ef745ee699100c1a5f41d8eff6408 SHA512 5c3ba26711401b3f9dc8cd36d3a85b1a8efce409621efedfc4f1caf2a15536646f6f89a79b8e12c703d3b3a4627ecda8c800386ebff34e20fdfad39041d91aa4
-DIST autofs-5.1.1.tar.xz 290300 BLAKE2B 1350e0c0fa9d8669b68a9ce82a8a5b86017f85dd2c6f7cb1198438aa0a16dc1dcb87a1ee0330c14f9220ed2a6f97994b8a547a9f711d75f4e05656b51658e892 SHA512 37c0f10ee06bbfc76059ff9ae54d9b462f1c2bc39e8779e96dd5bfc2b07055606c0710f1c3de95e6f099edd2c5bb5a6f8a341be989d7554bf80011bfbe90c905
 DIST autofs-5.1.2.tar.xz 294792 BLAKE2B eeecac768726a1b2d336908b48222c53b1ffbc9eeff7b7f597ccbf55214d35f0d99eaeaa1c065509fffa31ec86729bdd51be873e003aa1fb7d88a9e2ab04f4c8 SHA512 435bcb41c9d467947c194d879e46692b5976131b8e923793bdeac34f70420ede740c4d70ec393413fff0b1010495ac7fe5fa8b45a59d15a2430ecae9ec3fe7e1
 DIST autofs-5.1.3.tar.xz 300632 BLAKE2B 500325ec790304442e896208e94e25cf862621fc2354fa3c31fbf277dcc570d0b2b27894728d9f881efdcca262b1ef6e2c957cd23e2aea1d5b3cd2cd822c813b SHA512 d5363f4442be5258465140920a32cb63340c5da060ef2e66678f003d6a0c00579880837f0a04f59c7bce57d1cbc0f42bdd26546a2195f87e7bd46334c9e32e35
-EBUILD autofs-5.0.10.ebuild 3109 BLAKE2B f685774f281a9c37e7627d2406c56641d4544ed0761d410434690bf704d531f587e54dead0828b1dc052e2613643f98f4ebe582811893e95501aa4b81042a996 SHA512 3ffe8bfced9f0be629801cdbb9407d5459c74ebd415843fe450889640c9e9f6e9e2ced37d4acb293e7f5529bd1cec78f6070ac9d63463989ad424aa0a36a9064
-EBUILD autofs-5.0.7-r4.ebuild 3858 BLAKE2B f98a2529b9ff2dfb633bdf44003c32a45b1257bd7c9a5d816695959058d61e87f3d9b546387e7ee5f1ff3ef508f3c00b11699479df2c7105bf002b87ea96dc7a SHA512 aff5ee939a191f82a517645d62456cd234a5e353a6acc2001fc9899362042637c11d289d17d63b97ecd7a8c84cbbfc1cd32179ef09155393dd11e6d8ac724b19
-EBUILD autofs-5.0.7-r5.ebuild 3920 BLAKE2B 8d14efe918a145cc8d7097c2f77b1f85b07adaedc128d4c9fb2ba338ea6d1d4838edc84a3d790fecc5ae58e31487171e2bb342432f0169eceacef80b8c1981fa SHA512 89db952a6ea7d131bdf8f20aaf92ae018e0ecf3b3f4cbba9070597e4d622b6afce328d3d9353c65f7d695b253250556b25d66059e0d698396620d8d24a25443f
-EBUILD autofs-5.1.1-r1.ebuild 3106 BLAKE2B cdea4dcbed7fa6bea4442c67922037ac99153e25a186c36b10c84d2e590e4ba4187f3ed1681797e6d5157d1ae39c4fdd4661bef84a0be11e9bb98b87ee2ace54 SHA512 64c3adee570faacef9443fa58a2d80f752ace36f45c2f3c3fa6a9c356f42fb20bf79b1b000dbeddd485b04d3d80b5e3d873165319b061333861ff2dab8b47a14
-EBUILD autofs-5.1.2.ebuild 3194 BLAKE2B bd2bf1b336199c72744d0330675b86c2c442c5db926b94484cba9cd54d17d9132e71113bd4c5c637eb233ec2dfa9d0ae5bd72a9237ed1bf69fe653d81086c012 SHA512 015b15d113d6133231a75c0d0388116205fc2f4f528e7274a2dfbcc00bd77ca585543f90344bd87bd863abe3d608fcb5cd3cca9d2f91ebcb6a273b56787b82c3
-EBUILD autofs-5.1.3.ebuild 3146 BLAKE2B 962f39d2e5e6fae862dc921b6c583adfd95d1d0a6f740ba05dbea3120425952ab1fac98ae09a417e4afc010d98c38a42a03f7ccb7060c1c3002556b78dea27ae SHA512 5d929b3dc87f4aa2887aa5eebf2e971f42db34bb554526c533095313759249e1747604875fc811d3951d3bd69e62040793c351f7356b19dc48ebfa5210d302cf
-MISC metadata.xml 841 BLAKE2B 86575a5ec52b22c79a3bc39aefa47f8dff8faa977ab5851e1cc67c6cd12e5cbbefe684060d3f9c357c225cc5009d225540480d0199eb849ff2c0f48e515bfbb0 SHA512 5ba14e7d13eeb9a64a8f0df0ab17304cb247ca9fd69068f00085defbb11e955c9bc08e2d3f8eec1a39a5f22de89aef8aae6ec5918575f72918a1b31d40c89c9b
+DIST autofs-5.1.4.tar.xz 304864 BLAKE2B 7348aa1106554eb765919c765c0585b5d975d7a0ea036dec5b509711bf33cefd0f3e1e857a6865434adabbd1e323cfe8ffb09eb234495672e81101f79b8f4d0f SHA512 1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589
+EBUILD autofs-5.1.2.ebuild 3157 BLAKE2B 29c4a6f616f3da60798d51d01fd2547509a9e74ac8d98abe570bf13b68f5c3a104d28d19c76bdc1be8fe0002ec38d835c1f3b28d51f57bd7e1f46ce33698cf3f SHA512 2be0c80720dca0ebc3c0ac654cfdc4eddd388bb244808f904e82f3346a8d9d6cbcd83d50c776aaf6adef27288c411aacc5dec0bd4e10954d1e3f33ca41211ba1
+EBUILD autofs-5.1.3.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
+EBUILD autofs-5.1.4.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
+MISC metadata.xml 790 BLAKE2B 279487980b9a81aaf42322ab4502ab3ec5aac78e4b0b58cb19043db0742f7b3832145ebf1e725c6f476170cc3a59130a1072d4856cf271ad56fe561262b50eac SHA512 594bbea9701ebca1c17630eeb3f06b47f0c74ef426aed68be1ce868316736f80f835fa73d31a93627e2a81415f489aace91a1ca1e02f4cef17783b102a77a023
diff --git a/net-fs/autofs/autofs-5.0.7-r4.ebuild b/net-fs/autofs/autofs-5.0.7-r4.ebuild
deleted file mode 100644
index 89d72705b501..000000000000
--- a/net-fs/autofs/autofs-5.0.7-r4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=3
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://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 )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-
-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
-	)
-
-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.7-r5.ebuild b/net-fs/autofs/autofs-5.0.7-r5.ebuild
deleted file mode 100644
index 21e1bfc9c984..000000000000
--- a/net-fs/autofs/autofs-5.0.7-r5.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=3
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://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 )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-
-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.1.1-r1.ebuild b/net-fs/autofs/autofs-5.1.1-r1.ebuild
deleted file mode 100644
index e19da04a290a..000000000000
--- a/net-fs/autofs/autofs-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=0
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~dlan/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 )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-
-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.2.ebuild b/net-fs/autofs/autofs-5.1.2.ebuild
index ce5f6209858f..902979caabdf 100644
--- a/net-fs/autofs/autofs-5.1.2.ebuild
+++ b/net-fs/autofs/autofs-5.1.2.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=5
@@ -21,7 +21,7 @@ SRC_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"
+IUSE="-dmalloc 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.
@@ -30,7 +30,6 @@ 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
@@ -77,8 +76,8 @@ src_configure() {
 		$(use_with ldap openldap)
 		$(use_with libtirpc)
 		$(use_with sasl)
-		$(use_with hesiod)
 		$(use_enable mount-locking)
+		--without-hesiod
 		--disable-ext-env
 		--enable-sloppy-mount # bug #453778
 		--enable-force-shutdown
diff --git a/net-fs/autofs/autofs-5.1.3.ebuild b/net-fs/autofs/autofs-5.1.3.ebuild
index 5bf0855d2311..c09dd3334e1f 100644
--- a/net-fs/autofs/autofs-5.1.3.ebuild
+++ b/net-fs/autofs/autofs-5.1.3.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
+inherit linux-info multilib systemd toolchain-funcs
 
 PATCH_VER=
 [[ -n ${PATCH_VER} ]] && \
@@ -21,7 +18,7 @@ SRC_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"
+IUSE="-dmalloc 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.
@@ -30,7 +27,6 @@ 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
@@ -57,7 +53,7 @@ src_prepare() {
 	fi
 
 	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
+	default
 }
 
 src_configure() {
@@ -72,24 +68,20 @@ src_configure() {
 		$(use_with ldap openldap)
 		$(use_with libtirpc)
 		$(use_with sasl)
-		$(use_with hesiod)
 		$(use_enable mount-locking)
+		--without-hesiod
 		--disable-ext-env
 		--enable-sloppy-mount # bug #453778
 		--enable-force-shutdown
 		--enable-ignore-busy
-		--with-systemd="$(systemd_get_unitdir)" #bug #479492
+		--with-systemd="$(systemd_get_systemunitdir)" #bug #479492
 		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
 	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	if kernel_is -lt 2 6 30; then
 		# kernel patches
diff --git a/net-fs/autofs/autofs-5.0.10.ebuild b/net-fs/autofs/autofs-5.1.4.ebuild
index 8dcfbc310b05..c09dd3334e1f 100644
--- a/net-fs/autofs/autofs-5.0.10.ebuild
+++ b/net-fs/autofs/autofs-5.1.4.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
+inherit linux-info multilib systemd toolchain-funcs
 
 PATCH_VER=
 [[ -n ${PATCH_VER} ]] && \
@@ -21,7 +18,7 @@ SRC_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"
+IUSE="-dmalloc 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.
@@ -30,7 +27,6 @@ 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
@@ -41,10 +37,11 @@ RDEPEND=">=sys-apps/util-linux-2.20
 	libtirpc? ( net-libs/libtirpc )
 	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 "
-
 DEPEND="${RDEPEND}
 	sys-devel/flex
-	virtual/yacc"
+	virtual/yacc
+	libtirpc? ( net-libs/rpcsvc-proto )
+"
 
 CONFIG_CHECK="~AUTOFS4_FS"
 
@@ -56,7 +53,7 @@ src_prepare() {
 	fi
 
 	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
+	default
 }
 
 src_configure() {
@@ -71,24 +68,20 @@ src_configure() {
 		$(use_with ldap openldap)
 		$(use_with libtirpc)
 		$(use_with sasl)
-		$(use_with hesiod)
 		$(use_enable mount-locking)
+		--without-hesiod
 		--disable-ext-env
 		--enable-sloppy-mount # bug #453778
 		--enable-force-shutdown
 		--enable-ignore-busy
-		--with-systemd="$(systemd_get_unitdir)" #bug #479492
+		--with-systemd="$(systemd_get_systemunitdir)" #bug #479492
 		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
 	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	if kernel_is -lt 2 6 30; then
 		# kernel patches
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index e91fd580a5fb..f36813693b70 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="dmalloc">Enable debugging with the dmalloc library</flag>
-		<flag name="hesiod">Install hesiod module</flag>
 		<flag name="ldap">Install LDAP module</flag>
 		<flag name="libtirpc">Use TiRPC library instead of SunRPC</flag>
 		<flag name="mount-locking">