removed all "CATEGORY" entries in ebuild. They shouldn't be needed anymore.

59 files changed, 83 insertions, 130 deletions

diff --git a/sys-apps/00baselayout/00baselayout-1.1-r1.ebuild b/sys-apps/00baselayout/00baselayout-1.1-r1.ebuild
index bfec8c433618..a45129763f2b 100644
--- a/sys-apps/00baselayout/00baselayout-1.1-r1.ebuild
+++ b/sys-apps/00baselayout/00baselayout-1.1-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/00baselayout/00baselayout-1.1-r1.ebuild,v 1.1 2000/08/02 17:07:11 achim Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/00baselayout/00baselayout-1.1-r1.ebuild,v 1.2 2000/08/16 04:38:22 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
 
 P=00baselayout-1.1
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="Baselayout"
 SRC_URI="ftp://gentoolinux.sourceforge.net/pub/gentoolinux/current/distfiles/"${A}
 
diff --git a/sys-apps/00initscripts/00initscripts-1.0-r1.ebuild b/sys-apps/00initscripts/00initscripts-1.0-r1.ebuild
index 2a4fe971f4fd..61d3a958ae15 100644
--- a/sys-apps/00initscripts/00initscripts-1.0-r1.ebuild
+++ b/sys-apps/00initscripts/00initscripts-1.0-r1.ebuild
@@ -5,7 +5,6 @@ P=00initscripts-1.0
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Colorized initscripts for Enoch"
-CATEGORY="sys"
 SRC_URI="ftp://gentoolinux.sourceforge.net/pub/gentoolinux/current/distfiles/"${A}
 
 src_install() {                               
diff --git a/sys-apps/at/at-3.1.8-r1.ebuild b/sys-apps/at/at-3.1.8-r1.ebuild
index d9cd10a86cd7..59b811d04ce3 100644
--- a/sys-apps/at/at-3.1.8-r1.ebuild
+++ b/sys-apps/at/at-3.1.8-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r1.ebuild,v 1.2 2000/08/16 04:38:22 drobbins Exp $
 
 P=at-3.1.8
 A="${P}.tar.bz2 ${P}.dif"
 S=${WORKDIR}/${P}
 DESCRIPTION="queues jobs for later execution"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.kreonet.re.kr/.2/Linux/Jurix/source/chroot/appl/at/${P}.tar.bz2
 	 ftp://ftp.kreonet.re.kr/.2/Linux/Jurix/source/chroot/appl/at/${P}.dif"
 
diff --git a/sys-apps/bash/bash-2.03-r1.ebuild b/sys-apps/bash/bash-2.03-r1.ebuild
index ff189857898d..c896d50fa6bc 100644
--- a/sys-apps/bash/bash-2.03-r1.ebuild
+++ b/sys-apps/bash/bash-2.03-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bash/bash-2.03-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bash/bash-2.03-r1.ebuild,v 1.2 2000/08/16 04:38:22 drobbins Exp $
 
 P=bash-2.03
 A=${P}.tar.gz
@@ -9,7 +9,6 @@ S=${WORKDIR}/${P}
 DESCRIPTION="The standard GNU Bourne again shell"
 SRC_URI="ftp://ftp.gnu.org/gnu/bash/"${A}
 HOMEPAGE="http://www.gnu.org/software/bash/bash.html"
-CATEGORY="sys-apps"
 
 src_compile() {                           
 
diff --git a/sys-apps/bzip2/bzip2-1.0.0-r1.ebuild b/sys-apps/bzip2/bzip2-1.0.0-r1.ebuild
index 580f3800fe4d..a1b4d1c01751 100644
--- a/sys-apps/bzip2/bzip2-1.0.0-r1.ebuild
+++ b/sys-apps/bzip2/bzip2-1.0.0-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.0-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bzip2/bzip2-1.0.0-r1.ebuild,v 1.2 2000/08/16 04:38:22 drobbins Exp $
 
 P=bzip2-1.0.0
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="A high-quality data compressor used extensively by Enoch"
 SRC_URI="ftp://sourceware.cygnus.com/pub/bzip2/v100/$A"
 HOMEPAGE="http://sourceware.cygnus.com/bzip2/"
diff --git a/sys-apps/console-data/console-data-1999.08.29-r1.ebuild b/sys-apps/console-data/console-data-1999.08.29-r1.ebuild
index fa4202b3e100..895436612ce3 100644
--- a/sys-apps/console-data/console-data-1999.08.29-r1.ebuild
+++ b/sys-apps/console-data/console-data-1999.08.29-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-data/console-data-1999.08.29-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-data/console-data-1999.08.29-r1.ebuild,v 1.2 2000/08/16 04:38:23 drobbins Exp $
 
 P=console-data-1999.08.29      
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="Data (fonts, keymaps) for the consoletools package"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/keyboards/"${A}
 HOMEPAGE="http://altern.org/ydirson/en/lct/data.html"
diff --git a/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild b/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild
index 49903f8b10d6..bd9583e643e5 100644
--- a/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild
+++ b/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/console-tools/console-tools-0.2.3-r1.ebuild,v 1.2 2000/08/16 04:38:23 drobbins Exp $
 
 P=console-tools-0.2.3
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Console and font utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/keyboards/"${A}
 HOMEPAGE="http://altern.org/ydirson/en/lct/"
 
diff --git a/sys-apps/cpio/cpio-2.4.2-r1.ebuild b/sys-apps/cpio/cpio-2.4.2-r1.ebuild
index 1fae7a6afbf5..ecb4f75a7314 100644
--- a/sys-apps/cpio/cpio-2.4.2-r1.ebuild
+++ b/sys-apps/cpio/cpio-2.4.2-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.4.2-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpio/cpio-2.4.2-r1.ebuild,v 1.2 2000/08/16 04:38:23 drobbins Exp $
 
 P="cpio-2.4.2"      
 A="${P}.tar.gz"
 S=${WORKDIR}/${P}
 DESCRIPTION="A file archival tool which can also read and write tar files"
-CATEGORY="sys-apps"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/cpio/"${A}
 HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html"
 
diff --git a/sys-apps/debianutils/debianutils-1.13.3-r1.ebuild b/sys-apps/debianutils/debianutils-1.13.3-r1.ebuild
index 71d6e4e91a01..8257576114dc 100644
--- a/sys-apps/debianutils/debianutils-1.13.3-r1.ebuild
+++ b/sys-apps/debianutils/debianutils-1.13.3-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.13.3-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.13.3-r1.ebuild,v 1.2 2000/08/16 04:38:23 drobbins Exp $
 
 P=debianutils-1.13.3     
 A=debianutils_1.13.3.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A selection of tools from Debian"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.debian.org/debian/dists/potato/main/source/base/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/diffutils/diffutils-2.7-r1.ebuild b/sys-apps/diffutils/diffutils-2.7-r1.ebuild
index cc4c5f893fd5..8e09240bf39f 100644
--- a/sys-apps/diffutils/diffutils-2.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-2.7-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.7-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.7-r1.ebuild,v 1.2 2000/08/16 04:38:24 drobbins Exp $
 
 P=diffutils-2.7      
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools to make diffs and compare files"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
 
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.18-r1.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.18-r1.ebuild
index f485c31cdc94..ddac7a8ebaef 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.18-r1.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.18-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.18-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.18-r1.ebuild,v 1.2 2000/08/16 04:38:24 drobbins Exp $
 P=e2fsprogs-1.18      
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard ext2 filesystem utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/e2fsprogs-1.18.tar.gz"
 HOMEPAGE="http://web.mit.edu/tytso/www/linux/e2fsprogs.html"
 
diff --git a/sys-apps/e2fsprogs/e2fsprogs-1.19.ebuild b/sys-apps/e2fsprogs/e2fsprogs-1.19.ebuild
index a4b08d6694a7..4ff7acf4591a 100644
--- a/sys-apps/e2fsprogs/e2fsprogs-1.19.ebuild
+++ b/sys-apps/e2fsprogs/e2fsprogs-1.19.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.19.ebuild,v 1.1 2000/08/15 17:44:29 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/e2fsprogs/e2fsprogs-1.19.ebuild,v 1.2 2000/08/16 04:38:24 drobbins Exp $
 
 P=e2fsprogs-1.19
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard ext2 filesystem utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-1.19.tar.gz"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
 
diff --git a/sys-apps/ebuild/ebuild-1.2-r1.ebuild b/sys-apps/ebuild/ebuild-1.2-r1.ebuild
index a6d3c0be3ef3..5f611033f3ef 100644
--- a/sys-apps/ebuild/ebuild-1.2-r1.ebuild
+++ b/sys-apps/ebuild/ebuild-1.2-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ebuild/ebuild-1.2-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ebuild/ebuild-1.2-r1.ebuild,v 1.2 2000/08/16 04:38:24 drobbins Exp $
 
 P=ebuild-1.2
 A=""
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="The heart of the ebuild-system"
 
 src_unpack() {
diff --git a/sys-apps/file/file-3.31-r1.ebuild b/sys-apps/file/file-3.31-r1.ebuild
index b57ad3ce57c9..21f83b423f12 100644
--- a/sys-apps/file/file-3.31-r1.ebuild
+++ b/sys-apps/file/file-3.31-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.31-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-3.31-r1.ebuild,v 1.2 2000/08/16 04:38:24 drobbins Exp $
 
 P=file-3.31
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Program to identify a file's format by scanning binary data for patters"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.astron.com/pub/file/file-3.31.tar.gz"
 
 src_compile() {                           
diff --git a/sys-apps/fileutils/fileutils-4.0x-r1.ebuild b/sys-apps/fileutils/fileutils-4.0x-r1.ebuild
index b723d4ad72b8..696e54623e12 100644
--- a/sys-apps/fileutils/fileutils-4.0x-r1.ebuild
+++ b/sys-apps/fileutils/fileutils-4.0x-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.0x-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/fileutils/fileutils-4.0x-r1.ebuild,v 1.2 2000/08/16 04:38:24 drobbins Exp $
 
 P=fileutils-4.0x
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls, etc)"
-CATEGORY="sys-apps"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/fileutils-4.0x.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/fileutils/fileutils.html"
 
diff --git a/sys-apps/findutils/findutils-4.1-r1.ebuild b/sys-apps/findutils/findutils-4.1-r1.ebuild
index 4aa19ebe147e..8b74d475fbf4 100644
--- a/sys-apps/findutils/findutils-4.1-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.1-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1-r1.ebuild,v 1.1 2000/08/02 17:07:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1-r1.ebuild,v 1.2 2000/08/16 04:38:25 drobbins Exp $
 
 P=findutils-4.1      
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU utilities to find files"
-CATEGORY="sys-apps"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/findutils/findutils-4.1.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
 
diff --git a/sys-apps/gawk/gawk-3.0.4-r1.ebuild b/sys-apps/gawk/gawk-3.0.4-r1.ebuild
index e55144c09380..8e921b74e772 100644
--- a/sys-apps/gawk/gawk-3.0.4-r1.ebuild
+++ b/sys-apps/gawk/gawk-3.0.4-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.0.4-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.0.4-r1.ebuild,v 1.2 2000/08/16 04:38:25 drobbins Exp $
 
 P=gawk-3.0.4     
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU awk pattern-matching language"
-CATEGORY="sys-apps"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/gawk/gawk-3.0.4.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
 
diff --git a/sys-apps/grep/grep-2.4.2-r1.ebuild b/sys-apps/grep/grep-2.4.2-r1.ebuild
index 0987e1455aa2..34f9b9d403af 100644
--- a/sys-apps/grep/grep-2.4.2-r1.ebuild
+++ b/sys-apps/grep/grep-2.4.2-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.4.2-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.4.2-r1.ebuild,v 1.2 2000/08/16 04:38:25 drobbins Exp $
 
 P=grep-2.4.2
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU regular expression matcher"
-CATEGORY="sys-apps"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/grep/${A}"
 HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
 
diff --git a/sys-apps/groff/groff-1.15-r1.ebuild b/sys-apps/groff/groff-1.15-r1.ebuild
index 2e45b74928b8..306265cf41ab 100644
--- a/sys-apps/groff/groff-1.15-r1.ebuild
+++ b/sys-apps/groff/groff-1.15-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.15-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/groff/groff-1.15-r1.ebuild,v 1.2 2000/08/16 04:38:26 drobbins Exp $
 
 P=groff-1.15
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Text formatter used for man pages"
-CATEGORY="sys-apps"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/groff/${A}"
 HOMEPAGE="http://www.gnu.org/software/groff/groff.html"
 
diff --git a/sys-apps/gzip/gzip-1.2.4a-r1.ebuild b/sys-apps/gzip/gzip-1.2.4a-r1.ebuild
index e742e77dc685..7459a698f499 100644
--- a/sys-apps/gzip/gzip-1.2.4a-r1.ebuild
+++ b/sys-apps/gzip/gzip-1.2.4a-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.2.4a-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gzip/gzip-1.2.4a-r1.ebuild,v 1.2 2000/08/16 04:38:26 drobbins Exp $
 
 P=gzip-1.2.4a      
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard GNU compressor"
-CATEGORY="sys-apps"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/gzip/${A}"
 HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
 
diff --git a/sys-apps/hdparm/hdparm-3.9-r1.ebuild b/sys-apps/hdparm/hdparm-3.9-r1.ebuild
index 98dff6aa8ea0..09968c583fc8 100644
--- a/sys-apps/hdparm/hdparm-3.9-r1.ebuild
+++ b/sys-apps/hdparm/hdparm-3.9-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-3.9-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-3.9-r1.ebuild,v 1.2 2000/08/16 04:38:26 drobbins Exp $
 
 P=hdparm-3.9
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Utility to change hard drive performance parameters"
-CATEGORY="sys-apps"
 SRC_URI="http://metalab.unc.edu/pub/Linux/system/hardware/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild b/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild
index 5394cae344ea..291bc0ced656 100644
--- a/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild
+++ b/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ipchains/ipchains-1.3.9-r1.ebuild,v 1.2 2000/08/16 04:38:26 drobbins Exp $
 
 P=ipchains-1.3.9     
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="2.2 kernel equivalent of ipfwadm"
-CATEGORY="sys-apps"
 SRC_URI="http://netfilter.kernelnotes.org/ipchains/${A}"
 HOMEPAGE="http://netfilter.filewatcher.org/ipchains/"
 
diff --git a/sys-apps/isapnptools/isapnptools-1.22-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.22-r1.ebuild
index c04f17bc112d..101c8c77fc62 100644
--- a/sys-apps/isapnptools/isapnptools-1.22-r1.ebuild
+++ b/sys-apps/isapnptools/isapnptools-1.22-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.22-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/isapnptools/isapnptools-1.22-r1.ebuild,v 1.2 2000/08/16 04:38:27 drobbins Exp $
 
 P=isapnptools-1.22
 A=${P}.tgz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="Tools for configuring ISA PnP devices"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/isapnptools-1.22.tgz"
 HOMEPAGE="http://www.roestock.demon.co.uk/isapnptools/"
diff --git a/sys-apps/less/less-358-r1.ebuild b/sys-apps/less/less-358-r1.ebuild
index 858927a04d29..1bdd294569f9 100644
--- a/sys-apps/less/less-358-r1.ebuild
+++ b/sys-apps/less/less-358-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-358-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-358-r1.ebuild,v 1.2 2000/08/16 04:38:27 drobbins Exp $
 
 P=less-358
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Excellent text file viewer"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/less/"${A}
 HOMEPAGE="http://www.gnu.org/software/less/less.html"
 
diff --git a/sys-apps/lilo/lilo-21.5-r1.ebuild b/sys-apps/lilo/lilo-21.5-r1.ebuild
index 8996b8bb3fa4..fa286ee034d3 100644
--- a/sys-apps/lilo/lilo-21.5-r1.ebuild
+++ b/sys-apps/lilo/lilo-21.5-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-21.5-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-21.5-r1.ebuild,v 1.2 2000/08/16 04:38:27 drobbins Exp $
 
 P=lilo-21.5
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard Linux boot loader"
-CATEGORY="sys-apps"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/"${A}
 
 src_compile() {                           
diff --git a/sys-apps/logrotate/logrotate-3.3-r1.ebuild b/sys-apps/logrotate/logrotate-3.3-r1.ebuild
index a66255768540..4f4d72f2ae59 100644
--- a/sys-apps/logrotate/logrotate-3.3-r1.ebuild
+++ b/sys-apps/logrotate/logrotate-3.3-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/logrotate/logrotate-3.3-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/logrotate/logrotate-3.3-r1.ebuild,v 1.2 2000/08/16 04:38:27 drobbins Exp $
 
 P=logrotate-3.3
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="Rotates, compresses, and mails system logs"
 SRC_URI="ftp://ftp.redhat.com/redhat/code/logrotate/"${A}
 
diff --git a/sys-apps/man/man-1.5h1-r1.ebuild b/sys-apps/man/man-1.5h1-r1.ebuild
index 1f4bae10a65c..218ec48dd37d 100644
--- a/sys-apps/man/man-1.5h1-r1.ebuild
+++ b/sys-apps/man/man-1.5h1-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5h1-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.5h1-r1.ebuild,v 1.2 2000/08/16 04:38:27 drobbins Exp $
 
 P=man-1.5h1 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard commands to read man pages"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.win.tue.nl/pub/linux-local/utils/man/${P}"
 
 src_compile() {                           
diff --git a/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild b/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild
index 907970c07457..f20b607af213 100644
--- a/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild
+++ b/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mkisofs/mkisofs-1.13-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
 
 P=mkisofs-1.13
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="Prints out location of specified executables that are in your path"
 SRC_URI="ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/$A"
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/mkisofs.html"
diff --git a/sys-apps/modutils/modutils-2.3.12-r1.ebuild b/sys-apps/modutils/modutils-2.3.12-r1.ebuild
index c33dadc90b1d..3f5b2afced0f 100644
--- a/sys-apps/modutils/modutils-2.3.12-r1.ebuild
+++ b/sys-apps/modutils/modutils-2.3.12-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.3.12-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.3.12-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
 
 P=modutils-2.3.12
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard kernel module utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.ocs.com.au/pub/modutils/v2.3/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/modutils/modutils-2.3.14-r1.ebuild b/sys-apps/modutils/modutils-2.3.14-r1.ebuild
index 20670c0c2a5e..8458dce8fe90 100644
--- a/sys-apps/modutils/modutils-2.3.14-r1.ebuild
+++ b/sys-apps/modutils/modutils-2.3.14-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.3.14-r1.ebuild,v 1.1 2000/08/12 16:02:10 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.3.14-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
 
 P=modutils-2.3.14
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard kernel module utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.ocs.com.au/pub/modutils/v2.3/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/most/most-4.9.0-r1.ebuild b/sys-apps/most/most-4.9.0-r1.ebuild
index 446e9770d32b..d282ec2f3e57 100644
--- a/sys-apps/most/most-4.9.0-r1.ebuild
+++ b/sys-apps/most/most-4.9.0-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.0-r1.ebuild,v 1.1 2000/08/02 17:07:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/most/most-4.9.0-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
 
 P=most-4.9.0     
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="An extremely excellent text file reader"
-CATEGORY="sys-apps"
 SRC_URI="ftp://space.mit.edu/pub/davis/most/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/net-tools/net-tools-1.57-r1.ebuild b/sys-apps/net-tools/net-tools-1.57-r1.ebuild
index 305f016c3444..1307cbcb4386 100644
--- a/sys-apps/net-tools/net-tools-1.57-r1.ebuild
+++ b/sys-apps/net-tools/net-tools-1.57-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.57-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.57-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
 
 P=net-tools-1.57
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="standard Linux network tools"
-CATEGORY="sys-apps"
 SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/netkit-base/netkit-base-0.16-r1.ebuild b/sys-apps/netkit-base/netkit-base-0.16-r1.ebuild
index 8f36474baec9..d3ba41ba33a6 100644
--- a/sys-apps/netkit-base/netkit-base-0.16-r1.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.16-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.16-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.16-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
 
 P=netkit-base-0.16
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard linux net thingees -- inetd, ping"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r1.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r1.ebuild
index f5bb60f03e50..bde6db3b8cb4 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r1.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r1.ebuild,v 1.1 2000/08/12 16:13:22 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
 
 P=netkit-base-0.17
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard linux net thingees -- inetd, ping"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/portage/files/ebuild b/sys-apps/portage/files/ebuild
index 1805cd016038..d4b4f08e02a5 100644
--- a/sys-apps/portage/files/ebuild
+++ b/sys-apps/portage/files/ebuild
@@ -14,7 +14,6 @@ export PROXY
 export HTTP_PROXY
 export FTP_PROXY
 
-
 initvars() {
 	#fix up ROOT path so that it always has a / after it
 	local rlen
@@ -955,8 +954,8 @@ dyn_install() {
     echo
     echo ">>> Install ${PF} into ${D}"
     src_install
-    install -d -m0700 ${D}/var/db/pkg/${PF}
-    cp ${STARTDIR}/${EBUILD} ${D}/var/db/pkg/${PF}
+    install -d -m0700 ${D}/var/db/pkg/${CATEGORY}/${PF}
+    cp ${STARTDIR}/${EBUILD} ${D}/var/db/pkg/${CATEGORY}/${PF}
     echo ">>> Completed installing into ${D}"
     echo
     cd ${BUILDDIR}
@@ -966,7 +965,7 @@ dyn_install() {
 dyn_merge() {
     trap "" SIGINT SIGQUIT
     #not interruptible, so that the db doesn't get garbled
-    if [ -d ${ROOT}/var/db/pkg/${PF} ]
+    if [ -d ${ROOT}/var/db/pkg/${CATEGORY}/${PF} ]
     then
 	echo 
 	echo '!!!' "${PF} already merged -- unmerge first" 
@@ -1047,7 +1046,7 @@ dyn_rpm () {
 
 dyn_help() {
 	echo
-	echo "Portage v1.0"
+	echo "Portage v1.0-r1"
 	echo "Copyright 2000 Gentoo Technologies, Inc."
 	echo 
 	echo "How to use the ebuild command:"
@@ -1067,12 +1066,13 @@ dyn_help() {
 	echo
 	echo "The following settings will be used for the ebuild process:"
 	echo
-	echo "  package     : ${PF}" "( \${PF} )"
+	echo "  package     : ${PF}" 
+	echo "  category    : ${CATEGORY}" 
 	echo "  description : ${DESCRIPTION}"
-	echo "  system      : ${CHOST}" "( \${CHOST} )"
-	echo "  c flags     : ${CFLAGS}" "( \${CFLAGS} )"
-	echo "  c++ flags   : ${CXXFLAGS}" "( \${CXXFLAGS} )"
-	echo "  make flags  : ${MAKEOPTS}" "( \${MAKEOPTS} )"
+	echo "  system      : ${CHOST}" 
+	echo "  c flags     : ${CFLAGS}" 
+	echo "  c++ flags   : ${CXXFLAGS}" 
+	echo "  make flags  : ${MAKEOPTS}" 
 	echo -n "  build mode  : "
 	if [ -n "${DEBUG}" ]
 	then
@@ -1080,8 +1080,8 @@ dyn_help() {
 	else
 	    echo "production (stripped)"
 	fi
-	echo "  merge to    : ${ROOT}" "( \${ROOT} )"
-	echo "  db location : ${ROOT}var/db/pkg/${P}/CONTENTS"
+	echo "  merge to    : ${ROOT}" 
+	echo "  db location : ${ROOT}var/db/pkg/${CATEGORY}/${P}/CONTENTS"
 	echo 
 	if [ -n "$USE" ]
 	then
@@ -1154,7 +1154,7 @@ src_menu() {
 #dummy value for help printouts
 P=packagename
 
-if [ $# -lt 2 ]
+if [ $# -lt 1 ]
 then
 	echo
 	echo '!!!' "At least two arguments expected."
@@ -1197,6 +1197,7 @@ setp() {
 }
 
 export STARTDIR=`pwd`
+export CATEGORY=`/usr/bin/basename ${STARTDIR}/..`
 export O=`dirname ${STARTDIR}/${1}`
 export EBUILD=${1}
 export PEBUILD=${O}/files/${PLATFORM}.ebuild
@@ -1265,6 +1266,11 @@ do
 done
 export PERLINSTALL
 
+if [ $# -eq 1 ]
+then
+	dyn_help
+fi
+
 foo=2
 while [ $foo -le $# ]
 do
diff --git a/sys-apps/portage/files/merge b/sys-apps/portage/files/merge
index 8ba378e628be..8c5cc3a7c8da 100644
--- a/sys-apps/portage/files/merge
+++ b/sys-apps/portage/files/merge
@@ -5,20 +5,23 @@ from commands import *
 import string
 
 mystart=os.path.normpath(os.environ["D"])
-mypackage=os.path.normpath(os.environ["PF"])
+mypackage=os.environ["PF"]
+mycategory=os.environ["CATEGORY"]
 myroot=os.environ["ROOT"]
 
 os.chdir(mystart)
 print 
 print ">>> Merging contents of",mystart,"into live filesystem at "+myroot
-print ">>> Recording merged files to "+myroot+"var/db/pkg/"+mypackage+"/CONTENTS"
+print ">>> Recording merged files to "+myroot+"var/db/pkg/"+mycategory+"/"+mypackage+"/CONTENTS"
 def prepare_db():
     if not os.path.isdir(myroot+"var/db"):
 	os.mkdir(myroot+"var/db",0755)
     if not os.path.isdir(myroot+"var/db/pkg"):
 	os.mkdir(myroot+"/var/db/pkg",0755)
-    if not os.path.isdir(myroot+"var/db/pkg/"+mypackage):
-	os.mkdir(myroot+"var/db/pkg/"+mypackage,0755)
+    if not os.path.isdir(myroot+"var/db/pkg/"+mycategory):
+	os.mkdir(myroot+"/var/db/pkg/"+mycategory,0755)
+    if not os.path.isdir(myroot+"var/db/pkg/"+mycategory+"/"+mypackage):
+	os.mkdir(myroot+"var/db/pkg/"+mycategory+"/"+mypackage,0755)
 
 def md5(x):
     myresult=getstatusoutput("/usr/bin/md5sum "+x)
@@ -73,7 +76,7 @@ def mergefiles():
 
 
 prepare_db()
-outfile=open(myroot+"var/db/pkg/"+mypackage+"/CONTENTS","w")
+outfile=open(myroot+"var/db/pkg/"+mycategory+"/"+mypackage+"/CONTENTS","w")
 mergefiles()
 print
 print ">>>",mypackage,"installed."
diff --git a/sys-apps/portage/portage-1.0-r1.ebuild b/sys-apps/portage/portage-1.0-r1.ebuild
index 840984d14752..be1338334ed4 100644
--- a/sys-apps/portage/portage-1.0-r1.ebuild
+++ b/sys-apps/portage/portage-1.0-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-1.0-r1.ebuild,v 1.1 2000/08/14 17:28:29 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-1.0-r1.ebuild,v 1.2 2000/08/16 04:38:28 drobbins Exp $
  
 A=""
 S=${WORKDIR}/${P}
-CATEGORY="sys"
 DESCRIPTION="Portage autobuild system"
 
 src_unpack() {
diff --git a/sys-apps/procps/procps-2.0.7-r1.ebuild b/sys-apps/procps/procps-2.0.7-r1.ebuild
index 43c380c64eef..05657cf0bbd6 100644
--- a/sys-apps/procps/procps-2.0.7-r1.ebuild
+++ b/sys-apps/procps/procps-2.0.7-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.7-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/procps/procps-2.0.7-r1.ebuild,v 1.2 2000/08/16 04:38:29 drobbins Exp $
 
 P=procps-2.0.7
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard informational utilities and process-handling tools"
-CATEGORY="sys-apps"
 SRC_URI="ftp://people.redhat.com/johnsonm/procps/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/psmisc/psmisc-19-r1.ebuild b/sys-apps/psmisc/psmisc-19-r1.ebuild
index f18c72516074..16c905aecb29 100644
--- a/sys-apps/psmisc/psmisc-19-r1.ebuild
+++ b/sys-apps/psmisc/psmisc-19-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/psmisc/psmisc-19-r1.ebuild,v 1.2 2000/08/16 04:38:29 drobbins Exp $
 
 #from Debian ;)
 
@@ -9,7 +9,6 @@ P=psmisc-19
 A=${P}.tar.gz
 S=${WORKDIR}/psmisc
 DESCRIPTION="Handy process-related utilities from Debian"
-CATEGORY="sys-apps"
 SRC_URI="ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/"${A}
 
 src_compile() {                           
diff --git a/sys-apps/raidtools/raidtools-0.90-r1.ebuild b/sys-apps/raidtools/raidtools-0.90-r1.ebuild
index eee003568786..d13b2d950e90 100644
--- a/sys-apps/raidtools/raidtools-0.90-r1.ebuild
+++ b/sys-apps/raidtools/raidtools-0.90-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-0.90-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidtools/raidtools-0.90-r1.ebuild,v 1.2 2000/08/16 04:38:29 drobbins Exp $
 
 P=raidtools-0.90-1
 A=raidtools-dangerous-0.90-20000116.tar.gz
 S=${WORKDIR}/raidtools-0.90
-CATEGORY="sys-apps"
 DESCRIPTION="Linux RAID 0/1/4/5 utilities"
 SRC_URI="http://people.redhat.com/mingo/raid-patches/"${A}
 
diff --git a/sys-apps/sed/files/digest b/sys-apps/sed/files/digest
index eb3052c500e7..c2922128b256 100644
--- a/sys-apps/sed/files/digest
+++ b/sys-apps/sed/files/digest
@@ -1 +1 @@
-MD5 2d960d1629bac872de97a693f2ce4410 sed-3.02a.tar.gz
+MD5 3bf4f42bc0a5f9345a7586a73be3df79 sed-3.02.80.tar.gz
diff --git a/sys-apps/sed/sed-3.02.80.ebuild b/sys-apps/sed/sed-3.02.80.ebuild
index 2ae402de7979..8ca7c08364d7 100644
--- a/sys-apps/sed/sed-3.02.80.ebuild
+++ b/sys-apps/sed/sed-3.02.80.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-3.02.80.ebuild,v 1.1 2000/08/14 21:34:33 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-3.02.80.ebuild,v 1.2 2000/08/16 04:38:29 drobbins Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Super-useful stream editor"
-CATEGORY="sys-apps"
 SRC_URI="ftp://alpha.gnu.org/pub/gnu/sed/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/setserial/setserial-2.17-r1.ebuild b/sys-apps/setserial/setserial-2.17-r1.ebuild
index 33aa2cb422c2..47c0b07cd941 100644
--- a/sys-apps/setserial/setserial-2.17-r1.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setserial/setserial-2.17-r1.ebuild,v 1.2 2000/08/16 04:38:30 drobbins Exp $
 
 P=setserial-2.17
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Configure your serial ports with it"
-CATEGORY="sys-apps"
 SRC_URI="ftp://tsx-11.mit.edu/pub/linux/sources/sbin/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild b/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild
index a65b89653b2d..5dd799f23864 100644
--- a/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild
+++ b/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sh-utils/sh-utils-2.0j-r1.ebuild,v 1.2 2000/08/16 04:38:30 drobbins Exp $
 
 P=sh-utils-2.0j
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Your standard GNU shell utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/shadow/shadow-19990827-r1.ebuild b/sys-apps/shadow/shadow-19990827-r1.ebuild
index 5b394429e94c..24a0078c33d2 100644
--- a/sys-apps/shadow/shadow-19990827-r1.ebuild
+++ b/sys-apps/shadow/shadow-19990827-r1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-19990827-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-19990827-r1.ebuild,v 1.2 2000/08/16 04:38:30 drobbins Exp $
 
 P="shadow-19990827"      
 A=${P}.tar.gz
 A0=shadow-19990827-redhat.patch
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities to deal with user accounts"
-CATEGORY="sys-apps"
 SRC_URI="ftp://piast.t19.ds.pwr.wroc.pl/pub/linux/shadow/shadow-19990827.tar.gz"
 
 src_compile() {                           
diff --git a/sys-apps/sharutils/sharutils-4.2.1-r1.ebuild b/sys-apps/sharutils/sharutils-4.2.1-r1.ebuild
index 5c9a23f902a9..395859c4a0b5 100644
--- a/sys-apps/sharutils/sharutils-4.2.1-r1.ebuild
+++ b/sys-apps/sharutils/sharutils-4.2.1-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sharutils/sharutils-4.2.1-r1.ebuild,v 1.2 2000/08/16 04:38:30 drobbins Exp $
 
 P=sharutils-4.2.1
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Tools to deal with shar archives"
-CATEGORY="sys-apps"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/sharutils/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/shtool/shtool-1.5.1-r1.ebuild b/sys-apps/shtool/shtool-1.5.1-r1.ebuild
index 9f153000496e..3307f8acb13a 100644
--- a/sys-apps/shtool/shtool-1.5.1-r1.ebuild
+++ b/sys-apps/shtool/shtool-1.5.1-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shtool/shtool-1.5.1-r1.ebuild,v 1.1 2000/08/01 05:05:20 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shtool/shtool-1.5.1-r1.ebuild,v 1.2 2000/08/16 04:38:30 drobbins Exp $
 
 A=shtool-1.5.1.tar.gz
 S=${WORKDIR}/shtool-1.5.1
-CATEGORY="sys-apps"
 DESCRIPTION="A compilation of small but very stable and portable shell scripts into a single shell tool"
 SRC_URI="ftp://ftp.gnu.org/gnu/shtool/${A}"
 HOMEPAGE="http://www.gnu.org/software/shtool/shtool.html"
diff --git a/sys-apps/sysklogd/sysklogd-1.3.31-r1.ebuild b/sys-apps/sysklogd/sysklogd-1.3.31-r1.ebuild
index 0a712bf9be25..ecd2ad24ce34 100644
--- a/sys-apps/sysklogd/sysklogd-1.3.31-r1.ebuild
+++ b/sys-apps/sysklogd/sysklogd-1.3.31-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.3.31-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.3.31-r1.ebuild,v 1.2 2000/08/16 04:38:30 drobbins Exp $
 
 P=sysklogd-1.3.31      
 A=sysklogd-1.3-31.tar.gz
 S=${WORKDIR}/sysklogd-1.3-31
 DESCRIPTION="standard log daemons"
-CATEGORY="sys-apps"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/sysvinit/sysvinit-2.78-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.78-r1.ebuild
index 7cc3b3afa420..31de78791898 100644
--- a/sys-apps/sysvinit/sysvinit-2.78-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.78-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel robbins <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.78-r1.ebuild,v 1.1 2000/08/02 17:07:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.78-r1.ebuild,v 1.2 2000/08/16 04:38:31 drobbins Exp $
 
 P="sysvinit-2.78"      
 A=${P}.tar.gz
 S=${WORKDIR}/sysvinit-2.78
 DESCRIPTION="System initialization schtuff"
-CATEGORY="sys-apps"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/init/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/tar/tar-1.13.17-r1.ebuild b/sys-apps/tar/tar-1.13.17-r1.ebuild
index e106285e8689..e1797047ab92 100644
--- a/sys-apps/tar/tar-1.13.17-r1.ebuild
+++ b/sys-apps/tar/tar-1.13.17-r1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.17-r1.ebuild,v 1.1 2000/08/02 17:07:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tar/tar-1.13.17-r1.ebuild,v 1.2 2000/08/16 04:38:31 drobbins Exp $
 
 P=tar-1.13.17
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 
 DESCRIPTION="Use this to make tarballs :)"
-CATEGORY="sys-apps"
 SRC_URI="ftp://alpha.gnu.org/gnu/tar/"${A}
 
 src_compile() {                           
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r1.ebuild
index 774a8551fa2f..781f1ae308d3 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r1.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r1.ebuild,v 1.1 2000/08/02 17:07:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r1.ebuild,v 1.2 2000/08/16 04:38:31 drobbins Exp $
 
 P=tcp-wrappers-7.6      
 A=tcp_wrappers_7.6.tar.gz
 A0="tcp_wrappers_7.6.patch"
 S=${WORKDIR}/tcp_wrappers_7.6
 DESCRIPTION="tcp wrappers"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.porcupine.org/pub/security/${A}"
 
 
diff --git a/sys-apps/texinfo/texinfo-4.0-r1.ebuild b/sys-apps/texinfo/texinfo-4.0-r1.ebuild
index f12bf2e75f58..abeb4c4d7320 100644
--- a/sys-apps/texinfo/texinfo-4.0-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-4.0-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.0-r1.ebuild,v 1.1 2000/08/03 16:16:11 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.0-r1.ebuild,v 1.2 2000/08/16 04:38:31 drobbins Exp $
 
 P=texinfo-4.0      
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="The GNU info program and utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.gnu.org/pub/gnu/texinfo/${A}"
 
 src_compile() {                           
diff --git a/sys-apps/textutils/textutils-2.0f-r1.ebuild b/sys-apps/textutils/textutils-2.0f-r1.ebuild
index e6107e9246e0..31f9748b2165 100644
--- a/sys-apps/textutils/textutils-2.0f-r1.ebuild
+++ b/sys-apps/textutils/textutils-2.0f-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0f-r1.ebuild,v 1.1 2000/08/02 17:07:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/textutils/textutils-2.0f-r1.ebuild,v 1.2 2000/08/16 04:38:31 drobbins Exp $
 
 P=textutils-2.0f
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 
-CATEGORY="sys-apps"
 DESCRIPTION="Standard GNU text utilities"
 SRC_URI="ftp://alpha.gnu.org/gnu/fetish/textutils-2.0f.tar.gz"
 
diff --git a/sys-apps/updated/updated-2.11-r1.ebuild b/sys-apps/updated/updated-2.11-r1.ebuild
index 2cefb5924dcf..b7f51681b69b 100644
--- a/sys-apps/updated/updated-2.11-r1.ebuild
+++ b/sys-apps/updated/updated-2.11-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/updated/updated-2.11-r1.ebuild,v 1.1 2000/08/02 17:07:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/updated/updated-2.11-r1.ebuild,v 1.2 2000/08/16 04:38:31 drobbins Exp $
 
 P=updated-2.11
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="Update flushes filesystem buffers at regular intervals"
 SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}"
 
diff --git a/sys-apps/util-linux/util-linux-2.10m-r1.ebuild b/sys-apps/util-linux/util-linux-2.10m-r1.ebuild
index 1f00c2553d52..25f9954efc2d 100644
--- a/sys-apps/util-linux/util-linux-2.10m-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.10m-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.10m-r1.ebuild,v 1.1 2000/08/02 17:07:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.10m-r1.ebuild,v 1.2 2000/08/16 04:38:32 drobbins Exp $
 
 P="util-linux-2.10m"      
 A="${P}.tar.bz2 
@@ -11,7 +11,6 @@ A="${P}.tar.bz2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Various useful Linux utilities"
-CATEGORY="sys-apps"
 SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/util-linux/${P}.tar.bz2
 	 ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/${P}-mount-compat.patch
 	 ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/${P}-mount-nfsv3.patch
diff --git a/sys-apps/vcron/vcron-3.0p1-r1.ebuild b/sys-apps/vcron/vcron-3.0p1-r1.ebuild
index 61070f855530..94daf0172902 100644
--- a/sys-apps/vcron/vcron-3.0p1-r1.ebuild
+++ b/sys-apps/vcron/vcron-3.0p1-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0p1-r1.ebuild,v 1.1 2000/08/02 17:07:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vcron/vcron-3.0p1-r1.ebuild,v 1.2 2000/08/16 04:38:32 drobbins Exp $
 
 P=vcron-3.0p1
 A=cron3.0pl1.tar.gz
 S=${WORKDIR}/cron3.0pl1
-CATEGORY="sys-apps"
 DESCRIPTION="Crontab Daemon"
 SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/daemons/cron/"${A}
 
diff --git a/sys-apps/vim-nogui/vim-nogui-5.7-r1.ebuild b/sys-apps/vim-nogui/vim-nogui-5.7-r1.ebuild
index 6f7aac40a01f..de00c7a73a3a 100644
--- a/sys-apps/vim-nogui/vim-nogui-5.7-r1.ebuild
+++ b/sys-apps/vim-nogui/vim-nogui-5.7-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vim-nogui/vim-nogui-5.7-r1.ebuild,v 1.2 2000/08/13 12:10:50 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vim-nogui/vim-nogui-5.7-r1.ebuild,v 1.3 2000/08/16 04:38:32 drobbins Exp $
 
 P=vim-nogui-5.7
 A="vim-5.7-src.tar.gz vim-5.7-rt.tar.gz"
 S=${WORKDIR}/vim-5.7
-CATEGORY="sys-apps"
 DESCRIPTION="Handy vi-compatible editor"
 SRC_URI="ftp://ftp.home.vim.org/pub/vim/unix/vim-5.7-src.tar.gz
 	 ftp://ftp.home.vim.org/pub/vim/unix/vim-5.7-rt.tar.gz"
diff --git a/sys-apps/which/which-2.11-r1.ebuild b/sys-apps/which/which-2.11-r1.ebuild
index 409eb2c85b26..ab2467b2af58 100644
--- a/sys-apps/which/which-2.11-r1.ebuild
+++ b/sys-apps/which/which-2.11-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.11-r1.ebuild,v 1.1 2000/08/02 17:07:16 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.11-r1.ebuild,v 1.2 2000/08/16 04:38:32 drobbins Exp $
 
 P=which-2.11
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
-CATEGORY="sys-apps"
 DESCRIPTION="Prints out location of specified executables that are in your path"
 SRC_URI="ftp://prep.ai.mit.edu/gnu/which/${P}"
 
diff --git a/sys-apps/xinetd/xinetd-2.1.8.8p3-r1.ebuild b/sys-apps/xinetd/xinetd-2.1.8.8p3-r1.ebuild
index 3a39600f1420..ab60cb03c9df 100644
--- a/sys-apps/xinetd/xinetd-2.1.8.8p3-r1.ebuild
+++ b/sys-apps/xinetd/xinetd-2.1.8.8p3-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.1.8.8p3-r1.ebuild,v 1.1 2000/08/02 17:07:17 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.1.8.8p3-r1.ebuild,v 1.2 2000/08/16 04:38:32 drobbins Exp $
 
 P=xinetd-2.1.8.8p3
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Replacement for inetd."
-CATEGORY="sys-apps"
 SRC_URI="http://www.xinetd.org/${A}"
 
 src_compile() {