moved bash from sys-apps to app-shells

60 files changed, 121 insertions, 530 deletions

diff --git a/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild b/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild
index fe5f53f45cd5..a0663b148805 100644
--- a/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild
+++ b/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild,v 1.10 2003/02/28 22:04:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ctcs/ctcs-1.3.0_pre4.ebuild,v 1.11 2003/03/11 20:50:08 seemant Exp $
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
@@ -13,22 +13,21 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 
-RDEPEND="virtual/glibc
-	 dev-util/dialog
-	 sys-apps/bash
-	 sys-apps/diffutils
-	 sys-apps/e2fsprogs
-	 sys-apps/fileutils
-	 sys-apps/grep
-	 sys-apps/modutils
-	 sys-apps/psmisc
-	 sys-apps/sed
-	 sys-apps/sh-utils
-	 sys-apps/textutils
-	 sys-apps/util-linux
-	 sys-devel/make
-	 sys-devel/perl
-	 sys-libs/ncurses"
+RDEPEND="dev-util/dialog
+	app-shells/bash
+	sys-apps/diffutils
+	sys-apps/e2fsprogs
+	sys-apps/fileutils
+	sys-apps/grep
+	sys-apps/modutils
+	sys-apps/psmisc
+	sys-apps/sed
+	sys-apps/sh-utils
+	sys-apps/textutils
+	sys-apps/util-linux
+	sys-devel/make
+	sys-devel/perl
+	sys-libs/ncurses"
 
 # Optional: app-admin/smartsuite  (depricated?)
 # Optional: sys-apps/lm_sensors
diff --git a/app-admin/fwanalog/fwanalog-0.4-r2.ebuild b/app-admin/fwanalog/fwanalog-0.4-r2.ebuild
index ba45d605a296..dc673c90d264 100644
--- a/app-admin/fwanalog/fwanalog-0.4-r2.ebuild
+++ b/app-admin/fwanalog/fwanalog-0.4-r2.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.4-r2.ebuild,v 1.10 2003/02/13 05:18:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.4-r2.ebuild,v 1.11 2003/03/11 20:50:08 seemant Exp $
+
+IUSE=""
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
 SRC_URI="http://tud.at/programm/fwanalog/${P}.tar.gz"
 HOMEPAGE="http://tud.at/programm/fwanalog/"
-IUSE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="" # this is just a bash script
-RDEPEND="sys-apps/bash
+RDEPEND="app-shells/bash
 	sys-apps/grep
 	sys-apps/gawk
 	sys-apps/sed
diff --git a/app-admin/fwanalog/fwanalog-0.6.1.ebuild b/app-admin/fwanalog/fwanalog-0.6.1.ebuild
index 04759b3a27e8..f2fb77bc5da1 100644
--- a/app-admin/fwanalog/fwanalog-0.6.1.ebuild
+++ b/app-admin/fwanalog/fwanalog-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.1.ebuild,v 1.2 2003/02/13 05:18:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.1.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 DEPEND="" # this is just a bash script
-RDEPEND="sys-apps/bash
+RDEPEND="app-shells/bash
 	sys-apps/grep
 	sys-apps/gawk
 	sys-apps/sed
diff --git a/app-admin/fwanalog/fwanalog-0.6.2.ebuild b/app-admin/fwanalog/fwanalog-0.6.2.ebuild
index d040eb61a45c..909d2ee82c17 100644
--- a/app-admin/fwanalog/fwanalog-0.6.2.ebuild
+++ b/app-admin/fwanalog/fwanalog-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.2.ebuild,v 1.2 2003/02/13 05:18:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fwanalog/fwanalog-0.6.2.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 DEPEND="" # this is just a bash script
-RDEPEND="sys-apps/bash
+RDEPEND="app-shells/bash
 	sys-apps/grep
 	sys-apps/gawk
 	sys-apps/sed
diff --git a/app-admin/localepurge/localepurge-0.2.ebuild b/app-admin/localepurge/localepurge-0.2.ebuild
index 4617b4f3731d..ef0308fa6130 100644
--- a/app-admin/localepurge/localepurge-0.2.ebuild
+++ b/app-admin/localepurge/localepurge-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.2.ebuild,v 1.6 2003/02/13 05:25:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.2.ebuild,v 1.7 2003/03/11 20:50:08 seemant Exp $
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="Script to recover diskspace wasted for unneeded locale files and localized man pages."
@@ -8,7 +8,7 @@ SRC_URI="mirror://gentoo/${P}.tbz2"
 HOMEPAGE="http://www.gentoo.org/~bass"
 LICENSE="GPL-2"
 DEPEND=""
-RDEPEND="sys-apps/bash"
+RDEPEND="app-shells/bash"
 IUSE=""
 
 KEYWORDS="x86 ppc"
diff --git a/app-editors/kxmleditor/kxmleditor-0.8.ebuild b/app-editors/kxmleditor/kxmleditor-0.8.ebuild
index 33fa1249ddca..50d384c9e375 100644
--- a/app-editors/kxmleditor/kxmleditor-0.8.ebuild
+++ b/app-editors/kxmleditor/kxmleditor-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kxmleditor/kxmleditor-0.8.ebuild,v 1.3 2003/02/13 06:57:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kxmleditor/kxmleditor-0.8.ebuild,v 1.4 2003/03/11 20:50:08 seemant Exp $
 inherit kde-base
 
 need-kde 3
@@ -21,4 +21,4 @@ src_compile() {
     kde_src_compile myconf configure
     kde_src_compile make
 
-}
\ No newline at end of file
+}
diff --git a/app-editors/vim/files/digest-vim-6.1-r15 b/app-editors/vim/files/digest-vim-6.1-r15
deleted file mode 100644
index bb72db297329..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r15
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 3b5a00da4fec4f3e5cbd3fba9940d153 vimpatch-1-213.tar.bz2 158015
diff --git a/app-editors/vim/files/digest-vim-6.1-r16 b/app-editors/vim/files/digest-vim-6.1-r16
deleted file mode 100644
index e291896c3990..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 80747ac21d83777aeefb714f7a385b11 vimpatch-1-245.tar.bz2 191362
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r17 b/app-editors/vim/files/digest-vim-6.1-r17
deleted file mode 100644
index 8b71488833aa..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 d4cb5c1c11783af6c31f6c5b9ed61695 vimpatch-1-263.tar.bz2 202289
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r18 b/app-editors/vim/files/digest-vim-6.1-r18
deleted file mode 100644
index 634730dab224..000000000000
--- a/app-editors/vim/files/digest-vim-6.1-r18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
-MD5 ce7f14e0f526220c85da6262661658e3 vimpatch-1-289.tar.bz2 216360
-MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r20 b/app-editors/vim/files/digest-vim-6.1-r20
new file mode 100644
index 000000000000..fdc355f9f02d
--- /dev/null
+++ b/app-editors/vim/files/digest-vim-6.1-r20
@@ -0,0 +1,4 @@
+MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
+MD5 3c743967e2d9ed45ce2228525a408d32 vimpatch-1-386.tar.bz2 543181
+MD5 fe2996fdbb3f072109c2fbc7bbbf0c05 vimpatch-gentoo.tar.bz2 3156
+MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/vim-6.1-r15.ebuild b/app-editors/vim/vim-6.1-r15.ebuild
deleted file mode 100644
index 33d21c6aacf5..000000000000
--- a/app-editors/vim/vim-6.1-r15.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r15.ebuild,v 1.7 2003/02/13 06:59:53 vapier Exp $
-
-# Please name the ebuild as follows.  If this is followed, there
-# should be no need to modify this ebuild when the Vim version is
-# updated.  (Yes it's overkill, but it was fun!)
-#
-#   vim-6.0, when 6.0 is finally released
-#   vim-6.0_pre9, where 9 = (i), for vim-6.0i
-#   vim-6.0_pre47, where 47 = 26(a) + 21(u), for vim-6.0au
-#   vim-6.0_pre72, where 72 = 52(b) + 20(t), for vim-6.0bt
-#
-# Quick reference:
-#   a=1   e=5   i=9   m=13  q=17  u=21  y=25
-#   b=2   f=6   j=10  n=14  r=18  v=22  z=26
-#   c=3   g=7   k=11  o=15  s=19  w=23 aa=27
-#   d=4   h=8   l=12  p=16  t=20  x=24 ab=28 (etc.)
-#
-# (08 Sep 2001 agriffis)
-
-set -e
-
-# Calculate the version based on the name of the ebuild
-vim_version="${PV%_pre*}"
-vim_pre="${PV##*_pre}"
-VIMPATCH="vimpatch-1-213.tar.bz2"
-
-if [ "$vim_version" = "$vim_pre" ]; then
-	# Final releases prior to 6.0 include a dash and decimal point in
-	# the directory name
-	if [ "${vim_version%%.*}" -lt 6 ]; then
-		S="$WORKDIR/vim-$vim_version"
-	else
-		S="$WORKDIR/vim${vim_version//.}"
-	fi
-	vim_letters=
-	A="vim-$vim_version.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-elif [ "$vim_pre" -lt 27 ]; then
-	# Handle (prerelease) versions with one trailing letter
-	vim_letters=`echo $vim_pre | awk '{printf "%c", $0+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-
-elif [ "$vim_pre" -lt 703 ]; then
-	# Handle (prerelease) versions with two trailing letters
-	vim_letters=`echo $vim_pre | awk '{printf "%c%c", $0/26+96, $0%26+96}'`
-	S="$WORKDIR/vim${vim_version//.}$vim_letters"
-	A="vim-$vim_version$vim_letters.tar.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unreleased/unix/$A
-			 ftp://ftp.us.vim.org/pub/vim/unreleased/unix/$A
-			 http://www.ibiblio.org/gentoo/distfiles/${VIMPATCH}"
-else
-	die "Eek!  I don't know how to interpret the version!"
-fi
-
-DESCRIPTION="Vi IMproved!"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="app-editors/vim-core
-	sys-libs/libtermcap-compat
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-# It appears that the tclinterp stuff in Vim is broken right now (at
-# least on Linux... it works on BSD).  When you --enable-tclinterp
-# flag, then the following command never returns:
-#
-#   VIMINIT='let OS = system("uname -s")' vim
-#
-# Please don't re-enable the tclinterp flag without verifying first
-# that the above works.  Thanks.  (08 Sep 2001 agriffis)
-
-
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${A}
-	# Fixup a script to use awk instead of nawk
-	cd ${S}/runtime/tools
-	mv mve.awk mve.awk.old
-	( read l; echo "#!/usr/bin/awk -f"; cat ) <mve.awk.old >mve.awk
-	# Another set of patch's borrowed from src rpm to fix syntax error's etc.
-	cd ${WORKDIR}
-	tar xvjf  ${FILESDIR}/vimpatch.tar.bz2 
-	cd $S
-	patch -p1 < ${WORKDIR}/vim-4.2-speed_t.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.1-vimnotvi.patch || die
-	patch -p1 < ${WORKDIR}/vim-5.6a-paths.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-fixkeys.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0-specsyntax.patch || die
-	patch -p1 < ${WORKDIR}/vim-6.0r-crv.patch || die
-			
-	cd ${WORKDIR}
-	tar xvjf ${DISTDIR}/${VIMPATCH}
-	cd ${S}
-
-	# Apply any patches available for this version
-	local patches=`echo ${WORKDIR}/${PV}.[0-9][0-9][0-9]`
-	case "$patches" in
-		*\]) 
-			;; # globbing didn't work; no patches available
-		*)
-			cd $S
-			for a in $patches; do
-				echo -n "Applying patch $a..."
-				patch -p0 < $a > /dev/null || die
-				echo "OK"
-			done
-			;;
-	esac
-}
-
-src_compile() {
-	local myconf
-	myconf="--without-x"
-	use nls    && myconf="$myconf --enable-multibyte"
-	use nls    || myconf="$myconf --disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	# This should fix a sandbox violation. 
-	addwrite "${SSH_TTY}"
-	
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	# Default vimrc
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-editors/vim/vim-6.1-r16.ebuild b/app-editors/vim/vim-6.1-r16.ebuild
deleted file mode 100644
index bd3aeb3701ae..000000000000
--- a/app-editors/vim/vim-6.1-r16.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r16.ebuild,v 1.9 2003/02/13 06:59:59 vapier Exp $
-
-VIMPATCH="vimpatch-1-245.tar.bz2"
-inherit vim
-
-DESCRIPTION="Vi IMproved!"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-DEPEND="app-editors/vim-core
-	sys-libs/libtermcap-compat
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-	local myconf
-	myconf="--without-x"
-	use nls    && myconf="$myconf --enable-multibyte"
-	use nls    || myconf="$myconf --disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-
-	# This should fix a sandbox violation. 
-	addwrite "${SSH_TTY}"
-	
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --with-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	# Default vimrc
-	insinto /usr/share/vim
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-editors/vim/vim-6.1-r17.ebuild b/app-editors/vim/vim-6.1-r17.ebuild
deleted file mode 100644
index 271dea638b8c..000000000000
--- a/app-editors/vim/vim-6.1-r17.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r17.ebuild,v 1.15 2003/02/13 07:00:04 vapier Exp $
-
-IUSE="nls perl python ruby tcltk gpm X"
-
-VIMPATCH="vimpatch-1-263.tar.bz2"
-inherit vim
-
-DESCRIPTION="Vi IMproved!"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-DEPEND="app-editors/vim-core
-	sys-libs/libtermcap-compat
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-	local myconf
-	myconf="--with-features=big --enable-multibyte"
-	use nls    && myconf="$myconf --enable-multibyte"
-	use nls    || myconf="$myconf --disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-	
-	# the console vim will change the caption of a terminal in X.
-	# the configure script should autodetect X being installed, so
-	# we'll specifically turn it off if X is not in the USE vars.
-	# -rphillips
-	use X      && myconf="$myconf --with-x"
-
-	# This should fix a sandbox violation. 
- 	for file in /dev/pty/s*
- 	do
- 		addwrite $file
- 	done
-
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --enable-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-
-	# move config files to /etc/vim/
-	echo "#define SYS_VIMRC_FILE \"/etc/vim/vimrc\"" \
-		>>${WORKDIR}/vim61/src/feature.h
-	echo "#define SYS_GVIMRC_FILE \"/etc/vim/gvimrc\"" \
-		>>${WORKDIR}/vim61/src/feature.h
-
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	ln -s vim ${D}/usr/bin/rvim
-	ln -s vim  ${D}/usr/bin/ex
-	ln -s vim  ${D}/usr/bin/view
-	ln -s vim  ${D}/usr/bin/rview
-	
-	# Default vimrc
-	insinto /etc/vim/
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-editors/vim/vim-6.1-r18.ebuild b/app-editors/vim/vim-6.1-r18.ebuild
deleted file mode 100644
index 3e2062ac5a3b..000000000000
--- a/app-editors/vim/vim-6.1-r18.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.1-r18.ebuild,v 1.3 2003/02/13 07:00:09 vapier Exp $
-
-IUSE="nls perl python ruby tcltk gpm X"
-
-VIMPATCH="vimpatch-1-289.tar.bz2"
-inherit vim
-
-DESCRIPTION="Vi IMproved!"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-DEPEND="app-editors/vim-core
-	sys-libs/libtermcap-compat
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?	( >=sys-libs/gpm-1.19.3 )
-	perl?	( sys-devel/perl )
-	python? ( dev-lang/python )
-	ruby?	( >=dev-lang/ruby-1.6.4 )"
-#	tcltk?	( dev-lang/tcl )"
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-	local myconf
-	myconf="--with-features=big --enable-multibyte"
-	use nls    && myconf="$myconf --enable-multibyte"
-	use nls    || myconf="$myconf --disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	
-# tclinterp is BROKEN.  See note above DEPEND=
-#	use tcltk  && myconf="$myconf --enable-tclinterp"
-
-# Added back gpm for temporary will remove if necessary, I think that I have
-# fixed most of gpm so it should be fine.
-	use gpm    || myconf="$myconf --disable-gpm"
-	
-	# the console vim will change the caption of a terminal in X.
-	# the configure script should autodetect X being installed, so
-	# we'll specifically turn it off if X is not in the USE vars.
-	# -rphillips
-	use X      && myconf="$myconf --with-x"
-
-	# This should fix a sandbox violation. 
- 	for file in /dev/pty/s*
- 	do
- 		addwrite $file
- 	done
-
-	#
-	# Build a nogui version, this will install as /usr/bin/vim
-	#
-	./configure \
-		--prefix=/usr --mandir=/usr/share/man --host=$CHOST \
-		--with-features=huge --enable-cscope $myconf \
-		--enable-gui=no \
-		|| die "vim configure failed"
-
-	# move config files to /etc/vim/
-	echo "#define SYS_VIMRC_FILE \"/etc/vim/vimrc\"" \
-		>>${WORKDIR}/vim61/src/feature.h
-	echo "#define SYS_GVIMRC_FILE \"/etc/vim/gvimrc\"" \
-		>>${WORKDIR}/vim61/src/feature.h
-
-	# Parallel make does not work
-	make || die "vim make failed"
-}
-
-src_install() {
-	dobin src/vim
-	ln -s vim ${D}/usr/bin/vimdiff
-	ln -s vim ${D}/usr/bin/rvim
-	ln -s vim  ${D}/usr/bin/ex
-	ln -s vim  ${D}/usr/bin/view
-	ln -s vim  ${D}/usr/bin/rview
-	
-	# Default vimrc
-	insinto /etc/vim/
-	doins ${FILESDIR}/vimrc
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "gvim has now a seperate ebuild, 'emerge gvim' will install gvim"
-}
diff --git a/app-emulation/game-launcher/game-launcher-0.9.8.ebuild b/app-emulation/game-launcher/game-launcher-0.9.8.ebuild
index e074b8d50d9c..3b5eb84f142e 100644
--- a/app-emulation/game-launcher/game-launcher-0.9.8.ebuild
+++ b/app-emulation/game-launcher/game-launcher-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/game-launcher/game-launcher-0.9.8.ebuild,v 1.2 2003/02/13 07:13:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/game-launcher/game-launcher-0.9.8.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 DESCRIPTION="Game Launcher is a cross platform, universal front end for emulators.It has been known to work with MAME, Nesticle, RockNES, zSNES, snes9x, Callus, Stella, z26 and Genecyst."
 HOMEPAGE="http://www.dribin.org/dave/game_launcher/"
@@ -60,4 +60,4 @@ pkg_postinst() {
     einfo "You can add a new group and then change the permissions."
     einfo "Members of that group then can run it."
     echo
-}
\ No newline at end of file
+}
diff --git a/app-emulation/plex86/plex86-20021117.ebuild b/app-emulation/plex86/plex86-20021117.ebuild
index 611b1c596830..da9ac7cc63b8 100644
--- a/app-emulation/plex86/plex86-20021117.ebuild
+++ b/app-emulation/plex86/plex86-20021117.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/plex86/plex86-20021117.ebuild,v 1.3 2003/03/11 12:11:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/plex86/plex86-20021117.ebuild,v 1.4 2003/03/11 20:50:08 seemant Exp $
 
 DESCRIPTION="Plex86 is THE opensource free-software alternative for VMWare, VirtualPC, and other IA-32 on IA-32 \"Virtual PC products.\""
 HOMEPAGE="http://savannah.gnu.org/projects/plex86/"
@@ -64,4 +64,4 @@ pkg_postinst() {
     einfo "Contact me (lordvan@lordvan.com) if you encounter any problems."
     echo
 
-}
\ No newline at end of file
+}
diff --git a/app-misc/mime-types/mime-types-1.0.ebuild b/app-misc/mime-types/mime-types-1.0.ebuild
index cd570f803717..2dafd097dcd2 100644
--- a/app-misc/mime-types/mime-types-1.0.ebuild
+++ b/app-misc/mime-types/mime-types-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mime-types/mime-types-1.0.ebuild,v 1.2 2003/02/13 09:06:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mime-types/mime-types-1.0.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 IUSE=""
 S=${WORKDIR}/${P}
@@ -21,4 +21,4 @@ src_install() {
 	dodir /etc
 	insinto /etc
 	doins mime.types
-}
\ No newline at end of file
+}
diff --git a/app-misc/sqeed/sqeed-0.2.2.ebuild b/app-misc/sqeed/sqeed-0.2.2.ebuild
index d85d35cef447..15f78e732d67 100644
--- a/app-misc/sqeed/sqeed-0.2.2.ebuild
+++ b/app-misc/sqeed/sqeed-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sqeed/sqeed-0.2.2.ebuild,v 1.7 2003/02/13 09:09:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sqeed/sqeed-0.2.2.ebuild,v 1.8 2003/03/11 20:50:08 seemant Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A simple bash script holding a database with notes."
@@ -11,7 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-DEPEND="sys-apps/bash"
+DEPEND="app-shells/bash"
 
 src_install() {
 	insinto /etc/
diff --git a/app-sci/epix/epix-0.8.8a.ebuild b/app-sci/epix/epix-0.8.8a.ebuild
index 1f8a16cf6f99..89fadd28d3cf 100644
--- a/app-sci/epix/epix-0.8.8a.ebuild
+++ b/app-sci/epix/epix-0.8.8a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/epix/epix-0.8.8a.ebuild,v 1.2 2003/02/14 16:40:09 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/epix/epix-0.8.8a.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
 HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~x86"
 
 IUSE=""
-DEPEND="sys-apps/bash"
+DEPEND="app-shells/bash"
 	
 
 src_unpack() {
diff --git a/app-shells/bash-completion/bash-completion-20021017.ebuild b/app-shells/bash-completion/bash-completion-20021017.ebuild
index d70d9a86ca35..f89e1296d1c4 100644
--- a/app-shells/bash-completion/bash-completion-20021017.ebuild
+++ b/app-shells/bash-completion/bash-completion-20021017.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20021017.ebuild,v 1.5 2003/02/13 09:28:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20021017.ebuild,v 1.6 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${PN/-/_}
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="sys-apps/tar sys-apps/bzip2"
-RDEPEND=">=sys-apps/bash-2.05a"
+RDEPEND=">=app-shells/bash-2.05a"
 
 src_install() {
 	insinto /etc
diff --git a/app-shells/bash-completion/bash-completion-20021221.ebuild b/app-shells/bash-completion/bash-completion-20021221.ebuild
index 58733c33cd0d..31d11d6bbdbf 100644
--- a/app-shells/bash-completion/bash-completion-20021221.ebuild
+++ b/app-shells/bash-completion/bash-completion-20021221.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20021221.ebuild,v 1.3 2003/02/13 09:28:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20021221.ebuild,v 1.4 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${PN/-/_}
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="sys-apps/tar sys-apps/bzip2"
-RDEPEND=">=sys-apps/bash-2.05a"
+RDEPEND=">=app-shells/bash-2.05a"
 
 src_install() {
 	insinto /etc
diff --git a/app-shells/bash-completion/bash-completion-20021231.ebuild b/app-shells/bash-completion/bash-completion-20021231.ebuild
index d1c71e3ac97c..94d7fe66d158 100644
--- a/app-shells/bash-completion/bash-completion-20021231.ebuild
+++ b/app-shells/bash-completion/bash-completion-20021231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20021231.ebuild,v 1.2 2003/02/13 09:28:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20021231.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${PN/-/_}
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 DEPEND="sys-apps/tar sys-apps/bzip2"
-RDEPEND=">=sys-apps/bash-2.05a"
+RDEPEND=">=app-shells/bash-2.05a"
 
 src_install() {
 	insinto /etc
diff --git a/app-shells/bash-completion/bash-completion-20030209.ebuild b/app-shells/bash-completion/bash-completion-20030209.ebuild
index e886c13df26f..d4047398bd66 100644
--- a/app-shells/bash-completion/bash-completion-20030209.ebuild
+++ b/app-shells/bash-completion/bash-completion-20030209.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20030209.ebuild,v 1.1 2003/02/17 20:58:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20030209.ebuild,v 1.2 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${PN/-/_}
 DESCRIPTION="Programmable Completion for bash (includes emerge and ebuild commands)."
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 DEPEND="sys-apps/tar
 	sys-apps/bzip2"
 
-RDEPEND=">=sys-apps/bash-2.05a"
+RDEPEND=">=app-shells/bash-2.05a"
 
 src_install() {
 	insinto /etc
diff --git a/sys-apps/bash/ChangeLog b/app-shells/bash/ChangeLog
index f12eda4a2291..487eda434974 100644
--- a/sys-apps/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/bash
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bash/ChangeLog,v 1.23 2003/02/24 22:34:58 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.1 2003/03/11 20:50:08 seemant Exp $
+
+*bash-2.05a-r3 (11 Mar 2003)
+
+  11 Mar 2003; Seemant Kulleen <seemant@gentoo.org> bash-2.05a-r3.ebuild,
+  bash-2.05b-r3.ebuild, files/config-top.h.diff:
+  moved to app-shells
 
   20 Feb 2003; Zach Welch <zwelch@gentoo.org> bash-2.05b-r3.ebuild :
   Added arm to keywords.
diff --git a/sys-apps/bash/bash-2.05a-r3.ebuild b/app-shells/bash/bash-2.05a-r3.ebuild
index 7bb8fcbe53d9..1c84b6caacc9 100644
--- a/sys-apps/bash/bash-2.05a-r3.ebuild
+++ b/app-shells/bash/bash-2.05a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bash/bash-2.05a-r3.ebuild,v 1.11 2003/02/13 15:49:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05a-r3.ebuild,v 1.1 2003/03/11 20:50:08 seemant Exp $
 
 inherit flag-o-matic gnuconfig
 
diff --git a/sys-apps/bash/bash-2.05b-r3.ebuild b/app-shells/bash/bash-2.05b-r3.ebuild
index 677681a9413b..bfdb5d8def65 100644
--- a/sys-apps/bash/bash-2.05b-r3.ebuild
+++ b/app-shells/bash/bash-2.05b-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bash/bash-2.05b-r3.ebuild,v 1.20 2003/02/24 22:34:58 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-2.05b-r3.ebuild,v 1.1 2003/03/11 20:50:08 seemant Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/sys-apps/bash/files/config-top.h.diff b/app-shells/bash/files/config-top.h.diff
index 51367b300833..51367b300833 100644
--- a/sys-apps/bash/files/config-top.h.diff
+++ b/app-shells/bash/files/config-top.h.diff
diff --git a/sys-apps/bash/files/digest-bash-2.05a-r3 b/app-shells/bash/files/digest-bash-2.05a-r3
index 5dc9061017e7..5dc9061017e7 100644
--- a/sys-apps/bash/files/digest-bash-2.05a-r3
+++ b/app-shells/bash/files/digest-bash-2.05a-r3
diff --git a/sys-apps/bash/files/digest-bash-2.05b-r3 b/app-shells/bash/files/digest-bash-2.05b-r3
index 9e2103210e00..9e2103210e00 100644
--- a/sys-apps/bash/files/digest-bash-2.05b-r3
+++ b/app-shells/bash/files/digest-bash-2.05b-r3
diff --git a/app-text/diction/diction-1.02.ebuild b/app-text/diction/diction-1.02.ebuild
index a2e9bc43aaaf..77a432623257 100644
--- a/app-text/diction/diction-1.02.ebuild
+++ b/app-text/diction/diction-1.02.ebuild
@@ -23,4 +23,4 @@ src_compile() {
 
 src_install () {
     make prefix=${D}/usr install
-}
\ No newline at end of file
+}
diff --git a/dev-db/firebird/firebird-1.0-r1.ebuild b/dev-db/firebird/firebird-1.0-r1.ebuild
index d2954c0f3a10..29c968c21cdf 100644
--- a/dev-db/firebird/firebird-1.0-r1.ebuild
+++ b/dev-db/firebird/firebird-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.0-r1.ebuild,v 1.6 2003/02/13 10:01:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.0-r1.ebuild,v 1.7 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/firebird-1.0.0.796
 DESCRIPTION="Firebird is a relational database offering many ANSI SQL-92 features that runs on Linux, Windows, and a variety of Unix platforms. Firebird offers excellent concurrency, high performance, and powerful language support for stored procedures and triggers. It has been used in production systems, under a variety of names since 1981."
@@ -10,7 +10,7 @@ HOMEPAGE="http://firebird.sourceforge.net/"
 SLOT="0"
 LICENSE="MPL-1.1"
 KEYWORDS="x86"
-DEPEND="sys-apps/bash
+DEPEND="app-shells/bash
 	app-arch/zip
 	>=sys-devel/gcc-2.95.3-r5"
 
diff --git a/dev-perl/Net-RawIP/Net-RawIP-0.09d.ebuild b/dev-perl/Net-RawIP/Net-RawIP-0.09d.ebuild
index 5cbf0fce144b..67cb836911ee 100644
--- a/dev-perl/Net-RawIP/Net-RawIP-0.09d.ebuild
+++ b/dev-perl/Net-RawIP/Net-RawIP-0.09d.ebuild
@@ -9,4 +9,4 @@ DEPEND="net-libs/libpcap"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86"
\ No newline at end of file
+KEYWORDS="~x86"
diff --git a/dev-perl/NetPacket/NetPacket-0.03.ebuild b/dev-perl/NetPacket/NetPacket-0.03.ebuild
index 01cffe616bd6..0d6481077091 100644
--- a/dev-perl/NetPacket/NetPacket-0.03.ebuild
+++ b/dev-perl/NetPacket/NetPacket-0.03.ebuild
@@ -7,4 +7,4 @@ HOMEPAGE="http://www.cpan.org/"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86"
\ No newline at end of file
+KEYWORDS="~x86"
diff --git a/dev-python/twisted-cvs/twisted-cvs-20021104.ebuild b/dev-python/twisted-cvs/twisted-cvs-20021104.ebuild
index d1f3ef5351cb..b833ad53a5cf 100644
--- a/dev-python/twisted-cvs/twisted-cvs-20021104.ebuild
+++ b/dev-python/twisted-cvs/twisted-cvs-20021104.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-cvs/twisted-cvs-20021104.ebuild,v 1.2 2003/02/13 11:39:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-cvs/twisted-cvs-20021104.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 ECVS_USER="anon"
 ECVS_SERVER="twistedmatrix.com:/cvs"
@@ -55,4 +55,4 @@ pkg_postinst() {
     einfo "This is for testing only! Do not submit bugs regarding this to"
     einfo "Bugzilla. Instead mail me at lordvan@gentoo.org"
     echo
-}
\ No newline at end of file
+}
diff --git a/dev-util/dialog/dialog-0.9_beta20020519.ebuild b/dev-util/dialog/dialog-0.9_beta20020519.ebuild
index 331602652cab..d81daaf2a4d7 100644
--- a/dev-util/dialog/dialog-0.9_beta20020519.ebuild
+++ b/dev-util/dialog/dialog-0.9_beta20020519.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.9_beta20020519.ebuild,v 1.13 2003/02/22 08:53:59 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.9_beta20020519.ebuild,v 1.14 2003/03/11 20:50:08 seemant Exp $
 
 MY_PV="0.9b-20020519"
 S=${WORKDIR}/dialog-${MY_PV}
@@ -12,7 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha mips hppa arm"
 
-DEPEND=">=sys-apps/bash-2.04-r3
+DEPEND=">=app-shells/bash-2.04-r3
 	>=sys-libs/ncurses-5.2-r5"
 
 src_compile() {
diff --git a/dev-util/dialog/dialog-0.9_beta20020814.ebuild b/dev-util/dialog/dialog-0.9_beta20020814.ebuild
index 3e4da50ba43d..d5c44722eb35 100644
--- a/dev-util/dialog/dialog-0.9_beta20020814.ebuild
+++ b/dev-util/dialog/dialog-0.9_beta20020814.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.9_beta20020814.ebuild,v 1.6 2003/02/22 08:53:59 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.9_beta20020814.ebuild,v 1.7 2003/03/11 20:50:08 seemant Exp $
 
 MY_PV="0.9b-20020814"
 S=${WORKDIR}/dialog-${MY_PV}
@@ -12,7 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc alpha ~hppa arm"
 
-DEPEND=">=sys-apps/bash-2.04-r3
+DEPEND=">=app-shells/bash-2.04-r3
 	>=sys-libs/ncurses-5.2-r5"
 
 src_compile() {
diff --git a/dev-util/dialog/dialog-0.9_beta20030130.ebuild b/dev-util/dialog/dialog-0.9_beta20030130.ebuild
index 60d421840cde..920daf2ea394 100644
--- a/dev-util/dialog/dialog-0.9_beta20030130.ebuild
+++ b/dev-util/dialog/dialog-0.9_beta20030130.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.9_beta20030130.ebuild,v 1.1 2003/03/01 19:22:56 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/dialog/dialog-0.9_beta20030130.ebuild,v 1.2 2003/03/11 20:50:08 seemant Exp $
 
 MY_PV="0.9b-20020814"
 S=${WORKDIR}/dialog-${MY_PV}
@@ -12,7 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc alpha ~hppa ~arm"
 
-DEPEND=">=sys-apps/bash-2.04-r3
+DEPEND=">=app-shells/bash-2.04-r3
 	>=sys-libs/ncurses-5.2-r5"
 
 src_compile() {
diff --git a/dev-util/kcachegrind/kcachegrind-0.3.ebuild b/dev-util/kcachegrind/kcachegrind-0.3.ebuild
index 3552ab016044..96341b77d14c 100644
--- a/dev-util/kcachegrind/kcachegrind-0.3.ebuild
+++ b/dev-util/kcachegrind/kcachegrind-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kcachegrind/kcachegrind-0.3.ebuild,v 1.2 2003/02/13 11:57:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kcachegrind/kcachegrind-0.3.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 inherit kde-base
 
 need-kde 3
@@ -13,4 +13,4 @@ HOMEPAGE="http://kcachegrind.sourceforge.net"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-RDEPEND="$RDEPEND >=dev-util/valgrind-1.0.4-r1"
\ No newline at end of file
+RDEPEND="$RDEPEND >=dev-util/valgrind-1.0.4-r1"
diff --git a/net-dns/dlint/dlint-1.4.0.ebuild b/net-dns/dlint/dlint-1.4.0.ebuild
index 929cf03fe2ed..869e9c9fd71e 100644
--- a/net-dns/dlint/dlint-1.4.0.ebuild
+++ b/net-dns/dlint/dlint-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dlint/dlint-1.4.0.ebuild,v 1.8 2003/02/13 13:57:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dlint/dlint-1.4.0.ebuild,v 1.9 2003/03/11 20:50:08 seemant Exp $
 
 MY_P=${PN}${PV}
 S=${WORKDIR}/${MY_P}
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 
 DEPEND="net-dns/bind-tools
 	sys-devel/perl
-	sys-apps/bash"
+	app-shells/bash"
 
 src_compile() {
 
diff --git a/net-firewall/dynfw/dynfw-1.0.1.ebuild b/net-firewall/dynfw/dynfw-1.0.1.ebuild
index 3a8b35ec9e84..ee6329e6223d 100644
--- a/net-firewall/dynfw/dynfw-1.0.1.ebuild
+++ b/net-firewall/dynfw/dynfw-1.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/dynfw/dynfw-1.0.1.ebuild,v 1.2 2003/03/04 00:56:29 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/dynfw/dynfw-1.0.1.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${P}
 
 DESCRIPTION="Dynamic Firewall Tools for netfilter-based firewalls"
 SRC_URI="http://gentoo.org/projects/${P}.tar.gz"
 HOMEPAGE="http://gentoo.org/projects/dynfw"
-DEPEND="sys-apps/bash"
+DEPEND="app-shells/bash"
 KEYWORDS="x86 sparc "
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-fs/autofs/autofs-3.1.7-r4.ebuild b/net-fs/autofs/autofs-3.1.7-r4.ebuild
index 75e90fd30f77..7436ad5085a0 100644
--- a/net-fs/autofs/autofs-3.1.7-r4.ebuild
+++ b/net-fs/autofs/autofs-3.1.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r4.ebuild,v 1.3 2003/02/13 13:59:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-3.1.7-r4.ebuild,v 1.4 2003/03/11 20:50:08 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Kernel based automounter"
@@ -63,4 +63,4 @@ pkg_postinst() {
 	echo ""
 	einfo "Also the normal autofs status has been renamed stats"
 	einfo "as there is already a predefined Gentoo status"
-}	
\ No newline at end of file
+}	
diff --git a/net-misc/keychain/keychain-2.0.2.ebuild b/net-misc/keychain/keychain-2.0.2.ebuild
index b08723a72113..8042a65622b4 100644
--- a/net-misc/keychain/keychain-2.0.2.ebuild
+++ b/net-misc/keychain/keychain-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.0.2.ebuild,v 1.6 2003/02/13 14:55:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/keychain/keychain-2.0.2.ebuild,v 1.7 2003/03/11 20:50:08 seemant Exp $
 
 DESCRIPTION="A front-end to ssh-agent"
 HOMEPAGE="http://www.gentoo.org/proj/en/keychain.xml"
@@ -12,7 +12,7 @@ LICENSE="GPL"
 SLOT="0"
 
 DEPEND="virtual/glibc"
-RDEPEND="${DEPEND} sys-apps/bash net-misc/openssh sys-apps/sh-utils"
+RDEPEND="${DEPEND} app-shells/bash net-misc/openssh sys-apps/sh-utils"
 
 src_install() {
 	dobin keychain
diff --git a/net-zope/translationservice/translationservice-0.3.ebuild b/net-zope/translationservice/translationservice-0.3.ebuild
index a3503214eeb6..321dcc1f554d 100644
--- a/net-zope/translationservice/translationservice-0.3.ebuild
+++ b/net-zope/translationservice/translationservice-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/translationservice-0.3.ebuild,v 1.1 2003/03/03 22:47:55 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/translationservice-0.3.ebuild,v 1.2 2003/03/11 20:50:08 seemant Exp $
 
 inherit zproduct
 
@@ -10,4 +10,4 @@ SRC_URI="${HOMEPAGE}/TranslationService-${PV}.tgz"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
-ZPROD_LIST="TranslationService"
\ No newline at end of file
+ZPROD_LIST="TranslationService"
diff --git a/profiles/updates/1Q-2003 b/profiles/updates/1Q-2003
index eab5db76098d..71d8dda8c9c8 100644
--- a/profiles/updates/1Q-2003
+++ b/profiles/updates/1Q-2003
@@ -15,3 +15,4 @@ move dev-libs/gtk-sharp x11-libs/gtk-sharp
 move app-editors/kile-1.31 app-editors/kile-1.3.1
 move app-i18n/kde-i18n-zh_CN.GB2312-2.2.2 app-i18n/kde-i18n-zh_CN-2.2.2
 move app-i18n/kde-i18n-zh_TW.Big5-2.2.2 app-i18n/kde-i18n-zh_TW-2.2.2
+move sys-apps/bash app-shells/bash
diff --git a/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild b/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild
index f8f7d5cc64c5..277c980354b1 100644
--- a/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild
+++ b/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild
@@ -1,7 +1,7 @@
 # (C) 2002 The TelemetryBox Corporation. http://telemetrybox.biz
 # Distributed under the terms of the GNU General Public License v2
 # Christoph Lameter, <christoph@lameter.com>, July 15, 2002
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild,v 1.5 2002/12/09 04:37:24 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/discover-data/discover-data-1.2002.05.23.ebuild,v 1.6 2003/03/11 20:50:08 seemant Exp $
 
 DESCRIPTION="data for discover. list of pci ids. pnp ids etc."
 SRC_URI="ftp://ftp.debian.org/debian/pool/main/d/discover-data/discover-data_1.2002.05.23-1.tar.gz"
@@ -11,7 +11,7 @@ SLOT="1"
 KEYWORDS="x86 ppc sparc "
 
 DEPEND="sys-apps/tar sys-apps/gzip"
-RDEPEND="sys-apps/bash"
+RDEPEND="app-shells/bash"
 
 S=${WORKDIR}/discover-data-${P}-1
 
diff --git a/sys-apps/portage/portage-2.0.46-r12.ebuild b/sys-apps/portage/portage-2.0.46-r12.ebuild
index 9c5435754a1f..ae9f66bb08b8 100644
--- a/sys-apps/portage/portage-2.0.46-r12.ebuild
+++ b/sys-apps/portage/portage-2.0.46-r12.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.46-r12.ebuild,v 1.4 2003/02/23 07:07:18 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.46-r12.ebuild,v 1.5 2003/03/11 20:50:08 seemant Exp $
 
 IUSE="build"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.ta
 HOMEPAGE="http://www.gentoo.org"
 KEYWORDS="alpha hppa mips ppc sparc x86"
 LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a )"
+RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
 get_portver() {
 	python -c "import portage,string; print string.join(portage.pkgsplit(portage.best(portage.db[\"${ROOT}\"][\"vartree\"].dbapi.match(\"sys-apps/portage\"))))"
diff --git a/sys-apps/portage/portage-2.0.47-r5.ebuild b/sys-apps/portage/portage-2.0.47-r5.ebuild
index 66619b99c694..cf6c65ae97ef 100644
--- a/sys-apps/portage/portage-2.0.47-r5.ebuild
+++ b/sys-apps/portage/portage-2.0.47-r5.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r5.ebuild,v 1.4 2003/02/26 13:56:35 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r5.ebuild,v 1.5 2003/03/11 20:50:08 seemant Exp $
 
 IUSE="build"
 
@@ -14,7 +14,7 @@ SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.ta
 HOMEPAGE="http://www.gentoo.org"
 KEYWORDS="alpha arm hppa mips ppc sparc x86"
 LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a )"
+RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
 get_portver() {
 	python -c "import portage,string; print string.join(portage.pkgsplit(portage.best(portage.db[\"${ROOT}\"][\"vartree\"].dbapi.match(\"sys-apps/portage\"))))"
diff --git a/sys-apps/portage/portage-2.0.47-r6.ebuild b/sys-apps/portage/portage-2.0.47-r6.ebuild
index 7158898d6d69..54e921d3f1a6 100644
--- a/sys-apps/portage/portage-2.0.47-r6.ebuild
+++ b/sys-apps/portage/portage-2.0.47-r6.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r6.ebuild,v 1.2 2003/02/27 10:49:10 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r6.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 IUSE="build"
 
@@ -14,7 +14,7 @@ SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.ta
 HOMEPAGE="http://www.gentoo.org"
 KEYWORDS="alpha arm hppa mips ppc sparc x86"
 LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a )"
+RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
 get_portver() {
 	python -c "import portage,string; print string.join(portage.pkgsplit(portage.best(portage.db[\"${ROOT}\"][\"vartree\"].dbapi.match(\"sys-apps/portage\"))))"
diff --git a/sys-apps/portage/portage-2.0.47-r7.ebuild b/sys-apps/portage/portage-2.0.47-r7.ebuild
index 11361a3328a8..5502efd82233 100644
--- a/sys-apps/portage/portage-2.0.47-r7.ebuild
+++ b/sys-apps/portage/portage-2.0.47-r7.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r7.ebuild,v 1.1 2003/02/27 11:58:15 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r7.ebuild,v 1.2 2003/03/11 20:50:08 seemant Exp $
 
 IUSE="build"
 
@@ -14,7 +14,7 @@ SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.ta
 HOMEPAGE="http://www.gentoo.org"
 KEYWORDS="alpha arm hppa mips ppc sparc x86"
 LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a )"
+RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
 get_portver() {
 	python -c "import portage,string; print string.join(portage.pkgsplit(portage.best(portage.db[\"${ROOT}\"][\"vartree\"].dbapi.match(\"sys-apps/portage\"))))"
diff --git a/sys-apps/portage/portage-2.0.47-r8.ebuild b/sys-apps/portage/portage-2.0.47-r8.ebuild
index 255d603b0e2b..99024558fd60 100644
--- a/sys-apps/portage/portage-2.0.47-r8.ebuild
+++ b/sys-apps/portage/portage-2.0.47-r8.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r8.ebuild,v 1.4 2003/03/03 18:36:51 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r8.ebuild,v 1.5 2003/03/11 20:50:08 seemant Exp $
 
 IUSE="build"
 
@@ -14,7 +14,7 @@ SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.ta
 HOMEPAGE="http://www.gentoo.org"
 KEYWORDS="alpha arm hppa mips ppc sparc x86"
 LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a )"
+RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
 get_portver() {
 	python -c "import portage,string; print string.join(portage.pkgsplit(portage.best(portage.db[\"${ROOT}\"][\"vartree\"].dbapi.match(\"sys-apps/portage\"))))"
diff --git a/sys-apps/portage/portage-2.0.47-r9.ebuild b/sys-apps/portage/portage-2.0.47-r9.ebuild
index 67e913544ed2..dab711bb47c5 100644
--- a/sys-apps/portage/portage-2.0.47-r9.ebuild
+++ b/sys-apps/portage/portage-2.0.47-r9.ebuild
@@ -1,5 +1,5 @@
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r9.ebuild,v 1.1 2003/03/11 11:42:01 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.47-r9.ebuild,v 1.2 2003/03/11 20:50:08 seemant Exp $
 
 IUSE="build"
 
@@ -14,7 +14,7 @@ SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.ta
 HOMEPAGE="http://www.gentoo.org"
 KEYWORDS="alpha arm hppa mips ppc sparc x86"
 LICENSE="GPL-2"
-RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=sys-apps/bash-2.05a )"
+RDEPEND="!build? ( >=sys-apps/fileutils-4.1.8 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a )"
 
 get_portver() {
 	python -c "import portage,string; print string.join(portage.pkgsplit(portage.best(portage.db[\"${ROOT}\"][\"vartree\"].dbapi.match(\"sys-apps/portage\"))))"
diff --git a/sys-libs/readline/readline-4.2a-r1.ebuild b/sys-libs/readline/readline-4.2a-r1.ebuild
index 5e30f91a9788..58dac4ce7d91 100644
--- a/sys-libs/readline/readline-4.2a-r1.ebuild
+++ b/sys-libs/readline/readline-4.2a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.2a-r1.ebuild,v 1.5 2003/03/05 11:34:03 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.2a-r1.ebuild,v 1.6 2003/03/11 20:50:08 seemant Exp $
 
 inherit eutils gnuconfig
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2-r2
-	>=sys-apps/bash-2.05a-r3"
+	>=app-shells/bash-2.05a-r3"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-libs/readline/readline-4.3-r3.ebuild b/sys-libs/readline/readline-4.3-r3.ebuild
index bae3e0a9a710..3f75f4ccd286 100644
--- a/sys-libs/readline/readline-4.3-r3.ebuild
+++ b/sys-libs/readline/readline-4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r3.ebuild,v 1.5 2003/02/24 20:57:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r3.ebuild,v 1.6 2003/03/11 20:50:08 seemant Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha mips"
 
 # We must be sertain that we have a bash that is linked
 # to its internal readline, else we may get problems.
-DEPEND=">=sys-apps/bash-2.05b-r2
+DEPEND=">=app-shells/bash-2.05b-r2
 	>=sys-libs/ncurses-5.2-r2"
 
 src_unpack() {
diff --git a/sys-libs/readline/readline-4.3-r4.ebuild b/sys-libs/readline/readline-4.3-r4.ebuild
index dd7dbc27c19e..9765dc69bce8 100644
--- a/sys-libs/readline/readline-4.3-r4.ebuild
+++ b/sys-libs/readline/readline-4.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r4.ebuild,v 1.8 2003/02/24 20:57:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-4.3-r4.ebuild,v 1.9 2003/03/11 20:50:08 seemant Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa arm mips"
 
 # We must be sertain that we have a bash that is linked
 # to its internal readline, else we may get problems.
-DEPEND=">=sys-apps/bash-2.05b-r2
+DEPEND=">=app-shells/bash-2.05b-r2
 	>=sys-libs/ncurses-5.2-r2"
 
 src_unpack() {
diff --git a/x11-misc/genmenu/genmenu-0.9.0.ebuild b/x11-misc/genmenu/genmenu-0.9.0.ebuild
index d71a7968591f..5c88f4d656fc 100644
--- a/x11-misc/genmenu/genmenu-0.9.0.ebuild
+++ b/x11-misc/genmenu/genmenu-0.9.0.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/genmenu/genmenu-0.9.0.ebuild,v 1.3 2003/02/13 17:13:48 vapier Exp $
-
-S="${WORKDIR}/${P}"
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/genmenu/genmenu-0.9.0.ebuild,v 1.4 2003/03/11 20:50:08 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="menu generator for Blackbox, WindowMaker, and Enlightenment"
-SRC_URI="http://home.online.no/~geir37/archive/${P}.tar.gz"
 HOMEPAGE="http://projects.gtk.mine.nu/genmenu"
+SRC_URI="http://home.online.no/~geir37/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
-DEPEND="sys-apps/bash"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="~x86 ~ppc ~sparc"
+
+DEPEND="app-shells/bash"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch genmenu < ${FILESDIR}/${PN}-${PV}.patch
+	patch genmenu < ${FILESDIR}/${P}.patch
 }
 
 src_install () {
diff --git a/x11-misc/idesk/idesk-0.3.3.ebuild b/x11-misc/idesk/idesk-0.3.3.ebuild
index 7f1966dd3578..31079a73db80 100644
--- a/x11-misc/idesk/idesk-0.3.3.ebuild
+++ b/x11-misc/idesk/idesk-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2              
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.3.3.ebuild,v 1.3 2003/02/13 17:15:00 vapier Exp $                                                                    
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.3.3.ebuild,v 1.4 2003/03/11 20:50:08 seemant Exp $                                                                    
 DESCRIPTION="Utility to place icons on the root window"                         
                                                                                 
 HOMEPAGE="http://linuxhelp.hn.org/idesk.php"                           
@@ -39,4 +39,4 @@ pkg_postinst() {
 	einfo "NOTE: Please refer to ${HOMEPAGE}"
 	einfo "NOTE: For info on configuring ${PN}"
 	einfo
-}	
\ No newline at end of file
+}	
diff --git a/x11-misc/idesk/idesk-0.3.4.ebuild b/x11-misc/idesk/idesk-0.3.4.ebuild
index c9e587b3606a..747a38fc38ef 100644
--- a/x11-misc/idesk/idesk-0.3.4.ebuild
+++ b/x11-misc/idesk/idesk-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2              
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.3.4.ebuild,v 1.2 2003/02/13 17:15:06 vapier Exp $                                                                    
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.3.4.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $                                                                    
 DESCRIPTION="Utility to place icons on the root window"                         
                                                                                 
 HOMEPAGE="http://linuxhelp.hn.org/idesk.php"                           
@@ -39,4 +39,4 @@ pkg_postinst() {
 	einfo "NOTE: Please refer to ${HOMEPAGE}"
 	einfo "NOTE: For info on configuring ${PN}"
 	einfo
-}	
\ No newline at end of file
+}	
diff --git a/x11-misc/idesk/idesk-0.3.5.ebuild b/x11-misc/idesk/idesk-0.3.5.ebuild
index 424e6a4eb597..00c2b74c538c 100644
--- a/x11-misc/idesk/idesk-0.3.5.ebuild
+++ b/x11-misc/idesk/idesk-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2              
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.3.5.ebuild,v 1.2 2003/02/13 17:15:17 vapier Exp $                                                                    
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.3.5.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $                                                                    
 DESCRIPTION="Utility to place icons on the root window"                         
                                                                                 
 HOMEPAGE="http://linuxhelp.hn.org/idesk.php"                           
@@ -39,4 +39,4 @@ pkg_postinst() {
 	einfo "NOTE: Please refer to ${HOMEPAGE}"
 	einfo "NOTE: For info on configuring ${PN}"
 	einfo
-}	
\ No newline at end of file
+}	
diff --git a/x11-wm/aewm/aewm-1.2.0.ebuild b/x11-wm/aewm/aewm-1.2.0.ebuild
index 660f9f6a0b1b..1329fe4ea97e 100644
--- a/x11-wm/aewm/aewm-1.2.0.ebuild
+++ b/x11-wm/aewm/aewm-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.2.0.ebuild,v 1.2 2003/02/13 17:46:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.2.0.ebuild,v 1.3 2003/03/11 20:50:08 seemant Exp $
 
 IUSE=""
 
@@ -29,4 +29,4 @@ src_install() {
 
 pkg_postinst() {
 	einfo "See /usr/share/doc/${P}/README.gz for some delicious ~/.xinitrc recipes"
-}
\ No newline at end of file
+}