[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/

[Yixun Lan]

commit:     2ade32304a5da38f31b76ff753eb90c5f9dd91eb
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 14:01:18 2018 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 14:10:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ade3230

net-fs/autofs: drop autotools-utils & update to EAPI=6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-fs/autofs/autofs-5.1.3.ebuild | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/net-fs/autofs/autofs-5.1.3.ebuild b/net-fs/autofs/autofs-5.1.3.ebuild
index 7badfc02a03..c09dd3334e1 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-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} ]] && \
@@ -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() {
@@ -77,18 +74,14 @@ src_configure() {
 		--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