dont install stupid COPYING file

30 files changed, 137 insertions, 198 deletions

diff --git a/app-accessibility/at-poke/at-poke-0.2.1.ebuild b/app-accessibility/at-poke/at-poke-0.2.1.ebuild
index d2472f58035a..37f09b053990 100644
--- a/app-accessibility/at-poke/at-poke-0.2.1.ebuild
+++ b/app-accessibility/at-poke/at-poke-0.2.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-accessibility/at-poke/at-poke-0.2.1.ebuild,v 1.1 2004/03/18 00:06:56 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-poke/at-poke-0.2.1.ebuild,v 1.2 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="the accessibility poking tool"
 HOMEPAGE="http://www.gnome.org/"
 
-IUSE=""
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="x86 sparc"
 SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE=""
 
 RDEPEND=">=gnome-extra/at-spi-1.1.5
 	>=gnome-base/libglade-2
@@ -18,10 +18,9 @@ RDEPEND=">=gnome-extra/at-spi-1.1.5
 	>=gnome-base/libgnomeui-2
 	>=gnome-extra/libgail-gnome-0.5.0
 	>=dev-libs/popt-1.5"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
 G2CONF="${G2CONF} --enable-platform-gnome-2"
 
-DOCS="AUTHORS COPYING COPYING.LIB ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
diff --git a/app-accessibility/at-poke/at-poke-0.2.2.ebuild b/app-accessibility/at-poke/at-poke-0.2.2.ebuild
index 329bc8f1cc9a..7779c2635ab6 100644
--- a/app-accessibility/at-poke/at-poke-0.2.2.ebuild
+++ b/app-accessibility/at-poke/at-poke-0.2.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-accessibility/at-poke/at-poke-0.2.2.ebuild,v 1.3 2004/04/28 21:36:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-poke/at-poke-0.2.2.ebuild,v 1.4 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="The accessibility poking tool"
 HOMEPAGE="http://www.gnome.org/"
 
-IUSE=""
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 sparc"
 SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE=""
 
 RDEPEND=">=gnome-extra/at-spi-1.3.12
 	>=gnome-base/libglade-2
@@ -18,10 +18,9 @@ RDEPEND=">=gnome-extra/at-spi-1.3.12
 	>=gnome-base/libgnomeui-2
 	gnome-extra/libgail-gnome
 	>=dev-libs/popt-1.5"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
 G2CONF="${G2CONF} --enable-platform-gnome-2"
 
-DOCS="AUTHORS ChangeLog COPYING* NEWS README TODO"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/app-accessibility/dasher/dasher-3.2.10-r1.ebuild b/app-accessibility/dasher/dasher-3.2.10-r1.ebuild
index e6cc99767cf2..ab5ddf38d422 100644
--- a/app-accessibility/dasher/dasher-3.2.10-r1.ebuild
+++ b/app-accessibility/dasher/dasher-3.2.10-r1.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-accessibility/dasher/dasher-3.2.10-r1.ebuild,v 1.5 2004/05/30 22:10:18 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-3.2.10-r1.ebuild,v 1.6 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils gnome2
 
 DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
 HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
 
-IUSE="accessibility gnome"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc ~sparc"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+IUSE="accessibility gnome"
 
 # The package claims to support 'qte', but it hasn't been tested.
 # Any patches from someone who can test it are welcome.
@@ -27,7 +27,6 @@ RDEPEND="dev-libs/expat
 		>=gnome-base/libgnomeui-2
 		app-accessibility/gnome-speech
 		>=gnome-extra/at-spi-1 )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.18
 	dev-util/pkgconfig
@@ -37,7 +36,7 @@ G2CONF="${G2CONF} $(use_with gnome)"
 G2CONF="${G2CONF} $(use_with accessibility a11y)"
 G2CONF="${G2CONF} $(use_with accessibility speech)"
 
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING MAINTAINERS NEWS README"
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-accessibility/dasher/dasher-3.2.4.ebuild b/app-accessibility/dasher/dasher-3.2.4.ebuild
index b0c03f0dc43f..d9549abac8b2 100644
--- a/app-accessibility/dasher/dasher-3.2.4.ebuild
+++ b/app-accessibility/dasher/dasher-3.2.4.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-accessibility/dasher/dasher-3.2.4.ebuild,v 1.5 2004/05/29 03:24:12 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-3.2.4.ebuild,v 1.6 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="A text entry interface, driven by continuous pointing gestures"
 HOMEPAGE="http://www.inference.phy.cam.ac.uk/dasher/"
 
-IUSE="accessibility gnome nls"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
-LICENSE="GPL-2"
+IUSE="accessibility gnome nls"
 
 # The archive claims 'qte' support, but wont compile with QT
 # Need to wait for upstream <obz@gentoo.org>
@@ -26,7 +26,6 @@ RDEPEND="dev-libs/expat
 		>=gnome-base/libgnomeui-2
 		app-accessibility/gnome-speech
 		>=gnome-extra/at-spi-1 )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.18
 	dev-util/pkgconfig
@@ -36,4 +35,4 @@ G2CONF="${G2CONF} $(use_enable nls) $(use_enable gnome)"
 G2CONF="${G2CONF} $(use_enable accessibility a11y)"
 G2CONF="${G2CONF} $(use_enable accessibility speech)"
 
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING MAINTAINERS NEWS README"
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
diff --git a/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild b/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild
index f43e5e65fb67..171a4d5a374c 100644
--- a/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild
+++ b/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild
@@ -1,16 +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-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild,v 1.2 2004/04/26 07:36:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild,v 1.3 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils
 
-DESCRIPTION="This adds support for several speech synthesizers to emacspeak"
+DESCRIPTION="adds support for several speech synthesizers to emacspeak"
 HOMEPAGE="http://leb.net/blinux"
 SRC_URI="http://leb.net/pub/blinux/emacspeak/blinux/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
+
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}
 	>=app-accessibility/emacspeak-18"
@@ -20,16 +22,11 @@ src_unpack() {
 	epatch ${FILESDIR}/gentoo-apollo-fix.patch
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	make \
 		prefix=${D}/usr \
 		man1dir=${D}/usr/share/man/man1 \
 		install || die
-	dodoc COPYING CREDITS ChangeLog INSTALL OtherSynthesizers TODO
+	dodoc CREDITS ChangeLog INSTALL OtherSynthesizers TODO
 	dodoc TROUBLESHOOTING README*
 }
diff --git a/app-accessibility/festival/festival-1.4.3-r1.ebuild b/app-accessibility/festival/festival-1.4.3-r1.ebuild
index 9cdcd8fec598..b5117ec89298 100644
--- a/app-accessibility/festival/festival-1.4.3-r1.ebuild
+++ b/app-accessibility/festival/festival-1.4.3-r1.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3-r1.ebuild,v 1.10 2004/05/19 00:22:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3-r1.ebuild,v 1.11 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Festival Text to Speech engine"
-IUSE="asterisk doc"
 HOMEPAGE="http://www.cstr.ed.ac.uk/"
 SITE="http://www.speech.cs.cmu.edu/${PN}/cstr/${PN}/${PV}"
-
 SRC_URI="${SITE}/${P}-release.tar.gz
 	${SITE}/festlex_CMU.tar.gz
 	${SITE}/festlex_OALD.tar.gz
@@ -24,14 +21,17 @@ SRC_URI="${SITE}/${P}-release.tar.gz
 	${SITE}/festvox_us3.tar.gz
 	doc? ( ${SITE}/festdoc-1.4.2.tar.gz )"
 
-SLOT="0"
 LICENSE="FESTIVAL BSD as-is"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc amd64"
+IUSE="asterisk doc"
 
 RDEPEND=">=app-accessibility/speech-tools-1.2.3"
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
+S=${WORKDIR}/${PN}
+
 src_unpack() {
 	unpack ${P}-release.tar.gz
 	unpack festlex_CMU.tar.gz
@@ -167,7 +167,7 @@ src_install() {
 	# Install the docs
 	cd ${S} # needed
 	into /usr
-	dodoc ACKNOWLEDGMENTS COPYING NEWS README
+	dodoc ACKNOWLEDGMENTS NEWS README
 	doman doc/festival.1 doc/festival_client.1
 
 	if use doc; then
diff --git a/app-accessibility/festival/festival-1.4.3.ebuild b/app-accessibility/festival/festival-1.4.3.ebuild
index 3618e96183cd..33836344de05 100644
--- a/app-accessibility/festival/festival-1.4.3.ebuild
+++ b/app-accessibility/festival/festival-1.4.3.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3.ebuild,v 1.7 2004/04/25 20:57:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-1.4.3.ebuild,v 1.8 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Festival Text to Speech engine"
-IUSE="asterisk doc"
 HOMEPAGE="http://www.cstr.ed.ac.uk/"
 SITE="http://www.speech.cs.cmu.edu/${PN}/cstr/${PN}/${PV}"
-
 SRC_URI="${SITE}/${P}-release.tar.gz
 	${SITE}/festlex_CMU.tar.gz
 	${SITE}/festlex_OALD.tar.gz
@@ -24,14 +21,17 @@ SRC_URI="${SITE}/${P}-release.tar.gz
 	${SITE}/festvox_us3.tar.gz
 	doc? ( ${SITE}/festdoc-1.4.2.tar.gz )"
 
-SLOT="0"
 LICENSE="FESTIVAL BSD as-is"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc amd64"
+IUSE="asterisk doc"
 
 RDEPEND=">=app-accessibility/speech-tools-1.2.3"
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
+S=${WORKDIR}/${PN}
+
 src_unpack() {
 	unpack ${P}-release.tar.gz
 	unpack festlex_CMU.tar.gz
diff --git a/app-accessibility/flite/flite-1.2-r1.ebuild b/app-accessibility/flite/flite-1.2-r1.ebuild
index c96c96aca4ae..d961de5d98e4 100644
--- a/app-accessibility/flite/flite-1.2-r1.ebuild
+++ b/app-accessibility/flite/flite-1.2-r1.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-accessibility/flite/flite-1.2-r1.ebuild,v 1.1 2004/05/31 16:44:48 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2-r1.ebuild,v 1.2 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils
 
-IUSE="static"
-
 DESCRIPTION="Flite text to speech engine"
 HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
 SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.bz2
 	 http://www.speech.cs.cmu.edu/flite/packed/${P}/${PN}_lexfix.tar.gz"
 
-SLOT="0"
 LICENSE="BSD as-is"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="static"
 
 RDEPEND="virtual/glibc"
 
@@ -44,7 +43,7 @@ src_compile() {
 
 src_install () {
 	dobin bin/*
-	dodoc ACKNOWLEDGEMENTS README COPYING
+	dodoc ACKNOWLEDGEMENTS README
 
 	if use static; then
 		dolib.a lib/*.a
diff --git a/app-accessibility/flite/flite-1.2.ebuild b/app-accessibility/flite/flite-1.2.ebuild
index 2dd6607d10d8..e91acb09788e 100644
--- a/app-accessibility/flite/flite-1.2.ebuild
+++ b/app-accessibility/flite/flite-1.2.ebuild
@@ -1,17 +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-accessibility/flite/flite-1.2.ebuild,v 1.5 2004/04/22 17:54:06 eradicator Exp $
-
-IUSE="static"
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/flite/flite-1.2.ebuild,v 1.6 2004/05/31 18:45:21 vapier Exp $
 
 DESCRIPTION="Flite text to speech engine"
 HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
 SRC_URI="http://www.speech.cs.cmu.edu/flite/packed/${P}/${P}-release.tar.bz2
 	 http://www.speech.cs.cmu.edu/flite/packed/${P}/${PN}_lexfix.tar.gz"
 
-SLOT="0"
 LICENSE="BSD as-is"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
+IUSE="static"
 
 RDEPEND="virtual/glibc"
 
@@ -39,7 +38,7 @@ src_compile() {
 
 src_install () {
 	dobin bin/*
-	dodoc ACKNOWLEDGEMENTS README COPYING
+	dodoc ACKNOWLEDGEMENTS README
 
 	if use static; then
 		dolib.a lib/*.a
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.10.10.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.10.10.ebuild
index 16fb35c44db3..0af21cfc94db 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.10.10.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.10.10.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-accessibility/gnome-mag/gnome-mag-0.10.10.ebuild,v 1.6 2004/05/29 03:31:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.10.10.ebuild,v 1.7 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 sparc hppa ~alpha ~ia64 ~amd64 ppc mips"
-
+KEYWORDS="x86 ppc sparc mips ~alpha hppa ~amd64 ~ia64"
 IUSE=""
 
 RDEPEND=">=gnome-base/libbonobo-1.107
@@ -20,11 +19,10 @@ RDEPEND=">=gnome-base/libbonobo-1.107
 	>=x11-libs/gtk+-2.1
 	dev-libs/popt
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.10.11.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.10.11.ebuild
index 3c82ea900e07..2e94280ef78f 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.10.11.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.10.11.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-accessibility/gnome-mag/gnome-mag-0.10.11.ebuild,v 1.4 2004/05/30 22:16:07 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.10.11.ebuild,v 1.5 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 ~sparc ~hppa ~alpha ~ia64 ~amd64 ~ppc ~mips"
-
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
 IUSE=""
 
 RDEPEND=">=gnome-base/libbonobo-1.107
@@ -20,11 +19,10 @@ RDEPEND=">=gnome-base/libbonobo-1.107
 	>=x11-libs/gtk+-2.1
 	dev-libs/popt
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.10.4.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.10.4.ebuild
index b522918a95d7..20a99e29b338 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.10.4.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.10.4.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-accessibility/gnome-mag/gnome-mag-0.10.4.ebuild,v 1.1 2004/03/17 22:04:43 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.10.4.ebuild,v 1.2 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 sparc hppa alpha ia64 ~amd64 ppc"
-
+KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
 IUSE="debug"
 
 RDEPEND=">=gnome-base/libbonobo-2
@@ -19,7 +18,6 @@ RDEPEND=">=gnome-base/libbonobo-2
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.2
 	dev-libs/popt"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -27,4 +25,4 @@ G2CONF="${G2CONF} $(use_enable debug)"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.10.6.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.10.6.ebuild
index 48b66c335132..2cc26fafc7fa 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.10.6.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.10.6.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-accessibility/gnome-mag/gnome-mag-0.10.6.ebuild,v 1.4 2004/05/29 03:31:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.10.6.ebuild,v 1.5 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 sparc hppa ~alpha ~ia64 amd64 ppc"
-
+KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
 IUSE="debug"
 
 RDEPEND=">=gnome-base/libbonobo-1.107
@@ -20,7 +19,6 @@ RDEPEND=">=gnome-base/libbonobo-1.107
 	>=x11-libs/gtk+-2.1
 	dev-libs/popt
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -28,5 +26,4 @@ G2CONF="${G2CONF} $(use_enable debug)"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
-
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.2.8.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.2.8.ebuild
index 4f89ef12fef4..425f26ba78cf 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.2.8.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.2.8.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-accessibility/gnome-speech/gnome-speech-0.2.8.ebuild,v 1.1 2004/03/17 22:15:32 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.2.8.ebuild,v 1.2 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,17 +9,15 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 sparc hppa alpha ia64 ppc ~amd64"
-
+KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
 IUSE=""
 
 RDEPEND=">=gnome-base/libbonobo-2
 	>=gnome-base/ORBit2-2.4"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 # The Java support for this package seems to be somewhat brain-damaged,
 # and although it would be nice to implement it via the "java" USE flag,
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild
index c1a9ca30bde9..cf07bcf774c1 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-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-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild,v 1.4 2004/05/29 03:29:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.3.1.ebuild,v 1.5 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,20 +9,17 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 sparc hppa ~alpha ~ia64 ppc amd64"
-
+KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
 IUSE=""
 
 RDEPEND=">=gnome-base/libbonobo-1.97
 	>=gnome-base/ORBit2-2.3.94"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 # The Java support for this package seems to be somewhat brain-damaged,
 # and although it would be nice to implement it via the "java" USE flag,
 # we will have to disable it entirely for now.
 export JAVAC=no
-
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
index c1cf760b6a7e..70e8f6c32cdf 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild
@@ -1,19 +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-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild,v 1.8 2004/05/29 03:29:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.3.2-r1.ebuild,v 1.9 2004/05/31 18:45:21 vapier Exp $
 
 inherit java-pkg gnome2
 
-IUSE="java"
-
 DESCRIPTION="Simple general API for producing text-to-speech output"
 HOMEPAGE="http://www.gnome.org/"
 
-SLOT="1"
-
-KEYWORDS="x86 ppc hppa ~alpha ~ia64 sparc ~amd64"
 LICENSE="LGPL-2"
-
+SLOT="1"
+KEYWORDS="x86 ppc sparc ~alpha hppa ~amd64 ~ia64"
+IUSE="java"
 
 RDEPEND=">=gnome-base/libbonobo-1.97
 	>=gnome-base/ORBit2-2.3.94
@@ -25,15 +22,13 @@ RDEPEND=">=gnome-base/libbonobo-1.97
 #	freetts? ( app-accessibility/freetts
 #		!java? ( virtual/jdk
 #			app-accessibility/java-access-bridge ) )"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
-
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_compile() {
-	if [ `use java` ]
+	if use java
 	then
 		if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ]
 		then
@@ -54,11 +49,10 @@ src_compile() {
 	gnome2_src_compile
 }
 
-
 src_install() {
 	gnome2_src_install
 
-	if [ `use java` ]
+	if use java
 	then
 		java-pkg_dojar ${D}/usr/share/jar/*.jar
 		rm -rf ${D}/usr/share/jar
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild
index 750c27d6bf32..f9ce75ec45d7 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.3.2.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-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild,v 1.5 2004/05/29 03:29:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.3.2.ebuild,v 1.6 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,17 +9,15 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 ~sparc hppa ~alpha ~ia64 ppc ~amd64"
-
+KEYWORDS="x86 ppc ~sparc ~alpha hppa ~amd64 ~ia64"
 IUSE=""
 
 RDEPEND=">=gnome-base/libbonobo-1.97
 	>=gnome-base/ORBit2-2.3.94"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 # Check out >=gnome-speech-0.3.2-r1 for java support
 export JAVAC=no
diff --git a/app-accessibility/gnopernicus/gnopernicus-0.7.1-r1.ebuild b/app-accessibility/gnopernicus/gnopernicus-0.7.1-r1.ebuild
index 43c5700be3ed..0272bcfd97cc 100644
--- a/app-accessibility/gnopernicus/gnopernicus-0.7.1-r1.ebuild
+++ b/app-accessibility/gnopernicus/gnopernicus-0.7.1-r1.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-accessibility/gnopernicus/gnopernicus-0.7.1-r1.ebuild,v 1.2 2004/04/19 18:44:33 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnopernicus/gnopernicus-0.7.1-r1.ebuild,v 1.3 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="Software tools for blind and visually impaired in Gnome 2"
 HOMEPAGE="http://www.baum.ro/gnopernicus.html"
 
-IUSE="ipv6"
-SLOT="0"
-KEYWORDS="x86 sparc hppa alpha ia64 ppc ~amd64"
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
+IUSE="ipv6"
 
 # libgail-gnome is only required during runtime
-
 RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/popt-1.5
 	>=gnome-base/libgnome-2
@@ -26,11 +25,10 @@ RDEPEND=">=gnome-base/gconf-2
 	>=app-accessibility/gnome-speech-0.2.4
 	>=app-accessibility/gnome-mag-0.9
 	>=gnome-extra/libgail-gnome-1.0"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_compile() {
 	local myconf="--with-default-fonts-path=${D}/usr/share/fonts/default/Type1"
@@ -41,4 +39,3 @@ src_compile() {
 	gnome2_src_configure
 	emake || die "compilation failure"
 }
-
diff --git a/app-accessibility/gnopernicus/gnopernicus-0.7.4.ebuild b/app-accessibility/gnopernicus/gnopernicus-0.7.4.ebuild
index f1f1f6e0b79c..a589b941077e 100644
--- a/app-accessibility/gnopernicus/gnopernicus-0.7.4.ebuild
+++ b/app-accessibility/gnopernicus/gnopernicus-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-accessibility/gnopernicus/gnopernicus-0.7.4.ebuild,v 1.4 2004/05/29 03:30:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnopernicus/gnopernicus-0.7.4.ebuild,v 1.5 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="Software tools for blind and visually impaired in Gnome 2"
 HOMEPAGE="http://www.baum.ro/gnopernicus.html"
 
-IUSE="ipv6"
-SLOT="0"
-KEYWORDS="x86 sparc hppa ~alpha ~ia64 ppc amd64"
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~alpha hppa amd64 ~ia64"
+IUSE="ipv6"
 
 # libgail-gnome is only required during runtime
-
 RDEPEND=">=gnome-base/gconf-1.1.5
 	>=dev-libs/popt-1.5
 	>=gnome-base/libgnome-1.102
@@ -27,7 +26,6 @@ RDEPEND=">=gnome-base/gconf-1.1.5
 	>=app-accessibility/gnome-mag-0.9
 	>=gnome-extra/libgail-gnome-1.0
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.29
 	dev-util/pkgconfig"
@@ -36,5 +34,4 @@ G2CONF="${G2CONF} \
 	--with-default-fonts-path=${D}/usr/share/fonts/default/Type1 \
 	$(use_enable ipv6)"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
-
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/app-accessibility/gnopernicus/gnopernicus-0.8.1.ebuild b/app-accessibility/gnopernicus/gnopernicus-0.8.1.ebuild
index da8a20c8d9ba..02cdc4e014cf 100644
--- a/app-accessibility/gnopernicus/gnopernicus-0.8.1.ebuild
+++ b/app-accessibility/gnopernicus/gnopernicus-0.8.1.ebuild
@@ -1,20 +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-accessibility/gnopernicus/gnopernicus-0.8.1.ebuild,v 1.7 2004/05/29 03:30:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnopernicus/gnopernicus-0.8.1.ebuild,v 1.8 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils gnome2
 
-IUSE="ipv6 brltty"
-
 DESCRIPTION="Software tools for blind and visually impaired in Gnome 2"
 HOMEPAGE="http://www.baum.ro/gnopernicus.html"
 
-SLOT="1"
-KEYWORDS="x86 sparc hppa ~alpha ~ia64 ppc ~amd64"
 LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="x86 ppc sparc ~alpha hppa ~amd64 ~ia64"
+IUSE="ipv6 brltty"
 
 # libgail-gnome is only required during runtime
-
 RDEPEND=">=gnome-base/gconf-1.1.5
 	>=dev-libs/popt-1.5
 	>=gnome-base/libgnome-1.102
@@ -29,7 +27,6 @@ RDEPEND=">=gnome-base/gconf-1.1.5
 	>=gnome-extra/libgail-gnome-1.0
 	virtual/x11
 	brltty? ( app-accessibility/brltty )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.29
 	dev-util/pkgconfig
@@ -38,11 +35,10 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} --with-default-fonts-path=${D}/usr/share/fonts/default/Type1"
 G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable brltty)"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	epatch ${FILESDIR}/${P}-brltty_fix.patch
 }
diff --git a/app-accessibility/gnopernicus/gnopernicus-0.8.4.ebuild b/app-accessibility/gnopernicus/gnopernicus-0.8.4.ebuild
index 77a61a723714..bf482c82caf7 100644
--- a/app-accessibility/gnopernicus/gnopernicus-0.8.4.ebuild
+++ b/app-accessibility/gnopernicus/gnopernicus-0.8.4.ebuild
@@ -1,20 +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-accessibility/gnopernicus/gnopernicus-0.8.4.ebuild,v 1.3 2004/05/30 22:23:15 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnopernicus/gnopernicus-0.8.4.ebuild,v 1.4 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils gnome2
 
-IUSE="ipv6 brltty"
-
 DESCRIPTION="Software tools for blind and visually impaired in Gnome 2"
 HOMEPAGE="http://www.baum.ro/gnopernicus.html"
 
-SLOT="1"
-KEYWORDS="x86 ~sparc ~hppa ~alpha ~ia64 ~ppc ~amd64"
 LICENSE="LGPL-2"
+SLOT="1"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="ipv6 brltty"
 
 # libgail-gnome is only required during runtime
-
 RDEPEND=">=gnome-base/gconf-1.1.5
 	>=dev-libs/popt-1.5
 	>=gnome-base/libgnome-1.102
@@ -29,7 +27,6 @@ RDEPEND=">=gnome-base/gconf-1.1.5
 	>=gnome-extra/libgail-gnome-1.0
 	virtual/x11
 	brltty? ( app-accessibility/brltty )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.29
 	dev-util/pkgconfig
@@ -38,12 +35,11 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} --with-default-fonts-path=${D}/usr/share/fonts/default/Type1"
 G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable brltty)"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	# Patch to make it work with any version of brltty.
 	epatch ${FILESDIR}/${P}-brltty_fix.patch
 }
diff --git a/app-accessibility/gok/gok-0.10.0.ebuild b/app-accessibility/gok/gok-0.10.0.ebuild
index 0e5f7de4b8dc..986c9215f0e9 100644
--- a/app-accessibility/gok/gok-0.10.0.ebuild
+++ b/app-accessibility/gok/gok-0.10.0.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-accessibility/gok/gok-0.10.0.ebuild,v 1.6 2004/05/29 03:26:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-0.10.0.ebuild,v 1.7 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gok.ca/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 ~sparc hppa ~alpha ~ia64 ppc ~amd64"
-
+KEYWORDS="x86 ppc ~sparc ~alpha hppa ~amd64 ~ia64"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.3.1
@@ -23,19 +22,16 @@ RDEPEND=">=x11-libs/gtk+-2.3.1
 	>=x11-libs/libwnck-1
 	>=gnome-extra/at-spi-1.3.4
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.27.3
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	sed -i \
 		-e "s:\$pkgdatadir:${ROOT}/usr/share/${PN}:" \
 		gok-with-references.schemas.m4
diff --git a/app-accessibility/gok/gok-0.10.2.ebuild b/app-accessibility/gok/gok-0.10.2.ebuild
index b4c23e0c6488..aac94897ebd2 100644
--- a/app-accessibility/gok/gok-0.10.2.ebuild
+++ b/app-accessibility/gok/gok-0.10.2.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-accessibility/gok/gok-0.10.2.ebuild,v 1.4 2004/05/30 22:29:40 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-0.10.2.ebuild,v 1.5 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gok.ca/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="x86 ~sparc ~hppa ~alpha ~ia64 ~ppc ~amd64"
-
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.3.1
@@ -24,22 +23,19 @@ RDEPEND=">=x11-libs/gtk+-2.3.1
 	>=gnome-extra/at-spi-1.3.4
 	gnome-base/ORBit2
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.27.3
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 # Problems when creating .kbd files
 MAKEOPTS="${MAKEOPTS} -j1"
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	sed -i \
 		-e "s:\$pkgdatadir:${ROOT}/usr/share/${PN}:" \
 		gok-with-references.schemas.m4
diff --git a/app-accessibility/gok/gok-0.9.1.ebuild b/app-accessibility/gok/gok-0.9.1.ebuild
index 9aae3515ff68..13c3281b8839 100644
--- a/app-accessibility/gok/gok-0.9.1.ebuild
+++ b/app-accessibility/gok/gok-0.9.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-accessibility/gok/gok-0.9.1.ebuild,v 1.1 2004/03/17 22:17:47 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-0.9.1.ebuild,v 1.2 2004/05/31 18:45:21 vapier Exp $
 
 inherit gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gok.ca/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc hppa alpha ia64 ppc ~amd64"
-
+KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2
@@ -22,17 +21,14 @@ RDEPEND=">=x11-libs/gtk+-2
 	media-sound/esound
 	>=x11-libs/libwnck-1
 	>=gnome-extra/at-spi-1.3.4"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	sed -i 's:$pkgdatadir:/usr/share/gok:' gok-with-references.schemas.m4
 }
diff --git a/app-accessibility/gok/gok-0.9.3.ebuild b/app-accessibility/gok/gok-0.9.3.ebuild
index ca5559023444..a817e90eb8e5 100644
--- a/app-accessibility/gok/gok-0.9.3.ebuild
+++ b/app-accessibility/gok/gok-0.9.3.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-accessibility/gok/gok-0.9.3.ebuild,v 1.5 2004/05/29 03:26:43 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-0.9.3.ebuild,v 1.6 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils gnome2
 
@@ -9,8 +9,7 @@ HOMEPAGE="http://www.gok.ca/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 -sparc hppa ~alpha ~ia64 ppc amd64 mips"
-
+KEYWORDS="x86 ppc -sparc mips ~alpha hppa amd64 ~ia64"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2
@@ -23,19 +22,15 @@ RDEPEND=">=x11-libs/gtk+-2
 	>=x11-libs/libwnck-1
 	>=gnome-extra/at-spi-1.3.4
 	virtual/x11"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
-src_unpack()
-{
+src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	epatch ${FILESDIR}/${PN}-${PV}-ansi_C.patch
 	sed -i 's:$pkgdatadir:/usr/share/gok:' gok-with-references.schemas.m4
 }
-
diff --git a/app-accessibility/java-access-bridge/java-access-bridge-1.3.1.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.3.1.ebuild
index afd269a2e58f..17fd4b672dd8 100644
--- a/app-accessibility/java-access-bridge/java-access-bridge-1.3.1.ebuild
+++ b/app-accessibility/java-access-bridge/java-access-bridge-1.3.1.ebuild
@@ -1,24 +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-accessibility/java-access-bridge/java-access-bridge-1.3.1.ebuild,v 1.8 2004/05/29 03:28:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.3.1.ebuild,v 1.9 2004/05/31 18:45:21 vapier Exp $
 
 inherit java-pkg gnome2
 
 DESCRIPTION="Gnome Java Accessibility Bridge"
 HOMEPAGE="http://www.gnome.org/"
+
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~amd64 ppc"
+KEYWORDS="x86 ppc sparc ~amd64"
 IUSE=""
+
 RDEPEND=">=gnome-base/libbonobo-2
 	>=gnome-extra/at-spi-1.3.9
 	>=virtual/jdk-1.4"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-java/java-config"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 G2CONF="${G2CONF} --with-java-home=${JAVA_HOME}"
 
 src_install() {
diff --git a/app-accessibility/java-access-bridge/java-access-bridge-1.4.2.ebuild b/app-accessibility/java-access-bridge/java-access-bridge-1.4.2.ebuild
index 56e8a438ef96..9bcb72a0b49d 100644
--- a/app-accessibility/java-access-bridge/java-access-bridge-1.4.2.ebuild
+++ b/app-accessibility/java-access-bridge/java-access-bridge-1.4.2.ebuild
@@ -1,23 +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-accessibility/java-access-bridge/java-access-bridge-1.4.2.ebuild,v 1.3 2004/05/29 03:28:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/java-access-bridge/java-access-bridge-1.4.2.ebuild,v 1.4 2004/05/31 18:45:21 vapier Exp $
 
 inherit java-pkg gnome2
 
 DESCRIPTION="Gnome Java Accessibility Bridge"
 HOMEPAGE="http://www.gnome.org/"
+
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ppc"
+KEYWORDS="~x86 ppc ~sparc ~amd64"
 IUSE=""
+
 RDEPEND=">=gnome-base/libbonobo-2
 	>=gnome-extra/at-spi-1.3.9
 	>=virtual/jdk-1.4"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS ChangeLog COPYING NEWS README"
+DOCS="AUTHORS ChangeLog NEWS README"
 
 src_compile() {
 	if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ]
diff --git a/app-accessibility/speechd/speechd-0.56-r1.ebuild b/app-accessibility/speechd/speechd-0.56-r1.ebuild
index 9b600143361a..d103596391f4 100644
--- a/app-accessibility/speechd/speechd-0.56-r1.ebuild
+++ b/app-accessibility/speechd/speechd-0.56-r1.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-accessibility/speechd/speechd-0.56-r1.ebuild,v 1.4 2004/04/20 09:02:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd/speechd-0.56-r1.ebuild,v 1.5 2004/05/31 18:45:21 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.speechio.org/dl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="esd"
 
 DEPEND="dev-lang/perl"
@@ -24,7 +24,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dobin ${S}/bin/speechd ${S}/bin/catspeech
 	use esd && dosed 's,#\($use_esd\),\1,g' /usr/bin/speechd
 	insinto /etc
@@ -32,17 +32,17 @@ src_install () {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/speechd.rc speechd
 	doman ${S}/man/man1/*.1
-	dodoc README AUTHORS CHANGELOG COPYING TODO speechio.faq
+	dodoc README AUTHORS CHANGELOG TODO speechio.faq
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	enewgroup speech
 
 	einfo "Execute ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
 	einfo "to build the neccessary FIFO on /dev/speech."
 }
 
-pkg_config () {
+pkg_config() {
 	mkfifo --mode=0660 /dev/speech
 	chown root:speech /dev/speech
 
diff --git a/app-accessibility/speechd/speechd-0.56.ebuild b/app-accessibility/speechd/speechd-0.56.ebuild
index 5d5e66a8dce8..fa7427a02259 100644
--- a/app-accessibility/speechd/speechd-0.56.ebuild
+++ b/app-accessibility/speechd/speechd-0.56.ebuild
@@ -1,32 +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-accessibility/speechd/speechd-0.56.ebuild,v 1.4 2004/03/24 17:20:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd/speechd-0.56.ebuild,v 1.5 2004/05/31 18:45:21 vapier Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Implements /dev/speech (any text written to /dev/speech will be spoken aloud)"
 HOMEPAGE="http://www.speechio.org/"
 SRC_URI="http://www.speechio.org/dl/${P}.tar.gz"
-IUSE=""
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64"
+IUSE=""
 
 DEPEND="dev-lang/perl
 	app-accessibility/festival"
 
+S=${WORKDIR}/${PN}
+
 src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	dobin ${S}/bin/speechd ${S}/bin/catspeech
 	insinto /etc
 	doins speechdrc speechd.sub
 	doman ${S}/man/man1/*.1
-	dodoc README AUTHORS CHANGELOG COPYING TODO
+	dodoc README AUTHORS CHANGELOG TODO
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	if ! grep -q ^speech: /etc/group ; then
 		groupadd speech || die "problem adding group speech"
 	fi
@@ -35,7 +37,7 @@ pkg_postinst () {
 	einfo "to build the neccessary FIFO on /dev/speech."
 }
 
-pkg_config () {
+pkg_config() {
 	mkfifo --mode=0660 /dev/speech
 	chown root:speech /dev/speech
 
@@ -50,4 +52,3 @@ pkg_config () {
 #	einfo "Removing FIFO at /dev/speech ..."
 #	rm -f /dev/speech
 #}
-
diff --git a/app-accessibility/yasr/yasr-0.6.5.ebuild b/app-accessibility/yasr/yasr-0.6.5.ebuild
index 6d73ed8ed545..100fd6ce3ee3 100644
--- a/app-accessibility/yasr/yasr-0.6.5.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/yasr/yasr-0.6.5.ebuild,v 1.6 2004/04/23 03:57:35 dmwaters Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/yasr/yasr-0.6.5.ebuild,v 1.7 2004/05/31 18:45:21 vapier Exp $
 
-DESCRIPTION="Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."
-HOMEPAGE="http://yasr.sourceforge.net"
+DESCRIPTION="general-purpose console screen reader"
+HOMEPAGE="http://yasr.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
@@ -14,14 +14,13 @@ IUSE=""
 DEPEND="virtual/glibc
 	>=sys-devel/make-3.80
 	>=sys-devel/autoconf-2.58"
-
 RDEPEND=""
 
 src_unpack(){
 	unpack ${A}
 	cd ${S}
 	sed -i '/^aclocaldir =/s:@aclocaldir@:$(destdir)/aclocal:' ${S}/m4/Makefile.*
-	}
+}
 
 src_compile() {
 	econf --datadir='/etc' || die "econf failed"
@@ -30,6 +29,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc README ChangeLog COPYING ABOUT-NLS AUTHORS BUGS CREDITS INSTALL
+	dodoc README ChangeLog AUTHORS BUGS CREDITS INSTALL
 }
-