From 3c0ac23fc220e56b44356d845aaf1b71df69c816 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jul 2018 19:07:46 +0100 Subject: gentoo resync : 21.07.2018 --- net-fs/nfs-utils/Manifest | 4 +- net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild | 178 ----------------------------- net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild | 2 +- 3 files changed, 2 insertions(+), 182 deletions(-) delete mode 100644 net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild (limited to 'net-fs/nfs-utils') diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index ae4928d5b224..6281914e614e 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -17,10 +17,8 @@ AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf2970 AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f -DIST nfs-utils-1.3.4.tar.bz2 814545 BLAKE2B 4b8c5fa4c1c21858e19d05f973c6d94185cf6a15c88348dda5e47c6714f9dba00dfa05237d908479970440b2ea57287600e92cb4d49872127b3801e075d6bf1a SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3 DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf50880a89ec97cb8ce4453266ba5b145eb1ca7a4362ac1a91ea5c1ebddd4fcd1d6a4cd12f45637cd5d845cc6d8d5f139d SHA512 4b948d92f515e9340163f53ab26dd7189fa8b13909f5c668b7c66ae13f181ed778967edc0a20753763540b5a3f93a41a2de38a7276ffbfadfd866c5ed422520c -EBUILD nfs-utils-1.3.4-r1.ebuild 5139 BLAKE2B 8c2504911449d130588e6293c0691ddaa881630e01b390e4f7cd891e02ebcf137984565867b21ad59261d38d5ae5bad89ce7d5a3684bc9ae6f3b8a0787d08d06 SHA512 828f39b3f7f117e5930b42c62908b9f6f5ba7cefacaf2a2149108b428b03da8ca1f1ca993a86264876f1103d6118ef6be62ec25babb4d6aff0270b24a4fe4e0a -EBUILD nfs-utils-2.3.1-r3.ebuild 5294 BLAKE2B 3c04d19a98bd620de460ae07bca7a609bc57c1de39ac621c7cf9404a5297b79d8f3e2d9d5ec2c2fb14754dcd6cb5b0e4e39d1c5f54cb3568e70ae95b266e76ef SHA512 342f97daba6c64b74da49617024c659e3be6f50b698564958a171b222502911369b87f2d18e7770c3fe5f0869d89a5db6d15c1624a62fe1d311de581e1fe137f +EBUILD nfs-utils-2.3.1-r3.ebuild 5293 BLAKE2B 785b622435b7f2a7ffe2993c4a3dfd4a18d25170761f1c59157d55fe3643ddee33862b9ce0da3d29a9a50d80ef2c50d1a77d61ef2c86dca5f10082761da712fd SHA512 70b6a1c3dce229571c1c07f0fe32a3cb392f349d8928b5d7007c4485c3cc3f20710eb400141d893af2098518af481a2fa79d3a0b5e8f2bab5dca571dacc86af6 EBUILD nfs-utils-2.3.2.ebuild 5385 BLAKE2B 4dfc11b9a80be2dcd0501c3da9e541d16cd6d260cf28d18d2fe2cb539274b85b9fa2b29c4f1c251989b8cc2b2778f1aea0f93f10a259458f3e55a15787e03c02 SHA512 1e05759322d7726187956010ff65985970dc3b032838d8b4090361035a922c9d4d425a7c6cd1c415ea5e6f32aacf1f1fbdff1a3d50a58ac09f43e310964799a7 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5 diff --git a/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild deleted file mode 100644 index 466e8e2c5e4f..000000000000 --- a/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic multilib autotools systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) - caps? ( sys-libs/libcap ) - sys-libs/e2fsprogs-libs - >=net-nds/rpcbind-0.2.4 - net-libs/libtirpc:= - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent:= - >=net-libs/libnfsidmap-0.21-r1 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - nfsidmap? ( - >=net-libs/libnfsidmap-0.24 - >=sys-apps/keyutils-1.5.9 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-nds/portmap - ! id_resolver.conf - doins id_resolver.conf - fi - - insinto /etc - doins "${FILESDIR}"/exports - keepdir /etc/exports.d - - local f list=() opt_need="" - if use nfsv4 ; then - opt_need="rpc.idmapd" - list+=( rpc.idmapd rpc.pipefs ) - use kerberos && list+=( rpc.gssd rpc.svcgssd ) - fi - for f in nfs nfsclient rpc.statd "${list[@]}" ; do - newinitd "${FILESDIR}"/${f}.initd ${f} - done - newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01 - for f in nfs nfsclient ; do - newconfd "${FILESDIR}"/${f}.confd ${f} - done - sed -i \ - -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \ - "${ED}"/etc/conf.d/nfs || die #234132 - - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die - fi - rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die - sed -i -r \ - -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \ - -e '/^(After|Wants)=nfs-config.service$/d' \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${D}$(systemd_get_unitdir)"/* || die - - keepdir /var/lib/nfs #368505 - keepdir /var/lib/nfs/v4recovery #603628 -} - -pkg_postinst() { - # Install default xtab and friends if there's none existing. In - # 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 - 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 - - if systemd_is_booted; then - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild index ff490a255b5b..5cd180a79be4 100644 --- a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild @@ -15,7 +15,7 @@ if [[ "${PV}" = *_rc* ]] ; then S="${WORKDIR}/${PN}-${PN}-${MY_PV}" else SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" fi LICENSE="GPL-2" -- cgit v1.2.3