cleanup old stuff

Package-Manager: portage-2.0.53_rc7

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ffd02880c8a121186721f309885bcd92a7337f8f..1654c2d501c90a4146c62996a62afc8139767982 100644 (file)
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -3,7 +3,6 @@ Hash: SHA1
 
 MD5 b2c2e3d2fe34adf5699943ba00ccb402 ChangeLog 10586
 MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
-MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7-r1 67
 MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7-r2 67
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
 MD5 8d3d9ac54a272ccbd554d80df273c51a files/nfs 6750
@@ -16,12 +15,11 @@ MD5 fc332370f9517304bc251f505b17abf2 files/nfs.confd 533
 MD5 1f3e6130e4a60767a213d34ff3131ae4 files/nfsmount 1171
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 MD5 a5785bca6bda4d00aabdc28e36802df1 nfs-utils-1.0.6-r6.ebuild 2926
-MD5 297d2da334fb6df5e747f61b989ef7ca nfs-utils-1.0.7-r1.ebuild 3272
-MD5 854612a273789b0188aa41905996ead6 nfs-utils-1.0.7-r2.ebuild 3414
+MD5 e29c1034de44312ab28a6111ba2722d0 nfs-utils-1.0.7-r2.ebuild 3375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDSC21gIKl8Uu19MoRAkiPAJwOOAbhMXeEYvykDv+iMkIIGdU+ygCfZCU1
-0jPuxOeQL2CywwVsrnbBRaY=
-=xTKO
+iD8DBQFDgC9+gIKl8Uu19MoRAvjRAJ9HSktAQIl3PfgcNCvNKaBml9pEowCeJPhU
+egCZMrbX29QHCcDq9M2DLSU=
+=lRLX
 -----END PGP SIGNATURE-----

diff --git a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r1 b/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r1
deleted file mode 100644 (file)
index 0b0ec24..0000000
--- a/net-fs/nfs-utils/files/digest-nfs-utils-1.0.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f863120261cd572ad320a9152581e11 nfs-utils-1.0.7.tar.gz 398577

diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild
deleted file mode 100644 (file)
index 1bb4c9e..0000000
--- a/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2005 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.0.7-r1.ebuild,v 1.6 2005/08/24 00:25:09 vapier Exp $
-
-inherit gnuconfig eutils flag-o-matic
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://nfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="nonfsv4 tcpd kerberos"
-
-# 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)
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-       >=net-nds/portmap-5b-r6
-       >=sys-apps/util-linux-2.11f
-       !nonfsv4? (
-               >=dev-libs/libevent-1.0b
-               >=net-libs/nfsidmap-0.9
-       )
-       kerberos? ( app-crypt/mit-krb5 )"
-DEPEND="${RDEPEND}
-       >=sys-apps/portage-2.0.51"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       # Fix gcc4 issues #88421
-       epatch "${FILESDIR}"/${P}-gcc4.patch
-
-       # getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc
-       epatch "${FILESDIR}"/nfs-utils-1.0.6-uclibc.patch
-
-       # since the usn36 patch is now integrated (at least the parts we care about)
-       # into 1.0.7, we need to re-apply the rquoted patch (04 Feb 2005 agriffis)
-       epatch "${FILESDIR}"/nfs-utils-0.3.3-rquotad-overflow.patch
-
-       sed -i 's:@mandir@:$(install_prefix)@mandir@:' config.mk.in
-}
-
-src_compile() {
-       econf \
-               --mandir=/usr/share/man \
-               --with-statedir=/var/lib/nfs \
-               --disable-rquotad \
-               --enable-nfsv3 \
-               --enable-secure-statd \
-               $(use_enable !nonfsv4 nfsv4) \
-               $(use_enable kerberos gss) \
-               || die "Configure failed"
-
-       if ! use tcpd ; then
-               sed -i "s:\(-lwrap\|-DHAVE_TCP_WRAPPER\)::" config.mk
-       fi
-
-       # parallel make fails for depend target
-       emake -j1 depend || die "failed to make depend"
-       emake || die "Failed to compile"
-}
-
-src_install() {
-       make install_prefix="${D}" install || die
-
-       # Don't overwrite existing xtab/etab, install the original
-       # versions somewhere safe...  more info in pkg_postinst
-       dodir /usr/lib/nfs
-       keepdir /var/lib/nfs/{sm,sm.bak}
-       mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
-       keepdir /var/lib/nfs
-       keepdir /var/lib/nfs/v4root
-
-       # Install some client-side binaries in /sbin
-       dodir /sbin
-       mv "${D}"/usr/sbin/rpc.{lockd,statd} "${D}"/sbin/
-
-       dodoc ChangeLog README
-       docinto linux-nfs ; dodoc linux-nfs/*
-
-       insinto /etc ; doins "${FILESDIR}"/exports
-
-       doinitd "${FILESDIR}"/nfs "${FILESDIR}"/nfsmount
-       newconfd "${FILESDIR}"/nfs.confd nfs
-
-       # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
-       if ! use elibc_glibc ; then
-               dobin tools/rpcgen/rpcgen || die "rpcgen"
-               newdoc tools/rpcgen/README README.rpcgen
-       fi
-}
-
-pkg_preinst() {
-       if [[ -s ${ROOT}/etc/exports ]] ; then
-               rm -f "${IMAGE}"/etc/exports
-       fi
-}
-
-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.  This fixes
-       # bug 30486
-       local f
-       for f in "${ROOT}"/usr/lib/nfs/*; do
-               [[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-               einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs"
-               cp -pPR ${f} "${ROOT}"/var/lib/nfs/
-       done
-}

diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild
index 7d21d3954c6cba346da532e8b90777fff6feef1b..aad0f0722255718d179b581a0e190e4d517f1b2b 100644 (file)
--- a/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.0.7-r2.ebuild,v 1.1 2005/10/08 20:34:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7-r2.ebuild,v 1.2 2005/11/20 08:09:00 vapier Exp $
 
-inherit gnuconfig eutils flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="NFS client and server daemons"
 HOMEPAGE="http://nfs.sourceforge.net/"
@@ -19,7 +19,6 @@ IUSE="nonfsv4 tcpd kerberos"
 # (04 Feb 2005 agriffis)
 RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
        >=net-nds/portmap-5b-r6
-       >=sys-apps/util-linux-2.11f
        !nonfsv4? (
                >=dev-libs/libevent-1.0b
                >=net-libs/nfsidmap-0.9