Remove old versions, proxied commit for Dennis dlan Lan; fixes bug #478020.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

26 files changed, 20 insertions, 2598 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index f66d81db1941..b3874b027f39 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.170 2013/10/24 14:02:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.171 2013/11/10 13:16:02 tomwij Exp $
+
+  10 Nov 2013; Tom Wijsman <TomWij@gentoo.org> -autofs-4.1.4-r1.ebuild,
+  -autofs-5.0.4-r5.ebuild, -autofs-5.0.6-r3.ebuild, -autofs-5.0.6-r4.ebuild,
+  -autofs-5.0.6-r5.ebuild, -autofs-5.0.7-r1.ebuild, -autofs-5.0.7-r2.ebuild,
+  -autofs-5.0.7.ebuild, -autofs-9999.ebuild,
+  -files/autofs-4.1.4-clean-up-maps.patch,
+  -files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch,
+  -files/autofs-4.1.4-fix-man-pages.patch, -files/autofs-4.1.4-init.patch,
+  -files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch,
+  -files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch,
+  -files/autofs-5.0.4-user-ldflags-and-as-needed.patch, -files/autofs-5.0.5-add-
+  missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch,
+  -files/autofs-5.0.5-fix-building-without-ldap.patch,
+  -files/autofs-5.0.6-ipv6_name_lookup_regression.patch,
+  -files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch,
+  -files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch,
+  -files/autofs-5.0.7-mount-sloppy.patch, -files/autofs.rc12,
+  -files/autofs.rc13, -files/autofs5.rc1:
+  Remove old versions, proxied commit for Dennis dlan Lan; fixes bug #478020.
 
 *autofs-5.0.8-r1 (24 Oct 2013)
 
diff --git a/net-fs/autofs/autofs-4.1.4-r1.ebuild b/net-fs/autofs/autofs-4.1.4-r1.ebuild
deleted file mode 100644
index 85c07bf4e8d1..000000000000
--- a/net-fs/autofs/autofs-4.1.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-4.1.4-r1.ebuild,v 1.6 2012/02/29 13:13:05 ranger Exp $
-
-EAPI="4"
-
-inherit eutils multilib autotools
-
-PATCH_VER="1"
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="mirror://kernel/linux/daemons/${PN}/v4/${P}.tar.bz2
-	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="hesiod ldap"
-
-DEPEND="hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0 )"
-RDEPEND="${DEPEND}"
-
-UPSTREAM_FILESDIR="gentoo/${CATEGORY}/${PN}/files"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}"/patches
-
-	# Accumulated fixes for bugs
-	#    #154797: Respect CC and CFLAGS
-	#    #253412: Respect LDFLAGS
-	#    #247969: Link order for --as-needed
-	epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded.patch
-
-	# Reflect init script implementation
-	epatch "${FILESDIR}"/${P}-fix-man-pages.patch
-
-	# Use Gentoo specific maps, init script and config file
-	for i in home master misc; do
-		if [ -e samples/auto.${i} ]; then
-			mv samples/auto.${i}{,.bak} || die "Failed to backup auto.${i}"
-		fi
-		ln -s "${S}/${UPSTREAM_FILESDIR}"/auto.${i} samples/auto.${i} || \
-			die "Failed to symlink auto.${i}"
-	done
-
-	# Clean-up maps and disable everything.
-	epatch "${FILESDIR}"/${P}-clean-up-maps.patch
-
-	# Fix installation path of ldap samples and maps
-	epatch "${FILESDIR}"/${P}-fix-install-ldap-samples-and-maps.patch
-
-	epatch "${FILESDIR}"/${P}-init.patch #Fix init script deps
-
-	# Do not include <nfs/nfs.h>, rather <linux/nfs.h>,
-	# as the former is a lame header for the latter (bug #157968)
-	sed 's@nfs/nfs.h@linux/nfs.h@' -i lib/rpc_subs.c || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
-	# with >=sys-apps/util-linux-2.19,
-	addpredict "/etc/mtab"
-
-	econf \
-		$(use_with ldap openldap) \
-		$(use_with hesiod)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README* CHANGELOG CREDITS COPYRIGHT
-
-	newinitd ${UPSTREAM_FILESDIR}/${PN}.init ${PN}
-	newconfd ${UPSTREAM_FILESDIR}/${PN}.conf ${PN}
-}
-
-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
-	elog "Also the normal autofs status has been renamed stats"
-	elog "as there is already a predefined Gentoo status"
-	if use ldap; then
-		elog
-		elog "Sample files for ldap have been installed into"
-		elog "${PREFIX}/usr/share/share/doc/${P}/samples."
-	fi
-}
diff --git a/net-fs/autofs/autofs-5.0.4-r5.ebuild b/net-fs/autofs/autofs-5.0.4-r5.ebuild
deleted file mode 100644
index 72f90a2b06c2..000000000000
--- a/net-fs/autofs/autofs-5.0.4-r5.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.4-r5.ebuild,v 1.10 2012/04/25 16:29:19 jlec Exp $
-
-inherit eutils multilib autotools
-
-IUSE="ldap sasl"
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v5"
-# This list is taken directly from http://kernel.org/pub/linux/daemons/autofs/v5/patch_order-${PV}
-# Please do not modify the order
-PATCH_LIST="
-	${P}-fix-dumb-libxml2-check.patch
-	${P}-expire-specific-submount-only.patch
-	${P}-fix-negative-cache-non-existent-key.patch
-	${P}-fix-ldap-detection.patch
-	${P}-use-CLOEXEC-flag.patch
-	${P}-fix-select-fd-limit.patch
-	${P}-make-hash-table-scale-to-thousands-of-entries.patch
-	${P}-fix-quoted-mess.patch
-	${P}-use-CLOEXEC-flag-setmntent.patch
-	${P}-fix-hosts-map-use-after-free.patch
-	${P}-uris-list-locking-fix.patch
-	${P}-renew-sasl-creds-upon-reconnect-fail.patch
-	${P}-library-reload-fix-update.patch
-	${P}-force-unlink-umount.patch
-	${P}-always-read-file-maps.patch
-	${P}-code-analysis-corrections.patch
-	${P}-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch
-	${P}-easy-alloca-replacements.patch
-	${P}-configure-libtirpc.patch
-	${P}-ipv6-name-and-address-support.patch
-	${P}-ipv6-parse.patch
-	${P}-add-missing-changelog-entries.patch
-	${P}-use-CLOEXEC-flag-setmntent-include-fix.patch
-	${P}-easy-alloca-replacements-fix.patch
-	${P}-libxml2-workaround-fix.patch
-	${P}-configure-libtirpc-fix.patch
-	${P}-add-nfs-mount-proto-default-conf-option.patch
-	${P}-fix-bad-token-declare.patch
-	${P}-fix-return-start-status-on-fail.patch
-	${P}-fix-double-free-in-expire_proc.patch
-	${P}-another-easy-alloca-replacements-fix.patch
-	${P}-add-lsb-init-script-parameter-block.patch
-	${P}-always-read-file-maps-fix.patch
-	${P}-use-misc-device.patch
-	${P}-fix-restorecon.patch
-	${P}-clear-rpc-client-on-lookup-fail.patch
-	${P}-fix-lsb-init-script-header.patch
-	${P}-fix-memory-leak-reading-ldap-master.patch
-	${P}-fix-st_remove_tasks-locking.patch
-	${P}-reset-flex-scanner-when-setting-buffer.patch
-	${P}-zero-s_magic-is-valid.patch
-	${P}-use-percent-hack-for-master.patch
-	${P}-use-intr-as-hosts-mount-default.patch
-	${P}-fix-kernel-includes.patch
-	${P}-dont-umount-existing-direct-mount-on-reread.patch
-	${P}-library-reload-fix-update-fix.patch
-	${P}-improve-manual-umount-recovery.patch
-	${P}-dont-fail-on-ipv6-address-adding-host.patch
-	${P}-always-read-file-maps-multi-map-fix.patch
-	${P}-always-read-file-maps-key-lookup-fixes.patch
-	${P}-use-srv-query-for-domain-dn.patch
-	${P}-fix-incorrect-dclist-free.patch
-	${P}-srv-lookup-handle-endian.patch
-	${P}-library-reload-fix-update-fix-2.patch
-	${P}-fix-notify-mount-message-path.patch
-	${P}-remount-we-created-mount-point-fix.patch
-	${P}-fix-double-free-in-do_sasl_bind.patch
-	${P}-manual-umount-recovery-fixes.patch
-	${P}-fix-map-type-info-parse-error.patch"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2"
-for i in ${PATCH_LIST} ; do
-	SRC_URI="${SRC_URI} ${SRC_URI_BASE}/${i}"
-done ;
-DEPEND="ldap? ( >=net-nds/openldap-2.0
-		sasl? ( dev-libs/cyrus-sasl
-			virtual/krb5
-			dev-libs/libxml2 )
-	)"
-	# currently, sasl code assumes the presence of kerberosV
-RDEPEND="${DEPEND}"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	for i in ${PATCH_LIST}; do
-		EPATCH_OPTS="-p1 -d ${S}" epatch "${DISTDIR}"/${i}
-	done
-
-	cd "${S}"
-
-	# fixes bug #210762
-	epatch "${FILESDIR}"/${PN}-5.0.3-heimdal.patch
-
-	# fixes bugs #253412 and #247969
-	epatch "${FILESDIR}"/${P}-user-ldflags-and-as-needed-v2.patch
-
-	# # use CC and CFLAGS from environment (bug #154797)
-	# write these values in Makefile.conf
-	(echo "# Use the compiler and cflags determined by configure";
-	echo "CC := @CC@"; echo "CFLAGS := @CFLAGS@") >> Makefile.conf.in
-	# make sure Makefile.conf is parsed after Makefile.rules
-	sed -ni '/include Makefile.conf/{x; n; G}; p' Makefile
-	sed -i 's/^\(CC\|CXX\).*//' Makefile.rules
-	sed -i 's/^CFLAGS=-fPIE.*//' configure.in
-
-	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
-	# as the former is a lame header for the latter (bug #157968)
-	sed -i 's@nfs/nfs.h@linux/nfs.h@' include/rpc_subs.h
-
-	eautoreconf
-}
-
-src_compile() {
-	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
-	# with >=sys-apps/util-linux-2.19,
-	addpredict "/etc/mtab"
-
-	CFLAGS="${CFLAGS}" \
-	econf \
-		$(use_with ldap openldap) \
-		$(use_with sasl) \
-		--without-hesiod \
-		--enable-ignore-busy
-
-	emake DONTSTRIP=1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}"/autofs5.rc1 autofs
-}
-
-pkg_postinst() {
-	elog "Note: If you plan on using autofs for automounting"
-	elog "remote NFS mounts without having the NFS daemon running"
-	elog "please add portmap to your default run-level."
-}
diff --git a/net-fs/autofs/autofs-5.0.6-r3.ebuild b/net-fs/autofs/autofs-5.0.6-r3.ebuild
deleted file mode 100644
index 79d465ce5d34..000000000000
--- a/net-fs/autofs/autofs-5.0.6-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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-r3.ebuild,v 1.7 2012/02/29 16:38:20 ranger Exp $
-
-EAPI="4"
-inherit eutils multilib autotools linux-info
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-PATCH_VER=""
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
-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"
-
-# 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="
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? ( dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	# Fix for bug #210762
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203
-	epatch "${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
-	epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded.patch
-
-	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
-	# as the former is a lame header for the latter (bug #157968)
-	sed 's@nfs/nfs.h@linux/nfs.h@' -i include/rpc_subs.h || die
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039
-	# Disable LDAP specific code if USE="-ldap", let's see what upstream says...
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-building-without-ldap.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=361899
-	epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
-
-	# Fix for bug #373577
-	# Upstream reference: http://article.gmane.org/gmane.linux.kernel.autofs/6187
-	# Fix regression in IPv6 name lookup regression
-	epatch "${FILESDIR}"/${P}-ipv6_name_lookup_regression.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=381315
-	epatch "${FILESDIR}"/${P}-revert-ldap.patch
-	eautoreconf
-}
-
-src_configure() {
-	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
-	# with >=sys-apps/util-linux-2.19,
-	addpredict "/etc/mtab"
-
-	# --with-confdir is for bug #361481
-	econf \
-		--with-confdir=/etc/conf.d \
-		$(use_with ldap openldap) \
-		$(use_with sasl) \
-		$(use_with hesiod) \
-		--enable-ignore-busy
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL
-
-	# kernel patches
-	docinto patches
-	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-
-	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.6-r4.ebuild b/net-fs/autofs/autofs-5.0.6-r4.ebuild
deleted file mode 100644
index 70aa055e0b42..000000000000
--- a/net-fs/autofs/autofs-5.0.6-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 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-r4.ebuild,v 1.1 2011/10/14 20:15:13 pva Exp $
-
-EAPI="4"
-inherit eutils multilib autotools linux-info
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-PATCH_VER=""
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
-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"
-
-# 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="
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? ( dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	# Fix for bug #210762
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203
-	epatch "${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
-	epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded.patch
-
-	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
-	# as the former is a lame header for the latter (bug #157968)
-	sed 's@nfs/nfs.h@linux/nfs.h@' -i include/rpc_subs.h || die
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039
-	# Disable LDAP specific code if USE="-ldap", let's see what upstream says...
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-building-without-ldap.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=361899
-	epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
-
-	# Fix for bug #373577
-	# Upstream reference: http://article.gmane.org/gmane.linux.kernel.autofs/6187
-	# Fix regression in IPv6 name lookup regression
-	epatch "${FILESDIR}"/${P}-ipv6_name_lookup_regression.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=381315
-	epatch "${FILESDIR}"/${P}-revert-ldap.patch
-	eautoreconf
-}
-
-src_configure() {
-	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
-	# with >=sys-apps/util-linux-2.19,
-	addpredict "/etc/mtab"
-
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	econf \
-		--with-confdir=/etc/conf.d \
-		--with-mapdir=/etc/autofs \
-		$(use_with ldap openldap) \
-		$(use_with sasl) \
-		$(use_with hesiod) \
-		--enable-ignore-busy
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL
-
-	# kernel patches
-	docinto patches
-	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-
-	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.6-r5.ebuild b/net-fs/autofs/autofs-5.0.6-r5.ebuild
deleted file mode 100644
index c645f99b06da..000000000000
--- a/net-fs/autofs/autofs-5.0.6-r5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 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 $
-
-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} ]] && \
-	PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
-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"
-
-# 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="
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? ( dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	# Fix for bug #210762
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203
-	epatch "${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
-	epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded-r2.patch
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039
-	# Disable LDAP specific code if USE="-ldap", let's see what upstream says...
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-building-without-ldap.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=361899
-	epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=381315
-	epatch "${FILESDIR}"/${P}-revert-ldap.patch
-	eautoreconf
-}
-
-src_configure() {
-	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
-	# with >=sys-apps/util-linux-2.19,
-	addpredict "/etc/mtab"
-
-	# --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
-	econf \
-		--with-confdir=/etc/conf.d \
-		--with-mapdir=/etc/autofs \
-		$(use_with ldap openldap) \
-		$(use_with sasl) \
-		$(use_with hesiod) \
-		--enable-ignore-busy
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL
-
-	# kernel patches
-	docinto patches
-	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-
-	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-r1.ebuild b/net-fs/autofs/autofs-5.0.7-r1.ebuild
deleted file mode 100644
index e0aad1ee793e..000000000000
--- a/net-fs/autofs/autofs-5.0.7-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r1.ebuild,v 1.3 2013/05/06 08:45:14 jlec Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils linux-info multilib
-
-PATCH_VER=2
-[[ -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.bz2
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-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.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-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.6-respect-user-flags-and-fix-asneeded-r2.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-mount-sloppy.patch #453778
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-	autotools-utils_src_prepare
-}
-
-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
-		$(use_with ldap openldap)
-		$(use_with sasl)
-		$(use_with hesiod)
-		$(use_enable mount-locking)
-		--enable-ignore-busy
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	# kernel patches
-	docinto patches
-	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-
-	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-r2.ebuild b/net-fs/autofs/autofs-5.0.7-r2.ebuild
deleted file mode 100644
index ff851f56708d..000000000000
--- a/net-fs/autofs/autofs-5.0.7-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7-r2.ebuild,v 1.1 2013/06/12 22:19:03 robbat2 Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils linux-info multilib
-
-PATCH_VER=3
-[[ -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.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 )
-	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"
-
-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.6-respect-user-flags-and-fix-asneeded-r2.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
-	)
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-	epatch_user
-	autotools-utils_src_prepare
-}
-
-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
-		$(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
-	)
-	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.ebuild b/net-fs/autofs/autofs-5.0.7.ebuild
deleted file mode 100644
index 261450bdd2ef..000000000000
--- a/net-fs/autofs/autofs-5.0.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.7.ebuild,v 1.1 2013/03/25 19:27:27 hwoarang Exp $
-
-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} ]] && \
-	PATCHSET_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-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 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="
-	hesiod? ( net-dns/hesiod )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? ( dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5 ) )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	# Fix for bug #210762
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203
-	epatch "${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
-	epatch "${FILESDIR}"/${PN}-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
-
-	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039
-	# Disable LDAP specific code if USE="-ldap", let's see what upstream says...
-	epatch "${FILESDIR}"/${PN}-5.0.5-fix-building-without-ldap.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=361899
-	epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=381315
-	epatch "${FILESDIR}"/${PN}-5.0.6-revert-ldap.patch
-	eautoreconf
-}
-
-src_configure() {
-	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
-	# with >=sys-apps/util-linux-2.19,
-	addpredict "/etc/mtab"
-
-	# --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
-	econf \
-		--with-confdir=/etc/conf.d \
-		--with-mapdir=/etc/autofs \
-		$(use_with ldap openldap) \
-		$(use_with sasl) \
-		$(use_with hesiod) \
-		$(use_enable mount-locking) \
-		--enable-ignore-busy
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL
-
-	# kernel patches
-	docinto patches
-	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-
-	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-9999.ebuild b/net-fs/autofs/autofs-9999.ebuild
deleted file mode 100644
index 538044a96563..000000000000
--- a/net-fs/autofs/autofs-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-9999.ebuild,v 1.3 2013/07/30 07:31:20 maksbotan Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git"
-inherit autotools-utils linux-info multilib git-2
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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_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
-		$(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
-		--enable-force-shutdown
-		--enable-ignore-busy
-	)
-	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/files/autofs-4.1.4-clean-up-maps.patch b/net-fs/autofs/files/autofs-4.1.4-clean-up-maps.patch
deleted file mode 100644
index 51ccf9543baf..000000000000
--- a/net-fs/autofs/files/autofs-4.1.4-clean-up-maps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- samples/auto.net.old	2010-06-20 22:13:27.049079018 +0200
-+++ samples/auto.net	2010-06-20 22:15:31.729124132 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # $Id: autofs-4.1.4-clean-up-maps.patch,v 1.1 2011/04/06 14:10:32 pva Exp $
- 
-@@ -11,7 +11,7 @@ key="$1"
- 
- # add "nosymlink" here if you want to suppress symlinking local filesystems
- # add "nonstrict" to make it OK for some filesystems to not mount
--opts="-fstype=nfs,hard,intr,nodev,nosuid"
-+opts="-fstype=nfs,hard,intr,nodev,nosuid,nonstrict"
- 
- # Showmount comes in a number of names and varieties.  "showmount" is
- # typically an older version which accepts the '--no-headers' flag
-@@ -20,24 +20,14 @@ opts="-fstype=nfs,hard,intr,nodev,nosuid
- #SHOWMOUNT="kshowmount --no-headers -e $key"
- #SHOWMOUNT="showmount -e $key | tail -n +2"
- 
--for P in /bin /sbin /usr/bin /usr/sbin
--do
--	for M in showmount kshowmount
--	do
--		if [ -x $P/$M ]
--		then
--			SMNT=$P/$M
--			break
--		fi
--	done
--done
-+SMNT=/usr/sbin/showmount
- 
- [ -x $SMNT ] || exit 1
- 
- # Newer distributions get this right
- SHOWMOUNT="$SMNT --no-headers -e $key"
- 
--$SHOWMOUNT | LC_ALL=C sort +0 | \
-+$SHOWMOUNT | LC_ALL=C sort -k 1 | \
- 	awk -v key="$key" -v opts="$opts" -- '
- 	BEGIN	{ ORS=""; first=1 }
- 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
---- samples/auto.smb.old	2010-06-20 22:10:17.507329273 +0200
-+++ samples/auto.smb	2010-06-20 22:15:58.884079957 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # $Id: autofs-4.1.4-clean-up-maps.patch,v 1.1 2011/04/06 14:10:32 pva Exp $
- 
-@@ -7,14 +7,7 @@
- key="$1"
- opts="-fstype=cifs"
- 
--for P in /bin /sbin /usr/bin /usr/sbin
--do
--	if [ -x $P/smbclient ]
--	then
--		SMBCLIENT=$P/smbclient
--		break
--	fi
--done
-+SMBCLIENT="/usr/bin/smbclient"
-
- [ -x $SMBCLIENT ] || exit 1
- 
diff --git a/net-fs/autofs/files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch b/net-fs/autofs/files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch
deleted file mode 100644
index 02939a7c34b0..000000000000
--- a/net-fs/autofs/files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- samples/Makefile.old	2010-06-21 16:08:54.916105841 +0200
-+++ samples/Makefile	2010-06-21 16:11:52.867934825 +0200
-@@ -13,34 +13,33 @@ endif
- CFLAGS += -I../include
- LIBS = -lldap -llber
- 
--all: $(BINS) rc.autofs
-+all: $(BINS)
- 
- autofs-ldap-auto-master: $(OBJS)
- 	$(CC) $(AUTOFS_LDFLAGS) $(LDFLAGS) -o autofs-ldap-auto-master $(OBJS) $(LIBS)
- 
--rc.autofs: rc.autofs.in
--	sed -e "s|@@sbindir@@|$(sbindir)|g" \
--	    -e "s|@@autofslibdir@@|$(autofslibdir)|g" \
--	    -e "s|@@initdir@@|$(initdir)|g" < rc.autofs.in > rc.autofs
--
- install: all
--	install -d -m 755 $(INSTALLROOT)/etc
--	-mv -f $(INSTALLROOT)/etc/auto.master $(INSTALLROOT)/etc/auto.master.old
--	install -c auto.master -m 644 $(INSTALLROOT)/etc
--	-mv -f $(INSTALLROOT)/etc/auto.misc $(INSTALLROOT)/etc/auto.misc.old
--	install -c auto.misc   -m 644 $(INSTALLROOT)/etc
--	-mv -f $(INSTALLROOT)/etc/auto.net $(INSTALLROOT)/etc/auto.net.old
--	install -c auto.net    -m 755 $(INSTALLROOT)/etc
--	-mv -f $(INSTALLROOT)/etc/auto.smb $(INSTALLROOT)/etc/auto.smb.old
--	install -c auto.smb    -m 755 $(INSTALLROOT)/etc
--	install -d -m 755 $(INSTALLROOT)$(initdir)
--	install -c rc.autofs   -m 755 $(INSTALLROOT)$(initdir)/autofs
--	install -d -m 755 $(INSTALLROOT)$(autofslibdir)
-+	install -d -m 755 $(INSTALLROOT)/etc/autofs
-+	install -c auto.master -m 644 $(INSTALLROOT)/etc/autofs
-+	install -c auto.misc   -m 644 $(INSTALLROOT)/etc/autofs
-+	install -c auto.net    -m 755 $(INSTALLROOT)/etc/autofs
-+	install -c auto.smb    -m 755 $(INSTALLROOT)/etc/autofs
-+	install -c auto.home    -m 755 $(INSTALLROOT)/etc/autofs
- 	install -d -m 755 $(INSTALLROOT)/var/run/autofs
- ifeq ($(LDAP), 1)
-+	install -d -m 755 $(INSTALLROOT)$(autofslibdir)
- 	install -c autofs-ldap-auto-master -m 755 $(INSTALLROOT)$(autofslibdir)
-+	install -d -m 755 $(INSTALLROOT)/etc/openldap/schema
-+	install -c autofs.schema           -m 644 $(INSTALLROOT)/etc/openldap/schema
-+	install -d -m 755 $(INSTALLROOT)/usr/share/doc/${P}/samples
-+	install -c auto.master.ldap             -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples
-+	install -c ldap-automount-auto.direct   -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples
-+	install -c ldap-automount-auto.indirect -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples
-+	install -c ldap-automount-auto.master   -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples
-+	install -c ldap-nis-auto.direct   -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples
-+	install -c ldap-nis-auto.indirect -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples
-+	install -c ldap-nis-auto.master   -m 644 $(INSTALLROOT)/usr/share/doc/${P}/samples
- endif
- 
- clean):
- 	rm -f *.o *.s autofs-ldap-auto-master rc.autofs
--
diff --git a/net-fs/autofs/files/autofs-4.1.4-fix-man-pages.patch b/net-fs/autofs/files/autofs-4.1.4-fix-man-pages.patch
deleted file mode 100644
index ffda7d0f360d..000000000000
--- a/net-fs/autofs/files/autofs-4.1.4-fix-man-pages.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- man/autofs.8.in.old	2005-01-05 11:12:42.000000000 +0100
-+++ man/autofs.8.in	2010-05-31 23:10:16.589319809 +0200
-@@ -4,7 +4,7 @@
- @@INIT.D@@/autofs \- Control Script for automounter
- .SH SYNOPSIS
- .B @@INIT.D@@/autofs
--.I start|stop|reload|status
-+.I start|stop|reload|stats|status
- .SH "DESCRIPTION"
- .B autofs
- control the operation of the
-@@ -30,7 +30,7 @@ to find mount points on the system. For 
- .BR automount (8)
- process is started with the appropriate parameters. You can check the
- active mount points for the automounter with the
--.B @@INIT.D@@/autofs status
-+.B @@INIT.D@@/autofs stats
- command. If the
- .I auto.master
- configuration file contains a line of the form
-@@ -54,9 +54,12 @@ map is modified then the
- .B autofs
- script must be rerun to activate the changes.
- .P
--.B @@INIT.D@@/autofs status
-+.B @@INIT.D@@/autofs stats
- will display the current configuration and a list of currently running
- automount daemons.
-+.P
-+.B @@INIT.D@@/autofs status
-+will display whether automount service is running.
- .SH "SEE ALSO"
- .BR automount (8),
- .BR autofs (5),
-@@ -64,4 +67,5 @@ automount daemons.
- .SH AUTHOR
- This manual page was written by Christoph Lameter <chris@waterf.org>,
- for the Debian GNU/Linux system.  Edited by H. Peter Anvin
--<hpa@transmeta.com>.
-+<hpa@transmeta.com>.  Edited by D. Polke <dustin.polke@uni-siegen.de> to
-+reflect Gentoo's init script implementation.
diff --git a/net-fs/autofs/files/autofs-4.1.4-init.patch b/net-fs/autofs/files/autofs-4.1.4-init.patch
deleted file mode 100644
index cdb66e73ef21..000000000000
--- a/net-fs/autofs/files/autofs-4.1.4-init.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- gentoo/net-fs/autofs/files/autofs.init.orig
-+++ gentoo/net-fs/autofs/files/autofs.init
-@@ -11,11 +11,12 @@ DAEMON=/usr/sbin/automount
- SYSCONFDIR=/etc/autofs
- 
- depend() {
--	need localmount	portmap
--	use ypbind nfs slapd portmap
-+	need localmount
-+	use ypbind nfs slapd portmap net
- }
- 
--opts="start stop status stats reload restart"
-+extra_commands="stats"
-+extra_started_commands="reload"
- 
- #
- # Check for all maps that are to be loaded
diff --git a/net-fs/autofs/files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch b/net-fs/autofs/files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch
deleted file mode 100644
index 505cf4e8fd44..000000000000
--- a/net-fs/autofs/files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-=== modified file 'Makefile.conf.in'
---- Makefile.conf.in	2011-04-06 13:55:30 +0000
-+++ Makefile.conf.in	2011-04-06 13:56:05 +0000
-@@ -58,3 +58,6 @@
- 
- # Location for init.d files
- initdir = @initdir@
-+
-+# Use the compiler detected by configure
-+CC := @CC@
-
-=== modified file 'Makefile.rules'
---- Makefile.rules	2011-04-06 13:55:30 +0000
-+++ Makefile.rules	2011-04-06 13:57:27 +0000
-@@ -11,24 +11,20 @@
- 	   Makefile.conf.in .version .autofs-* configure.in aclocal.m4 \
- 	   configure *.patch autofs.spec
- 
-+# Attempt to be friends with autotools
-+INSTALLROOT = $(DESTDIR)
-+
- # autofs utility library
- AUTOFS_LIB = ../lib/autofs.a
- 
- # Compilers, linkers and flags
--# The STRIP defined here *must not* remove any dynamic-loading symbols
--
- ifdef DEBUG
--CFLAGS    = -O2 -g -DDEBUG
--LDFLAGS   = -g
--STRIP     = :
-+CFLAGS    ?= -O2 -g -DDEBUG
- else
--CFLAGS    = -O3 -fomit-frame-pointer -Wall
--LDFLAGS   = -s
--STRIP     = strip --strip-debug
-+CFLAGS    ?= -O3 -fomit-frame-pointer -Wall
- endif
-+AUTOFS_LDFLAGS = -g
- 
--CC        = gcc
--CXX       = g++
- CXXFLAGS  = $(CFLAGS)
- LD        = ld
- SOLDFLAGS = -shared -Xlinker -rpath -Xlinker $(autofslibdir)
-@@ -44,5 +40,4 @@
- 	$(CC) $(CFLAGS) -S $<
- 
- .c.so:
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB)
--	$(STRIP) $*.so
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB)
-
-=== modified file 'daemon/Makefile'
---- daemon/Makefile	2011-04-06 13:55:30 +0000
-+++ daemon/Makefile	2011-04-06 13:56:05 +0000
-@@ -12,14 +12,13 @@
- version := $(shell cat ../.version)
- 
- CFLAGS += -rdynamic $(DAEMON_CFLAGS) -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" -DVERSION_STRING=\"$(version)\" -I../include
--LDFLAGS += -rdynamic
-+AUTOFS_LDFLAGS += -rdynamic
- LIBS = -ldl
- 
- all: automount
- 
- automount: $(OBJS) $(AUTOFS_LIB)
--	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
--	$(STRIP) automount
-+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
- 
- clean:
- 	rm -f *.o *.s *~ automount
-
-=== modified file 'lib/Makefile'
---- lib/Makefile	2011-04-06 13:55:30 +0000
-+++ lib/Makefile	2011-04-06 13:56:05 +0000
-@@ -35,18 +35,15 @@
- 
- mount_clnt.o: mount_clnt.c
- 	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
--	$(STRIP) mount_clnt.o
- 
- mount_xdr.c: mount.h
- 	$(RPCGEN) -c -o mount_xdr.c mount.x
- 
- mount_xdr.o: mount_xdr.c
- 	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
--	$(STRIP) mount_xdr.o
- 
- listmount.o: listmount.c
- 	$(CC) $(CFLAGS) -o listmount.o -c listmount.c
--	$(STRIP) listmount.o
- 
- install: all
- 
-
-=== modified file 'modules/Makefile'
---- modules/Makefile	2011-04-06 13:55:30 +0000
-+++ modules/Makefile	2011-04-06 13:56:42 +0000
-@@ -69,20 +69,16 @@
- # Ad hoc compilation rules for modules which need auxilliary libraries
- #
- lookup_yp.so: lookup_yp.c
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o lookup_yp.so lookup_yp.c $(AUTOFS_LIB) $(LIBNSL)
--	$(STRIP) lookup_yp.so
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o lookup_yp.so lookup_yp.c $(AUTOFS_LIB) $(LIBNSL)
- 
- lookup_nisplus.so: lookup_nisplus.c
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o lookup_nisplus.so lookup_nisplus.c \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o lookup_nisplus.so lookup_nisplus.c \
- 		$(AUTOFS_LIB) $(LIBNSL)
--	$(STRIP) lookup_nisplus.so
- 
- lookup_hesiod.so: lookup_hesiod.c
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
- 		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
--	$(STRIP) lookup_hesiod.so
- 
- lookup_ldap.so: lookup_ldap.c
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
- 		lookup_ldap.c $(AUTOFS_LIB) $(LIBLDAP)
--	$(STRIP) lookup_ldap.so
-
-=== modified file 'samples/Makefile'
---- samples/Makefile	2011-04-06 13:55:30 +0000
-+++ samples/Makefile	2011-04-06 13:56:05 +0000
-@@ -16,8 +16,7 @@
- all: $(BINS) rc.autofs
- 
- autofs-ldap-auto-master: $(OBJS)
--	$(CC) $(LDFLAGS) -o autofs-ldap-auto-master $(OBJS) $(LIBS)
--	$(STRIP) autofs-ldap-auto-master
-+	$(CC) $(AUTOFS_LDFLAGS) $(LDFLAGS) -o autofs-ldap-auto-master $(OBJS) $(LIBS)
- 
- rc.autofs: rc.autofs.in
- 	sed -e "s|@@sbindir@@|$(sbindir)|g" \
-
diff --git a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch b/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch
deleted file mode 100644
index 931ebf494878..000000000000
--- a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed-v2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur autofs-5.0.4-old/Makefile.rules autofs-5.0.4/Makefile.rules
---- autofs-5.0.4-old/Makefile.rules	2009-04-27 10:54:19.000000000 +0200
-+++ autofs-5.0.4/Makefile.rules	2009-04-27 10:55:55.000000000 +0200
-@@ -24,16 +24,16 @@
- 
- ifdef DEBUG
- CFLAGS    ?= -g -Wall -DDEBUG
--LDFLAGS   = -g
-+AUTOFS_LDFLAGS   = -g
- STRIP     = :
- else
- ifdef DONTSTRIP
- CFLAGS    ?= -O2 -g
--LDFLAGS   = -g
-+AUTOFS_LDFLAGS   = -g
- STRIP     = :
- else
- CFLAGS    ?= -O2 -Wall
--LDFLAGS   = -s
-+AUTOFS_LDFLAGS   = -s
- STRIP     = strip --strip-debug
- endif
- endif
-@@ -45,15 +45,14 @@
- SOLDFLAGS = -shared
- 
- CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
--LDFLAGS += -lpthread
- 
- ifdef TIRPCLIB
- CFLAGS += -I/usr/include/tirpc
--LDFLAGS += $(TIRPCLIB)
-+AUTOFS_LDFLAGS += $(TIRPCLIB)
- endif
- 
- ifdef DMALLOCLIB
--LDFLAGS += $(DMALLOCLIB)
-+AUTOFS_LDFLAGS += $(DMALLOCLIB)
- endif
- 
- # Standard rules
-diff -ur autofs-5.0.4-old/daemon/Makefile autofs-5.0.4/daemon/Makefile
---- autofs-5.0.4-old/daemon/Makefile	2009-04-27 10:54:19.000000000 +0200
-+++ autofs-5.0.4/daemon/Makefile	2009-04-27 10:54:37.000000000 +0200
-@@ -20,12 +20,12 @@
- CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
- CFLAGS += -DVERSION_STRING=\"$(version)\"
- LDFLAGS += -rdynamic
--LIBS = -ldl
-+LIBS = -ldl -lpthread
- 
- all: automount
- 
- automount: $(OBJS) $(AUTOFS_LIB)
--	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
-+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
- 	$(STRIP) automount
- 
- clean:
diff --git a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch b/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch
deleted file mode 100644
index ba650593b92d..000000000000
--- a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-1/2) Patch 177057 to bug #253412: use user ldflags, don't add pthreads through ldflags
-
-diff -ru a/Makefile.rules b/Makefile.rules
---- a/Makefile.rules	2009-01-01 21:54:02.000000000 -0600
-+++ b/Makefile.rules	2009-01-01 22:17:41.000000000 -0600
-@@ -24,16 +24,16 @@
- 
- ifdef DEBUG
- CFLAGS    ?= -g -Wall -DDEBUG
--LDFLAGS   = -g
-+AUTOFS_LDFLAGS   = -g
- STRIP     = :
- else
- ifdef DONTSTRIP
- CFLAGS    ?= -O2 -g
--LDFLAGS   = -g
-+AUTOFS_LDFLAGS   = -g
- STRIP     = :
- else
- CFLAGS    ?= -O2 -Wall
--LDFLAGS   = -s
-+AUTOFS_LDFLAGS   = -s
- STRIP     = strip --strip-debug
- endif
- endif
-@@ -45,10 +45,9 @@
- SOLDFLAGS = -shared
- 
- CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
--LDFLAGS += -lpthread
- 
- ifdef DMALLOCLIB
--LDFLAGS += $(DMALLOCLIB)
-+AUTOFS_LDFLAGS += $(DMALLOCLIB)
- endif
- 
- # Standard rules
-diff -ru a/daemon/Makefile b/daemon/Makefile
---- a/daemon/Makefile	2009-01-01 22:14:10.000000000 -0600
-+++ b/daemon/Makefile	2009-01-01 22:24:03.000000000 -0600
-@@ -25,7 +25,7 @@
- all: automount
- 
- automount: $(OBJS) $(AUTOFS_LIB)
--	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
-+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
- 	$(STRIP) automount
- 
- clean:
-
-
-
-2/2) Patch 177056 to bug #247969: add -lpthread the correct way (removed from LDFLAGS in above patch)
-
-diff -ru a/daemon/Makefile b/daemon/Makefile
---- a/daemon/Makefile	2009-01-01 22:14:10.000000000 -0600
-+++ b/daemon/Makefile	2009-01-01 22:21:16.000000000 -0600
-@@ -20,7 +20,7 @@
- CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
- CFLAGS += -DVERSION_STRING=\"$(version)\"
- LDFLAGS += -rdynamic
--LIBS = -ldl
-+LIBS = -ldl -lpthread
- 
- all: automount
- 
diff --git a/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch b/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
deleted file mode 100644
index 4d70d2a2f766..000000000000
--- a/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./modules/lookup_ldap.c
-+++ ./modules/lookup_ldap.c
-@@ -591,10 +591,12 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
- {
- 	LDAP *ldap;
- 
-+#ifdef HAVE_SASL
- 	if (ctxt->extern_cert && ctxt->extern_key) {
- 		set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert);
- 		set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key);
- 	}
-+#endif
- 
- 	ldap = init_ldap_connection(logopt, uri, ctxt);
- 	if (ldap) {
-@@ -1372,10 +1374,12 @@ static void free_context(struct lookup_context *ctxt)
- 		defaults_free_searchdns(ctxt->sdns);
- 	if (ctxt->dclist)
- 		free_dclist(ctxt->dclist);
-+#ifdef HAVE_SASL
- 	if (ctxt->extern_cert)
- 		free(ctxt->extern_cert);
- 	if (ctxt->extern_key)
- 		free(ctxt->extern_key);
-+#endif
- 	free(ctxt);
- 
- 	return;
diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch
deleted file mode 100644
index 3429b6f05893..000000000000
--- a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-=== modified file 'Makefile.rules'
---- Makefile.rules	2011-04-30 18:13:36 +0000
-+++ Makefile.rules	2011-04-30 18:12:37 +0000
-@@ -42,6 +42,10 @@
- AUTOFS_LDFLAGS += $(DMALLOCLIB)
- endif
- 
-+ifdef SASL
-+CFLAGS +=  $(XML_FLAGS)
-+endif
-+
- # Standard rules
- 
- .SUFFIXES: .c .o .s .so
-
-=== modified file 'lib/defaults.c'
---- lib/defaults.c	2011-04-30 18:13:36 +0000
-+++ lib/defaults.c	2011-04-30 18:12:37 +0000
-@@ -19,7 +19,10 @@
- 
- #include "list.h"
- #include "defaults.h"
-+#include "config.h"
-+#ifdef WITH_LDAP
- #include "lookup_ldap.h"
-+#endif
- #include "log.h"
- #include "automount.h"
- 
-@@ -197,6 +200,7 @@
- 	return 1;
- }
- 
-+#ifdef WITH_LDAP
- void defaults_free_uris(struct list_head *list)
- {
- 	struct list_head *next;
-@@ -252,9 +256,11 @@
- 
- 	return 1;
- }
-+#endif
- 
- struct list_head *defaults_get_uris(void)
- {
-+#ifdef WITH_LDAP
- 	FILE *f;
- 	char buf[MAX_LINE_LEN];
- 	char *res;
-@@ -288,6 +294,9 @@
- 
- 	fclose(f);
- 	return list;
-+#else
-+	return NULL;
-+#endif
- }
- 
- /*
-@@ -450,6 +459,7 @@
- 	return res;
- }
- 
-+#ifdef WITH_LDAP
- struct ldap_schema *defaults_get_default_schema(void)
- {
- 	struct ldap_schema *schema;
-@@ -645,6 +655,7 @@
- 
- 	return schema;
- }
-+#endif
- 
- unsigned int defaults_get_mount_nfs_default_proto(void)
- {
-
diff --git a/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch b/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch
deleted file mode 100644
index 7465a98a3993..000000000000
--- a/net-fs/autofs/files/autofs-5.0.6-ipv6_name_lookup_regression.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- modules/replicated.c
-+++ modules/replicated.c	
-@@ -1111,7 +1111,8 @@ static int add_host_addrs(struct host **list, const char *host,
-                          unsigned int weight, unsigned int options)
- {
- 	struct addrinfo hints, *ni, *this;
--	char *name = strdup(host);
-+	char *n_ptr;
-+	char *name = n_ptr = strdup(host);
- 	int len;
- 	char buf[MAX_ERR_BUF];
- 	int rr = 0;
-@@ -1125,15 +1126,17 @@ static int add_host_addrs(struct host **list, const char *host,
- 	}
- 	len = strlen(name);
- 
--	if (name[0] == '[' && name[--len] == ']')
-+	if (name[0] == '[' && name[--len] == ']') {
- 		name[len] = '\0';
-+		name++;
-+	}
- 
- 	memset(&hints, 0, sizeof(hints));
- 	hints.ai_flags = AI_NUMERICHOST;
- 	hints.ai_family = AF_UNSPEC;
- 	hints.ai_socktype = SOCK_DGRAM;
- 
--	ret = getaddrinfo(name + 1, NULL, &hints, &ni);
-+	ret = getaddrinfo(name, NULL, &hints, &ni);
- 	if (ret)
- 		goto try_name;
- 
-@@ -1153,7 +1156,7 @@ try_name:
- 	hints.ai_family = AF_UNSPEC;
- 	hints.ai_socktype = SOCK_DGRAM;
- 
--	ret = getaddrinfo(name + 1, NULL, &hints, &ni);
-+	ret = getaddrinfo(name, NULL, &hints, &ni);
- 	if (ret) {
- 		error(LOGOPT_ANY, "hostname lookup failed: %s",
- 			gai_strerror(ret));
-@@ -1172,7 +1175,7 @@ try_name:
- 	}
- 	freeaddrinfo(ni);
- done:
--	free(name);
-+	free(n_ptr);
- 	return ret;
- }
diff --git a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch b/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch
deleted file mode 100644
index a61696b6fb16..000000000000
--- a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/Makefile.conf.in
-+++ b/Makefile.conf.in
-@@ -100,3 +100,6 @@ initdir = @initdir@
- 
- # Location of systemd unit files
- systemddir = @systemddir@
-+
-+# Use the compiler determined by configure
-+CC := @CC@
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -16,44 +16,30 @@ INSTALLROOT = $(DESTDIR)
- AUTOFS_LIB = ../lib/autofs.a
- 
- # Compilers, linkers and flags
--# The STRIP defined here *must not* remove any dynamic-loading symbols
--
- ifdef DMALLOCLIB
- DEBUG=1
- endif
- 
- ifdef DEBUG
- CFLAGS    ?= -g -Wall -DDEBUG
--LDFLAGS   = -g
--STRIP     = :
- else
--ifdef DONTSTRIP
- CFLAGS    ?= -O2 -g
--LDFLAGS   = -g
--STRIP     = :
--else
--CFLAGS    ?= -O2 -Wall
--LDFLAGS   = -s
--STRIP     = strip --strip-debug
--endif
- endif
-+AUTOFS_LDFLAGS = -g
- 
--CC        = gcc
--CXX       = g++
- CXXFLAGS  = $(CFLAGS)
- LD        = ld
- SOLDFLAGS = -shared
- 
- CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
--LDFLAGS += -lpthread
- 
- ifdef TIRPCLIB
- CFLAGS += -I/usr/include/tirpc
--LDFLAGS += $(TIRPCLIB)
-+AUTOFS_LDFLAGS += $(TIRPCLIB)
- endif
- 
- ifdef DMALLOCLIB
--LDFLAGS += $(DMALLOCLIB)
-+AUTOFS_LDFLAGS += $(DMALLOCLIB)
- endif
- 
- ifdef SASL
-@@ -71,5 +57,4 @@ endif
- 	$(CC) $(CFLAGS) -S $<
- 
- .c.so:
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
--	$(STRIP) $*.so
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
---- a/configure.in
-+++ b/configure.in
-@@ -183,7 +183,7 @@ AC_ARG_WITH(hesiod,
- 		: Search for Hesiod in normal directory path
- 	else
- 		: Search for Hesiod in specific directory
--		LDFLAGS="$LDFLAGS -L${withval}/lib"
-+		LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib"
- 		LIBHESIOD="-L${withval}/lib"
- 		HESIOD_FLAGS="-I${withval}/include"
- 	fi
---- a/daemon/Makefile
-+++ b/daemon/Makefile
-@@ -2,8 +2,8 @@
- # Makefile for autofs
- #
- 
---include ../Makefile.conf
- include ../Makefile.rules
-+-include ../Makefile.conf
- 
- SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
- 	lookup.c state.c flag.c
-@@ -20,7 +20,7 @@ CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfi
- CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
- CFLAGS += -DVERSION_STRING=\"$(version)\"
- LDFLAGS += -rdynamic
--LIBS = -ldl
-+LIBS = -ldl -lpthread
- 
- ifeq ($(LDAP), 1)
-     CFLAGS += $(XML_FLAGS)
-@@ -30,8 +30,7 @@ endif
- all: automount
- 
- automount: $(OBJS) $(AUTOFS_LIB)
--	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
--	$(STRIP) automount
-+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
- 
- clean:
- 	rm -f *.o *.s *~ automount
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -41,14 +41,12 @@ mount_clnt.c: mount.h
- 
- mount_clnt.o: mount_clnt.c
- 	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
--	$(STRIP) mount_clnt.o
- 
- mount_xdr.c: mount.h
- 	$(RPCGEN) -c -o mount_xdr.c mount.x
- 
- mount_xdr.o: mount_xdr.c
- 	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
--	$(STRIP) mount_xdr.o
- 
- master_tok.c: master_tok.l
- 	$(LEX) -o$@ -Pmaster_ $?
---- a/modules/Makefile
-+++ b/modules/Makefile
-@@ -87,9 +87,8 @@ endif
- # Ad hoc compilation rules for modules which need auxilliary libraries
- #
- lookup_hesiod.so: lookup_hesiod.c
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
- 		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
--	$(STRIP) lookup_hesiod.so
- 
- cyrus-sasl.o: cyrus-sasl.c
- 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
-@@ -98,13 +97,10 @@ cyrus-sasl-extern.o: cyrus-sasl-extern.c
- 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
- 
- lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ)
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
- 		lookup_ldap.c dclist.o base64.o $(SASL_OBJ) \
- 		$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
--	$(STRIP) lookup_ldap.so
- 
- mount_nfs.so: mount_nfs.c replicated.o
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
- 		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
--	$(STRIP) mount_nfs.so
--
diff --git a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch b/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch
deleted file mode 100644
index 276eb27d1f58..000000000000
--- a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch
+++ /dev/null
@@ -1,160 +0,0 @@
---- Makefile.conf.in
-+++ Makefile.conf.in
-@@ -95,3 +95,5 @@
- # Location for init.d files
- initdir = @initdir@
- 
-+# Use the compiler determined by configure
-+CC := @CC@
-
---- Makefile.rules
-+++ Makefile.rules
-@@ -16,44 +16,30 @@
- AUTOFS_LIB = ../lib/autofs.a
- 
- # Compilers, linkers and flags
--# The STRIP defined here *must not* remove any dynamic-loading symbols
--
- ifdef DMALLOCLIB
- DEBUG=1
- endif
- 
- ifdef DEBUG
- CFLAGS    ?= -g -Wall -DDEBUG
--LDFLAGS   = -g
--STRIP     = :
- else
--ifdef DONTSTRIP
- CFLAGS    ?= -O2 -g
--LDFLAGS   = -g
--STRIP     = :
--else
--CFLAGS    ?= -O2 -Wall
--LDFLAGS   = -s
--STRIP     = strip --strip-debug
--endif
--endif
-+endif
-+AUTOFS_LDFLAGS = -g
- 
--CC        = gcc
--CXX       = g++
- CXXFLAGS  = $(CFLAGS)
- LD        = ld
- SOLDFLAGS = -shared
- 
- CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
--LDFLAGS += -lpthread
- 
- ifdef TIRPCLIB
- CFLAGS += -I/usr/include/tirpc
--LDFLAGS += $(TIRPCLIB)
-+AUTOFS_LDFLAGS += $(TIRPCLIB)
- endif
- 
- ifdef DMALLOCLIB
--LDFLAGS += $(DMALLOCLIB)
-+AUTOFS_LDFLAGS += $(DMALLOCLIB)
- endif
- 
- # Standard rules
-@@ -67,5 +53,4 @@
- 	$(CC) $(CFLAGS) -S $<
- 
- .c.so:
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
--	$(STRIP) $*.so
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
-
---- configure.in
-+++ configure.in
-@@ -174,7 +174,7 @@
- 		: Search for Hesiod in normal directory path
- 	else
- 		: Search for Hesiod in specific directory
--		LDFLAGS="$LDFLAGS -L${withval}/lib"
-+		LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib"
- 		LIBHESIOD="-L${withval}/lib"
- 		HESIOD_FLAGS="-I${withval}/include"
- 	fi
-
---- daemon/Makefile
-+++ daemon/Makefile
-@@ -2,8 +2,8 @@
- # Makefile for autofs
- #
- 
-+include ../Makefile.rules
- -include ../Makefile.conf
--include ../Makefile.rules
- 
- SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
- 	lookup.c state.c flag.c
-@@ -20,7 +20,7 @@
- CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
- CFLAGS += -DVERSION_STRING=\"$(version)\"
- LDFLAGS += -rdynamic
--LIBS = -ldl
-+LIBS = -ldl -lpthread
- 
- ifeq ($(LDAP), 1)
-     CFLAGS += $(XML_FLAGS)
-@@ -30,8 +30,7 @@
- all: automount
- 
- automount: $(OBJS) $(AUTOFS_LIB)
--	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
--	$(STRIP) automount
-+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
- 
- clean:
- 	rm -f *.o *.s *~ automount
-
---- lib/Makefile
-+++ lib/Makefile
-@@ -41,14 +41,12 @@
- 
- mount_clnt.o: mount_clnt.c
- 	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
--	$(STRIP) mount_clnt.o
- 
- mount_xdr.c: mount.h
- 	$(RPCGEN) -c -o mount_xdr.c mount.x
- 
- mount_xdr.o: mount_xdr.c
- 	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
--	$(STRIP) mount_xdr.o
- 
- master_tok.c: master_tok.l
- 	$(LEX) -o$@ -Pmaster_ $?
-
---- modules/Makefile
-+++ modules/Makefile
-@@ -85,9 +85,8 @@
- # Ad hoc compilation rules for modules which need auxilliary libraries
- #
- lookup_hesiod.so: lookup_hesiod.c
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
- 		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
--	$(STRIP) lookup_hesiod.so
- 
- cyrus-sasl.o: cyrus-sasl.c
- 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
-@@ -96,13 +95,10 @@
- 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
- 
- lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ)
--	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
- 		lookup_ldap.c dclist.o base64.o $(SASL_OBJ) \
- 		$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
--	$(STRIP) lookup_ldap.so
- 
- mount_nfs.so: mount_nfs.c replicated.o
--	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
-+	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
- 		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
--	$(STRIP) mount_nfs.so
--
-
diff --git a/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch b/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch
deleted file mode 100644
index 670d9bc7c547..000000000000
--- a/net-fs/autofs/files/autofs-5.0.7-mount-sloppy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/453778
-
-we've had a stable util-linux that supports -s for a long time (and the ebuild
-forces a recent version), so disable this test which implicitly tries to modify
-files like /etc/mtab and piss off the sandbox.
-
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -65,7 +65,7 @@
- AC_DEFUN(AF_SLOPPY_MOUNT,
- [if test -n "$MOUNT" ; then
-   AC_MSG_CHECKING([if mount accepts the -s option])
--  if "$MOUNT" -s > /dev/null 2>&1 ; then
-+  if true > /dev/null 2>&1 ; then
-     AC_DEFINE(HAVE_SLOPPY_MOUNT, 1, [define if the mount command supports the -s option])
-     AC_MSG_RESULT(yes)
-   else
diff --git a/net-fs/autofs/files/autofs.rc12 b/net-fs/autofs/files/autofs.rc12
deleted file mode 100644
index 9fdfc20bdd98..000000000000
--- a/net-fs/autofs/files/autofs.rc12
+++ /dev/null
@@ -1,288 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc12,v 1.1 2005/03/15 04:18:38 robbat2 Exp $
-
-# rc file for automount using a Sun-style "master map".
-# We first look for a local /etc/autofs/auto.master, then a YP
-# map with that name
-
-DAEMON=/usr/sbin/automount
-SYSCONFDIR=/etc/autofs
-
-depend() {
-	need localmount	
-	use ypbind nfs slapd portmap net
-}
-
-opts="start stop status stats reload restart"
-
-# this file is used to avoid the subshell-die problem
-TMPSRC=/var/run/autofs.tmp
-
-#
-# Check for all maps that are to be loaded
-#
-function getschemes() {
-	schemes="$(awk '/^automount:/{ $1="" ; gsub("\\[.*\\]","") ; print $0 }' /etc/nsswitch.conf)"
-	# have a default entry
-	[ -z "$schemes" ] && echo 'files' || echo $schemes
-}
-
-function getfilemounts() {
-	if [ -f /etc/autofs/auto.master ] ; then
-		sed -e '/^#/d' -e '/^$/d' < /etc/autofs/auto.master
-	fi
-}
-
-function catnismap() {
-	[ -z "$1" ] && map="auto_master" || map="$1"
-	/usr/bin/ypcat -k ${map} 2> /dev/null | sed -e '/^#/d' -e '/^$/d'
-}
-
-function getnismounts() {
-        YPMAP="$(catnismap auto.master)"
-        if [ -z "$YPMAP" ]; then
-                catnismap
-        else
-                catnismap auto.master
-        fi
-}
-
-function getldapmounts() {
-	autofs_lam=/usr/lib/autofs/autofs-ldap-auto-master
-	if [ -f $autofs_lam -a -x $autofs_lam ]; then
-		${autofs_lam} \
-		-m ${ldap_map_oc} -e ${ldap_entry_oc} \
-		-n ${ldap_map_key} -k ${ldap_entry_key} \
-		-v ${ldap_value} 2> /dev/null
-	fi
-}
-
-function getrawmounts()
-{
-	for scheme in `getschemes` ; do
-		case "$scheme" in
-			files)
-				getfilemounts
-				;;
-			nis*)
-				getnismounts
-				;;
-			ldap*)
-				getldapmounts
-				;;
-		esac
-	done
-}
-
-
-#
-# This function will build a list of automount commands to execute in
-# order to activate all the mount points. It is used to figure out
-# the difference of automount points in case of a reload
-#
-function getmounts()
-{
-	knownmaps=" "
-	# seperate storage variable to avoid clobbering the other $TMPSRC
-	TMPSRC_mounts="$TMPSRC.mounts"
-	getrawmounts >$TMPSRC_mounts
-	while read dir map options
-	do
-		# These checks screen out duplicates and skip over directories
-		# where the map is '-'.
-		if [ ! -z "$dir" -a ! -z "$map" \
-			-a "x${map:0:1}" != "x-" \
-			-a "`echo "$knownmaps" | grep -w $dir/`" = "" ]; then
-		# If the options include a -t or --timeout parameter, then
-		# pull those particular options out.
-		# echo DAEMONOPTIONS OPTIONS $daemonoptions $options
-		startupoptions=""
-		opt_timeout=""
-		opt_pidfile=""
-		opt_verbose=""
-		opt_debug=""
-		opt_ghost=""
-
-		# use getopt to parse all of it
-		#getopteval="$(getopt -q -o -t:p:vdg --long timeout:,pid-file:,verbose,debug,ghost -- "$daemonoptions $options") "
-		getopt_input="$daemonoptions $options"
-		getopt_eval="$(getopt -q -o -t:vdg --long timeout:,verbose,debug,ghost -- $getopt_input) "
-		eval set -- "${getopt_eval}"
-		while [ -n "$1" ]; do
-			#-p|--pid-file) opt_pidfile="$2" ; shift 2 ;;
-			case $1 in
-				-t|--timeout) opt_timeout="$2" ; shift 2 ;;
-				-v|--verbose) opt_verbose="--verbose" ; shift ;;
-				-d|--debug) opt_debug="--debug" ; shift ;;
-				-g|--ghost) opt_ghost="--ghost" ; shift ;;
-				--) shift ; break ;;
-				*) shift ;; # just ignore other params for now
-			esac
-		done
-		# build the parameters	
-		[ -n "${opt_timeout}" ] && startupoptions="${startupoptions} --timeout ${opt_timeout}"
-		#[ -n "${opt_pidfile}" ] && startupoptions="${startupoptions} --pid-file ${opt_pidfile}"
-		startupoptions="${startupoptions} ${opt_ghost} ${opt_verbose} ${opt_debug}"
-
-		# Other option flags are intended for maps.
-		# unfortuntely this can't be integrated with the above getopt(1)
-		mapoptions="$(echo $daemonoptions $options | sed  \
-			-e '/-t/{s/--*t\(imeout\)*[[:space:]=]*\([0-9][0-9]*\)//g }' \
-			-e '/-v/{s/--*v\(erbose\)*//g }' \
-			-e '/-d/{s/--*d\(ebug\)*//g }' \
-			-e '/-g/{s/--*g\(host\)*//g }' \
-			-e 's/^[[:space:]]*//g' \
-			-e 's/[[:space:]]*$//g')"
-			#-e '/-p/{s/--*p\(id-file\)*[[:space:]=]*\([^[:space:]]*\)//g }' \
-
-		# Break up the maptype and map, if the map type is specified
-		maptype="${map/:*}"
-		# Handle degenerate map specifiers
-		if [ "$maptype" = "$map" ] ; then
-			if [ -x "$map" ]; then
-				maptype="program"
-			elif [ -x "/etc/$map" ]; then
-				maptype="program"
-				map="/etc/$map"
-				map="${map//\/\//\/}" # strip doubles
-			elif [ -f "$map" ]; then
-				maptype="file"
-			elif [ -f "/etc/$map" ]; then
-				maptype="file"
-				map="/etc/$map"
-				map="${map//\/\//\/}" # strip doubles
-			elif [ "$map" = "hesiod" -o "$map" = "userhome" ] ; then
-				maptype="$map"
-				map=
-			elif [ "$map" = "multi" ] ; then
-				maptype="$map"
-				map=
-			else
-				maptype=yp
-				map="${map/*\/}" # same as "basename $map"
-				map="${map/#auto_/auto.}" # echo $map | sed -e 's/^auto_home/auto.home/' -e 's/^auto_mnt/auto.mnt/'
-			fi
-		fi
-		map="${map#*:}"
-
-		#echo >>/tmp/debug
-		#date >>/tmp/debug
-		#echo STARTUPOPTIONS $startupoptions >> /tmp/debug
-		#echo DIR $dir >> /tmp/debug
-		#echo MAPTYPE $maptype >> /tmp/debug
-		#echo MAP $map >> /tmp/debug
-		#echo MAPOPTIONS $mapoptions >> /tmp/debug
-		#echo LOCALOPTIONS $localoptions >> /tmp/debug
-		#echo OPTIONS $options >>/tmp/debug
-		#echo GETOPT_INPUT $getopt_input >>/tmp/debug
-
-		[ -z "${startupoptions}" ] && startupoptions=" " # to make life easier later
-		# protect startupoptions with _X_ to use it later
-		cmdline="$DAEMON ${startupoptions// /_X_} $dir $maptype $map ${mapoptions} ${localoptions}"
-		# leave out the " so that white space gets compressed
-		echo ${cmdline}
-
-		# echo ------------------------
-		fi
-		knownmaps=" $dir/ $knownmaps"
-	done <$TMPSRC_mounts
-	rm -f $TMPSRC_mounts
-}
-
-
-start() {
-	ebegin "Starting automounter"
-	# ensure autofs support is loaded
-	grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs
-	if [ $? -ne 0 ]; then
-		eend 1 "No autofs support available"
-		return 1
-	fi
-	
-	getmounts >$TMPSRC
-
-	# Check that maps exist
-	if [ ! -s $TMPSRC ]; then
-		eend 1 "No automount maps defined"
-		return 1
-	fi
-	
-	while read cmd startupopts mnt rest ; do
-		pidfile=/var/run/autofs${mnt//\//.}.pid
-		startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )"
-		bin="/usr/sbin/automount"
-		params="$(echo $startupopts $mnt $rest)"
-
-		echo -n " $mnt"
-		#echo " $mnt ($params)"
-
-		start-stop-daemon --start --pidfile $pidfile --quiet \
-			--exec ${bin} -- ${params}
-		#ps ax | grep "[0-9]:[0-9][0-9] ${bin} ${params}" | (
-		#	read pid rest
-		#	echo $pid > $pidfile
-		#	echo "$mnt $rest" >> $pidfile
-		#)
-		if [ $? -ne 0 ]; then
-			eerror "Failure on $mnt"
-		else
-			echo "${params}" >> $pidfile
-		fi
-	done < $TMPSRC
-	# clean up
-	rm -f $TMPSRC
-
-	echo
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping automounter"
-	start-stop-daemon --stop --quiet --signal USR2 --exec /usr/sbin/automount
-	eend $?
-}
-
-stats() {
-	echo "Configured Mount Points:"
-	echo "------------------------"
-	getmounts >$TMPSRC
-	while read cmd startupopts mnt rest ; do
-		pidfile=/var/run/autofs${mnt//\//.}.pid
-		startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )"
-		params="$(echo $startupopts $mnt $rest)"
-		echo $cmd $params
-	done <$TMPSRC
-	rm -f $TMPSRC
-	echo ""
-	echo "Active Mount Points:"
-	echo "--------------------"
-	ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | (
-		while read pid tt stat time command; do echo $command; done
-	)
-}
-
-reload() {
-	echo "Reloading automounter: checking for changes ... "
-	getmounts >$TMPSRC
-	for i in /var/run/autofs.*.pid
-	do
-		pid=`head -n 1 $i 2>/dev/null`
-		[ -z "$pid" ] && continue
-		command=`tail -n +2 $i`
-		if ! grep -q "^$command" $TMPSRC
-		then
-			echo "Stopping automounter: $command"
-			kill -USR2 $pid
-		fi
-	done
-	rm -f $TMPSRC
-	svc_start
-}
-
-restart() {
-	svc_stop
-	svc_start
-}	
diff --git a/net-fs/autofs/files/autofs.rc13 b/net-fs/autofs/files/autofs.rc13
deleted file mode 100644
index 6d2a0d71f314..000000000000
--- a/net-fs/autofs/files/autofs.rc13
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs.rc13,v 1.1 2008/01/24 10:09:19 stefaan Exp $
-
-# rc file for automount using a Sun-style "master map".
-# We first look for a local /etc/autofs/auto.master, then a YP
-# map with that name
-
-DAEMON=/usr/sbin/automount
-SYSCONFDIR=/etc/autofs
-
-depend() {
-	need localmount	
-	use ypbind nfs slapd portmap net
-}
-
-opts="start stop status stats reload restart"
-
-# this file is used to avoid the subshell-die problem
-TMPSRC=/var/run/autofs.tmp
-
-#
-# Check for all maps that are to be loaded
-#
-function getschemes() {
-	schemes="$(awk '/^automount:/{ $1="" ; gsub("\\[.*\\]","") ; print $0 }' /etc/nsswitch.conf)"
-	# have a default entry
-	[ -z "$schemes" ] && echo 'files' || echo $schemes
-}
-
-function getfilemounts() {
-	if [ -f /etc/autofs/auto.master ] ; then
-		sed -e '/^#/d' -e '/^$/d' < /etc/autofs/auto.master
-	fi
-}
-
-function catnismap() {
-	[ -z "$1" ] && map="auto_master" || map="$1"
-	/usr/bin/ypcat -k ${map} 2> /dev/null | sed -e '/^#/d' -e '/^$/d'
-}
-
-function getnismounts() {
-        YPMAP="$(catnismap auto.master)"
-        if [ -z "$YPMAP" ]; then
-                catnismap
-        else
-                catnismap auto.master
-        fi
-}
-
-function getldapmounts() {
-	autofs_lam=/usr/lib/autofs/autofs-ldap-auto-master
-	if [ -f $autofs_lam -a -x $autofs_lam ]; then
-		${autofs_lam} \
-		-m ${ldap_map_oc} -e ${ldap_entry_oc} \
-		-n ${ldap_map_key} -k ${ldap_entry_key} \
-		-v ${ldap_value} 2> /dev/null
-	fi
-}
-
-function getrawmounts()
-{
-	for scheme in `getschemes` ; do
-		case "$scheme" in
-			files)
-				getfilemounts
-				;;
-			nis*)
-				getnismounts
-				;;
-			ldap*)
-				getldapmounts
-				;;
-		esac
-	done
-}
-
-
-#
-# This function will build a list of automount commands to execute in
-# order to activate all the mount points. It is used to figure out
-# the difference of automount points in case of a reload
-#
-function getmounts()
-{
-	knownmaps=" "
-	# seperate storage variable to avoid clobbering the other $TMPSRC
-	TMPSRC_mounts="$TMPSRC.mounts"
-	getrawmounts >$TMPSRC_mounts
-	while read dir map options
-	do
-		# These checks screen out duplicates and skip over directories
-		# where the map is '-'.
-		if [ ! -z "$dir" -a ! -z "$map" \
-			-a "x${map:0:1}" != "x-" \
-			-a "`echo "$knownmaps" | grep -w $dir/`" = "" ]; then
-		# If the options include a -t or --timeout parameter, then
-		# pull those particular options out.
-		# echo DAEMONOPTIONS OPTIONS $daemonoptions $options
-		startupoptions=""
-		opt_timeout=""
-		opt_pidfile=""
-		opt_verbose=""
-		opt_debug=""
-		opt_ghost=""
-
-		# use getopt to parse all of it
-		#getopteval="$(getopt -q -o -t:p:vdg --long timeout:,pid-file:,verbose,debug,ghost -- "$daemonoptions $options") "
-		getopt_input="$daemonoptions $options"
-		getopt_eval="$(getopt -q -o -t:vdg --long timeout:,verbose,debug,ghost -- $getopt_input) "
-		eval set -- "${getopt_eval}"
-		while [ -n "$1" ]; do
-			#-p|--pid-file) opt_pidfile="$2" ; shift 2 ;;
-			case $1 in
-				-t|--timeout) opt_timeout="$2" ; shift 2 ;;
-				-v|--verbose) opt_verbose="--verbose" ; shift ;;
-				-d|--debug) opt_debug="--debug" ; shift ;;
-				-g|--ghost) opt_ghost="--ghost" ; shift ;;
-				--) shift ; break ;;
-				*) shift ;; # just ignore other params for now
-			esac
-		done
-		# build the parameters	
-		[ -n "${opt_timeout}" ] && startupoptions="${startupoptions} --timeout ${opt_timeout}"
-		#[ -n "${opt_pidfile}" ] && startupoptions="${startupoptions} --pid-file ${opt_pidfile}"
-		startupoptions="${startupoptions} ${opt_ghost} ${opt_verbose} ${opt_debug}"
-
-		# Other option flags are intended for maps.
-		# unfortuntely this can't be integrated with the above getopt(1)
-		mapoptions="$(echo $daemonoptions $options | sed  \
-			-e '/-t/{s/--*t\(imeout\)*[[:space:]=]*\([0-9][0-9]*\)//g }' \
-			-e '/-v/{s/--*v\(erbose\)*//g }' \
-			-e '/-d/{s/--*d\(ebug\)*//g }' \
-			-e '/-g/{s/--*g\(host\)*//g }' \
-			-e 's/^[[:space:]]*//g' \
-			-e 's/[[:space:]]*$//g')"
-			#-e '/-p/{s/--*p\(id-file\)*[[:space:]=]*\([^[:space:]]*\)//g }' \
-
-		# Break up the maptype and map, if the map type is specified
-		maptype="${map/:*}"
-		# Handle degenerate map specifiers
-		if [ "$maptype" = "$map" ] ; then
-			if [ -x "$map" ]; then
-				maptype="program"
-			elif [ -x "/etc/$map" ]; then
-				maptype="program"
-				map="/etc/$map"
-				map="${map//\/\//\/}" # strip doubles
-			elif [ -f "$map" ]; then
-				maptype="file"
-			elif [ -f "/etc/$map" ]; then
-				maptype="file"
-				map="/etc/$map"
-				map="${map//\/\//\/}" # strip doubles
-			elif [ "$map" = "hesiod" -o "$map" = "userhome" ] ; then
-				maptype="$map"
-				map=
-			elif [ "$map" = "multi" ] ; then
-				maptype="$map"
-				map=
-			else
-				maptype=yp
-				map="${map/*\/}" # same as "basename $map"
-				map="${map/#auto_/auto.}" # echo $map | sed -e 's/^auto_home/auto.home/' -e 's/^auto_mnt/auto.mnt/'
-			fi
-		fi
-		map="${map#*:}"
-
-		#echo >>/tmp/debug
-		#date >>/tmp/debug
-		#echo STARTUPOPTIONS $startupoptions >> /tmp/debug
-		#echo DIR $dir >> /tmp/debug
-		#echo MAPTYPE $maptype >> /tmp/debug
-		#echo MAP $map >> /tmp/debug
-		#echo MAPOPTIONS $mapoptions >> /tmp/debug
-		#echo LOCALOPTIONS $localoptions >> /tmp/debug
-		#echo OPTIONS $options >>/tmp/debug
-		#echo GETOPT_INPUT $getopt_input >>/tmp/debug
-
-		[ -z "${startupoptions}" ] && startupoptions=" " # to make life easier later
-		# protect startupoptions with _X_ to use it later
-		cmdline="$DAEMON ${startupoptions// /_X_} $dir $maptype $map ${mapoptions} ${localoptions}"
-		# leave out the " so that white space gets compressed
-		echo ${cmdline}
-
-		# echo ------------------------
-		fi
-		knownmaps=" $dir/ $knownmaps"
-	done <$TMPSRC_mounts
-	rm -f $TMPSRC_mounts
-}
-
-
-start() {
-	ebegin "Starting automounter"
-	# ensure autofs support is loaded
-	grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs
-	if [ $? -ne 0 ]; then
-		eend 1 "No autofs support available"
-		return 1
-	fi
-	
-	getmounts >$TMPSRC
-
-	# Check that maps exist
-	if [ ! -s $TMPSRC ]; then
-		eend 1 "No automount maps defined"
-		return 1
-	fi
-	
-	while read cmd startupopts mnt rest ; do
-		pidfile=/var/run/autofs${mnt//\//.}.pid
-		startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )"
-		bin="/usr/sbin/automount"
-		params="$(echo $startupopts $mnt $rest)"
-
-		echo -n " $mnt"
-		#echo " $mnt ($params)"
-
-		start-stop-daemon --start --pidfile $pidfile --quiet \
-			--exec ${bin} -- ${params}
-		#ps ax | grep "[0-9]:[0-9][0-9] ${bin} ${params}" | (
-		#	read pid rest
-		#	echo $pid > $pidfile
-		#	echo "$mnt $rest" >> $pidfile
-		#)
-		# Omitted these five lines, see http://bugs.gentoo.org/110887
-		#if [ $? -ne 0 ]; then
-		#	eerror "Failure on $mnt"
-		#else
-		#	echo "${params}" >> $pidfile
-		#fi
-	done < $TMPSRC
-	# clean up
-	rm -f $TMPSRC
-
-	echo
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping automounter"
-	start-stop-daemon --stop --quiet --signal USR2 --exec /usr/sbin/automount
-	eend $?
-}
-
-stats() {
-	echo "Configured Mount Points:"
-	echo "------------------------"
-	getmounts >$TMPSRC
-	while read cmd startupopts mnt rest ; do
-		pidfile=/var/run/autofs${mnt//\//.}.pid
-		startupopts="$(echo ${startupopts//_X_/ } --pid-file ${pidfile} )"
-		params="$(echo $startupopts $mnt $rest)"
-		echo $cmd $params
-	done <$TMPSRC
-	rm -f $TMPSRC
-	echo ""
-	echo "Active Mount Points:"
-	echo "--------------------"
-	ps ax|grep "[0-9]:[0-9][0-9] /usr/sbin/automount " | (
-		while read pid tt stat time command; do echo $command; done
-	)
-}
-
-reload() {
-	echo "Reloading automounter: checking for changes ... "
-	getmounts >$TMPSRC
-	for i in /var/run/autofs.*.pid
-	do
-		pid=`head -n 1 $i 2>/dev/null`
-		[ -z "$pid" ] && continue
-		command=`tail -n +2 $i`
-		if ! grep -q "^$command" $TMPSRC
-		then
-			echo "Stopping automounter: $command"
-			kill -USR2 $pid
-		fi
-	done
-	rm -f $TMPSRC
-	svc_start
-}
-
-restart() {
-	svc_stop
-	svc_start
-}	
diff --git a/net-fs/autofs/files/autofs5.rc1 b/net-fs/autofs/files/autofs5.rc1
deleted file mode 100644
index 9e4252adf3ea..000000000000
--- a/net-fs/autofs/files/autofs5.rc1
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/files/autofs5.rc1,v 1.1 2008/02/05 12:32:20 stefaan Exp $
-
-DAEMON=/usr/sbin/automount
-PIDFILE=/var/run/autofs.pid
-
-depend() {
-	need localmount	
-	use ypbind nfs slapd portmap net
-}
-
-opts="start stop restart status reload"
-
-start() {
-	ebegin "Starting automounter"
-
-	# ensure autofs support is loaded
-	grep -q autofs /proc/filesystems || modprobe -q autofs4 || modprobe -q autofs
-	if [ $? -ne 0 ]; then
-		eend 1 "No autofs support available"
-		return 1
-	fi
-	
-	start-stop-daemon --start --exec ${DAEMON} -- -p ${PIDFILE} ${daemonoptions}
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping automounter"
-	start-stop-daemon --stop --quiet --signal TERM -p ${PIDFILE}
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading automounter"
-	kill -HUP $(cat ${PIDFILE})
-	eend $?
-}
-