Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/
Date: Sun, 02 Dec 2018 17:55:24
Message-Id: 1543773286.2e778f6f4c2655d45180898c5b12f61812e97b2d.zlogene@gentoo
1 commit: 2e778f6f4c2655d45180898c5b12f61812e97b2d
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 2 17:54:46 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 2 17:54:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e778f6f
7
8 net-fs/nfs-utils: Drop old
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 net-fs/nfs-utils/Manifest | 1 -
14 net-fs/nfs-utils/nfs-utils-2.3.2.ebuild | 191 --------------------------------
15 2 files changed, 192 deletions(-)
16
17 diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
18 index 3ea779b3bc5..92c38322217 100644
19 --- a/net-fs/nfs-utils/Manifest
20 +++ b/net-fs/nfs-utils/Manifest
21 @@ -1,3 +1,2 @@
22 DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3
23 -DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf50880a89ec97cb8ce4453266ba5b145eb1ca7a4362ac1a91ea5c1ebddd4fcd1d6a4cd12f45637cd5d845cc6d8d5f139d SHA512 4b948d92f515e9340163f53ab26dd7189fa8b13909f5c668b7c66ae13f181ed778967edc0a20753763540b5a3f93a41a2de38a7276ffbfadfd866c5ed422520c
24 DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba
25
26 diff --git a/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild
27 deleted file mode 100644
28 index 553fb8c8b2d..00000000000
29 --- a/net-fs/nfs-utils/nfs-utils-2.3.2.ebuild
30 +++ /dev/null
31 @@ -1,191 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -inherit autotools flag-o-matic multilib systemd
38 -
39 -DESCRIPTION="NFS client and server daemons"
40 -HOMEPAGE="http://linux-nfs.org/"
41 -
42 -if [[ "${PV}" = *_rc* ]] ; then
43 - inherit versionator
44 - MY_PV="$(replace_all_version_separators -)"
45 - 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"
46 - S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
47 -else
48 - SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
49 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
50 -fi
51 -
52 -LICENSE="GPL-2"
53 -SLOT="0"
54 -IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
55 -REQUIRED_USE="kerberos? ( nfsv4 )"
56 -RESTRICT="test" #315573
57 -
58 -# kth-krb doesn't provide the right include
59 -# files, and nfs-utils doesn't build against heimdal either,
60 -# so don't depend on virtual/krb.
61 -# (04 Feb 2005 agriffis)
62 -DEPEND_COMMON="
63 - net-libs/libtirpc:=
64 - >=net-nds/rpcbind-0.2.4
65 - sys-libs/e2fsprogs-libs
66 - caps? ( sys-libs/libcap )
67 - ldap? ( net-nds/openldap )
68 - libmount? ( sys-apps/util-linux )
69 - nfsdcld? ( >=dev-db/sqlite-3.3 )
70 - nfsv4? (
71 - dev-libs/libevent:=
72 - >=sys-apps/keyutils-1.5.9
73 - kerberos? (
74 - >=net-libs/libtirpc-0.2.4-r1[kerberos]
75 - app-crypt/mit-krb5
76 - )
77 - )
78 - nfsv41? (
79 - sys-fs/lvm2
80 - )
81 - tcpd? ( sys-apps/tcp-wrappers )
82 - uuid? ( sys-apps/util-linux )"
83 -RDEPEND="${DEPEND_COMMON}
84 - !net-libs/libnfsidmap
85 - !net-nds/portmap
86 - !<sys-apps/openrc-0.13.9
87 - selinux? (
88 - sec-policy/selinux-rpc
89 - sec-policy/selinux-rpcbind
90 - )
91 -"
92 -DEPEND="${DEPEND_COMMON}
93 - dev-libs/libxml2
94 - net-libs/rpcsvc-proto
95 - virtual/pkgconfig"
96 -
97 -PATCHES=(
98 - "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
99 - "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
100 - "${FILESDIR}"/${PN}-2.3.2-junction_libs.patch
101 - "${FILESDIR}"/${PN}-2.3.2-no-werror.patch
102 -)
103 -
104 -src_prepare() {
105 - default
106 -
107 - sed \
108 - -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
109 - -i utils/*/Makefile.am || die
110 -
111 - eautoreconf
112 -}
113 -
114 -src_configure() {
115 - export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
116 - export ac_cv_header_keyutils_h=$(usex nfsidmap)
117 - local myeconfargs=(
118 - --with-statedir="${EPREFIX%/}"/var/lib/nfs
119 - --enable-tirpc
120 - --with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
121 - --with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
122 - --with-rpcgen
123 - --with-systemd="$(systemd_get_systemunitdir)"
124 - --without-gssglue
125 - $(use_enable caps)
126 - $(use_enable ipv6)
127 - $(use_enable junction)
128 - $(use_enable kerberos gss)
129 - $(use_enable kerberos svcgss)
130 - $(use_enable ldap)
131 - $(use_enable libmount libmount-mount)
132 - $(use_enable nfsdcld nfsdcltrack)
133 - $(use_enable nfsv4)
134 - $(use_enable nfsv41)
135 - $(use_enable uuid)
136 - $(use_with tcpd tcp-wrappers)
137 - )
138 - econf "${myeconfargs[@]}"
139 -}
140 -
141 -src_compile(){
142 - # remove compiled files bundled in the tarball
143 - emake clean
144 - default
145 -}
146 -
147 -src_install() {
148 - default
149 - rm linux-nfs/Makefile* || die
150 - dodoc -r linux-nfs README
151 -
152 - # Don't overwrite existing xtab/etab, install the original
153 - # versions somewhere safe... more info in pkg_postinst
154 - keepdir /var/lib/nfs/{,sm,sm.bak}
155 - mv "${ED%/}"/var/lib/nfs "${ED%/}"/usr/$(get_libdir)/ || die
156 -
157 - # Install some client-side binaries in /sbin
158 - dodir /sbin
159 - mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
160 -
161 - if use nfsv4 && use nfsidmap ; then
162 - # Install a config file for idmappers in newer kernels. #415625
163 - insinto /etc/request-key.d
164 - echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
165 - doins id_resolver.conf
166 - fi
167 -
168 - insinto /etc
169 - doins "${FILESDIR}"/exports
170 - keepdir /etc/exports.d
171 -
172 - local f list=() opt_need=""
173 - if use nfsv4 ; then
174 - opt_need="rpc.idmapd"
175 - list+=( rpc.idmapd rpc.pipefs )
176 - use kerberos && list+=( rpc.gssd rpc.svcgssd )
177 - fi
178 - for f in nfs nfsclient rpc.statd "${list[@]}" ; do
179 - newinitd "${FILESDIR}"/${f}.initd ${f}
180 - done
181 - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
182 - for f in nfs nfsclient ; do
183 - newconfd "${FILESDIR}"/${f}.confd ${f}
184 - done
185 - sed -i \
186 - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
187 - "${ED%/}"/etc/conf.d/nfs || die #234132
188 -
189 - local systemd_systemunitdir="$(systemd_get_systemunitdir)"
190 - sed -i \
191 - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
192 - "${ED%/}${systemd_systemunitdir}"/* || die
193 -
194 - keepdir /var/lib/nfs #368505
195 - keepdir /var/lib/nfs/v4recovery #603628
196 -
197 -}
198 -
199 -pkg_postinst() {
200 - # Install default xtab and friends if there's none existing. In
201 - # src_install we put them in /usr/lib/nfs for safe-keeping, but
202 - # the daemons actually use the files in /var/lib/nfs. #30486
203 - local f
204 - for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
205 - [[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
206 - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
207 - cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
208 - done
209 -
210 - if systemd_is_booted; then
211 - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
212 - ewarn "We have switched to upstream systemd unit files. Since"
213 - ewarn "they got renamed, you should probably enable the new ones."
214 - ewarn "You can run 'equery files nfs-utils | grep systemd'"
215 - ewarn "to know what services you need to enable now."
216 - fi
217 - else
218 - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
219 - ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
220 - ewarn "same runlevel as nfsmount."
221 - fi
222 -}