Version bump, bug #324961 thank Dustin Polke for this job.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

8 files changed, 426 insertions, 2 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 5e74c8bed438..00603ceec3b0 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.101 2011/04/03 17:55:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.102 2011/04/06 14:10:32 pva Exp $
+
+*autofs-4.1.4 (06 Apr 2011)
+
+  06 Apr 2011; Peter Volkov <pva@gentoo.org> +autofs-4.1.4.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:
+  Version bump, bug #324961 thank Dustin Polke for this job.
 
 *autofs-5.0.5-r2 (03 Apr 2011)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index e504bb60c556..0db52153275b 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -2,6 +2,11 @@ AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f
 AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
 AUX auto.net 1134 RMD160 6396a1d4faac5e9a2bf0f83d53fa7e3c578840f9 SHA1 7a6c88657d22630f688ca80cc5ca782a93eb33f0 SHA256 5ff54fb5e8588b7e7503fca90cad179acec1dbe85a4b81f9c2320151f6b34602
 AUX autofs-4.1.3-signal-race-fix.patch 426 RMD160 1cd4bdc099d29e75d5b6833ffbd2c93f22bf4a3d SHA1 31d20235bd414e8a74de19d951e3f7cf3b61c035 SHA256 1f7f25ce97546c038b71cb9a4ba7dd1fe88e9cd66f0fc34c8411fd76bd7b60de
+AUX autofs-4.1.4-clean-up-maps.patch 1779 RMD160 eeeb76e4aefddbf0a389a6ebd037de3974cad3f0 SHA1 7494a2f630abc348510c0ef417de33c90d900287 SHA256 e7e782016fd1af945107805eac243c0d6355b13366932c7d25447013c5a2c445
+AUX autofs-4.1.4-fix-install-ldap-samples-and-maps.patch 2645 RMD160 d2c1794dbb291e716e0712bc3d556cb195d8b8ba SHA1 219d6758f090cbb756380b5067aa9ad916fe2092 SHA256 188e73bcee6e2a10e1b5957a59a48ba1df7af534535e84359aaffb6f3e5986e7
+AUX autofs-4.1.4-fix-man-pages.patch 1397 RMD160 5fb831758d8a4daaae347a46e888102f258f2993 SHA1 697c4404aa48b3d2266f118473fb11aa04257bcc SHA256 2ad7f542990b74ac0113afacfaf703b45d925477d098c013c14717ca7a5a540d
+AUX autofs-4.1.4-init.patch 336 RMD160 3abc496d3e2f9b7267f4a645775fa63e9c24e694 SHA1 a3022d60a11257b8072299e7b7036ea37ae8af11 SHA256 886825df108b48ca8eb86a92b627e1c61d4509a5b2c2a8404953b35c0e8207d4
+AUX autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch 4223 RMD160 2e782926682b81408a2098b80ce7a19783eaa80d SHA1 65d85218dcded570e375214766d8b6f5df4c61d5 SHA256 6151293e89dfce612d3a05393293b4167b42dff74c8e75be480e4648455357e0
 AUX autofs-5.0.3-heimdal.patch 1380 RMD160 ed40e452a7648aec1b25e1002c99929be97b8bf9 SHA1 3f7d05c14e52a9a8160a43a38a7b736bb81bb68b SHA256 ca62546abf6b6ae2ed95f53d439d25770f20e70651fdaf5a0edf9d69920b108a
 AUX autofs-5.0.3-map-patch-fix.patch 2543 RMD160 3be39a53ddc5125b9ca09f636f3099c02b15de20 SHA1 4d0613ba4c9f51b1bdfdc2f854f02b0acc2681fa SHA256 7a905f5784b9ecddb757cc998033827b58c2c3f4ea514fd746d1d99d8f0f1d5b
 AUX autofs-5.0.4-user-ldflags-and-as-needed-v2.patch 1520 RMD160 ab22c45f92eca01abeaaba9546263340de8e5c9b SHA1 c91af03a8b61458127a9a37c8bab3941fff3942c SHA256 6a772377a5e37e1056ca337d22dcbdeb3fd5667947d5e728288eaa8fed86912f
@@ -26,6 +31,8 @@ DIST autofs-4.1.3-replicated_server_select.patch 962 RMD160 52f13fed9e443e0810d3
 DIST autofs-4.1.3-sock-leak-fix.patch 1236 RMD160 09ca250b5711d04336f61fb7a227d99ae2b4d053 SHA1 995838278a74211eb537202f4c918302bd38fa38 SHA256 6aaa548688e7d48eb735dfa9acb1c097b82f8ef68a3ca30aab70a92b9b36453b
 DIST autofs-4.1.3-strict.patch 1626 RMD160 8527db5b40eb7d0bf7fcc6f47a5be5beb22905d3 SHA1 fa51323f0546a8b493bf3daebe7d5e40fd43b288 SHA256 518a7930cb6bad18f045dfc493ce39816e6fbce0f80c444dd75a33d722a8caff
 DIST autofs-4.1.3.tar.bz2 125234 RMD160 7df2839fce00222609bd7977a9d6275276e232b4 SHA1 ad7727e15c0ce35f3ad3a7cd2984197cf951f44f SHA256 9257a603815ee8c8d0f2935ff3c254b23f8007eee5fa8c9bf2e3661fdc171035
+DIST autofs-4.1.4-patches-1.tar.lzma 12000 RMD160 a4c33c1038cd77a897d61fcb4ab228bfa8d95120 SHA1 17e6b04587448115489311b885129e6900fef647 SHA256 fd0dd024572c6e120b65d6d2ee23cdd7d4d4ddde7031b7bac5ea58cd07431117
+DIST autofs-4.1.4.tar.bz2 171044 RMD160 71bbc8795122564adc7f9a447172ea66281a7e4a SHA1 81b2cd238f04b990ed9d2b073ab7d8e01937b7f5 SHA256 e25caa0e9639ea54dd7c4f21e8146ac9859a61fa126f397edf874b5fdc147430
 DIST autofs-5.0.2-init-cb-on-load.patch 4410 RMD160 972aa738759b0fe924fb69096d25477829e604fd SHA1 4b9518cfe8efb54750e92cf9fb0458d15885072b SHA256 9054b6da6bba5659ac3c41a17cd7f50706af454083b6f3ed5ad602ee0fff9966
 DIST autofs-5.0.3-add-replicated-debug-logging.patch 5894 RMD160 add99af19fdcba2b8d1056fec74035682d327490 SHA1 04af2063ccdc85cc275a0487b6a55c862f03a87b SHA256 0b75df6b121fabf24b7eadf572961dc22c4bd55116293a974000682d1470e194
 DIST autofs-5.0.3-add-umount_wait-parameter.patch 4384 RMD160 0f3f3bc65fd0117986bd9b6f72b8256842455f67 SHA1 69ad8aa0081870dc3d3dbe38aa0c0189d9fa30db SHA256 a2aec14d52f32cfd4a5e491717862675b9da5d7a21dcfa5cb8a694461640273f
@@ -140,9 +147,10 @@ DIST autofs-5.0.5-patches-3.tar.lzma 77343 RMD160 fc60a2605b65f9926dfd334c86c96f
 DIST autofs-5.0.5.tar.bz2 301327 RMD160 4d105cce439544193b4abcb0ca4763f8c1d3cf54 SHA1 7f8a320cc126cb233be23749669735320fe6933c SHA256 68c73e01bc3c14c7d3613a861bbde4ab601c13f3127fcb837d49e435e5986002
 EBUILD autofs-4.1.3-r7.ebuild 2992 RMD160 7fc94cc967a7756eb9efb3da4a422fbb647c4d2c SHA1 056a5a4710b7275fb47a495985b51a64312412c4 SHA256 e8c538577a1a04659a0ff990b543efdb2dbb61d8b6bbb1cd2c7c1b159a842710
 EBUILD autofs-4.1.3-r9.ebuild 3101 RMD160 29c754ba5407258028cc372ee0d88193224f2ff9 SHA1 4fd3ec05fc46d05148c7ef32f97ee402bf2cb23f SHA256 a895a29abf8ee920cfa87764a30052f2d014d3003fc0421d430d0c2300e233bd
+EBUILD autofs-4.1.4.ebuild 2599 RMD160 bed4f4be0a9e35fcf18dcc7a8172294fa6695244 SHA1 0144ff43516bdba0d5ed1e113f741143620a703f SHA256 f42ff48952c009e83e5ff4c93cb444bf0267b8b71ca56a166b63291593043275
 EBUILD autofs-5.0.3-r6.ebuild 4266 RMD160 f1fedf489dceea7366f0d334d499fcc1db57d824 SHA1 b8dc48046353e6ea3e4bdd7c228d0ed565077634 SHA256 7db072e58681b59a7e04970134ea8c5d37ffc1388e7e64a27280a013886d335a
 EBUILD autofs-5.0.4-r5.ebuild 4856 RMD160 f976f8a74c6c4d3aeb9d70066409c53de99baee8 SHA1 14829c8353c82928d902247891cbbae0b3b6e099 SHA256 3e175bde315b472c7f83c94a847f0c40666b345c9486bf143c7a39db0cb71ccc
 EBUILD autofs-5.0.5-r2.ebuild 3301 RMD160 7e43be08e6464b8e0a9ba167faa27d5ca8db0c31 SHA1 0e97b3800a702ca5249f808fdfb8c1bec8a1ca9d SHA256 2d52de140cebbfcb1b97ff8d5ed61dacd58a4321f9a570084ae1ad1f845bc6ac
 EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
-MISC ChangeLog 17118 RMD160 60fa34e931c72af2db89c07b0da61bcd5e47dbe6 SHA1 1ac77d14ec6805aaab5461b6fe042c30d8f065b3 SHA256 0e0126b5a6d7f888bf5e82f2151826a1d8bf717ce037816d37f27236d7227467
+MISC ChangeLog 17522 RMD160 fdeb86e4d6e7f2165905a0599f50c21cd19edd97 SHA1 6ddbf84c9035c6c29150176d7e32daea916d5285 SHA256 00ed93f621f751feb50fff79270f1bdd2be2f669d27c7b2c008457b774472e6f
 MISC metadata.xml 629 RMD160 e54d3bf18dc419c0e900d81ed9aca1432e555d65 SHA1 64893b5cd342d35c9278df1b63fa106629b5ccf4 SHA256 2f9dffb787ccf5f094c9f839c60f32cc78f12546b56da94fec2c1fbb23e07e2b
diff --git a/net-fs/autofs/autofs-4.1.4.ebuild b/net-fs/autofs/autofs-4.1.4.ebuild
new file mode 100644
index 000000000000..b2d56306a6a7
--- /dev/null
+++ b/net-fs/autofs/autofs-4.1.4.ebuild
@@ -0,0 +1,90 @@
+# 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-4.1.4.ebuild,v 1.1 2011/04/06 14:10:32 pva 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() {
+	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/files/autofs-4.1.4-clean-up-maps.patch b/net-fs/autofs/files/autofs-4.1.4-clean-up-maps.patch
new file mode 100644
index 000000000000..51ccf9543baf
--- /dev/null
+++ b/net-fs/autofs/files/autofs-4.1.4-clean-up-maps.patch
@@ -0,0 +1,68 @@
+--- 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
new file mode 100644
index 000000000000..02939a7c34b0
--- /dev/null
+++ b/net-fs/autofs/files/autofs-4.1.4-fix-install-ldap-samples-and-maps.patch
@@ -0,0 +1,55 @@
+--- 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
new file mode 100644
index 000000000000..ffda7d0f360d
--- /dev/null
+++ b/net-fs/autofs/files/autofs-4.1.4-fix-man-pages.patch
@@ -0,0 +1,41 @@
+--- 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
new file mode 100644
index 000000000000..d7ec75164094
--- /dev/null
+++ b/net-fs/autofs/files/autofs-4.1.4-init.patch
@@ -0,0 +1,13 @@
+--- gentoo/net-fs/autofs/files/autofs.init.orig
++++ gentoo/net-fs/autofs/files/autofs.init
+@@ -11,8 +11,8 @@ 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"
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
new file mode 100644
index 000000000000..505cf4e8fd44
--- /dev/null
+++ b/net-fs/autofs/files/autofs-4.1.4-respect-user-flags-and-fix-asneeded.patch
@@ -0,0 +1,140 @@
+=== 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" \
+