1 |
jlec 14/05/21 15:58:19 |
2 |
|
3 |
Modified: metadata.xml ChangeLog nfs-utils-1.2.9-r3.ebuild |
4 |
Log: |
5 |
net-fs/nfs-utils: Some prefix love |
6 |
|
7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 net-fs/nfs-utils/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/metadata.xml?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/metadata.xml,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- metadata.xml 7 Nov 2013 07:50:22 -0000 1.7 |
23 |
+++ metadata.xml 21 May 2014 15:58:19 -0000 1.8 |
24 |
@@ -1,16 +1,16 @@ |
25 |
<?xml version="1.0" encoding="UTF-8"?> |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
-<herd>net-fs</herd> |
29 |
- <longdescription>NFS client and server daemons</longdescription> |
30 |
- <use> |
31 |
- <flag name='libmount'>Link mount.nfs with libmount</flag> |
32 |
- <flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag> |
33 |
- <flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag> |
34 |
- <flag name='nfsv3'>Enable support for NFSv3</flag> |
35 |
- <flag name='nfsv4'>Enable support for NFSv4</flag> |
36 |
- <flag name='nfsv41'>Enable support for NFSv4.1</flag> |
37 |
- <flag name='nonfsv4'>Disable support for NFSv4</flag> |
38 |
- <flag name='uuid'>Support UUID lookups in rpc.mountd</flag> |
39 |
- </use> |
40 |
+ <herd>net-fs</herd> |
41 |
+ <longdescription>NFS client and server daemons</longdescription> |
42 |
+ <use> |
43 |
+ <flag name="libmount">Link mount.nfs with libmount</flag> |
44 |
+ <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon</flag> |
45 |
+ <flag name="nfsidmap">Enable support for newer nfsidmap helper</flag> |
46 |
+ <flag name="nfsv3">Enable support for NFSv3</flag> |
47 |
+ <flag name="nfsv4">Enable support for NFSv4</flag> |
48 |
+ <flag name="nfsv41">Enable support for NFSv4.1</flag> |
49 |
+ <flag name="nonfsv4">Disable support for NFSv4</flag> |
50 |
+ <flag name="uuid">Support UUID lookups in rpc.mountd</flag> |
51 |
+ </use> |
52 |
</pkgmetadata> |
53 |
|
54 |
|
55 |
|
56 |
1.244 net-fs/nfs-utils/ChangeLog |
57 |
|
58 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.244&view=markup |
59 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?rev=1.244&content-type=text/plain |
60 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/ChangeLog?r1=1.243&r2=1.244 |
61 |
|
62 |
Index: ChangeLog |
63 |
=================================================================== |
64 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v |
65 |
retrieving revision 1.243 |
66 |
retrieving revision 1.244 |
67 |
diff -u -r1.243 -r1.244 |
68 |
--- ChangeLog 3 Feb 2014 14:30:24 -0000 1.243 |
69 |
+++ ChangeLog 21 May 2014 15:58:19 -0000 1.244 |
70 |
@@ -1,6 +1,10 @@ |
71 |
# ChangeLog for net-fs/nfs-utils |
72 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
73 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.243 2014/02/03 14:30:24 vapier Exp $ |
74 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.244 2014/05/21 15:58:19 jlec Exp $ |
75 |
+ |
76 |
+ 21 May 2014; Justin Lecher <jlec@g.o> nfs-utils-1.2.9-r3.ebuild, |
77 |
+ metadata.xml: |
78 |
+ Some prefix love |
79 |
|
80 |
03 Feb 2014; Mike Frysinger <vapier@g.o> nfs-utils-1.2.9-r3.ebuild: |
81 |
Drop librpcsecgss dep as it is not used when libtirpc is utilized (which we |
82 |
|
83 |
|
84 |
|
85 |
1.3 net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild |
86 |
|
87 |
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 |
88 |
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 |
89 |
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 |
90 |
|
91 |
Index: nfs-utils-1.2.9-r3.ebuild |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild,v |
94 |
retrieving revision 1.2 |
95 |
retrieving revision 1.3 |
96 |
diff -u -r1.2 -r1.3 |
97 |
--- nfs-utils-1.2.9-r3.ebuild 3 Feb 2014 14:30:24 -0000 1.2 |
98 |
+++ nfs-utils-1.2.9-r3.ebuild 21 May 2014 15:58:19 -0000 1.3 |
99 |
@@ -1,6 +1,6 @@ |
100 |
# Copyright 1999-2014 Gentoo Foundation |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
-# $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 $ |
103 |
+# $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 $ |
104 |
|
105 |
EAPI="4" |
106 |
|
107 |
@@ -55,6 +55,11 @@ |
108 |
src_prepare() { |
109 |
epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch |
110 |
epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch |
111 |
+ |
112 |
+ sed \ |
113 |
+ -e "/^sbindir/s:= := \"${EPREFIX}\":g" \ |
114 |
+ -i utils/*/Makefile.am || die |
115 |
+ |
116 |
eautoreconf |
117 |
} |
118 |
|
119 |
@@ -62,8 +67,9 @@ |
120 |
export libsqlite3_cv_is_recent=yes # Our DEPEND forces this. |
121 |
export ac_cv_header_keyutils_h=$(usex nfsidmap) |
122 |
econf \ |
123 |
- --with-statedir=/var/lib/nfs \ |
124 |
+ --with-statedir="${EPREFIX}"/var/lib/nfs \ |
125 |
--enable-tirpc \ |
126 |
+ --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \ |
127 |
$(use_enable libmount libmount-mount) \ |
128 |
$(use_with tcpd tcp-wrappers) \ |
129 |
$(use_enable nfsdcld nfsdcltrack) \ |
130 |
@@ -136,10 +142,10 @@ |
131 |
# src_install we put them in /usr/lib/nfs for safe-keeping, but |
132 |
# the daemons actually use the files in /var/lib/nfs. #30486 |
133 |
local f |
134 |
- mkdir -p "${ROOT}"/var/lib/nfs #368505 |
135 |
- for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do |
136 |
- [[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue |
137 |
- einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs" |
138 |
- cp -pPR "${f}" "${ROOT}"/var/lib/nfs/ |
139 |
+ mkdir -p "${EROOT}"/var/lib/nfs #368505 |
140 |
+ for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do |
141 |
+ [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue |
142 |
+ einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" |
143 |
+ cp -pPR "${f}" "${EROOT}"/var/lib/nfs/ |
144 |
done |
145 |
} |