Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/
Date: Mon, 28 May 2018 10:35:44
Message-Id: 1527503706.c929830bd43a547199dcfbe3a475f4e1a7cea7aa.polynomial-c@gentoo
1 commit: c929830bd43a547199dcfbe3a475f4e1a7cea7aa
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 28 10:25:59 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon May 28 10:35:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c929830b
7
8 net-fs/nfs-utils: Removed old.
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 net-fs/nfs-utils/Manifest | 5 -
13 net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild | 175 -------------------
14 net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild | 190 --------------------
15 net-fs/nfs-utils/nfs-utils-2.2.1-r1.ebuild | 191 ---------------------
16 net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild | 190 --------------------
17 .../nfs-utils-2.2.2_rc1_p20171107-r1.ebuild | 185 --------------------
18 net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild | 191 ---------------------
19 7 files changed, 1127 deletions(-)
20
21 diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
22 index 0448778a503..d651a0e6ecf 100644
23 --- a/net-fs/nfs-utils/Manifest
24 +++ b/net-fs/nfs-utils/Manifest
25 @@ -1,8 +1,3 @@
26 DIST nfs-utils-1.3.4.tar.bz2 814545 BLAKE2B 4b8c5fa4c1c21858e19d05f973c6d94185cf6a15c88348dda5e47c6714f9dba00dfa05237d908479970440b2ea57287600e92cb4d49872127b3801e075d6bf1a SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c
27 -DIST nfs-utils-2.1.1.tar.bz2 820083 BLAKE2B 2a8e3a4456c413436bbcc96654500c3eb9328df2591903c4ae6cb0a80d6849d97783037713f6bd944f3e6570485af072dadfd01434f4bd524827fd43cfe44b18 SHA512 ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448
28 -DIST nfs-utils-2.1.2_rc6.tar.gz 476695 BLAKE2B 98560d710d41d0077e69ad1f3e758f50d9a0acd334bed22f5c082e5d14b4b734d337026f23be538a6948407ced80a2f12a6a406044076f004e530090f5fb63d9 SHA512 d7c054074e2ea4370a5e47922785fa2a0cf595623d0222cb16f910c4946ed7f3d6f093b471557ce139c85ad0dd321bed0222f5c5aa5b7bca04b31d422eb35f75
29 -DIST nfs-utils-2.2.1.tar.bz2 853812 BLAKE2B bc973f8fe781f7658161d0d5895bc32ffeeab7a06276aed827926304f8e3b82287804aaa7e49c458d9b69992193c6c733fb6ae359063c076cfd15bd21185c432 SHA512 05e2aa4f413a4a4927995847211680baf87f956a435d0d903dd7b6239f72e66a15a089758d41874c05c2137e0626d72c1714010c2a9ce854943fef7798db9a24
30 -DIST nfs-utils-2.2.2_rc1.tar.gz 509381 BLAKE2B 8429cd9d01ce2a15451d21b89cabc6b50b54bd30d2e12a21f04d4be04a6e729a8bd3a8da3f0d120caf6ba2b0c91199f65f1c878a49d437e0c689bcba9f5d162f SHA512 5cc9a19e1ebf1831f1914419c0e7f12ff12037caa35e5866dfba8bf30c5355dcf2e039928b9b336c6755df856549ccac6ea646d61b57c68f96fd586d21a27f1a
31 -DIST nfs-utils-2.2.2_rc1_p20171107.tar.gz 509543 BLAKE2B 44c5bf63b16b7727f6cdba0d1051929f6e132b87fcb8e9e18a0ad699dfeec1b26f9988fc7b5db5dbcc1dd3c04f1dd30fa0f89616fe86cbfd4dbb36f0d8aed08b SHA512 27e38fe3ff2d94aa45a526343c88c781b39db4f85b2fd50b632516be609f7a05dced115e26f73176ba28409cd38a3c7db6ddb8370ab75071150b1cf3fba46e43
32 DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3
33 DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf50880a89ec97cb8ce4453266ba5b145eb1ca7a4362ac1a91ea5c1ebddd4fcd1d6a4cd12f45637cd5d845cc6d8d5f139d SHA512 4b948d92f515e9340163f53ab26dd7189fa8b13909f5c668b7c66ae13f181ed778967edc0a20753763540b5a3f93a41a2de38a7276ffbfadfd866c5ed422520c
34
35 diff --git a/net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild
36 deleted file mode 100644
37 index 54de57a47ac..00000000000
38 --- a/net-fs/nfs-utils/nfs-utils-2.1.1-r1.ebuild
39 +++ /dev/null
40 @@ -1,175 +0,0 @@
41 -# Copyright 1999-2017 Gentoo Foundation
42 -# Distributed under the terms of the GNU General Public License v2
43 -
44 -EAPI="5"
45 -
46 -inherit eutils flag-o-matic multilib autotools systemd
47 -
48 -DESCRIPTION="NFS client and server daemons"
49 -HOMEPAGE="http://linux-nfs.org/"
50 -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
51 -
52 -LICENSE="GPL-2"
53 -SLOT="0"
54 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
55 -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
56 -REQUIRED_USE="kerberos? ( nfsv4 )"
57 -RESTRICT="test" #315573
58 -
59 -# kth-krb doesn't provide the right include
60 -# files, and nfs-utils doesn't build against heimdal either,
61 -# so don't depend on virtual/krb.
62 -# (04 Feb 2005 agriffis)
63 -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
64 - caps? ( sys-libs/libcap )
65 - sys-libs/e2fsprogs-libs
66 - >=net-nds/rpcbind-0.2.4
67 - net-libs/libtirpc:=
68 - libmount? ( sys-apps/util-linux )
69 - nfsdcld? ( >=dev-db/sqlite-3.3 )
70 - nfsv4? (
71 - dev-libs/libevent:=
72 - >=net-libs/libnfsidmap-0.21-r1
73 - kerberos? (
74 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
75 - app-crypt/mit-krb5
76 - )
77 - nfsidmap? (
78 - >=net-libs/libnfsidmap-0.24
79 - >=sys-apps/keyutils-1.5.9
80 - )
81 - )
82 - nfsv41? (
83 - sys-fs/lvm2
84 - )
85 - uuid? ( sys-apps/util-linux )"
86 -RDEPEND="${DEPEND_COMMON}
87 - !net-nds/portmap
88 - !<sys-apps/openrc-0.13.9
89 - selinux? (
90 - sec-policy/selinux-rpc
91 - sec-policy/selinux-rpcbind
92 - )
93 -"
94 -DEPEND="${DEPEND_COMMON}
95 - virtual/pkgconfig"
96 -
97 -src_prepare() {
98 - epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
99 - epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
100 -
101 - sed \
102 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
103 - -i utils/*/Makefile.am || die
104 -
105 - epatch_user
106 - eautoreconf
107 -}
108 -
109 -src_configure() {
110 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
111 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
112 - econf \
113 - --with-statedir="${EPREFIX}"/var/lib/nfs \
114 - --enable-tirpc \
115 - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
116 - $(use_enable libmount libmount-mount) \
117 - $(use_with tcpd tcp-wrappers) \
118 - $(use_enable nfsdcld nfsdcltrack) \
119 - $(use_enable nfsv4) \
120 - $(use_enable nfsv41) \
121 - $(use_enable ipv6) \
122 - $(use_enable caps) \
123 - $(use_enable uuid) \
124 - $(use_enable kerberos gss) \
125 - $(use_enable kerberos svcgss) \
126 - --without-gssglue
127 -}
128 -
129 -src_compile(){
130 - # remove compiled files bundled in the tarball
131 - emake clean
132 - default
133 -}
134 -
135 -src_install() {
136 - default
137 - rm linux-nfs/Makefile* || die
138 - dodoc -r linux-nfs README
139 -
140 - # Don't overwrite existing xtab/etab, install the original
141 - # versions somewhere safe... more info in pkg_postinst
142 - keepdir /var/lib/nfs/{,sm,sm.bak}
143 - mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
144 -
145 - # Install some client-side binaries in /sbin
146 - dodir /sbin
147 - mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
148 -
149 - if use nfsv4 && use nfsidmap ; then
150 - # Install a config file for idmappers in newer kernels. #415625
151 - insinto /etc/request-key.d
152 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
153 - doins id_resolver.conf
154 - fi
155 -
156 - insinto /etc
157 - doins "${FILESDIR}"/exports
158 - keepdir /etc/exports.d
159 -
160 - local f list=() opt_need=""
161 - if use nfsv4 ; then
162 - opt_need="rpc.idmapd"
163 - list+=( rpc.idmapd rpc.pipefs )
164 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
165 - fi
166 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
167 - newinitd "${FILESDIR}"/${f}.initd ${f}
168 - done
169 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
170 - for f in nfs nfsclient ; do
171 - newconfd "${FILESDIR}"/${f}.confd ${f}
172 - done
173 - sed -i \
174 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
175 - "${ED}"/etc/conf.d/nfs || die #234132
176 -
177 - systemd_dounit systemd/*.{mount,service,target}
178 - if ! use nfsv4 || ! use kerberos ; then
179 - rm "${ED}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
180 - fi
181 - if ! use nfsv41 ; then
182 - rm "${ED}$(systemd_get_unitdir)"/nfs-blkmap.* || die
183 - fi
184 - sed -i -r \
185 - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
186 - -e '/^(After|Wants)=nfs-config.service$/d' \
187 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
188 - "${ED}$(systemd_get_unitdir)"/* || die
189 -}
190 -
191 -pkg_postinst() {
192 - # Install default xtab and friends if there's none existing. In
193 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
194 - # the daemons actually use the files in /var/lib/nfs. #30486
195 - local f
196 - mkdir -p "${EROOT}"/var/lib/nfs #368505
197 - for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
198 - [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
199 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
200 - cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
201 - done
202 -
203 - if systemd_is_booted; then
204 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
205 - ewarn "We have switched to upstream systemd unit files. Since"
206 - ewarn "they got renamed, you should probably enable the new ones."
207 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
208 - ewarn "to know what services you need to enable now."
209 - fi
210 - else
211 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
212 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
213 - ewarn "same runlevel as nfsmount."
214 - fi
215 -}
216
217 diff --git a/net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild b/net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild
218 deleted file mode 100644
219 index 133e06869f0..00000000000
220 --- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc6.ebuild
221 +++ /dev/null
222 @@ -1,190 +0,0 @@
223 -# Copyright 1999-2017 Gentoo Foundation
224 -# Distributed under the terms of the GNU General Public License v2
225 -
226 -EAPI=6
227 -
228 -inherit autotools flag-o-matic multilib systemd
229 -
230 -DESCRIPTION="NFS client and server daemons"
231 -HOMEPAGE="http://linux-nfs.org/"
232 -
233 -if [[ "${PV}" = *_rc* ]] ; then
234 - inherit versionator
235 - MY_PV="$(replace_all_version_separators -)"
236 - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
237 - S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
238 -else
239 - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
240 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
241 -fi
242 -
243 -LICENSE="GPL-2"
244 -SLOT="0"
245 -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
246 -REQUIRED_USE="kerberos? ( nfsv4 )"
247 -RESTRICT="test" #315573
248 -
249 -# kth-krb doesn't provide the right include
250 -# files, and nfs-utils doesn't build against heimdal either,
251 -# so don't depend on virtual/krb.
252 -# (04 Feb 2005 agriffis)
253 -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
254 - caps? ( sys-libs/libcap )
255 - sys-libs/e2fsprogs-libs
256 - >=net-nds/rpcbind-0.2.4
257 - net-libs/libtirpc:=
258 - libmount? ( sys-apps/util-linux )
259 - nfsdcld? ( >=dev-db/sqlite-3.3 )
260 - nfsv4? (
261 - dev-libs/libevent:=
262 - >=net-libs/libnfsidmap-0.21-r1
263 - kerberos? (
264 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
265 - app-crypt/mit-krb5
266 - )
267 - nfsidmap? (
268 - >=net-libs/libnfsidmap-0.24
269 - >=sys-apps/keyutils-1.5.9
270 - )
271 - )
272 - nfsv41? (
273 - sys-fs/lvm2
274 - )
275 - uuid? ( sys-apps/util-linux )"
276 -RDEPEND="${DEPEND_COMMON}
277 - !net-nds/portmap
278 - !<sys-apps/openrc-0.13.9
279 - selinux? (
280 - sec-policy/selinux-rpc
281 - sec-policy/selinux-rpcbind
282 - )
283 -"
284 -DEPEND="${DEPEND_COMMON}
285 - virtual/pkgconfig"
286 -
287 -PATCHES=(
288 - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
289 - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
290 -)
291 -
292 -src_prepare() {
293 - default
294 -
295 - sed \
296 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
297 - -i utils/*/Makefile.am || die
298 -
299 - eautoreconf
300 -}
301 -
302 -src_configure() {
303 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
304 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
305 - local myeconfargs=(
306 - --with-statedir="${EPREFIX}"/var/lib/nfs
307 - --enable-tirpc
308 - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
309 - $(use_enable libmount libmount-mount)
310 - $(use_with tcpd tcp-wrappers)
311 - $(use_enable nfsdcld nfsdcltrack)
312 - $(use_enable nfsv4)
313 - $(use_enable nfsv41)
314 - $(use_enable ipv6)
315 - $(use_enable caps)
316 - $(use_enable uuid)
317 - $(use_enable kerberos gss)
318 - $(use_enable kerberos svcgss)
319 - --without-gssglue
320 - )
321 - econf "${myeconfargs[@]}"
322 -}
323 -
324 -src_compile(){
325 - # remove compiled files bundled in the tarball
326 - emake clean
327 - default
328 -}
329 -
330 -src_install() {
331 - default
332 - rm linux-nfs/Makefile* || die
333 - dodoc -r linux-nfs README
334 -
335 - # Don't overwrite existing xtab/etab, install the original
336 - # versions somewhere safe... more info in pkg_postinst
337 - keepdir /var/lib/nfs/{,sm,sm.bak}
338 - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
339 -
340 - # Install some client-side binaries in /sbin
341 - dodir /sbin
342 - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
343 -
344 - if use nfsv4 && use nfsidmap ; then
345 - # Install a config file for idmappers in newer kernels. #415625
346 - insinto /etc/request-key.d
347 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
348 - doins id_resolver.conf
349 - fi
350 -
351 - insinto /etc
352 - doins "${FILESDIR}"/exports
353 - keepdir /etc/exports.d
354 -
355 - local f list=() opt_need=""
356 - if use nfsv4 ; then
357 - opt_need="rpc.idmapd"
358 - list+=( rpc.idmapd rpc.pipefs )
359 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
360 - fi
361 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
362 - newinitd "${FILESDIR}"/${f}.initd ${f}
363 - done
364 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
365 - for f in nfs nfsclient ; do
366 - newconfd "${FILESDIR}"/${f}.confd ${f}
367 - done
368 - sed -i \
369 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
370 - "${ED%/}"/etc/conf.d/nfs || die #234132
371 -
372 - local systemd_systemunitdir="$(systemd_get_systemunitdir)"
373 - systemd_dounit systemd/*.{mount,service,target}
374 - if ! use nfsv4 || ! use kerberos ; then
375 - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
376 - fi
377 - if ! use nfsv41 ; then
378 - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
379 - fi
380 - sed -i \
381 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
382 - "${ED%/}${systemd_systemunitdir}"/* || die
383 -
384 - keepdir /var/lib/nfs #368505
385 - keepdir /var/lib/nfs/v4recovery #603628
386 -
387 -}
388 -
389 -pkg_postinst() {
390 - # Install default xtab and friends if there's none existing. In
391 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
392 - # the daemons actually use the files in /var/lib/nfs. #30486
393 - local f
394 - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
395 - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
396 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
397 - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
398 - done
399 -
400 - if systemd_is_booted; then
401 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
402 - ewarn "We have switched to upstream systemd unit files. Since"
403 - ewarn "they got renamed, you should probably enable the new ones."
404 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
405 - ewarn "to know what services you need to enable now."
406 - fi
407 - else
408 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
409 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
410 - ewarn "same runlevel as nfsmount."
411 - fi
412 -}
413
414 diff --git a/net-fs/nfs-utils/nfs-utils-2.2.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.1-r1.ebuild
415 deleted file mode 100644
416 index 64ed6b745b6..00000000000
417 --- a/net-fs/nfs-utils/nfs-utils-2.2.1-r1.ebuild
418 +++ /dev/null
419 @@ -1,191 +0,0 @@
420 -# Copyright 1999-2017 Gentoo Foundation
421 -# Distributed under the terms of the GNU General Public License v2
422 -
423 -EAPI=6
424 -
425 -inherit autotools flag-o-matic multilib systemd
426 -
427 -DESCRIPTION="NFS client and server daemons"
428 -HOMEPAGE="http://linux-nfs.org/"
429 -
430 -if [[ "${PV}" = *_rc* ]] ; then
431 - inherit versionator
432 - MY_PV="$(replace_all_version_separators -)"
433 - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
434 - S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
435 -else
436 - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
437 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
438 -fi
439 -
440 -LICENSE="GPL-2"
441 -SLOT="0"
442 -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
443 -REQUIRED_USE="kerberos? ( nfsv4 )"
444 -RESTRICT="test" #315573
445 -
446 -# kth-krb doesn't provide the right include
447 -# files, and nfs-utils doesn't build against heimdal either,
448 -# so don't depend on virtual/krb.
449 -# (04 Feb 2005 agriffis)
450 -DEPEND_COMMON="
451 - net-libs/libtirpc:=
452 - >=net-nds/rpcbind-0.2.4
453 - sys-libs/e2fsprogs-libs
454 - caps? ( sys-libs/libcap )
455 - ldap? ( net-nds/openldap )
456 - libmount? ( sys-apps/util-linux )
457 - nfsdcld? ( >=dev-db/sqlite-3.3 )
458 - nfsv4? (
459 - dev-libs/libevent:=
460 - >=sys-apps/keyutils-1.5.9
461 - kerberos? (
462 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
463 - app-crypt/mit-krb5
464 - )
465 - )
466 - nfsv41? (
467 - sys-fs/lvm2
468 - )
469 - tcpd? ( sys-apps/tcp-wrappers )
470 - uuid? ( sys-apps/util-linux )"
471 -RDEPEND="${DEPEND_COMMON}
472 - !net-libs/libnfsidmap
473 - !net-nds/portmap
474 - !<sys-apps/openrc-0.13.9
475 - selinux? (
476 - sec-policy/selinux-rpc
477 - sec-policy/selinux-rpcbind
478 - )
479 -"
480 -DEPEND="${DEPEND_COMMON}
481 - virtual/pkgconfig"
482 -
483 -PATCHES=(
484 - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
485 - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
486 -)
487 -
488 -src_prepare() {
489 - default
490 -
491 - sed \
492 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
493 - -i utils/*/Makefile.am || die
494 -
495 - eautoreconf
496 -}
497 -
498 -src_configure() {
499 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
500 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
501 - local myeconfargs=(
502 - --with-statedir="${EPREFIX}"/var/lib/nfs
503 - --enable-tirpc
504 - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
505 - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
506 - $(use_enable ldap)
507 - $(use_enable libmount libmount-mount)
508 - $(use_with tcpd tcp-wrappers)
509 - $(use_enable nfsdcld nfsdcltrack)
510 - $(use_enable nfsv4)
511 - $(use_enable nfsv41)
512 - $(use_enable ipv6)
513 - $(use_enable caps)
514 - $(use_enable uuid)
515 - $(use_enable kerberos gss)
516 - $(use_enable kerberos svcgss)
517 - --without-gssglue
518 - )
519 - econf "${myeconfargs[@]}"
520 -}
521 -
522 -src_compile(){
523 - # remove compiled files bundled in the tarball
524 - emake clean
525 - default
526 -}
527 -
528 -src_install() {
529 - default
530 - rm linux-nfs/Makefile* || die
531 - dodoc -r linux-nfs README
532 -
533 - # Don't overwrite existing xtab/etab, install the original
534 - # versions somewhere safe... more info in pkg_postinst
535 - keepdir /var/lib/nfs/{,sm,sm.bak}
536 - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
537 -
538 - # Install some client-side binaries in /sbin
539 - dodir /sbin
540 - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
541 -
542 - if use nfsv4 && use nfsidmap ; then
543 - # Install a config file for idmappers in newer kernels. #415625
544 - insinto /etc/request-key.d
545 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
546 - doins id_resolver.conf
547 - fi
548 -
549 - insinto /etc
550 - doins "${FILESDIR}"/exports
551 - keepdir /etc/exports.d
552 -
553 - local f list=() opt_need=""
554 - if use nfsv4 ; then
555 - opt_need="rpc.idmapd"
556 - list+=( rpc.idmapd rpc.pipefs )
557 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
558 - fi
559 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
560 - newinitd "${FILESDIR}"/${f}.initd ${f}
561 - done
562 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
563 - for f in nfs nfsclient ; do
564 - newconfd "${FILESDIR}"/${f}.confd ${f}
565 - done
566 - sed -i \
567 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
568 - "${ED%/}"/etc/conf.d/nfs || die #234132
569 -
570 - local systemd_systemunitdir="$(systemd_get_systemunitdir)"
571 - systemd_dounit systemd/*.{mount,service,target}
572 - if ! use nfsv4 || ! use kerberos ; then
573 - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
574 - fi
575 - if ! use nfsv41 ; then
576 - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
577 - fi
578 - sed -i \
579 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
580 - "${ED%/}${systemd_systemunitdir}"/* || die
581 -
582 - keepdir /var/lib/nfs #368505
583 - keepdir /var/lib/nfs/v4recovery #603628
584 -
585 -}
586 -
587 -pkg_postinst() {
588 - # Install default xtab and friends if there's none existing. In
589 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
590 - # the daemons actually use the files in /var/lib/nfs. #30486
591 - local f
592 - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
593 - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
594 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
595 - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
596 - done
597 -
598 - if systemd_is_booted; then
599 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
600 - ewarn "We have switched to upstream systemd unit files. Since"
601 - ewarn "they got renamed, you should probably enable the new ones."
602 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
603 - ewarn "to know what services you need to enable now."
604 - fi
605 - else
606 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
607 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
608 - ewarn "same runlevel as nfsmount."
609 - fi
610 -}
611
612 diff --git a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild
613 deleted file mode 100644
614 index 82d9cfbed86..00000000000
615 --- a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1-r1.ebuild
616 +++ /dev/null
617 @@ -1,190 +0,0 @@
618 -# Copyright 1999-2017 Gentoo Foundation
619 -# Distributed under the terms of the GNU General Public License v2
620 -
621 -EAPI=6
622 -
623 -inherit autotools flag-o-matic multilib systemd
624 -
625 -DESCRIPTION="NFS client and server daemons"
626 -HOMEPAGE="http://linux-nfs.org/"
627 -
628 -if [[ "${PV}" = *_rc* ]] ; then
629 - inherit versionator
630 - MY_PV="$(replace_all_version_separators -)"
631 - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
632 - S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
633 -else
634 - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
635 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
636 -fi
637 -
638 -LICENSE="GPL-2"
639 -SLOT="0"
640 -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
641 -REQUIRED_USE="kerberos? ( nfsv4 )"
642 -RESTRICT="test" #315573
643 -
644 -# kth-krb doesn't provide the right include
645 -# files, and nfs-utils doesn't build against heimdal either,
646 -# so don't depend on virtual/krb.
647 -# (04 Feb 2005 agriffis)
648 -DEPEND_COMMON="
649 - net-libs/libtirpc:=
650 - >=net-nds/rpcbind-0.2.4
651 - sys-libs/e2fsprogs-libs
652 - caps? ( sys-libs/libcap )
653 - ldap? ( net-nds/openldap )
654 - libmount? ( sys-apps/util-linux )
655 - nfsdcld? ( >=dev-db/sqlite-3.3 )
656 - nfsv4? (
657 - dev-libs/libevent:=
658 - >=sys-apps/keyutils-1.5.9
659 - kerberos? (
660 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
661 - app-crypt/mit-krb5
662 - )
663 - )
664 - nfsv41? (
665 - sys-fs/lvm2
666 - )
667 - tcpd? ( sys-apps/tcp-wrappers )
668 - uuid? ( sys-apps/util-linux )"
669 -RDEPEND="${DEPEND_COMMON}
670 - !net-libs/libnfsidmap
671 - !net-nds/portmap
672 - !<sys-apps/openrc-0.13.9
673 - selinux? (
674 - sec-policy/selinux-rpc
675 - sec-policy/selinux-rpcbind
676 - )
677 -"
678 -DEPEND="${DEPEND_COMMON}
679 - virtual/pkgconfig"
680 -
681 -PATCHES=(
682 - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
683 - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
684 -)
685 -
686 -src_prepare() {
687 - default
688 -
689 - sed \
690 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
691 - -i utils/*/Makefile.am || die
692 -
693 - eautoreconf
694 -}
695 -
696 -src_configure() {
697 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
698 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
699 - local myeconfargs=(
700 - --with-statedir="${EPREFIX}"/var/lib/nfs
701 - --enable-tirpc
702 - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
703 - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
704 - $(use_enable libmount libmount-mount)
705 - $(use_with tcpd tcp-wrappers)
706 - $(use_enable nfsdcld nfsdcltrack)
707 - $(use_enable nfsv4)
708 - $(use_enable nfsv41)
709 - $(use_enable ipv6)
710 - $(use_enable caps)
711 - $(use_enable uuid)
712 - $(use_enable kerberos gss)
713 - $(use_enable kerberos svcgss)
714 - --without-gssglue
715 - )
716 - econf "${myeconfargs[@]}"
717 -}
718 -
719 -src_compile(){
720 - # remove compiled files bundled in the tarball
721 - emake clean
722 - default
723 -}
724 -
725 -src_install() {
726 - default
727 - rm linux-nfs/Makefile* || die
728 - dodoc -r linux-nfs README
729 -
730 - # Don't overwrite existing xtab/etab, install the original
731 - # versions somewhere safe... more info in pkg_postinst
732 - keepdir /var/lib/nfs/{,sm,sm.bak}
733 - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
734 -
735 - # Install some client-side binaries in /sbin
736 - dodir /sbin
737 - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
738 -
739 - if use nfsv4 && use nfsidmap ; then
740 - # Install a config file for idmappers in newer kernels. #415625
741 - insinto /etc/request-key.d
742 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
743 - doins id_resolver.conf
744 - fi
745 -
746 - insinto /etc
747 - doins "${FILESDIR}"/exports
748 - keepdir /etc/exports.d
749 -
750 - local f list=() opt_need=""
751 - if use nfsv4 ; then
752 - opt_need="rpc.idmapd"
753 - list+=( rpc.idmapd rpc.pipefs )
754 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
755 - fi
756 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
757 - newinitd "${FILESDIR}"/${f}.initd ${f}
758 - done
759 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
760 - for f in nfs nfsclient ; do
761 - newconfd "${FILESDIR}"/${f}.confd ${f}
762 - done
763 - sed -i \
764 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
765 - "${ED%/}"/etc/conf.d/nfs || die #234132
766 -
767 - local systemd_systemunitdir="$(systemd_get_systemunitdir)"
768 - systemd_dounit systemd/*.{mount,service,target}
769 - if ! use nfsv4 || ! use kerberos ; then
770 - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
771 - fi
772 - if ! use nfsv41 ; then
773 - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
774 - fi
775 - sed -i \
776 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
777 - "${ED%/}${systemd_systemunitdir}"/* || die
778 -
779 - keepdir /var/lib/nfs #368505
780 - keepdir /var/lib/nfs/v4recovery #603628
781 -
782 -}
783 -
784 -pkg_postinst() {
785 - # Install default xtab and friends if there's none existing. In
786 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
787 - # the daemons actually use the files in /var/lib/nfs. #30486
788 - local f
789 - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
790 - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
791 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
792 - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
793 - done
794 -
795 - if systemd_is_booted; then
796 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
797 - ewarn "We have switched to upstream systemd unit files. Since"
798 - ewarn "they got renamed, you should probably enable the new ones."
799 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
800 - ewarn "to know what services you need to enable now."
801 - fi
802 - else
803 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
804 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
805 - ewarn "same runlevel as nfsmount."
806 - fi
807 -}
808
809 diff --git a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1_p20171107-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1_p20171107-r1.ebuild
810 deleted file mode 100644
811 index 397170e68c6..00000000000
812 --- a/net-fs/nfs-utils/nfs-utils-2.2.2_rc1_p20171107-r1.ebuild
813 +++ /dev/null
814 @@ -1,185 +0,0 @@
815 -# Copyright 1999-2017 Gentoo Foundation
816 -# Distributed under the terms of the GNU General Public License v2
817 -
818 -EAPI=6
819 -
820 -inherit autotools flag-o-matic multilib systemd
821 -
822 -DESCRIPTION="NFS client and server daemons"
823 -HOMEPAGE="http://linux-nfs.org/"
824 -
825 -MY_COMMIT="8d9bf479441d9d7a44a86b69026a7e9d431d3ade"
826 -SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${P}.tar.gz"
827 -S="${WORKDIR}/${PN}-${MY_COMMIT:0:7}"
828 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
829 -
830 -LICENSE="GPL-2"
831 -SLOT="0"
832 -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
833 -REQUIRED_USE="kerberos? ( nfsv4 )"
834 -RESTRICT="test" #315573
835 -
836 -# kth-krb doesn't provide the right include
837 -# files, and nfs-utils doesn't build against heimdal either,
838 -# so don't depend on virtual/krb.
839 -# (04 Feb 2005 agriffis)
840 -DEPEND_COMMON="
841 - net-libs/libtirpc:=
842 - >=net-nds/rpcbind-0.2.4
843 - sys-libs/e2fsprogs-libs
844 - caps? ( sys-libs/libcap )
845 - ldap? ( net-nds/openldap )
846 - libmount? ( sys-apps/util-linux )
847 - nfsdcld? ( >=dev-db/sqlite-3.3 )
848 - nfsv4? (
849 - dev-libs/libevent:=
850 - >=sys-apps/keyutils-1.5.9
851 - kerberos? (
852 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
853 - app-crypt/mit-krb5
854 - )
855 - )
856 - nfsv41? (
857 - sys-fs/lvm2
858 - )
859 - tcpd? ( sys-apps/tcp-wrappers )
860 - uuid? ( sys-apps/util-linux )"
861 -RDEPEND="${DEPEND_COMMON}
862 - !net-libs/libnfsidmap
863 - !net-nds/portmap
864 - !<sys-apps/openrc-0.13.9
865 - selinux? (
866 - sec-policy/selinux-rpc
867 - sec-policy/selinux-rpcbind
868 - )
869 -"
870 -DEPEND="${DEPEND_COMMON}
871 - virtual/pkgconfig"
872 -
873 -PATCHES=(
874 - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
875 - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
876 -)
877 -
878 -src_prepare() {
879 - default
880 -
881 - sed \
882 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
883 - -i utils/*/Makefile.am || die
884 -
885 - eautoreconf
886 -}
887 -
888 -src_configure() {
889 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
890 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
891 - local myeconfargs=(
892 - --with-statedir="${EPREFIX}"/var/lib/nfs
893 - --enable-tirpc
894 - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
895 - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
896 - $(use_enable libmount libmount-mount)
897 - $(use_with tcpd tcp-wrappers)
898 - $(use_enable nfsdcld nfsdcltrack)
899 - $(use_enable nfsv4)
900 - $(use_enable nfsv41)
901 - $(use_enable ipv6)
902 - $(use_enable caps)
903 - $(use_enable uuid)
904 - $(use_enable kerberos gss)
905 - $(use_enable kerberos svcgss)
906 - --without-gssglue
907 - )
908 - econf "${myeconfargs[@]}"
909 -}
910 -
911 -src_compile(){
912 - # remove compiled files bundled in the tarball
913 - emake clean
914 - default
915 -}
916 -
917 -src_install() {
918 - default
919 - rm linux-nfs/Makefile* || die
920 - dodoc -r linux-nfs README
921 -
922 - # Don't overwrite existing xtab/etab, install the original
923 - # versions somewhere safe... more info in pkg_postinst
924 - keepdir /var/lib/nfs/{,sm,sm.bak}
925 - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
926 -
927 - # Install some client-side binaries in /sbin
928 - dodir /sbin
929 - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
930 -
931 - if use nfsv4 && use nfsidmap ; then
932 - # Install a config file for idmappers in newer kernels. #415625
933 - insinto /etc/request-key.d
934 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
935 - doins id_resolver.conf
936 - fi
937 -
938 - insinto /etc
939 - doins "${FILESDIR}"/exports
940 - keepdir /etc/exports.d
941 -
942 - local f list=() opt_need=""
943 - if use nfsv4 ; then
944 - opt_need="rpc.idmapd"
945 - list+=( rpc.idmapd rpc.pipefs )
946 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
947 - fi
948 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
949 - newinitd "${FILESDIR}"/${f}.initd ${f}
950 - done
951 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
952 - for f in nfs nfsclient ; do
953 - newconfd "${FILESDIR}"/${f}.confd ${f}
954 - done
955 - sed -i \
956 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
957 - "${ED%/}"/etc/conf.d/nfs || die #234132
958 -
959 - local systemd_systemunitdir="$(systemd_get_systemunitdir)"
960 - systemd_dounit systemd/*.{mount,service,target}
961 - if ! use nfsv4 || ! use kerberos ; then
962 - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
963 - fi
964 - if ! use nfsv41 ; then
965 - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
966 - fi
967 - sed -i \
968 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
969 - "${ED%/}${systemd_systemunitdir}"/* || die
970 -
971 - keepdir /var/lib/nfs #368505
972 - keepdir /var/lib/nfs/v4recovery #603628
973 -
974 -}
975 -
976 -pkg_postinst() {
977 - # Install default xtab and friends if there's none existing. In
978 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
979 - # the daemons actually use the files in /var/lib/nfs. #30486
980 - local f
981 - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
982 - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
983 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
984 - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
985 - done
986 -
987 - if systemd_is_booted; then
988 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
989 - ewarn "We have switched to upstream systemd unit files. Since"
990 - ewarn "they got renamed, you should probably enable the new ones."
991 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
992 - ewarn "to know what services you need to enable now."
993 - fi
994 - else
995 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
996 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
997 - ewarn "same runlevel as nfsmount."
998 - fi
999 -}
1000
1001 diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild
1002 deleted file mode 100644
1003 index aed58ef0ff6..00000000000
1004 --- a/net-fs/nfs-utils/nfs-utils-2.3.1-r1.ebuild
1005 +++ /dev/null
1006 @@ -1,191 +0,0 @@
1007 -# Copyright 1999-2017 Gentoo Foundation
1008 -# Distributed under the terms of the GNU General Public License v2
1009 -
1010 -EAPI=6
1011 -
1012 -inherit autotools flag-o-matic multilib systemd
1013 -
1014 -DESCRIPTION="NFS client and server daemons"
1015 -HOMEPAGE="http://linux-nfs.org/"
1016 -
1017 -if [[ "${PV}" = *_rc* ]] ; then
1018 - inherit versionator
1019 - MY_PV="$(replace_all_version_separators -)"
1020 - SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
1021 - S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
1022 -else
1023 - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
1024 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
1025 -fi
1026 -
1027 -LICENSE="GPL-2"
1028 -SLOT="0"
1029 -IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
1030 -REQUIRED_USE="kerberos? ( nfsv4 )"
1031 -RESTRICT="test" #315573
1032 -
1033 -# kth-krb doesn't provide the right include
1034 -# files, and nfs-utils doesn't build against heimdal either,
1035 -# so don't depend on virtual/krb.
1036 -# (04 Feb 2005 agriffis)
1037 -DEPEND_COMMON="
1038 - net-libs/libtirpc:=
1039 - >=net-nds/rpcbind-0.2.4
1040 - sys-libs/e2fsprogs-libs
1041 - caps? ( sys-libs/libcap )
1042 - ldap? ( net-nds/openldap )
1043 - libmount? ( sys-apps/util-linux )
1044 - nfsdcld? ( >=dev-db/sqlite-3.3 )
1045 - nfsv4? (
1046 - dev-libs/libevent:=
1047 - >=sys-apps/keyutils-1.5.9
1048 - kerberos? (
1049 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
1050 - app-crypt/mit-krb5
1051 - )
1052 - )
1053 - nfsv41? (
1054 - sys-fs/lvm2
1055 - )
1056 - tcpd? ( sys-apps/tcp-wrappers )
1057 - uuid? ( sys-apps/util-linux )"
1058 -RDEPEND="${DEPEND_COMMON}
1059 - !net-libs/libnfsidmap
1060 - !net-nds/portmap
1061 - !<sys-apps/openrc-0.13.9
1062 - selinux? (
1063 - sec-policy/selinux-rpc
1064 - sec-policy/selinux-rpcbind
1065 - )
1066 -"
1067 -DEPEND="${DEPEND_COMMON}
1068 - virtual/pkgconfig"
1069 -
1070 -PATCHES=(
1071 - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
1072 - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
1073 - "${FILESDIR}"/${P}-svcgssd_undefined_reference.patch #641912
1074 -)
1075 -
1076 -src_prepare() {
1077 - default
1078 -
1079 - sed \
1080 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
1081 - -i utils/*/Makefile.am || die
1082 -
1083 - eautoreconf
1084 -}
1085 -
1086 -src_configure() {
1087 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
1088 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
1089 - local myeconfargs=(
1090 - --with-statedir="${EPREFIX}"/var/lib/nfs
1091 - --enable-tirpc
1092 - --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
1093 - --with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
1094 - $(use_enable libmount libmount-mount)
1095 - $(use_with tcpd tcp-wrappers)
1096 - $(use_enable nfsdcld nfsdcltrack)
1097 - $(use_enable nfsv4)
1098 - $(use_enable nfsv41)
1099 - $(use_enable ipv6)
1100 - $(use_enable caps)
1101 - $(use_enable uuid)
1102 - $(use_enable kerberos gss)
1103 - $(use_enable kerberos svcgss)
1104 - --without-gssglue
1105 - )
1106 - econf "${myeconfargs[@]}"
1107 -}
1108 -
1109 -src_compile(){
1110 - # remove compiled files bundled in the tarball
1111 - emake clean
1112 - default
1113 -}
1114 -
1115 -src_install() {
1116 - default
1117 - rm linux-nfs/Makefile* || die
1118 - dodoc -r linux-nfs README
1119 -
1120 - # Don't overwrite existing xtab/etab, install the original
1121 - # versions somewhere safe... more info in pkg_postinst
1122 - keepdir /var/lib/nfs/{,sm,sm.bak}
1123 - mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
1124 -
1125 - # Install some client-side binaries in /sbin
1126 - dodir /sbin
1127 - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
1128 -
1129 - if use nfsv4 && use nfsidmap ; then
1130 - # Install a config file for idmappers in newer kernels. #415625
1131 - insinto /etc/request-key.d
1132 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
1133 - doins id_resolver.conf
1134 - fi
1135 -
1136 - insinto /etc
1137 - doins "${FILESDIR}"/exports
1138 - keepdir /etc/exports.d
1139 -
1140 - local f list=() opt_need=""
1141 - if use nfsv4 ; then
1142 - opt_need="rpc.idmapd"
1143 - list+=( rpc.idmapd rpc.pipefs )
1144 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
1145 - fi
1146 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
1147 - newinitd "${FILESDIR}"/${f}.initd ${f}
1148 - done
1149 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
1150 - for f in nfs nfsclient ; do
1151 - newconfd "${FILESDIR}"/${f}.confd ${f}
1152 - done
1153 - sed -i \
1154 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
1155 - "${ED%/}"/etc/conf.d/nfs || die #234132
1156 -
1157 - local systemd_systemunitdir="$(systemd_get_systemunitdir)"
1158 - systemd_dounit systemd/*.{mount,service,target}
1159 - if ! use nfsv4 || ! use kerberos ; then
1160 - rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
1161 - fi
1162 - if ! use nfsv41 ; then
1163 - rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
1164 - fi
1165 - sed -i \
1166 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
1167 - "${ED%/}${systemd_systemunitdir}"/* || die
1168 -
1169 - keepdir /var/lib/nfs #368505
1170 - keepdir /var/lib/nfs/v4recovery #603628
1171 -
1172 -}
1173 -
1174 -pkg_postinst() {
1175 - # Install default xtab and friends if there's none existing. In
1176 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
1177 - # the daemons actually use the files in /var/lib/nfs. #30486
1178 - local f
1179 - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
1180 - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
1181 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
1182 - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
1183 - done
1184 -
1185 - if systemd_is_booted; then
1186 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
1187 - ewarn "We have switched to upstream systemd unit files. Since"
1188 - ewarn "they got renamed, you should probably enable the new ones."
1189 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
1190 - ewarn "to know what services you need to enable now."
1191 - fi
1192 - else
1193 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
1194 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
1195 - ewarn "same runlevel as nfsmount."
1196 - fi
1197 -}