jlec 14/05/21 15:58:19 Modified: metadata.xml ChangeLog nfs-utils-1.2.9-r3.ebuild Log: net-fs/nfs-utils: Some prefix love (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.8 net-fs/nfs-utils/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?r1=1.7&r2=1.8 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/metadata.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- metadata.xml 7 Nov 2013 07:50:22 -0000 1.7 +++ metadata.xml 21 May 2014 15:58:19 -0000 1.8 @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<herd>net-fs</herd> - <longdescription>NFS client and server daemons</longdescription> - <use> - <flag name='libmount'>Link mount.nfs with libmount</flag> - <flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag> - <flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag> - <flag name='nfsv3'>Enable support for NFSv3</flag> - <flag name='nfsv4'>Enable support for NFSv4</flag> - <flag name='nfsv41'>Enable support for NFSv4.1</flag> - <flag name='nonfsv4'>Disable support for NFSv4</flag> - <flag name='uuid'>Support UUID lookups in rpc.mountd</flag> - </use> + <herd>net-fs</herd> + <longdescription>NFS client and server daemons</longdescription> + <use> + <flag name="libmount">Link mount.nfs with libmount</flag> + <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon</flag> + <flag name="nfsidmap">Enable support for newer nfsidmap helper</flag> + <flag name="nfsv3">Enable support for NFSv3</flag> + <flag name="nfsv4">Enable support for NFSv4</flag> + <flag name="nfsv41">Enable support for NFSv4.1</flag> + <flag name="nonfsv4">Disable support for NFSv4</flag> + <flag name="uuid">Support UUID lookups in rpc.mountd</flag> + </use> </pkgmetadata> 1.244 net-fs/nfs-utils/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.244&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.244&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.243&r2=1.244 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- ChangeLog 3 Feb 2014 14:30:24 -0000 1.243 +++ ChangeLog 21 May 2014 15:58:19 -0000 1.244 @@ -1,6 +1,10 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.243 2014/02/03 14:30:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.244 2014/05/21 15:58:19 jlec Exp $ + + 21 May 2014; Justin Lecher <[email protected]> nfs-utils-1.2.9-r3.ebuild, + metadata.xml: + Some prefix love 03 Feb 2014; Mike Frysinger <[email protected]> nfs-utils-1.2.9-r3.ebuild: Drop librpcsecgss dep as it is not used when libtirpc is utilized (which we 1.3 net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild?r1=1.2&r2=1.3 Index: nfs-utils-1.2.9-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nfs-utils-1.2.9-r3.ebuild 3 Feb 2014 14:30:24 -0000 1.2 +++ nfs-utils-1.2.9-r3.ebuild 21 May 2014 15:58:19 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild,v 1.2 2014/02/03 14:30:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild,v 1.3 2014/05/21 15:58:19 jlec Exp $ EAPI="4" @@ -55,6 +55,11 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch + + sed \ + -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ + -i utils/*/Makefile.am || die + eautoreconf } @@ -62,8 +67,9 @@ export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. export ac_cv_header_keyutils_h=$(usex nfsidmap) econf \ - --with-statedir=/var/lib/nfs \ + --with-statedir="${EPREFIX}"/var/lib/nfs \ --enable-tirpc \ + --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \ $(use_enable libmount libmount-mount) \ $(use_with tcpd tcp-wrappers) \ $(use_enable nfsdcld nfsdcltrack) \ @@ -136,10 +142,10 @@ # src_install we put them in /usr/lib/nfs for safe-keeping, but # the daemons actually use the files in /var/lib/nfs. #30486 local f - mkdir -p "${ROOT}"/var/lib/nfs #368505 - for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do - [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue - einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs" - cp -pPR "${f}" "${ROOT}"/var/lib/nfs/ + mkdir -p "${EROOT}"/var/lib/nfs #368505 + for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do + [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue + einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" + cp -pPR "${f}" "${EROOT}"/var/lib/nfs/ done }
