From 40364ea673442dc4eadfb6891c2bae82a33428c7 Mon Sep 17 00:00:00 2001 From: Stefaan De Roeck Date: Tue, 5 Feb 2008 12:32:20 +0000 Subject: Rename file in the tree, specify name in metadata (Portage version: 2.1.4.1) --- net-fs/autofs/ChangeLog | 7 +++++- net-fs/autofs/autofs-5.0.3-r1.ebuild | 15 +++++++++++-- net-fs/autofs/autofs-5.0.3.ebuild | 4 ++-- net-fs/autofs/files/autofs.rc14 | 42 ------------------------------------ net-fs/autofs/files/autofs5.rc1 | 42 ++++++++++++++++++++++++++++++++++++ net-fs/autofs/metadata.xml | 3 ++- 6 files changed, 65 insertions(+), 48 deletions(-) delete mode 100644 net-fs/autofs/files/autofs.rc14 create mode 100644 net-fs/autofs/files/autofs5.rc1 (limited to 'net-fs') diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog index c02d0c876a81..30d05ba64e9b 100644 --- a/net-fs/autofs/ChangeLog +++ b/net-fs/autofs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/autofs # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.66 2008/02/01 09:07:18 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.67 2008/02/05 12:32:19 stefaan Exp $ + + 05 Feb 2008; Stefaan De Roeck +files/autofs5.rc1, + -files/autofs.rc14, metadata.xml, autofs-5.0.3.ebuild, + autofs-5.0.3-r1.ebuild: + Rename file in the tree, specify name in metadata *autofs-5.0.3-r1 (01 Feb 2008) diff --git a/net-fs/autofs/autofs-5.0.3-r1.ebuild b/net-fs/autofs/autofs-5.0.3-r1.ebuild index 333775746f81..43ad9fa3ac31 100644 --- a/net-fs/autofs/autofs-5.0.3-r1.ebuild +++ b/net-fs/autofs/autofs-5.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r1.ebuild,v 1.1 2008/02/01 09:07:18 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r1.ebuild,v 1.2 2008/02/05 12:32:19 stefaan Exp $ inherit eutils multilib autotools @@ -31,9 +31,20 @@ src_unpack() { cd "${S}" eautoconf || die "Autoconf failed" + + # # use CC and CFLAGS from environment (bug #154797) + # write these values in Makefile.conf +# (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 + + # do not include , rather , + # 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 } src_compile() { + CFLAGS="${CFLAGS}" \ econf \ $(use_with ldap openldap) \ $(use_with sasl) \ @@ -46,7 +57,7 @@ src_compile() { src_install() { make DESTDIR="${D}" install || die "make install failed" - newinitd "${FILESDIR}"/autofs.rc14 autofs + newinitd "${FILESDIR}"/autofs5.rc1 autofs } pkg_postinst() { diff --git a/net-fs/autofs/autofs-5.0.3.ebuild b/net-fs/autofs/autofs-5.0.3.ebuild index 6814a7c9f4d4..4e5cc4532755 100644 --- a/net-fs/autofs/autofs-5.0.3.ebuild +++ b/net-fs/autofs/autofs-5.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3.ebuild,v 1.1 2008/01/31 23:19:24 stefaan Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3.ebuild,v 1.2 2008/02/05 12:32:19 stefaan Exp $ inherit eutils multilib autotools @@ -39,7 +39,7 @@ src_compile() { src_install() { make DESTDIR="${D}" install || die "make install failed" - newinitd "${FILESDIR}"/autofs.rc14 autofs + newinitd "${FILESDIR}"/autofs5.rc1 autofs } pkg_postinst() { diff --git a/net-fs/autofs/files/autofs.rc14 b/net-fs/autofs/files/autofs.rc14 deleted file mode 100644 index 948e9242f761..000000000000 --- a/net-fs/autofs/files/autofs.rc14 +++ /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/autofs.rc14,v 1.1 2008/01/31 23:19:25 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 $? -} - diff --git a/net-fs/autofs/files/autofs5.rc1 b/net-fs/autofs/files/autofs5.rc1 new file mode 100644 index 000000000000..9e4252adf3ea --- /dev/null +++ b/net-fs/autofs/files/autofs5.rc1 @@ -0,0 +1,42 @@ +#!/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 $? +} + diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml index 9e24abe6169e..b3cc0332d3b8 100644 --- a/net-fs/autofs/metadata.xml +++ b/net-fs/autofs/metadata.xml @@ -3,6 +3,7 @@ net-fs - stefaan@gentoo.org + stefaan@gentoo.org + Stefaan De Roeck -- cgit v1.2.3-65-gdbad