change glibc to libc

14 files changed, 344 insertions, 345 deletions

diff --git a/sys-apps/findutils/files/digest-findutils-4.1.20 b/sys-apps/findutils/files/digest-findutils-4.1.20
deleted file mode 100644
index ee97aa90b56d..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e90ce7222daadeb8616b8db461e17cbc findutils-4.1.20.tar.gz 777980
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r1 b/sys-apps/findutils/files/digest-findutils-4.1.7-r1
deleted file mode 100644
index 71e0d8a53382..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.1.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r2 b/sys-apps/findutils/files/digest-findutils-4.1.7-r2
deleted file mode 100644
index 71e0d8a53382..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.1.7-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r3 b/sys-apps/findutils/files/digest-findutils-4.1.7-r3
deleted file mode 100644
index 71e0d8a53382..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.1.7-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.7-r4 b/sys-apps/findutils/files/digest-findutils-4.1.7-r4
deleted file mode 100644
index 71e0d8a53382..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.1.7-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 582d9b35006065f81f71d681c165fa1e findutils-4.1.7.tar.gz 634058
diff --git a/sys-apps/findutils/files/findutils-4.1.20-selinux.diff b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff
new file mode 100644
index 000000000000..e66d126949c8
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff
@@ -0,0 +1,336 @@
+diff -urN findutils-4.1.20.orig/find/Makefile.am findutils-4.1.20/find/Makefile.am
+--- findutils-4.1.20.orig/find/Makefile.am	2003-05-26 13:02:34.000000000 -0500
++++ findutils-4.1.20/find/Makefile.am	2003-09-28 15:40:28.000000000 -0500
+@@ -3,8 +3,9 @@
+ bin_PROGRAMS = find
+ find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c
+ EXTRA_DIST = defs.h $(man_MANS)
++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
+ INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+-LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
++LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux
+ man_MANS = find.1
+ SUBDIRS = testsuite
+ 
+diff -urN findutils-4.1.20.orig/find/Makefile.in findutils-4.1.20/find/Makefile.in
+--- findutils-4.1.20.orig/find/Makefile.in	2003-05-26 13:18:11.000000000 -0500
++++ findutils-4.1.20/find/Makefile.in	2003-09-28 15:42:44.000000000 -0500
+@@ -54,7 +54,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DWITH_SELINUX
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -145,7 +145,7 @@
+ bin_PROGRAMS = find
+ find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c
+ EXTRA_DIST = defs.h $(man_MANS)
+-LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@
++LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux
+ man_MANS = find.1
+ SUBDIRS = testsuite
+ subdir = find
+diff -urN findutils-4.1.20.orig/find/defs.h findutils-4.1.20/find/defs.h
+--- findutils-4.1.20.orig/find/defs.h	2003-05-26 08:37:29.000000000 -0500
++++ findutils-4.1.20/find/defs.h	2003-09-28 15:25:41.000000000 -0500
+@@ -127,6 +127,10 @@
+ #define MODE_RWX	(S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
+ #define MODE_ALL	(S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
+ 
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#endif /*WITH_SELINUX*/
++
+ /* Not char because of type promotion; NeXT gcc can't handle it.  */
+ typedef int boolean;
+ #define		true    1
+@@ -274,6 +278,9 @@
+     struct perm_val perm;	/* perm */
+     mode_t type;		/* type */
+     FILE *stream;		/* fprint fprint0 */
++#ifdef WITH_SELINUX
++    security_context_t scontext; /* scontext */
++#endif /*WITH_SELINUX*/
+     struct format_val printf_vec; /* printf fprintf */
+   } args;
+ 
+@@ -319,6 +326,11 @@
+ VOID *xmalloc PARAMS((size_t n));
+ VOID *xrealloc PARAMS((VOID *p, size_t n));
+ 
++#ifdef WITH_SELINUX
++boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
++extern int (*x_getfilecon) ();
++#endif /*WITH_SELINUX*/
++
+ /* xstrdup.c */
+ char *xstrdup PARAMS((char *string));
+ 
+diff -urN findutils-4.1.20.orig/find/find.1 findutils-4.1.20/find/find.1
+--- findutils-4.1.20.orig/find/find.1	2001-05-20 14:42:07.000000000 -0500
++++ findutils-4.1.20/find/find.1	2003-09-28 15:25:41.000000000 -0500
+@@ -230,6 +230,9 @@
+ file of type \fIc\fR; if \-follow has been given, true if \fIc\fR is
+ `l'.  In other words, for symbolic links, \-xtype checks the type of
+ the file that \-type does not check.
++.IP "\-context \fIscontext\fR"
++.IP "\--context \fIscontext\fR"
++(SELinux only) File has the security context \fIscontext\fR.
+ .SS ACTIONS
+ .IP "\-exec \fIcommand\fR ;"
+ Execute \fIcommand\fR; true if 0 status is returned.  All following
+@@ -417,6 +420,8 @@
+ File's user name, or numeric user ID if the user has no name.
+ .IP %U
+ File's numeric user ID.
++.IP %C
++(SELInux only) file's security context.
+ .PP
+ A `%' character followed by any other character is discarded (but the
+ other character is printed).
+diff -urN findutils-4.1.20.orig/find/find.c findutils-4.1.20/find/find.c
+--- findutils-4.1.20.orig/find/find.c	2003-05-24 13:36:25.000000000 -0500
++++ findutils-4.1.20/find/find.c	2003-09-28 15:25:41.000000000 -0500
+@@ -136,6 +136,9 @@
+ 
+ /* Pointer to the function used to stat files. */
+ int (*xstat) ();
++#ifdef WITH_SELINUX
++int (*x_getfilecon) ();
++#endif /* WITH_SELINUX */
+ 
+ /* Status value to return to system. */
+ int exit_status;
+@@ -182,6 +185,10 @@
+   xstat = debug_stat;
+ #else /* !DEBUG_STAT */
+   xstat = lstat;
++#ifdef WITH_SELINUX
++  int is_selinux_enabled_flag = is_selinux_enabled();
++  x_getfilecon = lgetfilecon;
++#endif /* WITH_SELINUX */
+ #endif /* !DEBUG_STAT */
+ 
+   human_block_size (getenv ("FIND_BLOCK_SIZE"), 0, &output_block_size);
+@@ -203,6 +210,14 @@
+       if (strchr ("-!(),", argv[i][0]) == NULL)
+ 	usage (_("paths must precede expression"));
+       predicate_name = argv[i];
++#ifdef WITH_SELINUX
++      if (! is_selinux_enabled_flag) {
++	if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
++	    (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
++	  error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name);
++	}
++      }
++#endif
+       parse_function = find_parser (predicate_name);
+       if (parse_function == NULL)
+ 	/* Command line option not recognized */
+diff -urN findutils-4.1.20.orig/find/parser.c findutils-4.1.20/find/parser.c
+--- findutils-4.1.20.orig/find/parser.c	2003-05-24 13:36:25.000000000 -0500
++++ findutils-4.1.20/find/parser.c	2003-09-28 15:25:41.000000000 -0500
+@@ -25,6 +25,10 @@
+ #include "modetype.h"
+ #include "xstrtol.h"
+ 
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#endif /*WITH_SELINUX*/
++
+ #if ENABLE_NLS
+ # include <libintl.h>
+ # define _(Text) gettext (Text)
+@@ -115,6 +119,9 @@
+ static boolean parse_version PARAMS((char *argv[], int *arg_ptr));
+ static boolean parse_xdev PARAMS((char *argv[], int *arg_ptr));
+ static boolean parse_xtype PARAMS((char *argv[], int *arg_ptr));
++#ifdef WITH_SELINUX
++static boolean parse_scontext PARAMS((char *argv[], int *arg_ptr));
++#endif /*WITH_SELINUX*/
+ 
+ static boolean insert_regex PARAMS((char *argv[], int *arg_ptr, boolean ignore_case));
+ static boolean insert_type PARAMS((char *argv[], int *arg_ptr, boolean (*which_pred )()));
+@@ -217,7 +224,11 @@
+   {"-version", parse_version},	/* GNU */
+   {"xdev", parse_xdev},
+   {"xtype", parse_xtype},	/* GNU */
+-  {0, 0}
++#ifdef WITH_SELINUX
++  {"context", parse_scontext},       /* SELINUX */
++  {"-context", parse_scontext},       /* SELINUX */
++#endif /*WITH_SELINUX*/
++   {0, 0}
+ };
+ 
+ /* Return a pointer to the parser function to invoke for predicate
+@@ -467,7 +478,10 @@
+ {
+   dereference = true;
+   xstat = stat;
+-  no_leaf_check = true;
++#ifdef WITH_SELINUX
++  x_getfilecon = getfilecon;
++#endif /* WITH_SELINUX */
++   no_leaf_check = true;
+   return (true);
+ }
+ 
+@@ -572,6 +586,10 @@
+       -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\
+       -size N[bckw] -true -type [bcdpfls] -uid N -used N -user NAME\n\
+       -xtype [bcdpfls]\n"));
++#ifdef WITH_SELINUX
++  puts (_("\
++      -context CONTEXT\n"));
++#endif /*WITH_SELINUX*/
+   puts (_("\
+ actions: -exec COMMAND ; -fprint FILE -fprint0 FILE -fprintf FILE FORMAT\n\
+       -ok COMMAND ; -print -print0 -printf FORMAT -prune -ls\n"));
+@@ -1202,6 +1220,32 @@
+   return true;
+ }
+ 
++#ifdef WITH_SELINUX
++
++static boolean
++parse_scontext ( argv, arg_ptr )
++     char *argv[];
++     int *arg_ptr;
++{
++  struct predicate *our_pred;
++
++  if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
++    return( false );
++
++  our_pred = insert_primary(pred_scontext);
++  our_pred->need_stat = false;
++#ifdef DEBUG
++  our_pred->p_name = find_pred_name (pred_scontext);
++#endif /*DEBUG*/
++
++  our_pred->args.scontext = argv[*arg_ptr];;
++
++  (*arg_ptr)++;
++  return( true );
++}
++
++#endif /*WITH_SELINUX*/
++
+ static boolean
+ parse_xtype (char **argv, int *arg_ptr)
+ {
+@@ -1360,7 +1404,11 @@
+ 	  if (*scan2 == '.')
+ 	    for (scan2++; ISDIGIT (*scan2); scan2++)
+ 	      /* Do nothing. */ ;
+-	  if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2))
++#ifdef WITH_SELINUX
++        if (strchr ("abcdfFgGhHiklmnpPstuUC", *scan2))
++#else  /* WITH_SELINUX */
++        if (strchr ("abcdfFgGhHiklmnpPstuU", *scan2))
++#endif /* WITH_SELINUX */
+ 	    {
+ 	      segmentp = make_segment (segmentp, format, scan2 - format,
+ 				       (int) *scan2);
+diff -urN findutils-4.1.20.orig/find/pred.c findutils-4.1.20/find/pred.c
+--- findutils-4.1.20.orig/find/pred.c	2003-05-24 13:36:25.000000000 -0500
++++ findutils-4.1.20/find/pred.c	2003-09-28 15:25:41.000000000 -0500
+@@ -29,6 +29,14 @@
+ #include "modetype.h"
+ #include "wait.h"
+ 
++#ifdef WITH_SELINUX
++#include <selinux/selinux.h>
++#endif /*WITH_SELINUX*/
++
++#ifndef FNM_CASEFOLD
++#define FNM_CASEFOLD (1<<4)
++#endif  /*FNM_CASEFOLD*/
++
+ #if ENABLE_NLS
+ # include <libintl.h>
+ # define _(Text) gettext (Text)
+@@ -71,7 +79,6 @@
+ 
+ extern int yesno ();
+ 
+-
+ /* Get or fake the disk device blocksize.
+    Usually defined by sys/param.h (if at all).  */
+ #ifndef DEV_BSIZE
+@@ -198,6 +205,9 @@
+   {pred_used, "used    "},
+   {pred_user, "user    "},
+   {pred_xtype, "xtype   "},
++#ifdef WITH_SELINUX
++  {pred_scontext, "context"},
++#endif /*WITH_SELINUX*/
+   {0, "none    "}
+ };
+ 
+@@ -721,6 +731,25 @@
+ 	  fprintf (fp, segment->text,
+ 		   human_readable ((uintmax_t) stat_buf->st_uid, hbuf, 1, 1));
+ 	  break;
++#ifdef WITH_SELINUX
++      case 'C':               /* SELinux security context */
++        {
++          security_context_t scontext;
++          int rv;
++          rv = (*x_getfilecon)(rel_pathname, &scontext);
++
++          if ( rv < 0 ) {
++            (void) fprintf(stderr, "getfileconf(%s): %s",
++                           pathname, strerror(errno));
++            (void) fflush(stderr);
++          }
++          else {
++	      segment->text[segment->text_len] = 's';
++	      (void) fprintf (fp, segment->text, scontext);
++          }
++        }
++        break ;
++#endif /* WITH_SELINUX */
+ 	}
+     }
+   return (true);
+@@ -1222,6 +1251,35 @@
+     }
+   return (pred_type (pathname, &sbuf, pred_ptr));
+ }
++  
++
++#ifdef WITH_SELINUX
++
++boolean
++pred_scontext ( pathname, stat_buf, pred_ptr )
++     char *pathname;
++     struct stat *stat_buf;
++     struct predicate *pred_ptr;
++{
++  int rv;
++  security_context_t scontext;
++
++  rv = (* x_getfilecon)(rel_pathname, &scontext);
++
++  if ( rv < 0 ) {
++    (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
++    (void) fflush(stderr);
++    return ( false );
++  }
++
++
++  rv= (strcmp( scontext,pred_ptr->args.scontext) == 0 );
++  freecon(scontext);
++  return rv;
++}
++
++#endif /*WITH_SELINUX*/
++
+ 
+ /*  1) fork to get a child; parent remembers the child pid
+     2) child execs the command requested
diff --git a/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2 b/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2
deleted file mode 100644
index bbf61aa14a5c..000000000000
--- a/sys-apps/findutils/files/findutils-4.1.20-selinux.diff.bz2
+++ /dev/null
diff --git a/sys-apps/findutils/findutils-4.1.20-r1.ebuild b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
index a5c50d94dd94..052002bb2e2c 100644
--- a/sys-apps/findutils/findutils-4.1.20-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.22 2004/06/28 16:07:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.23 2004/06/29 15:58:53 vapier Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
-SELINUX_PATCH="findutils-4.1.20-selinux.diff.bz2"
+SELINUX_PATCH="findutils-4.1.20-selinux.diff"
 
 DESCRIPTION="GNU utilities to find files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
diff --git a/sys-apps/findutils/findutils-4.1.20.ebuild b/sys-apps/findutils/findutils-4.1.20.ebuild
deleted file mode 100644
index 426cdf50388b..000000000000
--- a/sys-apps/findutils/findutils-4.1.20.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20.ebuild,v 1.8 2004/06/28 16:07:47 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU utilities to find files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
-# Note this doesn't point to gnu.org because alpha.gnu.org has quit
-# supplying the development versions.  If it comes back in the future
-# then we might want to redirect the link.  See bug 18729
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~alpha ~ia64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="nls build afs"
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	x86? ( afs? ( net-fs/openafs ) )"
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-}
-
-src_compile() {
-	local myconf=
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use afs; then
-		export CPPFLAGS=-I/usr/afsws/include
-		export LDFLAGS=-lpam
-		export LIBS="/usr/afsws/lib/pam_afs.so.1 -lpam"
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		${myconf} || die
-
-	emake libexecdir=/usr/lib/find || die
-}
-
-src_install() {
-	einstall libexecdir=${D}/usr/lib/find || die
-
-	prepallman
-
-	rm -rf ${D}/usr/var
-	if ! use build; then
-		dodoc COPYING NEWS README TODO ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Please note that the locate and updatedb binaries"
-	ewarn "are not longer provided by findutils."
-	ewarn "Please emerge slocate"
-}
diff --git a/sys-apps/findutils/findutils-4.1.7-r1.ebuild b/sys-apps/findutils/findutils-4.1.7-r1.ebuild
deleted file mode 100644
index 272d83259b4a..000000000000
--- a/sys-apps/findutils/findutils-4.1.7-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r1.ebuild,v 1.21 2004/06/28 16:07:47 vapier Exp $
-
-DESCRIPTION="GNU utilities to find files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
-IUSE="nls build"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/libc"
-
-src_compile() {
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--localstatedir=/var/spool/locate \
-		${myconf} || die
-
-	emake libexecdir=/usr/lib/find || die
-}
-
-src_install() {
-	#do not change 'localstatedir=/var/spool/locate' to
-	#'localstatedir=${D}/var/spool/locate', as it will then be hardcoded
-	#into locate and updatedb
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		localstatedir=/var/spool/locate \
-		libexecdir=${D}/usr/lib/find \
-		install || die
-
-	dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
-	rm -rf ${D}/usr/var
-	if ! use build
-	then
-		dodoc COPYING NEWS README TODO ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-	dodir /var/spool/locate
-	keepdir /var/spool/locate
-}
-
diff --git a/sys-apps/findutils/findutils-4.1.7-r2.ebuild b/sys-apps/findutils/findutils-4.1.7-r2.ebuild
deleted file mode 100644
index d2362908d421..000000000000
--- a/sys-apps/findutils/findutils-4.1.7-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r2.ebuild,v 1.16 2004/06/25 20:59:22 agriffis Exp $
-
-IUSE="nls build afs"
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="GNU utilities to find files"
-SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
-KEYWORDS="x86 amd64 ~hppa ppc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )
-	x86? ( afs? ( net-fs/openafs ) )"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use afs
-	    then
-		export CPPFLAGS=-I/usr/afsws/include
-		export LDFLAGS=-lpam
-		export LIBS="/usr/afsws/lib/pam_afs.so.1 -lpam"
-	fi
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--localstatedir=/var/spool/locate \
-		${myconf} || die
-
-	emake libexecdir=/usr/lib/find || die
-}
-
-src_install() {
-	#do not change 'localstatedir=/var/spool/locate' to
-	#'localstatedir=${D}/var/spool/locate', as it will then be hardcoded
-	#into locate and updatedb
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		localstatedir=/var/spool/locate \
-		libexecdir=${D}/usr/lib/find \
-		install || die
-
-	dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
-	rm -rf ${D}/usr/var
-	if ! use build
-	then
-		dodoc COPYING NEWS README TODO ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-	dodir /var/spool/locate
-	keepdir /var/spool/locate
-}
-
diff --git a/sys-apps/findutils/findutils-4.1.7-r3.ebuild b/sys-apps/findutils/findutils-4.1.7-r3.ebuild
deleted file mode 100644
index 5dd860a335bb..000000000000
--- a/sys-apps/findutils/findutils-4.1.7-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r3.ebuild,v 1.14 2004/06/25 20:59:22 agriffis Exp $
-
-IUSE="nls build afs"
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="GNU utilities to find files"
-SRC_URI="ftp://alpha.gnu.org/gnu/${P}.tar.gz"
-
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
-KEYWORDS="x86 amd64 ~hppa ppc"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	nls? ( sys-devel/gettext )
-	x86? ( afs? ( net-fs/openafs ) )"
-RDEPEND="virtual/glibc"
-
-src_compile() {
-
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use afs
-	    then
-		export CPPFLAGS=-I/usr/afsws/include
-		export LDFLAGS=-lpam
-		export LIBS="/usr/afsws/lib/pam_afs.so.1 -lpam"
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--localstatedir=/var/spool/locate \
-		${myconf} || die
-
-	emake libexecdir=/usr/lib/find || die
-}
-
-src_install() {
-	#do not change 'localstatedir=/var/spool/locate' to
-	#'localstatedir=${D}/var/spool/locate', as it will then be hardcoded
-	#into locate and updatedb
-	einstall \
-		localstatedir=${D}/var/spool/locate \
-		libexecdir=${D}/usr/lib/find \
-		|| die
-
-	prepallman
-
-	dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
-	rm -rf ${D}/usr/var
-	if ! use build
-	then
-		dodoc COPYING NEWS README TODO ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-	keepdir /var/spool/locate
-}
diff --git a/sys-apps/findutils/findutils-4.1.7-r4.ebuild b/sys-apps/findutils/findutils-4.1.7-r4.ebuild
deleted file mode 100644
index 972bd746e744..000000000000
--- a/sys-apps/findutils/findutils-4.1.7-r4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.18 2004/06/24 22:06:58 agriffis Exp $
-
-IUSE="nls build afs"
-
-inherit eutils
-
-DESCRIPTION="GNU utilities to find files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
-# Note this doesn't point to gnu.org because alpha.gnu.org has quit
-# supplying the development versions.  If it comes back in the future
-# then we might want to redirect the link.  See bug 18729
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="x86 amd64 ppc sparc hppa alpha ia64"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )
-	x86? ( afs? ( net-fs/openafs ) )"
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-}
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if use afs; then
-		export CPPFLAGS=-I/usr/afsws/include
-		export LDFLAGS=-lpam
-		export LIBS="/usr/afsws/lib/pam_afs.so.1 -lpam"
-	fi
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		${myconf} || die
-
-	emake libexecdir=/usr/lib/find || die
-}
-
-src_install() {
-	einstall libexecdir=${D}/usr/lib/find || die
-
-	prepallman
-
-	rm -rf ${D}/usr/var
-	if ! use build; then
-		dodoc COPYING NEWS README TODO ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Please note that the locate and updatedb binaries"
-	ewarn "are not longer provided by findutils."
-	ewarn "Please emerge slocate"
-}
diff --git a/sys-apps/findutils/findutils-4.1.7-r5.ebuild b/sys-apps/findutils/findutils-4.1.7-r5.ebuild
index fb657bf6b839..d378f35b9051 100644
--- a/sys-apps/findutils/findutils-4.1.7-r5.ebuild
+++ b/sys-apps/findutils/findutils-4.1.7-r5.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r5.ebuild,v 1.10 2004/06/25 20:59:22 agriffis Exp $
-
-IUSE="nls build afs"
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r5.ebuild,v 1.11 2004/06/29 15:58:53 vapier Exp $
 
 inherit eutils gnuconfig
 
 DESCRIPTION="GNU utilities to find files"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-
 # Note this doesn't point to gnu.org because alpha.gnu.org has quit
 # supplying the development versions.  If it comes back in the future
 # then we might want to redirect the link.  See bug 18729
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 ppc sparc hppa alpha ia64 mips"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
+IUSE="nls build afs"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )
 	x86? ( afs? ( net-fs/openafs ) )"
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}