change glibc to libc and clean up other horribly ugly ebuilds

23 files changed, 127 insertions, 173 deletions

diff --git a/app-misc/fujiplay/fujiplay-1.33.ebuild b/app-misc/fujiplay/fujiplay-1.33.ebuild
index 14d2217cb205..dc8e21ffa38e 100644
--- a/app-misc/fujiplay/fujiplay-1.33.ebuild
+++ b/app-misc/fujiplay/fujiplay-1.33.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.8 2004/06/24 22:11:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fujiplay/fujiplay-1.33.ebuild,v 1.9 2004/06/28 03:35:27 vapier Exp $
 
 DESCRIPTION="Utility for Fujifilm/Leica digital cameras (via serial port)"
-SRC_URI="http://topo.math.u-psud.fr/~bousch/fujiplay.tgz"
 HOMEPAGE="http://topo.math.u-psud.fr/~bousch/fujiplay.html"
+SRC_URI="http://topo.math.u-psud.fr/~bousch/fujiplay.tgz"
 
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-LICENSE="public-domain"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND=""
 
 S=${WORKDIR}
@@ -21,8 +21,7 @@ src_compile() {
 }
 
 src_install() {
-	into /usr
-	dobin fujiplay yycc2ppm
+	dobin fujiplay yycc2ppm || die
 	dodoc README fujiplay.lsm mx700-commands.html
 	emake all clean
 }
@@ -41,4 +40,3 @@ pkg_postrm() {
 	einfo "The symbolic link /dev/fujifilm was removed."
 	echo
 }
-
diff --git a/app-misc/gcal/gcal-3.01-r1.ebuild b/app-misc/gcal/gcal-3.01-r1.ebuild
index 2010fbfce9d3..fc68213ccfb5 100644
--- a/app-misc/gcal/gcal-3.01-r1.ebuild
+++ b/app-misc/gcal/gcal-3.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01-r1.ebuild,v 1.6 2004/06/24 22:12:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01-r1.ebuild,v 1.7 2004/06/28 03:36:10 vapier Exp $
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="http://www.gnu.org/software/gcal/gcal.html"
@@ -20,7 +20,7 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc ABOUT-NLS ATTENTION BUGS COPYING DISCLAIM HISTORY \
+	dodoc ABOUT-NLS ATTENTION BUGS DISCLAIM HISTORY \
 		INSTALL LIMITATIONS MANIFEST NEWS README SYMBOLS THANKS TODO
 
 	# Need to fix up paths for scripts in misc directory
diff --git a/app-misc/gcal/gcal-3.01.ebuild b/app-misc/gcal/gcal-3.01.ebuild
index c427bd2b1086..f5b49e658343 100644
--- a/app-misc/gcal/gcal-3.01.ebuild
+++ b/app-misc/gcal/gcal-3.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01.ebuild,v 1.6 2004/06/24 22:12:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01.ebuild,v 1.7 2004/06/28 03:36:10 vapier Exp $
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="http://www.gnu.org/software/gcal/gcal.html"
@@ -20,7 +20,7 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc ABOUT-NLS ATTENTION BUGS COPYING DISCLAIM HISTORY \
+	dodoc ABOUT-NLS ATTENTION BUGS DISCLAIM HISTORY \
 		INSTALL LIMITATIONS MANIFEST NEWS README SYMBOLS THANKS TODO
 
 	# Need to fix up paths for scripts in misc directory
diff --git a/app-misc/geekcode/geekcode-1.7.3.ebuild b/app-misc/geekcode/geekcode-1.7.3.ebuild
index c1d3e7bd0677..3c592d904b70 100644
--- a/app-misc/geekcode/geekcode-1.7.3.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Submitted by: Ferdy <ferdy@ferdyx.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.3.ebuild,v 1.7 2004/06/28 01:29:48 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.3.ebuild,v 1.8 2004/06/28 03:36:27 vapier Exp $
 
 DESCRIPTION="Geek code generator"
 HOMEPAGE="http://geekcode.sourceforge.net/"
 SRC_URI="mirror://sourceforge/geekcode/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 sparc ~mips"
 SLOT="0"
+KEYWORDS="x86 sparc ~mips amd64"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dodir /usr/bin
-	dobin geekcode
-
+	dobin geekcode || die
 	dodoc CHANGES README geekcode.txt
 }
diff --git a/app-misc/geekcode/geekcode-1.7.ebuild b/app-misc/geekcode/geekcode-1.7.ebuild
index 23fd3e6385f1..110c633756af 100644
--- a/app-misc/geekcode/geekcode-1.7.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Submitted by: Ferdy <ferdy@ferdyx.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.ebuild,v 1.5 2004/06/24 22:12:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geekcode/geekcode-1.7.ebuild,v 1.6 2004/06/28 03:36:27 vapier Exp $
 
 DESCRIPTION="Geek code generator"
 HOMEPAGE="http://geekcode.sourceforge.net/"
 SRC_URI="mirror://sourceforge/geekcode/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dodir /usr/bin
 	dobin geekcode
-
 	dodoc CHANGES README geekcode.txt
 }
diff --git a/app-misc/gentoo/gentoo-0.11.45.ebuild b/app-misc/gentoo/gentoo-0.11.45.ebuild
index a892ea4edc6c..935ce516261b 100644
--- a/app-misc/gentoo/gentoo-0.11.45.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.45.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.45.ebuild,v 1.11 2004/06/24 22:12:44 agriffis Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.45.ebuild,v 1.12 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ~hppa amd64 ~ia64"
+IUSE="nls gnome"
+
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 	econf \
@@ -34,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gentoo/gentoo-0.11.46.ebuild b/app-misc/gentoo/gentoo-0.11.46.ebuild
index d108a8df4f75..cda99c0e9c6d 100644
--- a/app-misc/gentoo/gentoo-0.11.46.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.46.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.46.ebuild,v 1.6 2004/06/24 22:12:44 agriffis Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.46.ebuild,v 1.7 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc alpha ~hppa amd64 ~ia64"
+IUSE="nls gnome"
 
-src_compile() {
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
+src_compile() {
 	econf \
 		--sysconfdir=/etc/gentoo \
 		`use_enable nls` || die
@@ -35,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gentoo/gentoo-0.11.48.ebuild b/app-misc/gentoo/gentoo-0.11.48.ebuild
index ba20bdc4df65..837e640801dc 100644
--- a/app-misc/gentoo/gentoo-0.11.48.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.48.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.48.ebuild,v 1.4 2004/06/24 22:12:44 agriffis Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.48.ebuild,v 1.5 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="nls gnome"
 
-src_compile() {
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
+src_compile() {
 	econf \
 		--sysconfdir=/etc/gentoo \
 		`use_enable nls` || die
@@ -35,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gentoo/gentoo-0.11.51.ebuild b/app-misc/gentoo/gentoo-0.11.51.ebuild
index 405406406f3b..3e6f36ae581d 100644
--- a/app-misc/gentoo/gentoo-0.11.51.ebuild
+++ b/app-misc/gentoo/gentoo-0.11.51.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.51.ebuild,v 1.5 2004/06/25 23:25:55 kugelfang Exp $
-
-IUSE="nls gnome"
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.11.51.ebuild,v 1.6 2004/06/28 03:36:48 vapier Exp $
 
 DESCRIPTION="A modern GTK+ based filemanager for any WM"
-SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.obsession.se/gentoo/"
+SRC_URI="mirror://sourceforge/gentoo/${P}.tar.gz"
 
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc sparc ~alpha ~hppa amd64 ~ia64"
+IUSE="nls gnome"
 
-src_compile() {
+DEPEND="=x11-libs/gtk+-1.2*"
+RDEPEND="nls? ( sys-devel/gettext )"
 
+src_compile() {
 	econf \
 		--sysconfdir=/etc/gentoo \
 		`use_enable nls` || die
@@ -35,7 +33,7 @@ src_install() {
 		doins ${FILESDIR}/gentoo.desktop
 	fi
 
-	dodoc AUTHORS BUGS CONFIG-CHANGES COPYING CREDITS ChangeLog INSTALL \
+	dodoc AUTHORS BUGS CONFIG-CHANGES CREDITS ChangeLog INSTALL \
 		NEWS ONEWS README* TODO
 	dodoc docs/FAQ docs/menus.txt
 
diff --git a/app-misc/gfontview/gfontview-0.5.0-r6.ebuild b/app-misc/gfontview/gfontview-0.5.0-r6.ebuild
index 2477214a4cd9..4c638ba2d8ec 100644
--- a/app-misc/gfontview/gfontview-0.5.0-r6.ebuild
+++ b/app-misc/gfontview/gfontview-0.5.0-r6.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r6.ebuild,v 1.5 2004/06/24 22:12:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gfontview/gfontview-0.5.0-r6.ebuild,v 1.6 2004/06/28 03:37:05 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="Fontviewer for PostScript Type 1 and TrueType"
-SRC_URI="mirror://sourceforge/gfontview/${P}.tar.gz"
 HOMEPAGE="http://gfontview.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gfontview/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE="nls gnome"
 
@@ -35,7 +35,7 @@ src_compile() {
 
 src_install() {
 	einstall
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 	insinto /usr/X11R6/include/X11/pixmaps/
 	doins error.xpm openhand.xpm font.xpm t1.xpm tt.xpm
 }
diff --git a/app-misc/git/git-4.3.20.ebuild b/app-misc/git/git-4.3.20.ebuild
index 4947dd9c0fcb..27e0322332d9 100644
--- a/app-misc/git/git-4.3.20.ebuild
+++ b/app-misc/git/git-4.3.20.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/git/git-4.3.20.ebuild,v 1.7 2004/06/24 22:13:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/git/git-4.3.20.ebuild,v 1.8 2004/06/28 03:37:22 vapier Exp $
 
 DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily task"
 HOMEPAGE="http://www.gnu.org/software/git/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-SLOT="0"
 
 DEPEND="sys-devel/binutils"
 
-src_compile() {
-	econf || die "econf failed"
-	emake
-}
-
 src_install() {
-	einstall
-	dodoc AUTHORS COPYING INSTALL README NEWS VERSION STATUS
+	einstall || die
+	dodoc AUTHORS INSTALL README NEWS VERSION STATUS
 }
diff --git a/app-misc/glabels/glabels-1.93.3.ebuild b/app-misc/glabels/glabels-1.93.3.ebuild
index 7b558485dab3..49b611f388cb 100644
--- a/app-misc/glabels/glabels-1.93.3.ebuild
+++ b/app-misc/glabels/glabels-1.93.3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/glabels-1.93.3.ebuild,v 1.5 2004/06/24 22:13:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glabels/glabels-1.93.3.ebuild,v 1.6 2004/06/28 03:37:44 vapier Exp $
 
 inherit gnome2
 
 DESCRIPTION="Program for creating labels and business cards"
 HOMEPAGE="http://glabels.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
 
-KEYWORDS="x86 ~ppc ~sparc"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
 SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.2
@@ -22,12 +22,11 @@ RDEPEND=">=dev-libs/glib-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	>=gnome-base/libgnomecanvas-2.0.1
 	>=gnome-base/libglade-2.0.1"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig
 	>=dev-util/intltool-0.21"
 
-DOCS="AUTHORS ChangeLog COPYING* README TODO"
+DOCS="AUTHORS ChangeLog README TODO"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-misc/glimpse/glimpse-4.15-r1.ebuild b/app-misc/glimpse/glimpse-4.15-r1.ebuild
index 6221f5fa2c33..983cd8836e76 100644
--- a/app-misc/glimpse/glimpse-4.15-r1.ebuild
+++ b/app-misc/glimpse/glimpse-4.15-r1.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.15-r1.ebuild,v 1.7 2004/06/24 22:13:43 agriffis Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.15-r1.ebuild,v 1.8 2004/06/28 03:38:22 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="A index/query system to search a large set of files quickly"
-SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 HOMEPAGE="http://webglimpse.net/"
+SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86 ~ppc ~mips amd64 sparc alpha ia64"
-RDEPEND="!dev-libs/tre
-	virtual/glibc"
-
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~mips alpha amd64 ia64"
+IUSE=""
 
+RDEPEND="!dev-libs/tre
+	virtual/libc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	epatch ${FILESDIR}/${PV}-errno.patch
diff --git a/app-misc/glimpse/glimpse-4.17.4.ebuild b/app-misc/glimpse/glimpse-4.17.4.ebuild
index e19223a0b713..ec39bd2cf743 100644
--- a/app-misc/glimpse/glimpse-4.17.4.ebuild
+++ b/app-misc/glimpse/glimpse-4.17.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.6 2004/06/24 22:13:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.7 2004/06/28 03:38:22 vapier Exp $
 
 inherit flag-o-matic eutils
 
@@ -12,10 +12,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="x86 ppc sparc mips alpha amd64 ia64"
 IUSE="static"
-RDEPEND="!dev-libs/tre
-	virtual/glibc"
 
-DEPEND="virtual/glibc"
+RDEPEND="!dev-libs/tre
+	virtual/libc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-misc/gramps/gramps-0.99.ebuild b/app-misc/gramps/gramps-0.99.ebuild
index b8fd31339e58..4303e79a05eb 100644
--- a/app-misc/gramps/gramps-0.99.ebuild
+++ b/app-misc/gramps/gramps-0.99.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-0.99.ebuild,v 1.2 2004/06/24 22:14:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-0.99.ebuild,v 1.3 2004/06/28 03:39:03 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 HOMEPAGE="http://gramps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-1.99.14
@@ -20,14 +20,14 @@ RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pyxml-0.7.1
 	>=dev-python/Imaging-1.1.3
 	>=dev-python/reportlab-1.11"
-
 DEPEND="${RDEPEND}
 	dev-lang/swig
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="COPYING NEWS README TODO"
+DOCS="NEWS README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
+
 pkg_setup() {
 	if ! python -c "import gtk.glade" 2>&1 > /dev/null ; then
 		eerror "You need to install pygtk with libglade support. Try:"
diff --git a/app-misc/gramps/gramps-1.0.0.ebuild b/app-misc/gramps/gramps-1.0.0.ebuild
index 8befb3cd14f2..8aad9798ec03 100644
--- a/app-misc/gramps/gramps-1.0.0.ebuild
+++ b/app-misc/gramps/gramps-1.0.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.0.ebuild,v 1.3 2004/06/24 22:14:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.0.ebuild,v 1.4 2004/06/28 03:39:03 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 HOMEPAGE="http://gramps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~sparc"
+IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-1.99.14
@@ -20,14 +20,14 @@ RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pyxml-0.7.1
 	>=dev-python/Imaging-1.1.3
 	>=dev-python/reportlab-1.11"
-
 DEPEND="${RDEPEND}
 	dev-lang/swig
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="COPYING NEWS README TODO"
+DOCS="NEWS README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
+
 pkg_setup() {
 	if ! python -c "import gtk.glade" 2>&1 > /dev/null ; then
 		eerror "You need to install pygtk with libglade support. Try:"
diff --git a/app-misc/gramps/gramps-1.0.1.ebuild b/app-misc/gramps/gramps-1.0.1.ebuild
index eb8b722f2a00..75ede08b34ee 100644
--- a/app-misc/gramps/gramps-1.0.1.ebuild
+++ b/app-misc/gramps/gramps-1.0.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.1.ebuild,v 1.4 2004/06/26 21:11:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-1.0.1.ebuild,v 1.5 2004/06/28 03:39:03 vapier Exp $
 
 inherit gnome2 virtualx
 
-IUSE=""
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 HOMEPAGE="http://gramps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gramps/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-1.99.14
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	app-text/scrollkeeper"
 
-DOCS="COPYING NEWS README TODO"
+DOCS="NEWS README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
diff --git a/app-misc/gtktalog/gtktalog-1.0.1.ebuild b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
index 8b544c769f79..cdc5ffaa9f85 100644
--- a/app-misc/gtktalog/gtktalog-1.0.1.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.1.ebuild,v 1.5 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.1.ebuild,v 1.6 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtktalog/gtktalog-1.0.2.ebuild b/app-misc/gtktalog/gtktalog-1.0.2.ebuild
index 96d8f86f9182..d7b45df86c85 100644
--- a/app-misc/gtktalog/gtktalog-1.0.2.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.2.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.2.ebuild,v 1.4 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.2.ebuild,v 1.5 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtktalog/gtktalog-1.0.3.ebuild b/app-misc/gtktalog/gtktalog-1.0.3.ebuild
index 5c418c858d3c..0f912f010e5b 100644
--- a/app-misc/gtktalog/gtktalog-1.0.3.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.3.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.3.ebuild,v 1.4 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.3.ebuild,v 1.5 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtypist/gtypist-2.5.ebuild b/app-misc/gtypist/gtypist-2.5.ebuild
index 91a1614e19f8..440c138dae87 100644
--- a/app-misc/gtypist/gtypist-2.5.ebuild
+++ b/app-misc/gtypist/gtypist-2.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.5.ebuild,v 1.13 2004/06/24 22:15:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.5.ebuild,v 1.14 2004/06/28 03:40:06 vapier Exp $
 
 DESCRIPTION="universal typing tutor"
-SRC_URI="ftp://ftp.gnu.org/gnu/gtypist/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html"
+SRC_URI="ftp://ftp.gnu.org/gnu/gtypist/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
@@ -17,12 +17,11 @@ src_compile() {
 	# gtypist also produces some Emacs/XEmacs editing modes if
 	# emacs/xemacs is present. if emacs/xemacs is not present then
 	# these emacs modes are not compiled or installed.
-
 	econf `use_enable nls` || die
 	emake || die
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 }
diff --git a/app-misc/gtypist/gtypist-2.6.2.ebuild b/app-misc/gtypist/gtypist-2.6.2.ebuild
index f2842dd8bfc9..04620c696d4b 100644
--- a/app-misc/gtypist/gtypist-2.6.2.ebuild
+++ b/app-misc/gtypist/gtypist-2.6.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.6.2.ebuild,v 1.7 2004/06/24 22:15:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.6.2.ebuild,v 1.8 2004/06/28 03:40:06 vapier Exp $
 
 DESCRIPTION="universal typing tutor"
-SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html"
+SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 }
diff --git a/app-misc/gtypist/gtypist-2.7.ebuild b/app-misc/gtypist/gtypist-2.7.ebuild
index 4289dd6d4649..7285d9e86fa3 100644
--- a/app-misc/gtypist/gtypist-2.7.ebuild
+++ b/app-misc/gtypist/gtypist-2.7.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.7.ebuild,v 1.4 2004/06/24 22:15:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtypist/gtypist-2.7.ebuild,v 1.5 2004/06/28 03:40:06 vapier Exp $
 
 DESCRIPTION="universal typing tutor"
-SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gtypist/gtypist.html"
+SRC_URI="mirror://gnu/gtypist/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO THANKS
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO THANKS
 }