dont install uselss COPYING file and fix other stuff while i'm at it

53 files changed, 421 insertions, 573 deletions

diff --git a/app-editors/XML-XSH/XML-XSH-1.6.ebuild b/app-editors/XML-XSH/XML-XSH-1.6.ebuild
index d3f5032f423e..55e260d9b442 100644
--- a/app-editors/XML-XSH/XML-XSH-1.6.ebuild
+++ b/app-editors/XML-XSH/XML-XSH-1.6.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH/XML-XSH-1.6.ebuild,v 1.2 2003/02/13 06:38:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/XML-XSH/XML-XSH-1.6.ebuild,v 1.3 2004/05/31 22:12:03 vapier Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
-
 DESCRIPTION="XML Editing Shell"
 HOMEPAGE="http://xsh.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xsh/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=dev-perl/XML-LibXML-1.54
 	dev-perl/Parse-RecDescent
diff --git a/app-editors/bluefish/bluefish-0.11.ebuild b/app-editors/bluefish/bluefish-0.11.ebuild
index b7fffd72e9c8..35d5206e3d01 100644
--- a/app-editors/bluefish/bluefish-0.11.ebuild
+++ b/app-editors/bluefish/bluefish-0.11.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-0.11.ebuild,v 1.5 2003/12/04 15:52:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-0.11.ebuild,v 1.6 2004/05/31 22:12:03 vapier Exp $
 
-IUSE="nls spell"
-
-DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer."
-SRC_URI="http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/${P}.tar.bz2"
+DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer"
 HOMEPAGE="http://bluefish.openoffice.nl/"
+SRC_URI="http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc"
 SLOT="0"
+KEYWORDS="x86 ~ppc sparc"
+IUSE="nls spell"
 
 RDEPEND=">=x11-libs/gtk+-2
 	dev-libs/libpcre
 	spell? ( app-text/aspell )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
diff --git a/app-editors/bluefish/bluefish-0.9.ebuild b/app-editors/bluefish/bluefish-0.9.ebuild
index 3f12e39649b8..2d9727cad8e1 100644
--- a/app-editors/bluefish/bluefish-0.9.ebuild
+++ b/app-editors/bluefish/bluefish-0.9.ebuild
@@ -1,31 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-0.9.ebuild,v 1.10 2003/10/02 18:30:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bluefish/bluefish-0.9.ebuild,v 1.11 2004/05/31 22:12:03 vapier Exp $
 
-DESCRIPTION="Bluefish is a GTK HTML editor for the experienced web designer or programmer."
-SRC_URI="http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/${P}.tar.bz2"
+DESCRIPTION="Bluefish is a GTK HTML editor for the experienced web designer or programmer"
 HOMEPAGE="http://bluefish.openoffice.nl/"
+SRC_URI="http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
 SLOT="0"
+KEYWORDS="x86 ppc sparc"
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2
 	dev-libs/libpcre"
-
 RDEPEND="${DEPEND}
 	sys-devel/gettext"
 
-src_compile() {
-	local myconf
-
-	econf ${myconf} || die
-	emake || die
-}
-
 src_install() {
-	cd ${S}
 	sed -i -e "s:"/usr/share/pixmaps/b":"${D}/usr/share/pixmaps/b":g" Makefile
 	cd data
 	sed -i -e "s:"/usr/share":"${D}/usr/share":g" Makefile
diff --git a/app-editors/conglomerate/conglomerate-0.7.11.ebuild b/app-editors/conglomerate/conglomerate-0.7.11.ebuild
index bef8dc1e9609..90fd4d8d0f7f 100644
--- a/app-editors/conglomerate/conglomerate-0.7.11.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.7.11.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.11.ebuild,v 1.3 2004/03/06 15:27:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.11.ebuild,v 1.4 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="XML editor"
 HOMEPAGE="http://www.conglomerate.org/"
-
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="doc"
@@ -21,10 +20,9 @@ RDEPEND="dev-libs/libxml2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=x11-libs/gtksourceview-0.6"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper
 	doc? ( >=dev-util/gtk-doc-0.6 )"
 
-DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README* TODO"
+DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README* TODO"
diff --git a/app-editors/conglomerate/conglomerate-0.7.12.ebuild b/app-editors/conglomerate/conglomerate-0.7.12.ebuild
index e9e699b74896..d255a02ecc18 100644
--- a/app-editors/conglomerate/conglomerate-0.7.12.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.7.12.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.12.ebuild,v 1.3 2004/04/13 21:01:24 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.12.ebuild,v 1.4 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="XML editor"
 HOMEPAGE="http://www.conglomerate.org/"
-
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc"
@@ -21,10 +20,9 @@ RDEPEND="dev-libs/libxml2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=x11-libs/gtksourceview-0.6"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper
 	doc? ( >=dev-util/gtk-doc-0.6 )"
 
-DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README* TODO"
+DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README* TODO"
diff --git a/app-editors/conglomerate/conglomerate-0.7.6.ebuild b/app-editors/conglomerate/conglomerate-0.7.6.ebuild
index b6d6ca0814de..cc3296be57b5 100644
--- a/app-editors/conglomerate/conglomerate-0.7.6.ebuild
+++ b/app-editors/conglomerate/conglomerate-0.7.6.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.6.ebuild,v 1.3 2004/02/04 16:36:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/conglomerate/conglomerate-0.7.6.ebuild,v 1.4 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="XML editor"
 HOMEPAGE="http://www.conglomerate.org/"
-
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="doc"
@@ -21,9 +20,8 @@ RDEPEND="dev-libs/libxml2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=x11-libs/gtksourceview-0.6"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-0.6 )"
 
-DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README* TODO"
+DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README* TODO"
diff --git a/app-editors/e3/e3-2.41.ebuild b/app-editors/e3/e3-2.41.ebuild
index 7dddd9f33344..e89d95b2e8f4 100644
--- a/app-editors/e3/e3-2.41.ebuild
+++ b/app-editors/e3/e3-2.41.ebuild
@@ -1,39 +1,33 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.41.ebuild,v 1.2 2003/06/29 18:24:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.41.ebuild,v 1.3 2004/05/31 22:12:03 vapier Exp $
 
 DESCRIPTION="Super Tiny Editor with wordstar, vi, and emacs key bindings"
-SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
 HOMEPAGE="http://www.sax.de/~adlibit"
-SLOT="0"
+SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -ppc -sparc"
+IUSE=""
+RESTRICT="nostrip"
 
 DEPEND="dev-lang/nasm"
 RDEPEND="sys-apps/sed"
 
-RESTRICT="nostrip"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-}
-
 src_compile() {
 	emake || die
 }
 
 src_install() {
 	dodir /usr/bin
-	dobin e3
+	dobin e3 || die
 	dosym e3 /usr/bin/e3vi
 	dosym e3 /usr/bin/e3em
 	dosym e3 /usr/bin/e3ws
 	dosym e3 /usr/bin/e3pi
 	dosym e3 /usr/bin/e3ne
-	if [ "`use build`" ]; then
+	if use build ; then
 		# easier-to-remember shell scripts
 		dobin ${FILESDIR}/vi
 		# this one is more trouble than its worth --woodchip
diff --git a/app-editors/e3/e3-2.42.ebuild b/app-editors/e3/e3-2.42.ebuild
index 24ef265ae1e8..1977fec603f6 100644
--- a/app-editors/e3/e3-2.42.ebuild
+++ b/app-editors/e3/e3-2.42.ebuild
@@ -1,39 +1,33 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.42.ebuild,v 1.2 2003/04/18 17:53:36 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.42.ebuild,v 1.3 2004/05/31 22:12:03 vapier Exp $
 
 DESCRIPTION="Super Tiny Editor with wordstar, vi, and emacs key bindings"
-SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
 HOMEPAGE="http://www.sax.de/~adlibit"
-SLOT="0"
+SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="-* x86"
+IUSE=""
+RESTRICT="nostrip"
 
 DEPEND="dev-lang/nasm"
 RDEPEND="sys-apps/sed"
 
-RESTRICT="nostrip"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-}
-
 src_compile() {
 	emake || die
 }
 
 src_install() {
 	dodir /usr/bin
-	dobin e3
+	dobin e3 || die
 	dosym e3 /usr/bin/e3vi
 	dosym e3 /usr/bin/e3em
 	dosym e3 /usr/bin/e3ws
 	dosym e3 /usr/bin/e3pi
 	dosym e3 /usr/bin/e3ne
-	if [ "`use build`" ]; then
+	if use build ; then
 		# easier-to-remember shell scripts
 		dobin ${FILESDIR}/vi
 		# this one is more trouble than its worth --woodchip
diff --git a/app-editors/e3/e3-2.43.ebuild b/app-editors/e3/e3-2.43.ebuild
index adc8a63c7384..b0327495cdaa 100644
--- a/app-editors/e3/e3-2.43.ebuild
+++ b/app-editors/e3/e3-2.43.ebuild
@@ -1,39 +1,33 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.43.ebuild,v 1.3 2003/10/01 15:06:45 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/e3/e3-2.43.ebuild,v 1.4 2004/05/31 22:12:03 vapier Exp $
 
 DESCRIPTION="Very tiny editor in x86 ASM with emacs, pico, and vi keybindings"
+HOMEPAGE="http://www.sax.de/~adlibit/"
 SRC_URI="http://www.sax.de/~adlibit/${P}.tar.gz"
-HOMEPAGE="http://www.sax.de/~adlibit"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="-* x86"
+IUSE=""
+RESTRICT="nostrip"
 
 DEPEND="dev-lang/nasm"
 RDEPEND="sys-apps/sed"
 
-RESTRICT="nostrip"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${WORKDIR}
-}
-
 src_compile() {
 	emake || die
 }
 
 src_install() {
 	dodir /usr/bin
-	dobin e3
+	dobin e3 || die
 	dosym e3 /usr/bin/e3vi
 	dosym e3 /usr/bin/e3em
 	dosym e3 /usr/bin/e3ws
 	dosym e3 /usr/bin/e3pi
 	dosym e3 /usr/bin/e3ne
-	if [ "`use build`" ]; then
+	if use build ; then
 		# easier-to-remember shell scripts
 		dobin ${FILESDIR}/vi
 		# this one is more trouble than its worth --woodchip
diff --git a/app-editors/fte/fte-20010819-r2.ebuild b/app-editors/fte/fte-20010819-r2.ebuild
index 8733a95d093d..60a5a9afedfe 100644
--- a/app-editors/fte/fte-20010819-r2.ebuild
+++ b/app-editors/fte/fte-20010819-r2.ebuild
@@ -1,44 +1,33 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r2.ebuild,v 1.16 2004/03/13 22:29:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r2.ebuild,v 1.17 2004/05/31 22:12:03 vapier Exp $
 
 inherit eutils
 
-IUSE="gpm slang X"
-
 DESCRIPTION="Lightweight text-mode editor"
 HOMEPAGE="http://fte.sourceforge.net"
 SRC_URI="mirror://sourceforge/fte/fte-20010819-src.zip
 	mirror://sourceforge/fte/fte-20010819-common.zip"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE="gpm slang X"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.20 )"
-
 DEPEND="app-arch/unzip
 	slang? ( sys-libs/slang )
 	${RDEPEND}"
 
-TARGETS=""
-
-if [ "`use slang`" ] ; then
-	TARGETS="$TARGETS sfte"
-fi
-
-if [ "`use X`" ] ; then
-	TARGETS="$TARGETS xfte"
-fi
-
-if [ "`use gpm`" ] ; then
-	TARGETS="$TARGETS vfte"
-fi
+set_targets() {
+	export TARGETS=""
+	use slang && TARGETS="$TARGETS sfte"
+	use X && TARGETS="$TARGETS xfte"
+	use gpm && TARGETS="$TARGETS vfte"
+}
 
 src_unpack() {
-
-	cd ${WORKDIR}
 	unpack fte-20010819-src.zip
 	unpack fte-20010819-common.zip
 
@@ -49,6 +38,7 @@ src_unpack() {
 
 	cp src/fte-unix.mak src/fte-unix.mak.orig
 
+	set_targets
 	sed \
 		-e "s:@targets@:${TARGETS}:" \
 		-e "s:@cflags@:${CFLAGS}:" \
@@ -62,17 +52,18 @@ src_compile() {
 	../src/cfte main.fte ../src/system.fterc
 }
 
-src_install () {
+src_install() {
 	local files
 	into /usr
 
+	set_targets
 	files="${TARGETS} cfte compkeys"
 
 	for i in ${files} ; do
 		dobin src/$i ;
 	done
 
-	dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO
+	dodoc Artistic CHANGES BUGS HISTORY README TODO
 
 	dodir etc/fte
 	cp src/system.fterc ${D}/etc/fte/system.fterc
@@ -90,4 +81,3 @@ src_install () {
 	cp -R config/* ${D}/usr/share/fte
 	rm -rf ${D}/usr/share/fte/CVS
 }
-
diff --git a/app-editors/fte/fte-20010819-r3.ebuild b/app-editors/fte/fte-20010819-r3.ebuild
index 89a8df00a6e3..78010fe7b51e 100644
--- a/app-editors/fte/fte-20010819-r3.ebuild
+++ b/app-editors/fte/fte-20010819-r3.ebuild
@@ -1,45 +1,34 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r3.ebuild,v 1.16 2004/03/13 22:29:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20010819-r3.ebuild,v 1.17 2004/05/31 22:12:03 vapier Exp $
 
 inherit eutils
 
-IUSE="gpm slang X"
-
 DESCRIPTION="Lightweight text-mode editor"
+HOMEPAGE="http://fte.sourceforge.net"
 SRC_URI="mirror://sourceforge/fte/${P}-src.zip
 	mirror://sourceforge/fte/${P}-common.zip"
-HOMEPAGE="http://fte.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE="gpm slang X"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.20 )"
-
 DEPEND="${RDEPEND}
 	slang? ( sys-libs/slang )
 	app-arch/unzip
 	X? ( virtual/x11 )"
 
-TARGETS=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
-if [ "`use slang`" ] ; then
-	TARGETS="${TARGETS} sfte"
-fi
-
-if [ "`use X`" ] ; then
-	TARGETS="${TARGETS} xfte"
-fi
-
-if [ "`use gpm`" ] ; then
-	TARGETS="${TARGETS} vfte"
-fi
+set_targets() {
+	export TARGETS=""
+	use slang && TARGETS="$TARGETS sfte"
+	use X && TARGETS="$TARGETS xfte"
+	use gpm && TARGETS="$TARGETS vfte"
+}
 
 src_unpack() {
-
-	cd ${WORKDIR}
 	unpack fte-20010819-src.zip
 	unpack fte-20010819-common.zip
 
@@ -48,6 +37,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.diff
 
+	set_targets
 	sed -i -e "s:@targets@:${TARGETS}:" \
 		-e "s:@cflags@:${CFLAGS}:" \
 		src/fte-unix.mak
@@ -60,17 +50,18 @@ src_compile() {
 	../src/cfte main.fte ../src/system.fterc
 }
 
-src_install () {
+src_install() {
 	local files
 	into /usr
 
+	set_targets
 	files="${TARGETS} cfte compkeys"
 
 	for i in ${files} ; do
 		dobin src/$i ;
 	done
 
-	dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO
+	dodoc Artistic CHANGES BUGS HISTORY README TODO
 
 	dodir etc/fte
 	cp src/system.fterc ${D}/etc/fte/system.fterc
diff --git a/app-editors/fte/fte-20020324-r1.ebuild b/app-editors/fte/fte-20020324-r1.ebuild
index 3e6158827b8b..c53e494f0677 100644
--- a/app-editors/fte/fte-20020324-r1.ebuild
+++ b/app-editors/fte/fte-20020324-r1.ebuild
@@ -1,39 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324-r1.ebuild,v 1.4 2004/03/13 22:29:59 mr_bones_ Exp $
-
-IUSE="gpm slang X"
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324-r1.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
 DESCRIPTION="Lightweight text-mode editor"
+HOMEPAGE="http://fte.sourceforge.net"
 SRC_URI="mirror://sourceforge/fte/${P}-src.zip
 	mirror://sourceforge/fte/${P}-common.zip"
-HOMEPAGE="http://fte.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc"
+IUSE="gpm slang X"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.20 )"
-
 DEPEND="${RDEPEND}
 	slang? ( sys-libs/slang )
 	app-arch/unzip
 	X? ( virtual/x11 )"
 
-TARGETS=""
-
-if [ "`use slang`" ] ; then
-	TARGETS="${TARGETS} sfte"
-fi
-
-if [ "`use X`" ] ; then
-	TARGETS="${TARGETS} xfte"
-fi
-
-if [ "`use gpm`" ] ; then
-	TARGETS="${TARGETS} vfte"
-fi
+set_targets() {
+	export TARGETS=""
+	use slang && TARGETS="$TARGETS sfte"
+	use X && TARGETS="$TARGETS xfte"
+	use gpm && TARGETS="$TARGETS vfte"
+}
 
 src_unpack() {
 
@@ -47,6 +38,7 @@ src_unpack() {
 
 	cp src/fte-unix.mak src/fte-unix.mak.orig
 
+	set_targets
 	sed \
 		-e "s:@targets@:${TARGETS}:" \
 		-e "s:@cflags@:${CFLAGS}:" \
@@ -57,16 +49,18 @@ src_compile() {
 	DEFFLAGS="PREFIX=/usr CONFIGDIR=/usr/share/fte \
 		DEFAULT_FTE_CONFIG=../config/main.fte OPTIMIZE="
 
-	emake $DEFFLAGS TARGETS="$TARGETS" all || die
+	set_targets
+	emake $DEFFLAGS TARGETS="${TARGETS}" all || die
 
 	cd config
 	../src/cfte main.fte ../src/system.fterc
 }
 
-src_install () {
+src_install() {
 	local files
 	into /usr
 
+	set_targets
 	files="${TARGETS} cfte compkeys"
 
 	for i in ${files} ; do
@@ -75,7 +69,7 @@ src_install () {
 
 	dobin ${FILESDIR}/fte
 
-	dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO
+	dodoc Artistic CHANGES BUGS HISTORY README TODO
 
 	dodir etc/fte
 	cp src/system.fterc ${D}/etc/fte/system.fterc
diff --git a/app-editors/fte/fte-20020324-r2.ebuild b/app-editors/fte/fte-20020324-r2.ebuild
index cb4aad0b511f..937e57af1547 100644
--- a/app-editors/fte/fte-20020324-r2.ebuild
+++ b/app-editors/fte/fte-20020324-r2.ebuild
@@ -1,45 +1,34 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324-r2.ebuild,v 1.1 2004/03/17 14:32:49 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324-r2.ebuild,v 1.2 2004/05/31 22:12:03 vapier Exp $
 
 inherit eutils
 
-IUSE="gpm slang X"
-
 DESCRIPTION="Lightweight text-mode editor"
+HOMEPAGE="http://fte.sourceforge.net"
 SRC_URI="mirror://sourceforge/fte/${P}-src.zip
 	mirror://sourceforge/fte/${P}-common.zip"
-HOMEPAGE="http://fte.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="gpm slang X"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.20 )"
-
 DEPEND="${RDEPEND}
 	slang? ( sys-libs/slang )
 	app-arch/unzip
 	X? ( virtual/x11 )"
 
-TARGETS=""
-
-if [ "`use slang`" ] ; then
-	TARGETS="${TARGETS} sfte"
-fi
-
-if [ "`use X`" ] ; then
-	TARGETS="${TARGETS} xfte"
-fi
-
-if [ "`use gpm`" ] ; then
-	TARGETS="${TARGETS} vfte"
-fi
+set_targets() {
+	export TARGETS=""
+	use slang && TARGETS="$TARGETS sfte"
+	use X && TARGETS="$TARGETS xfte"
+	use gpm && TARGETS="$TARGETS vfte"
+}
 
 src_unpack() {
-
-	cd ${WORKDIR}
 	unpack fte-20020324-src.zip
 	unpack fte-20020324-common.zip
 
@@ -49,6 +38,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/configpath.patch
 
+	set_targets
 	sed \
 		-e "s:@targets@:${TARGETS}:" \
 		-e "s:@cflags@:${CFLAGS}:" \
@@ -59,13 +49,15 @@ src_compile() {
 	DEFFLAGS="PREFIX=/usr CONFIGDIR=/usr/share/fte \
 		DEFAULT_FTE_CONFIG=../config/main.fte OPTIMIZE="
 
+	set_targets
 	emake $DEFFLAGS TARGETS="$TARGETS" all || die
 }
 
-src_install () {
+src_install() {
 	local files
 	into /usr
 
+	set_targets
 	files="${TARGETS} cfte compkeys"
 
 	for i in ${files} ; do
@@ -74,7 +66,7 @@ src_install () {
 
 	dobin ${FILESDIR}/fte
 
-	dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO
+	dodoc Artistic CHANGES BUGS HISTORY README TODO
 
 	keepdir etc/fte
 
diff --git a/app-editors/fte/fte-20020324.ebuild b/app-editors/fte/fte-20020324.ebuild
index 4cab48ab2885..07fc0b21da84 100644
--- a/app-editors/fte/fte-20020324.ebuild
+++ b/app-editors/fte/fte-20020324.ebuild
@@ -1,43 +1,32 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324.ebuild,v 1.17 2004/03/13 22:29:59 mr_bones_ Exp $
-
-IUSE="gpm slang X"
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324.ebuild,v 1.18 2004/05/31 22:12:03 vapier Exp $
 
 DESCRIPTION="Lightweight text-mode editor"
+HOMEPAGE="http://fte.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fte/${P}-src.zip
 	mirror://sourceforge/fte/${P}-common.zip"
-HOMEPAGE="http://fte.sourceforge.net"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
+IUSE="gpm slang X"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	gpm? ( >=sys-libs/gpm-1.20 )"
-
 DEPEND="${RDEPEND}
 	slang? ( sys-libs/slang )
 	app-arch/unzip
 	X? ( virtual/x11 )"
 
-TARGETS=""
-
-if [ "`use slang`" ] ; then
-	TARGETS="${TARGETS} sfte"
-fi
-
-if [ "`use X`" ] ; then
-	TARGETS="${TARGETS} xfte"
-fi
-
-if [ "`use gpm`" ] ; then
-	TARGETS="${TARGETS} vfte"
-fi
+set_targets() {
+	export TARGETS=""
+	use slang && TARGETS="$TARGETS sfte"
+	use X && TARGETS="$TARGETS xfte"
+	use gpm && TARGETS="$TARGETS vfte"
+}
 
 src_unpack() {
-
-	cd ${WORKDIR}
 	unpack fte-20020324-src.zip
 	unpack fte-20020324-common.zip
 
@@ -47,6 +36,7 @@ src_unpack() {
 
 	cp src/fte-unix.mak src/fte-unix.mak.orig
 
+	set_targets
 	sed \
 		-e "s:@targets@:${TARGETS}:" \
 		-e "s:@cflags@:${CFLAGS}:" \
@@ -57,23 +47,25 @@ src_compile() {
 	DEFFLAGS="PREFIX=/usr CONFIGDIR=/usr/share/fte \
 		DEFAULT_FTE_CONFIG=../config/main.fte OPTIMIZE="
 
+	set_targets
 	emake $DEFFLAGS TARGETS="$TARGETS" all || die
 
 	cd config
 	../src/cfte main.fte ../src/system.fterc
 }
 
-src_install () {
+src_install() {
 	local files
 	into /usr
 
+	set_targets
 	files="${TARGETS} cfte compkeys"
 
 	for i in ${files} ; do
 		dobin src/$i ;
 	done
 
-	dodoc Artistic CHANGES BUGS COPYING HISTORY README TODO
+	dodoc Artistic CHANGES BUGS HISTORY README TODO
 
 	dodir etc/fte
 	cp src/system.fterc ${D}/etc/fte/system.fterc
diff --git a/app-editors/gedit/gedit-0.9.6-r1.ebuild b/app-editors/gedit/gedit-0.9.6-r1.ebuild
index ed78b46174a3..747f35687a0d 100644
--- a/app-editors/gedit/gedit-0.9.6-r1.ebuild
+++ b/app-editors/gedit/gedit-0.9.6-r1.ebuild
@@ -1,43 +1,37 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-0.9.6-r1.ebuild,v 1.14 2004/05/29 03:43:38 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-0.9.6-r1.ebuild,v 1.15 2004/05/31 22:12:03 vapier Exp $
 
-IUSE="nls"
+inherit flag-o-matic
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Text Editor"
-SRC_URI="mirror://gnome//sources/gedit/${PV/.6}/${P}.tar.gz"
 HOMEPAGE="http://gedit.sourceforge.net/"
-SLOT="O"
+SRC_URI="mirror://gnome//sources/gedit/${PV/.6}/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="O"
 KEYWORDS="x86 sparc ppc"
+IUSE="nls"
 
-RDEPEND=" <gnome-base/libglade-2
-	 >=gnome-base/gnome-print-0.30
-	 =gnome-base/gnome-vfs-1*"
-
+RDEPEND="<gnome-base/libglade-2
+	>=gnome-base/gnome-print-0.30
+	=gnome-base/gnome-vfs-1*"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-
 src_compile() {
 	local myconf
+	use nls || myconf="--disable-nls"
+	append-flags `gnome-config --cflags libglade vfs`
 
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	CFLAGS="${CFLAGS} `gnome-config --cflags libglade vfs`"
-
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    ${myconf} || die
-
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		${myconf} || die
 	emake || die
 }
 
 src_install() {
-		make prefix=${D}/usr install || die
-
-	dodoc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README* THANKS TODO
+	make prefix=${D}/usr install || die
+	dodoc AUTHORS BUGS ChangeLog FAQ NEWS README* THANKS TODO
 }
diff --git a/app-editors/gedit/gedit-2.6.0.ebuild b/app-editors/gedit/gedit-2.6.0.ebuild
index 96a37079f482..0ae344179dde 100644
--- a/app-editors/gedit/gedit-2.6.0.ebuild
+++ b/app-editors/gedit/gedit-2.6.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.6.0.ebuild,v 1.4 2004/05/29 03:43:38 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.6.0.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="A text editor for the Gnome2 desktop"
 HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc hppa ~amd64 ~ia64 ~mips"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc ~mips ~alpha hppa ~amd64 ~ia64"
 IUSE="spell"
 
 RDEPEND=">=gnome-base/libglade-2
@@ -21,11 +21,10 @@ RDEPEND=">=gnome-base/libglade-2
 	>=x11-libs/gtksourceview-0.9
 	spell? ( virtual/aspell-dict )"
 # FIXME : spell autodetect only
-
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11
 	>=dev-util/intltool-0.29"
 
-DOCS="AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README THANKS TODO"
+DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS TODO"
diff --git a/app-editors/gedit/gedit-2.6.1.ebuild b/app-editors/gedit/gedit-2.6.1.ebuild
index 5f3b402490cb..f0df27f8f8fe 100644
--- a/app-editors/gedit/gedit-2.6.1.ebuild
+++ b/app-editors/gedit/gedit-2.6.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.6.1.ebuild,v 1.1 2004/05/04 15:10:04 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.6.1.ebuild,v 1.2 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="A text editor for the Gnome2 desktop"
 HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
 IUSE="spell"
 
 RDEPEND=">=gnome-base/libglade-2.3.6
@@ -21,11 +21,10 @@ RDEPEND=">=gnome-base/libglade-2.3.6
 	>=x11-libs/gtksourceview-1
 	spell? ( virtual/aspell-dict )"
 # FIXME : spell autodetect only
-
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11
 	>=dev-util/intltool-0.29"
 
-DOCS="AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README THANKS TODO"
+DOCS="AUTHORS BUGS ChangeLog INSTALL NEWS README THANKS TODO"
diff --git a/app-editors/ghex/ghex-1.2.1.ebuild b/app-editors/ghex/ghex-1.2.1.ebuild
index 58639a0c4637..5ec4fe2db4be 100644
--- a/app-editors/ghex/ghex-1.2.1.ebuild
+++ b/app-editors/ghex/ghex-1.2.1.ebuild
@@ -1,53 +1,40 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-1.2.1.ebuild,v 1.13 2003/09/05 23:05:05 msterret Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-1.2.1.ebuild,v 1.14 2004/05/31 22:12:03 vapier Exp $
 
 DESCRIPTION="Gnome Hexadecimal editor"
-
+HOMEPAGE="http://pluton.ijs.si/~jaka/gnome.html"
 SRC_URI="http://pluton.ijs.si/~jaka/${P}.tar.gz"
 
-HOMEPAGE="http://pluton.ijs.si/~jaka/gnome.html"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="x86 ppc sparc"
+IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	 >=gnome-base/gnome-libs-1.4.1.2-r3
 	 >=gnome-base/ORBit-0.5.12-r1
 	 >=gnome-base/gnome-print-0.34
 	 >=app-text/scrollkeeper-0.2"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
 src_compile() {
-
 	local myconf=""
-
 	use nls || myconf="$myconf --disable-nls" #default enabled
 
-	./configure 	--host=${CHOST} \
-			--prefix=/usr \
-			--infodir=/usr/share/info \
-			--mandir=/usr/share/man \
-			${myconf} || die "Configuration Failed"
-
+	econf ${myconf} || die
 	emake || die
 }
 
-src_install () {
-	make 	prefix=${D}/usr \
+src_install() {
+	make \
+		prefix=${D}/usr \
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		GNOME_DATA_DIR=${D}/usr/share \
 		localstatedir=${D}/var \
 		install || die "Installation Failed"
 
-	dodoc ABOUT-NLS AUTHORS COPYING COPYING-DOCS ChangeLog INSTALL \
-		NEWS README
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
 }
diff --git a/app-editors/ghex/ghex-2.2.1.ebuild b/app-editors/ghex/ghex-2.2.1.ebuild
index abfbe6bc4596..6ab782976fc0 100644
--- a/app-editors/ghex/ghex-2.2.1.ebuild
+++ b/app-editors/ghex/ghex-2.2.1.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.2.1.ebuild,v 1.2 2003/06/29 18:24:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.2.1.ebuild,v 1.3 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
-IUSE="nls"
-S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Hexadecimal editor"
 HOMEPAGE="http://pluton.ijs.si/~jaka/gnome.html"
 
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="x86"
+IUSE="nls"
+
 RDEPEND=">=gnome-base/gail-0.17
 	>=gnome-base/gconf-1.2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeprintui-2.2"
-
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/intltool
 	>=dev-util/pkgconfig-0.9"
 
-SLOT="2"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="x86"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
diff --git a/app-editors/ghex/ghex-2.4.0.1.ebuild b/app-editors/ghex/ghex-2.4.0.1.ebuild
index 92b361cdb506..2af942e4fb38 100644
--- a/app-editors/ghex/ghex-2.4.0.1.ebuild
+++ b/app-editors/ghex/ghex-2.4.0.1.ebuild
@@ -1,38 +1,34 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.4.0.1.ebuild,v 1.4 2004/01/19 12:58:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.4.0.1.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
 DESCRIPTION="Gnome hexadecimal editor"
 HOMEPAGE="http://pluton.ijs.si/~jaka/gnome.html"
 
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="x86 sparc"
+IUSE=""
+
 RDEPEND=">=gnome-base/gail-0.17
 	>=x11-libs/gtk+-2
 	>=dev-libs/atk-1
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeprintui-2.2"
-
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	dev-util/intltool
 	>=dev-util/pkgconfig-0.9"
 
-SLOT="2"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="x86 sparc"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
-MAKEOPTS="-j1"
+MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
-
 	unpack ${A}
-
 	cd ${S}
 	gnome2_omf_fix
-
 }
diff --git a/app-editors/ghex/ghex-2.4.1.ebuild b/app-editors/ghex/ghex-2.4.1.ebuild
index c8d26e85c902..d4b171941c7e 100644
--- a/app-editors/ghex/ghex-2.4.1.ebuild
+++ b/app-editors/ghex/ghex-2.4.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.4.1.ebuild,v 1.1 2004/02/14 12:56:07 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ghex/ghex-2.4.1.ebuild,v 1.2 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="Gnome hexadecimal editor"
 HOMEPAGE="http://www.gnome.org/softwaremap/projects/ghex/"
 
-IUSE=""
-SLOT="2"
 LICENSE="GPL-2 FDL-1.1"
+SLOT="2"
 KEYWORDS="~x86 ~sparc"
+IUSE=""
 
 RDEPEND=">=gnome-base/gail-0.17
 	>=x11-libs/gtk+-2
@@ -18,15 +18,14 @@ RDEPEND=">=gnome-base/gail-0.17
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeprintui-2.2"
-
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	dev-util/intltool
 	>=dev-util/pkgconfig-0.9"
 
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
-MAKEOPTS="-j1"
+MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-editors/gphpedit/gphpedit-0.4.3.ebuild b/app-editors/gphpedit/gphpedit-0.4.3.ebuild
index c0a321b0bbcb..b3a59bd9fa1c 100644
--- a/app-editors/gphpedit/gphpedit-0.4.3.ebuild
+++ b/app-editors/gphpedit/gphpedit-0.4.3.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.4.3.ebuild,v 1.4 2003/10/12 21:49:05 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.4.3.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
-DESCRIPTION="A Gnome2 PHP/HTML source editor."
-HOMEPAGE="http://www.gphpedit.org"
+DESCRIPTION="A Gnome2 PHP/HTML source editor"
+HOMEPAGE="http://www.gphpedit.org/"
 SRC_URI="http://gphpedit.org/releases/${P}.tar.gz"
 
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0
 	>=x11-libs/gtk+-2.0
 	>=gnome-base/libgnomeui-2.0
 	>=x11-libs/gtkscintilla2-0.0.8"
-
 DEPEND=">=dev-util/pkgconfig-0.12.0
-		${RDEPEND}"
+	${RDEPEND}"
 
-DOCS="AUTHORS ChangeLog COPYING README"
+DOCS="AUTHORS ChangeLog README"
 SCROLLKEEPER_UPDATE="0"
diff --git a/app-editors/gphpedit/gphpedit-0.9.6.ebuild b/app-editors/gphpedit/gphpedit-0.9.6.ebuild
index efe2fec11bb2..01e5e03e0357 100644
--- a/app-editors/gphpedit/gphpedit-0.9.6.ebuild
+++ b/app-editors/gphpedit/gphpedit-0.9.6.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.6.ebuild,v 1.1 2004/02/18 10:32:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gphpedit/gphpedit-0.9.6.ebuild,v 1.2 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
-DESCRIPTION="A Gnome2 PHP/HTML source editor."
-HOMEPAGE="http://www.gphpedit.org"
+DESCRIPTION="A Gnome2 PHP/HTML source editor"
+HOMEPAGE="http://www.gphpedit.org/"
 SRC_URI="http://gphpedit.org/download/files/${P}.tar.gz"
 
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0
 	>=x11-libs/gtk+-2.0
 	>=gnome-base/libgnomeui-2.0
 	>=x11-libs/gtkscintilla2-0.0.8
 	=gnome-extra/libgtkhtml-2*"
-
 DEPEND=">=dev-util/pkgconfig-0.12.0
-		${RDEPEND}"
+	${RDEPEND}"
 
-DOCS="AUTHORS ChangeLog COPYING README"
+DOCS="AUTHORS ChangeLog README"
 SCROLLKEEPER_UPDATE="0"
diff --git a/app-editors/hexedit/hexedit-1.2.2.ebuild b/app-editors/hexedit/hexedit-1.2.2.ebuild
index 4a4c19b3a387..ba04d6dd7ed1 100644
--- a/app-editors/hexedit/hexedit-1.2.2.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.2.ebuild
@@ -1,30 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hexedit/hexedit-1.2.2.ebuild,v 1.12 2004/01/18 20:22:37 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hexedit/hexedit-1.2.2.ebuild,v 1.13 2004/05/31 22:12:03 vapier Exp $
 
-S="${WORKDIR}/hexedit"
-DESCRIPTION="View and edit files in hex or ASCII."
-SRC_URI="http://merd.net/pixel/${P}.src.tgz"
+DESCRIPTION="View and edit files in hex or ASCII"
 HOMEPAGE="http://www.chez.com/prigaux/hexedit.html"
+SRC_URI="http://merd.net/pixel/${P}.src.tgz"
 
-DEPEND="virtual/glibc
-	sys-libs/ncurses"
-RDEPEND=""
-
+LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha amd64"
-LICENSE="GPL-1"
+IUSE=""
 
-src_compile() {
-	cd "${S}"
-	./configure --host="${CHOST}" --prefix=/usr --mandir=/usr/share/man \
-	|| die "./configure failed"
+DEPEND="virtual/glibc
+	sys-libs/ncurses"
+RDEPEND="sys-libs/ncurses"
 
-	emake || die
-}
+S=${WORKDIR}/hexedit
 
 src_install () {
-	dobin hexedit
+	dobin hexedit || die
 	doman hexedit.1
-	dodoc COPYING Changes TODO
+	dodoc Changes TODO
 }
diff --git a/app-editors/hteditor/hteditor-0.7.0.ebuild b/app-editors/hteditor/hteditor-0.7.0.ebuild
index 880d06b69793..793d488d87db 100644
--- a/app-editors/hteditor/hteditor-0.7.0.ebuild
+++ b/app-editors/hteditor/hteditor-0.7.0.ebuild
@@ -1,30 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.7.0.ebuild,v 1.4 2004/03/13 23:00:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.7.0.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
-IUSE=""
-
-DESCRIPTION="HT Editor - editor for executable files"
-HOMEPAGE="http://hte.sf.net/"
+DESCRIPTION="editor for executable files"
+HOMEPAGE="http://hte.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -alpha"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
-SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
-S="${WORKDIR}/ht-${PV}"
+S=${WORKDIR}/ht-${PV}
 
 src_compile() {
-	cd "${S}"
 	chmod +x configure
 	local myconf="--prefix=/usr --sysconfdir=/etc"
-	./configure ${myconf}  || die
+	./configure ${myconf} || die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS KNOWNBUGS TODO COPYING README
+	dodoc AUTHORS KNOWNBUGS TODO README
 }
diff --git a/app-editors/hteditor/hteditor-0.7.3.ebuild b/app-editors/hteditor/hteditor-0.7.3.ebuild
index 66f009393574..fa198b702e01 100644
--- a/app-editors/hteditor/hteditor-0.7.3.ebuild
+++ b/app-editors/hteditor/hteditor-0.7.3.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.7.3.ebuild,v 1.3 2004/03/16 02:35:08 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.7.3.ebuild,v 1.4 2004/05/31 22:12:03 vapier Exp $
 
-IUSE=""
-
-DESCRIPTION="HT Editor - editor for executable files"
-HOMEPAGE="http://hte.sf.net/"
+DESCRIPTION="editor for executable files"
+HOMEPAGE="http://hte.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -alpha"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
-SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
 S="${WORKDIR}/ht-${PV}"
 
 src_compile() {
-	cd "${S}"
 	chmod +x configure
 	local myconf="--prefix=/usr --sysconfdir=/etc"
 	./configure ${myconf}  || die
@@ -26,7 +24,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS KNOWNBUGS TODO COPYING README
+	dodoc AUTHORS KNOWNBUGS TODO README
 	dohtml doc/ht.html
 	doinfo doc/*.info
 }
diff --git a/app-editors/hteditor/hteditor-0.7.4.ebuild b/app-editors/hteditor/hteditor-0.7.4.ebuild
index 698a67eb34b2..b17953a5b76c 100644
--- a/app-editors/hteditor/hteditor-0.7.4.ebuild
+++ b/app-editors/hteditor/hteditor-0.7.4.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.7.4.ebuild,v 1.2 2004/03/16 12:58:57 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/hteditor/hteditor-0.7.4.ebuild,v 1.3 2004/05/31 22:12:03 vapier Exp $
 
-IUSE=""
-
-DESCRIPTION="HT Editor - editor for executable files"
-HOMEPAGE="http://hte.sf.net/"
+DESCRIPTION="editor for executable files"
+HOMEPAGE="http://hte.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~ppc -alpha"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
-SRC_URI="mirror://sourceforge/hte/ht-${PV}.tar.bz2"
 S="${WORKDIR}/ht-${PV}"
 
 src_compile() {
@@ -25,7 +24,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS KNOWNBUGS TODO COPYING README
+	dodoc AUTHORS KNOWNBUGS TODO README
 	dohtml doc/ht.html
 	doinfo doc/*.info
 }
diff --git a/app-editors/jed/jed-0.99.16-r1.ebuild b/app-editors/jed/jed-0.99.16-r1.ebuild
index a7a63471d1ab..ce34134f4e1f 100644
--- a/app-editors/jed/jed-0.99.16-r1.ebuild
+++ b/app-editors/jed/jed-0.99.16-r1.ebuild
@@ -1,14 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.13 2004/04/20 09:00:17 liquidx Exp $
-
-IUSE="X gpm truetype"
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.14 2004/05/31 22:12:03 vapier Exp $
 
 P0=${PN}-0.99-16
 S=${WORKDIR}/${P0}
 DESCRIPTION="Console S-Lang-based editor"
-SRC_URI="ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/${P0}.tar.bz2"
 HOMEPAGE="http://www.jedsoft.org/jed/"
+SRC_URI="ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/${P0}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE="X gpm truetype"
 
 DEPEND=">=sys-libs/slang-1.4.5
 	>=sys-apps/sed-4
@@ -16,13 +19,8 @@ DEPEND=">=sys-libs/slang-1.4.5
 	gpm? ( sys-libs/gpm )
 	X? ( truetype? ( virtual/xft
 		>=media-libs/freetype-2.0 ) )"
-
 PROVIDE="virtual/editor"
 
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-LICENSE="GPL-2"
-
 src_compile() {
 	export JED_ROOT=/usr/share/jed
 
@@ -31,7 +29,7 @@ src_compile() {
 		--bindir=/usr/bin \
 		--mandir=/usr/share/man || die
 
-	if [ -n "`use gpm`" ] ; then
+	if use gpm ; then
 		cd src
 		sed -i	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
 			-e 's/#MOUSELIB/MOUSELIB/' \
@@ -41,7 +39,7 @@ src_compile() {
 		cd ${S}
 	fi
 
-	if [ -n "`use X`" -a -n "`use truetype`" ]; then
+	if use X && use truetype ; then
 	   cd src
 	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile
 	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile
@@ -53,20 +51,19 @@ src_compile() {
 
 	emake || die
 
-	if [ -n "`use X`" ] ; then
+	if use X ; then
 		emake xjed || die
 	fi
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 
 	cd doc
 	cp README AUTHORS
 
 	cd ${S}
-	dodoc 	COPYING COPYRIGHT INSTALL INSTALL.unx README \
-		doc/AUTHORS doc/manual/jed.tex
+	dodoc INSTALL INSTALL.unx README doc/AUTHORS doc/manual/jed.tex
 
 	cd ${S}/info
 	rm info.info
@@ -86,5 +83,3 @@ src_install () {
 	rm -rf usr/share/jed/info
 	# can't rm usr/share/jed/doc -- used internally by jed/xjed
 }
-
-
diff --git a/app-editors/jed/jed-0.99.16-r2.ebuild b/app-editors/jed/jed-0.99.16-r2.ebuild
index e17f44b00fdf..995c71205d93 100644
--- a/app-editors/jed/jed-0.99.16-r2.ebuild
+++ b/app-editors/jed/jed-0.99.16-r2.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.4 2004/05/03 15:47:56 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
 inherit eutils
 
-IUSE="X gpm truetype"
-
 P0=${PN}-0.99-16
 S=${WORKDIR}/${P0}
 DESCRIPTION="Console S-Lang-based editor"
-SRC_URI="ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/${P0}.tar.bz2"
 HOMEPAGE="http://www.jedsoft.org/jed/"
+SRC_URI="ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/${P0}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~amd64"
+IUSE="X gpm truetype"
 
 DEPEND=">=sys-libs/slang-1.4.5
 	>=sys-apps/sed-4
@@ -18,13 +21,8 @@ DEPEND=">=sys-libs/slang-1.4.5
 	gpm? ( sys-libs/gpm )
 	X? ( truetype? ( virtual/xft
 		>=media-libs/freetype-2.0 ) )"
-
 PROVIDE="virtual/editor"
 
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~amd64"
-LICENSE="GPL-2"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}; epatch ${FILESDIR}/${P}-jed.info.patch
@@ -38,7 +36,7 @@ src_compile() {
 		--bindir=/usr/bin \
 		--mandir=/usr/share/man || die
 
-	if [ -n "`use gpm`" ] ; then
+	if use gpm ; then
 		cd src
 		sed -i	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
 			-e 's/#MOUSELIB/MOUSELIB/' \
@@ -48,7 +46,7 @@ src_compile() {
 		cd ${S}
 	fi
 
-	if [ -n "`use X`" -a -n "`use truetype`" ]; then
+	if use X && use truetype ; then
 	   cd src
 	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile
 	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile
@@ -60,20 +58,19 @@ src_compile() {
 
 	emake || die
 
-	if [ -n "`use X`" ] ; then
+	if use X ; then
 		emake xjed || die
 	fi
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 
 	cd doc
 	cp README AUTHORS
 
 	cd ${S}
-	dodoc 	COPYING COPYRIGHT INSTALL INSTALL.unx README \
-		doc/AUTHORS doc/manual/jed.tex
+	dodoc INSTALL INSTALL.unx README doc/AUTHORS doc/manual/jed.tex
 
 	cd ${S}/info
 	rm info.info
@@ -93,5 +90,3 @@ src_install () {
 	rm -rf usr/share/jed/info
 	# can't rm usr/share/jed/doc -- used internally by jed/xjed
 }
-
-
diff --git a/app-editors/joe/joe-3.0-r1.ebuild b/app-editors/joe/joe-3.0-r1.ebuild
index cc652ff99460..f9bc4c7d2e8d 100644
--- a/app-editors/joe/joe-3.0-r1.ebuild
+++ b/app-editors/joe/joe-3.0-r1.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.0-r1.ebuild,v 1.9 2004/05/30 19:29:22 joker Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.0-r1.ebuild,v 1.10 2004/05/31 22:12:03 vapier Exp $
 
 inherit flag-o-matic
 
 DESCRIPTION="A free ASCII-Text Screen Editor for UNIX"
-SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/joe-editor/"
+SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
+LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha mips amd64"
-LICENSE="GPL-1"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"
-
 PROVIDE="virtual/editor"
 
 src_unpack() {
@@ -39,7 +37,7 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc COPYING ChangeLog HINTS INFO LIST NEWS README README.cvs TODO
+	dodoc ChangeLog HINTS INFO LIST NEWS README README.cvs TODO
 }
 
 pkg_postinst() {
diff --git a/app-editors/katoob/katoob-0.3.5.ebuild b/app-editors/katoob/katoob-0.3.5.ebuild
index 1c75844eeed5..597e39dd51bc 100644
--- a/app-editors/katoob/katoob-0.3.5.ebuild
+++ b/app-editors/katoob/katoob-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/katoob/katoob-0.3.5.ebuild,v 1.5 2004/05/30 21:38:47 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/katoob/katoob-0.3.5.ebuild,v 1.6 2004/05/31 22:12:03 vapier Exp $
 
 inherit eutils
 
@@ -9,8 +9,8 @@ HOMEPAGE="http://www.arabeyes.org/project.php?proj=katoob"
 SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE="debug spell"
 
 DEPEND=">=x11-libs/gtk+-2
@@ -39,7 +39,5 @@ src_compile() {
 
 src_install() {
 	einstall
-	dodoc AUTHORS ChangeLog COPYING GPL.ar NEWS README RELEASE_NOTES \
-		THANKS TODO
+	dodoc AUTHORS ChangeLog NEWS README RELEASE_NOTES THANKS TODO
 }
-
diff --git a/app-editors/le/le-1.9.2.ebuild b/app-editors/le/le-1.9.2.ebuild
index 125c1bfb59e6..6f1ce356b94e 100644
--- a/app-editors/le/le-1.9.2.ebuild
+++ b/app-editors/le/le-1.9.2.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/le/le-1.9.2.ebuild,v 1.4 2004/03/13 23:00:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/le/le-1.9.2.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
-DESCRIPTION="LE is a Terminal text editor, capable of many block operations, has \
-			hex mode, syntax highlighting, etc."
+DESCRIPTION="Terminal text editor"
 HOMEPAGE="http://www.gnu.org/directory/text/editors/le-editor.html"
 SRC_URI="http://ftp.yars.free.net/pub/software/unix/util/texteditors/${P}.tar.bz2"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/glibc
 	ncurses? ( >=sys-libs/ncurses-5.2-r5 )"
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
-
-	dodoc COPYING ChangeLog FEATURES HISTORY INSTALL NEWS \
-		README TODO
+	dodoc ChangeLog FEATURES HISTORY INSTALL NEWS README TODO
 }
diff --git a/app-editors/mlview/mlview-0.6.2.ebuild b/app-editors/mlview/mlview-0.6.2.ebuild
index d3b6b91a973f..d4fbc349a3a1 100644
--- a/app-editors/mlview/mlview-0.6.2.ebuild
+++ b/app-editors/mlview/mlview-0.6.2.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mlview/mlview-0.6.2.ebuild,v 1.3 2004/05/14 04:42:09 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mlview/mlview-0.6.2.ebuild,v 1.4 2004/05/31 22:12:03 vapier Exp $
 
 inherit gnome2
 
-DESCRIPTION="MLview is an XML editor for the GNOME environment"
+DESCRIPTION="XML editor for the GNOME environment"
 HOMEPAGE="http://www.freespiders.org/projects/gmlview/"
-LICENSE="GPL-2"
 
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
+IUSE=""
 
 RDEPEND=">=gnome-base/libgnomeui-2.2
 	>=gnome-base/libgnome-2.2
@@ -21,12 +21,10 @@ RDEPEND=">=gnome-base/libgnomeui-2.2
 	>=x11-libs/gtk+-2.2
 	>=gnome-base/libglade-2
 	>=gnome-base/eel-2.2"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.25
 	sys-devel/gettext
 	dev-util/pkgconfig"
 
-DOCS="ABOUT-NLS AUTHORS BRANCHES COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS BRANCHES ChangeLog INSTALL NEWS README"
 USE_DESTDIR="1"
-
diff --git a/app-editors/mlview/mlview-0.6.3.ebuild b/app-editors/mlview/mlview-0.6.3.ebuild
index 9f533ffd7428..2cb5c810c35a 100644
--- a/app-editors/mlview/mlview-0.6.3.ebuild
+++ b/app-editors/mlview/mlview-0.6.3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mlview/mlview-0.6.3.ebuild,v 1.1 2004/05/18 20:22:48 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mlview/mlview-0.6.3.ebuild,v 1.2 2004/05/31 22:12:03 vapier Exp $
 
 inherit eutils gnome2
 
-DESCRIPTION="MLview is an XML editor for the GNOME environment"
+DESCRIPTION="XML editor for the GNOME environment"
 HOMEPAGE="http://www.freespiders.org/projects/gmlview/"
-LICENSE="GPL-2"
 
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
 
 RDEPEND=">=gnome-base/libgnomeui-2.2
 	>=gnome-base/libgnome-2.2
@@ -21,17 +21,15 @@ RDEPEND=">=gnome-base/libgnomeui-2.2
 	>=x11-libs/gtk+-2.2
 	>=gnome-base/libglade-2
 	>=gnome-base/eel-2.2"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.25
 	dev-util/pkgconfig"
 
-DOCS="ABOUT-NLS AUTHORS BRANCHES ChangeLog COPYING NEWS README"
+DOCS="AUTHORS BRANCHES ChangeLog NEWS README"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	# Patch to fix source mistakes that break compilation under gcc 2.
 	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 }
diff --git a/app-editors/mp/mp-3.1.9.ebuild b/app-editors/mp/mp-3.1.9.ebuild
index 3ff2b0f6ced1..e38845a0ead7 100644
--- a/app-editors/mp/mp-3.1.9.ebuild
+++ b/app-editors/mp/mp-3.1.9.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.1.9.ebuild,v 1.10 2004/03/13 22:30:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.1.9.ebuild,v 1.11 2004/05/31 22:12:03 vapier Exp $
 
-DESCRIPTION="mp, the definitive text editor"
-SRC_URI="http://triptico.dhis.org/download/${P}.tar.gz"
+DESCRIPTION="the definitive text editor"
 HOMEPAGE="http://www.triptico.com/software/mp.html"
+SRC_URI="http://triptico.dhis.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	sys-libs/ncurses"
-
 RDEPEND="${DEPEND}
 	dev-lang/perl"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
 src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin
 	make install PREFIX=${D}/usr || die
-	dodoc AUTHORS ChangeLog COPYING README
+	dodoc AUTHORS ChangeLog README
 	dohtml README.html doc/mp_api.html
 }
diff --git a/app-editors/mp/mp-3.2.10.ebuild b/app-editors/mp/mp-3.2.10.ebuild
index ddcd95891300..83c0e4839727 100644
--- a/app-editors/mp/mp-3.2.10.ebuild
+++ b/app-editors/mp/mp-3.2.10.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.2.10.ebuild,v 1.2 2004/03/13 22:30:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.2.10.ebuild,v 1.3 2004/05/31 22:12:03 vapier Exp $
 
-DESCRIPTION="mp, the definitive text editor"
-SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
+DESCRIPTION="the definitive text editor"
 HOMEPAGE="http://www.triptico.com/software/mp.html"
+SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+IUSE="ncurses gtk"
 
 DEPEND="virtual/glibc
 	ncurses? ( sys-libs/ncurses )
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
+	gtk? ( =x11-libs/gtk+-1.2* )
+	!gtk? ( sys-libs/ncurses )"
 RDEPEND="${DEPEND}
 	dev-lang/perl"
-IUSE="ncurses gtk"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
 
 src_compile() {
-	if [ -n "`use ncurses`" ] && [ -n "`use gtk`" ]; then emake || die;
-	elif [ -n "`use ncurses`" ]; then emake mp || die;
-	elif [ -n "`use gtk`" ]; then emake gmp || die;
-	else die "You need ncurses and/or gtk in your USE variables";
+	if use ncurses && use gtk ; then
+		emake || die
+	elif use ncurses || ! use gtk ; then
+		emake mp || die
+	elif use gtk ; then
+		emake gmp || die
 	fi
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin
 	make install PREFIX=${D}/usr || die "install failed"
-	dodoc AUTHORS Changelog COPYING README
+	dodoc AUTHORS Changelog README
 	dohtml README.html doc/mp_api.html
 
 	insinto /usr/share/pixmaps/
diff --git a/app-editors/mp/mp-3.2.7.ebuild b/app-editors/mp/mp-3.2.7.ebuild
index 471f68461cd8..1d31227050fd 100644
--- a/app-editors/mp/mp-3.2.7.ebuild
+++ b/app-editors/mp/mp-3.2.7.ebuild
@@ -1,29 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.2.7.ebuild,v 1.6 2004/03/13 22:30:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.2.7.ebuild,v 1.7 2004/05/31 22:12:03 vapier Exp $
 
-DESCRIPTION="mp, the definitive text editor"
-SRC_URI="http://triptico.dhis.org/download/${P}.tar.gz"
+DESCRIPTION="the definitive text editor"
 HOMEPAGE="http://www.triptico.com/software/mp.html"
+SRC_URI="http://triptico.dhis.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	sys-libs/ncurses"
-
 RDEPEND="${DEPEND}
 	dev-lang/perl"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
 src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin
 	make install PREFIX=${D}/usr || die
-	dodoc AUTHORS ChangeLog COPYING README
+	dodoc AUTHORS ChangeLog README
 	dohtml README.html doc/mp_api.html
 }
-
diff --git a/app-editors/mp/mp-3.2.8.ebuild b/app-editors/mp/mp-3.2.8.ebuild
index abb966d6e6b8..b8a53367c622 100644
--- a/app-editors/mp/mp-3.2.8.ebuild
+++ b/app-editors/mp/mp-3.2.8.ebuild
@@ -1,33 +1,36 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.2.8.ebuild,v 1.4 2004/05/28 21:31:04 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-3.2.8.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
-DESCRIPTION="mp, the definitive text editor"
-SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
+DESCRIPTION="the definitive text editor"
 HOMEPAGE="http://www.triptico.com/software/mp.html"
+SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64"
+IUSE="ncurses gtk"
 
 DEPEND="virtual/glibc
 	ncurses? ( sys-libs/ncurses )
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
+	gtk? ( =x11-libs/gtk+-1.2* )
+	!gtk? ( sys-libs/ncurses )"
 RDEPEND="${DEPEND}
 	dev-lang/perl"
-IUSE="ncurses gtk"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64"
 
 src_compile() {
-	if [ -n "`use ncurses`" ] && [ -n "`use gtk`" ]; then emake || die;
-	elif [ -n "`use ncurses`" ]; then emake mp || die;
-	elif [ -n "`use gtk`" ]; then emake gmp || die;
-	else die "You need ncurses and/or gtk in your USE variables";
+	if use ncurses && use gtk ; then
+		emake || die
+	elif use ncurses || ! use gtk ; then
+		emake mp || die
+	elif use gtk ; then
+		emake gmp || die
 	fi
 }
 
-src_install () {
+src_install() {
 	dodir /usr/bin
 	make install PREFIX=${D}/usr || die "install failed"
-	dodoc AUTHORS Changelog COPYING README
+	dodoc AUTHORS Changelog README
 	dohtml README.html doc/mp_api.html
 }
diff --git a/app-editors/ne/ne-1.19.ebuild b/app-editors/ne/ne-1.19.ebuild
index 32a6906f327d..0463118c6307 100644
--- a/app-editors/ne/ne-1.19.ebuild
+++ b/app-editors/ne/ne-1.19.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-1.19.ebuild,v 1.4 2004/03/13 22:30:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ne/ne-1.19.ebuild,v 1.5 2004/05/31 22:12:03 vapier Exp $
 
-DESCRIPTION="ne is the nice editor, easy to use for the beginner and powerful for the wizard"
-SRC_URI="http://ne.dsi.unimi.it/${P}.tar.gz"
+DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
 HOMEPAGE="http://ne.dsi.unimi.it/"
+SRC_URI="http://ne.dsi.unimi.it/${P}.tar.gz"
 
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
-PROVIDE="virtual/editor"
-
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-LICENSE="GPL-2"
 IUSE="ncurses"
 
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
+PROVIDE="virtual/editor"
+
 src_compile() {
-	if [ "`use ncurses`" ]; then
+	if use ncurses ; then
 		emake -C src ne CFLAGS="${CFLAGS} -DNODEBUG -D_POSIX_C_SOURCE=199506L" LIBS="-lncurses" || die
 	else
 		emake -C src net CFLAGS="${CFLAGS} -DNODEBUG -DTERMCAP -D_POSIX_C_SOURCE=199506L" LIBS="" || die
@@ -27,11 +27,10 @@ src_install() {
 
 	into /usr
 
-	dobin src/ne
+	dobin src/ne || die
 	doman doc/ne.1
 	doinfo doc/*.info*
 	dohtml doc/*.html
-	dodoc CHANGES COPYING README
+	dodoc CHANGES README
 	dodoc doc/*.txt doc/*.ps doc/*.texinfo doc/default.*
 }
-
diff --git a/app-editors/ng/ng-1.5_beta1.ebuild b/app-editors/ng/ng-1.5_beta1.ebuild
index b4368354515e..d8363a3916e1 100644
--- a/app-editors/ng/ng-1.5_beta1.ebuild
+++ b/app-editors/ng/ng-1.5_beta1.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Id: ng-1.5_beta1.ebuild,v 1.2 2004/05/15 18:47:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild,v 1.3 2004/05/31 22:12:03 vapier Exp $
 
 inherit eutils
 
-IUSE="canna"
-
 MY_P=${P/_beta/beta}
 
 DESCRIPTION="Emacs like micro editor Ng -- based on mg2a"
-SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
-
 HOMEPAGE="http://tt.sakura.ne.jp/~amura/ng/"
+SRC_URI="http://tt.sakura.ne.jp/~amura/archives/ng/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="Emacs"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE="canna"
 
-PROVIDE="virtual/editor"
 RDEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.0
 	canna? ( app-i18n/canna )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4.0"
+PROVIDE="virtual/editor"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -33,7 +31,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
 
 	if use canna; then
@@ -47,9 +44,8 @@ src_compile() {
 }
 
 src_install() {
-
-	dobin ng
-	dodoc docs/* COPYING LICENSE MANIFEST dot.ng
+	dobin ng || die
+	dodoc docs/* MANIFEST dot.ng
 
 	insinto /usr/share/ng
 	doins bin/*
@@ -65,4 +61,3 @@ pkg_postinst() {
 	einfo "and edit your .ng configuration file."
 	einfo
 }
-
diff --git a/app-editors/qemacs/qemacs-0.3.1.ebuild b/app-editors/qemacs/qemacs-0.3.1.ebuild
index 844d407ca239..1cbee675419a 100644
--- a/app-editors/qemacs/qemacs-0.3.1.ebuild
+++ b/app-editors/qemacs/qemacs-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1.ebuild,v 1.8 2004/04/25 22:04:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1.ebuild,v 1.9 2004/05/31 22:12:04 vapier Exp $
 
 inherit eutils
 
@@ -35,6 +35,6 @@ src_install() {
 	dodir /usr/bin
 	einstall || die
 	doman qe.1
-	dodoc COPYING Changelog README TODO VERSION
+	dodoc Changelog README TODO VERSION
 	dohtml *.html
 }
diff --git a/app-editors/scite/scite-1.4.9.ebuild b/app-editors/scite/scite-1.4.9.ebuild
index 8767b99679bd..c68c2eda0507 100644
--- a/app-editors/scite/scite-1.4.9.ebuild
+++ b/app-editors/scite/scite-1.4.9.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.4.9.ebuild,v 1.3 2003/09/05 23:05:05 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.4.9.ebuild,v 1.4 2004/05/31 22:12:04 vapier Exp $
 
 S=${WORKDIR}/$PN/gtk
 MY_PV=149
 DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org/"
 SRC_URI="http://www.scintilla.org/${PN}${MY_PV}.tgz"
-HOMEPAGE="http://www.scintilla.org"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	=x11-libs/gtk+-1.2*"
 RDEPEND=""
 
-SLOT="0"
-LICENSE="PYTHON"
-KEYWORDS="x86 ppc sparc "
-
 src_compile() {
 	make -C ../../scintilla/gtk || die
 	sed -e 's#usr/local#usr#g' -e 's#$(datadir)#${D}$(datadir)#g' \
@@ -28,7 +29,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr
 	dodir /usr/bin
 	dodir /usr/share
@@ -48,4 +49,3 @@ src_install () {
 		rm -rf ${D}/usr/share/gnome
 	fi
 }
-
diff --git a/app-editors/teco/teco-1.00-r2.ebuild b/app-editors/teco/teco-1.00-r2.ebuild
index 89c19f181ab2..a201eff2570a 100644
--- a/app-editors/teco/teco-1.00-r2.ebuild
+++ b/app-editors/teco/teco-1.00-r2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/teco-1.00-r2.ebuild,v 1.1 2003/09/08 13:08:17 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/teco/teco-1.00-r2.ebuild,v 1.2 2004/05/31 22:12:04 vapier Exp $
 
 inherit ccc
 
-DESCRIPTION="Classic TECO editor, Predecessor to EMACS."
+DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
 HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
 SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz
 	doc? ( mirror://gentoo/tecolore.txt.gz
 		mirror://gentoo/tech.txt.gz
 		mirror://gentoo/teco.doc.gz
 		mirror://gentoo/tecoprog.doc.gz )"
-LICENSE="freedist"
 
+LICENSE="freedist"
 SLOT="0"
 KEYWORDS="alpha x86"
 IUSE="doc"
diff --git a/app-editors/vile/vile-9.3h.ebuild b/app-editors/vile/vile-9.3h.ebuild
index 4f415dad969c..7a532ef4b653 100644
--- a/app-editors/vile/vile-9.3h.ebuild
+++ b/app-editors/vile/vile-9.3h.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.3h.ebuild,v 1.8 2003/10/03 11:53:47 agriffis Exp $
-
-IUSE="perl"
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.3h.ebuild,v 1.9 2004/05/31 22:12:04 vapier Exp $
 
 S=${WORKDIR}/vile-9.3
 DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
+HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
 SRC_URI="ftp://ftp.phred.org/pub/vile/vile-9.3.tgz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3a.patch.gz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3b.patch.gz
@@ -16,20 +15,17 @@ SRC_URI="ftp://ftp.phred.org/pub/vile/vile-9.3.tgz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3g.patch.gz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3h.patch.gz"
 
-HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc alpha"
+IUSE="perl"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	perl? ( dev-lang/perl )"
-
+DEPEND="${RDEPEND}
+	sys-devel/flex"
 PROVIDE="virtual/editor"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc alpha"
-
 src_unpack() {
 	unpack vile-9.3.tgz
 
@@ -55,6 +51,5 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc CHANGES* COPYING MANIFEST INSTALL README* doc/*
+	dodoc CHANGES* MANIFEST INSTALL README* doc/*
 }
-
diff --git a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild
index 3315f6804e31..f1a6eb8d25a2 100644
--- a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild
+++ b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild,v 1.14 2004/04/06 03:43:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r2.ebuild,v 1.15 2004/05/31 22:12:04 vapier Exp $
 
 inherit eutils
 
@@ -146,6 +146,6 @@ src_install() {
 	cd ${D}/usr/share/info
 	rm -f dir info.info texinfo* termcap*
 	cd ${S}
-	dodoc BUGS CHANGES-* COPYING ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
 	dodoc ${FILESDIR}/README.Gentoo
 }
diff --git a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild
index f212039fb6f4..01481d4e3c29 100644
--- a/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild
+++ b/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild,v 1.16 2004/04/06 03:43:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs-gtk/xemacs-gtk-21.4.8-r3.ebuild,v 1.17 2004/05/31 22:12:04 vapier Exp $
 
 inherit eutils
 
@@ -145,6 +145,6 @@ src_install() {
 	cd ${D}/usr/share/info
 	rm -f dir info.info texinfo* termcap*
 	cd ${S}
-	dodoc BUGS CHANGES-* COPYING ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
 	dodoc ${FILESDIR}/README.Gentoo
 }
diff --git a/app-editors/xemacs/xemacs-21.4.12.ebuild b/app-editors/xemacs/xemacs-21.4.12.ebuild
index d56a7cdd29ea..df407dc4f56c 100644
--- a/app-editors/xemacs/xemacs-21.4.12.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.12.ebuild,v 1.13 2004/02/21 22:54:05 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.12.ebuild,v 1.14 2004/05/31 22:12:04 vapier Exp $
 
 inherit eutils
 
@@ -191,8 +191,7 @@ src_install() {
 	cd ${D}/usr/share/info
 	rm -f dir info.info texinfo* termcap*
 	cd ${S}
-	dodoc BUGS CHANGES-* COPYING ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
 	dodoc ${FILESDIR}/README.Gentoo
 	rm -f ${D}/usr/share/info/emodules.info~*
 }
-
diff --git a/app-editors/xemacs/xemacs-21.4.15.ebuild b/app-editors/xemacs/xemacs-21.4.15.ebuild
index b26a1f21596a..c06f0ea9c863 100644
--- a/app-editors/xemacs/xemacs-21.4.15.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.15.ebuild,v 1.1 2004/05/21 23:19:31 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.15.ebuild,v 1.2 2004/05/31 22:12:04 vapier Exp $
 
 inherit eutils
 
@@ -84,13 +84,13 @@ src_compile() {
 		myconf="${myconf} --with-dialogs=lucid"
 		myconf="${myconf} --with-scrollbars=lucid"
 		myconf="${myconf} --with-menubars=lucid"
-		if [ "`use motif`" ] ; then
+		if use motif ; then
 			myconf="--with-widgets=motif"
 			myconf="${myconf} --with-dialogs=motif"
 			myconf="${myconf} --with-scrollbars=motif"
 			myconf="${myconf} --with-menubars=lucid"
 		fi
-		if [ "`use athena`" ] ; then
+		if use athena ; then
 			myconf="--with-widgets=athena"
 			if [ "`use Xaw3d`" ] ; then
 				myconf="${myconf} --with-athena=xaw3d"
@@ -195,8 +195,7 @@ src_install() {
 	cd ${D}/usr/share/info
 	rm -f dir info.info texinfo* termcap*
 	cd ${S}
-	dodoc BUGS CHANGES-* COPYING ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
 	dodoc ${FILESDIR}/README.Gentoo
 	rm -f ${D}/usr/share/info/emodules.info~*
 }
-
diff --git a/app-editors/xemacs/xemacs-21.4.9.ebuild b/app-editors/xemacs/xemacs-21.4.9.ebuild
index bf20ca26c33a..af22d2c72851 100644
--- a/app-editors/xemacs/xemacs-21.4.9.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.9.ebuild,v 1.14 2004/04/06 03:44:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.9.ebuild,v 1.15 2004/05/31 22:12:04 vapier Exp $
 
 inherit eutils
 
@@ -160,8 +160,7 @@ src_install() {
 	cd ${D}/usr/share/info
 	rm -f dir info.info texinfo* termcap*
 	cd ${S}
-	dodoc BUGS CHANGES-* COPYING ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
 	dodoc ${FILESDIR}/README.Gentoo
 	rm -f ${D}/usr/share/info/emodules.info~*
 }
-
diff --git a/app-editors/xvile/xvile-9.3h.ebuild b/app-editors/xvile/xvile-9.3h.ebuild
index f67467360b22..ba0f8ef224ca 100644
--- a/app-editors/xvile/xvile-9.3h.ebuild
+++ b/app-editors/xvile/xvile-9.3h.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.3h.ebuild,v 1.7 2004/03/13 23:00:56 mr_bones_ Exp $
-
-IUSE="perl"
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xvile/xvile-9.3h.ebuild,v 1.8 2004/05/31 22:12:04 vapier Exp $
 
 S=${WORKDIR}/vile-9.3
 DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
+HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
 SRC_URI="ftp://ftp.phred.org/pub/vile/vile-9.3.tgz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3a.patch.gz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3b.patch.gz
@@ -16,19 +15,17 @@ SRC_URI="ftp://ftp.phred.org/pub/vile/vile-9.3.tgz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3g.patch.gz
 	ftp://ftp.phred.org/pub/vile/patches/vile-9.3h.patch.gz"
 
-HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc alpha"
+IUSE="perl"
 
 DEPEND="virtual/glibc
 	sys-devel/flex
 	virtual/x11
 	=app-editors/vile-9.3h"
-
 RDEPEND="perl? ( dev-lang/perl )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-
 src_unpack() {
 	unpack vile-9.3.tgz
 
@@ -52,8 +49,8 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dobin xvile
 	make DESTDIR=${D} install || die
-	dodoc CHANGES* COPYING MANIFEST INSTALL README* doc/*
+	dodoc CHANGES* MANIFEST INSTALL README* doc/*
 }
diff --git a/app-editors/zile/zile-1.7_beta3.ebuild b/app-editors/zile/zile-1.7_beta3.ebuild
index af36dd6b220d..f8eb7da73175 100644
--- a/app-editors/zile/zile-1.7_beta3.ebuild
+++ b/app-editors/zile/zile-1.7_beta3.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-1.7_beta3.ebuild,v 1.1 2004/05/22 15:48:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zile/zile-1.7_beta3.ebuild,v 1.2 2004/05/31 22:12:04 vapier Exp $
 
-IUSE=""
 MY_P="${P/_beta/-b}"
-
 DESCRIPTION="tiny emacs clone"
 HOMEPAGE="http://zile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/zile/${MY_P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~alpha -ppc"
+IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.2"
 DEPEND=">=dev-util/gperf-2.7.2
@@ -39,5 +37,5 @@ src_install() {
 			-DEXPRESERVE=\\\"/var/lib/expreserve\\\"" \
 		install || die
 
-	dodoc AUTHORS COPYING HISTORY KNOWNBUGS NEWS README* TODO
+	dodoc AUTHORS HISTORY KNOWNBUGS NEWS README* TODO
 }
diff --git a/app-editors/zoinks/zoinks-0.3.7.ebuild b/app-editors/zoinks/zoinks-0.3.7.ebuild
index 75cd938eea04..2907344a9bb3 100644
--- a/app-editors/zoinks/zoinks-0.3.7.ebuild
+++ b/app-editors/zoinks/zoinks-0.3.7.ebuild
@@ -1,28 +1,29 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zoinks/zoinks-0.3.7.ebuild,v 1.4 2004/03/30 06:06:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zoinks/zoinks-0.3.7.ebuild,v 1.5 2004/05/31 22:12:04 vapier Exp $
 
-DESCRIPTION="Zoinks is a programmer's text editor and development environment"
+DESCRIPTION="programmer's text editor and development environment"
 HOMEPAGE="http://zoinks.mikelockwood.com/"
 SRC_URI="http://zoinks.mikelockwood.com/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE="nls imlib"
+
 DEPEND="nls? ( sys-devel/gettext )
 	imlib? ( media-libs/imlib )
 	virtual/x11"
 
 src_compile() {
-	local myconf
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable imlib`"
-	econf ${myconf} || die
+	econf \
+		`use_enable nls` \
+		`use_enable imlib` \
+		|| die
 	emake  || die
 }
 
 src_install() {
 	einstall || die
-	dodoc README INSTALL COPYING AUTHORS NEWS ChangeLog
+	dodoc README INSTALL AUTHORS NEWS ChangeLog
 }
-
diff --git a/app-editors/zoinks/zoinks-0.3.8.ebuild b/app-editors/zoinks/zoinks-0.3.8.ebuild
index 492690b9a8bb..aa9a3a547ca5 100644
--- a/app-editors/zoinks/zoinks-0.3.8.ebuild
+++ b/app-editors/zoinks/zoinks-0.3.8.ebuild
@@ -1,28 +1,29 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/zoinks/zoinks-0.3.8.ebuild,v 1.3 2004/03/30 06:06:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/zoinks/zoinks-0.3.8.ebuild,v 1.4 2004/05/31 22:12:04 vapier Exp $
 
-DESCRIPTION="Zoinks is a programmer's text editor and development environment"
+DESCRIPTION="programmer's text editor and development environment"
 HOMEPAGE="http://zoinks.mikelockwood.com/"
 SRC_URI="http://zoinks.mikelockwood.com/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="nls imlib"
+
 DEPEND="nls? ( sys-devel/gettext )
 	imlib? ( media-libs/imlib )
 	virtual/x11"
 
 src_compile() {
-	local myconf
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable imlib`"
-	econf ${myconf} || die
+	econf \
+		`use_enable nls` \
+		`use_enable imlib` \
+		|| die
 	emake  || die
 }
 
 src_install() {
 	einstall || die
-	dodoc README INSTALL COPYING AUTHORS NEWS ChangeLog
+	dodoc README INSTALL AUTHORS NEWS ChangeLog
 }
-