Slew of updates. Updated to the latest versions of the affected

programs, cleaned up the ebuilds to conform to the new standards, and
removed the older/stale versions...

27 files changed, 225 insertions, 370 deletions

diff --git a/app-admin/gkrellm/files/digest-gkrellm-1.2.2-r1 b/app-admin/gkrellm/files/digest-gkrellm-1.2.2-r1
deleted file mode 100644
index 233f51e5c723..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-1.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5eb9f0d8c861f4a5b40c0cded3e53ecc gkrellm-1.2.2.tar.gz 499712
diff --git a/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild b/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild
deleted file mode 100644
index 7bb02cc6d165..000000000000
--- a/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
-
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.gz"
-
-DEPEND="virtual/glibc
-        >=x11-libs/gtk+-1.2.10-r4
-        >=media-libs/imlib-1.9.10-r1"
-
-src_compile() {
-
-    emake  PREFIX=/usr prefix=/usr || die
-
-}
-
-src_install () {
-
-    cd src
-	 exeinto /usr/bin
-    doexe gkrellm
-
-    insinto /usr/include/gkrellm
-    for i in gkrellm.h gkrellm_private_proto.h gkrellm_public_proto.h
-    do
-      doins $i
-    done
-
-    dodir /usr/share/gkrellm/{themes,plugins}
-
-    cd ${S}
-
-    dodoc COPYRIGHT README Changelog
-    docinto html
-    dodoc Changelog-plugins.html Changelog-themes.html Themes.html
-}
-
-
diff --git a/app-admin/gkrellm/gkrellm-1.2.4.ebuild b/app-admin/gkrellm/gkrellm-1.2.4.ebuild
index 3de232b5885f..a3f1074bf27f 100644
--- a/app-admin/gkrellm/gkrellm-1.2.4.ebuild
+++ b/app-admin/gkrellm/gkrellm-1.2.4.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.4.ebuild,v 1.1 2001/11/26 20:35:20 azarah Exp $
+# /space/gentoo/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.2-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp
+
+
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.gz"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.gz"
+HOMEPAGE="http://www.gkrellm.net/"
 
 DEPEND="virtual/glibc
 	>=x11-libs/gtk+-1.2.10-r4
@@ -13,26 +16,26 @@ DEPEND="virtual/glibc
 
 
 src_compile() {
+	emake  PREFIX=/usr prefix=/usr || die
+}
 
-	use nls && ./enable_nls
+src_install() {
+	cd ${S}/src
 
-	emake || die
+	exeinto /usr/bin
+	doexe gkrellm
 
-}
+	insinto /usr/include/gkrellm
+	for i in gkrellm.h gkrellm_private_proto.h gkrellm_public_proto.h
+	do
+		doins $i
+	done
 
-src_install () {
+	dodir /usr/share/gkrellm/{themes,plugins}
 
-	dodir /usr/{bin,include,share/man}
-
-	make install \
-		INSTALLDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man/man1 \
-		INCLUDEDIR=${D}/usr/include \
-		LOCALEDIR=/usr/share/locale
+	cd ${S}
 
 	dodoc COPYRIGHT README Changelog
 	docinto html
 	dodoc Changelog-plugins.html Changelog-themes.html Themes.html
 }
-
-
diff --git a/app-editors/vile/files/digest-vile-9.2-r1 b/app-editors/vile/files/digest-vile-9.2-r1
deleted file mode 100644
index 67d115d7404a..000000000000
--- a/app-editors/vile/files/digest-vile-9.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 92b9c329db3f6a528b3b82296714bf4c vile-9.2.tgz 1335296
diff --git a/app-editors/vile/files/digest-vile-9.2p b/app-editors/vile/files/digest-vile-9.2p
new file mode 100644
index 000000000000..8f47aa5e99c3
--- /dev/null
+++ b/app-editors/vile/files/digest-vile-9.2p
@@ -0,0 +1,17 @@
+MD5 92b9c329db3f6a528b3b82296714bf4c vile-9.2.tgz 1339392
+MD5 a2c5d562302202fe2632746fed0bfbd4 vile-9.2a.patch.gz 32768
+MD5 110dc49ca162ff551c478edb9fd49635 vile-9.2b.patch.gz 49152
+MD5 a48389242027723dbdd41dc1fc605026 vile-9.2c.patch.gz 20480
+MD5 513fda8ab5fa3156481966a4451cc36b vile-9.2d.patch.gz 8192
+MD5 1f3eccdb4527e7fb4649ac8a343e9100 vile-9.2e.patch.gz 57344
+MD5 924a1e612631f8dc0c280096ca68ccad vile-9.2f.patch.gz 32768
+MD5 535e3eb334fa7da30bd61cc3a37e9001 vile-9.2g.patch.gz 94208
+MD5 02db5c9325dd07eec5824f5756f306ad vile-9.2h.patch.gz 8192
+MD5 8a7eac1ffe4693bfeb2fcd07e3593d4c vile-9.2i.patch.gz 24576
+MD5 6acba886d739f7d5cf3d6dadec2bcaa8 vile-9.2j.patch.gz 40960
+MD5 da6a196ff683af2c8a8b922f6210c9fa vile-9.2k.patch.gz 16384
+MD5 ea64890f72949ff12d6dbf67674e2cfb vile-9.2l.patch.gz 90112
+MD5 2d894ab312220a374d92b8a85052d5a0 vile-9.2m.patch.gz 40960
+MD5 0a72aff7483f97cff95b68557946f4d0 vile-9.2n.patch.gz 45056
+MD5 9a5709ffe2fe0f246e9cbcf9f2fd4870 vile-9.2o.patch.gz 98304
+MD5 c7ffc3c104e00c559eb546487b61a2a7 vile-9.2p.patch.gz 77824
diff --git a/app-editors/vile/vile-9.2-r1.ebuild b/app-editors/vile/vile-9.2-r1.ebuild
deleted file mode 100644
index 5d1b570f2fb9..000000000000
--- a/app-editors/vile/vile-9.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vile/vile-9.2-r1.ebuild,v 1.3 2001/11/10 02:54:28 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
-SRC_URI="ftp://dickey.his.com/vile/${P}.tgz"
-HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
-
-DEPEND="virtual/glibc
-        sys-devel/flex
-        >=sys-libs/ncurses-5.2
-        perl? ( sys-devel/perl )"
-
-RDEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2"
-
-src_compile() {
-    local myconf
-    if [ "`use perl`" ] ; then
-      myconf="--with-perl"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
-        $myconf --with-ncurses
-    try make
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc CHANGES* MANIFEST README
-
-}
diff --git a/app-editors/vile/vile-9.2p.ebuild b/app-editors/vile/vile-9.2p.ebuild
new file mode 100644
index 000000000000..2b8fdeb7f027
--- /dev/null
+++ b/app-editors/vile/vile-9.2p.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Jerry Alexandratos <jerry@gentoo.org>
+# /space/gentoo/cvsroot/gentoo-x86/app-editors/vile/vile-9.2-r1.ebuild,v 1.3 2001/11/10 02:54:28 hallski Exp
+
+S=${WORKDIR}/vile-9.2
+DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
+SRC_URI="ftp://ftp.phred.org/pub/vile/vile-9.2.tgz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2a.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2b.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2c.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2d.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2e.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2f.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2g.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2h.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2i.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2j.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2k.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2l.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2m.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2n.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2o.patch.gz
+	ftp://ftp.phred.org/pub/vile/patches/vile-9.2p.patch.gz"
+HOMEPAGE="http://www.clark.net/pub/dickey/vile/vile.html"
+
+DEPEND="virtual/glibc
+	sys-devel/flex
+	>=sys-libs/ncurses-5.2
+	perl? ( sys-devel/perl )"
+
+RDEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.2"
+
+
+src_unpack() {
+	unpack vile-9.2.tgz
+
+	cd ${S}
+	local i
+	for i in a b c d e f g h i j k l m n o p
+	do
+		gunzip -c ${DISTDIR}/vile-9.2$i.patch.gz | patch -p1
+	done
+}
+
+src_compile() {
+	local myconf
+	use perl && myconf="--with-perl"
+
+	./configure --prefix=/usr --host=${CHOST} \
+		--mandir=/usr/share/man \
+		--with-ncurses \
+		$myconf || die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc CHANGES* MANIFEST README
+}
diff --git a/app-shells/zsh/files/digest-zsh-3.1.9-r1 b/app-shells/zsh/files/digest-zsh-3.1.9-r1
deleted file mode 100644
index 96da171c9d1e..000000000000
--- a/app-shells/zsh/files/digest-zsh-3.1.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b69ed3f04d2a3eb676f8d2ace562270a zsh-3.1.9.tar.gz 1859584
diff --git a/app-shells/zsh/files/digest-zsh-4.0.2 b/app-shells/zsh/files/digest-zsh-4.0.2
deleted file mode 100644
index 84b41d895f24..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38611d4ddd2547668d48867772ce214e zsh-4.0.2.tar.gz 2105344
diff --git a/app-shells/zsh/files/digest-zsh-4.0.4 b/app-shells/zsh/files/digest-zsh-4.0.4
new file mode 100644
index 000000000000..19e0d84d88b5
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.0.4
@@ -0,0 +1 @@
+MD5 c49e228c269b2ff4a0001941f4eb3bf7 zsh-4.0.4.tar.gz 2129920
diff --git a/app-shells/zsh/zsh-3.1.9-r1.ebuild b/app-shells/zsh/zsh-3.1.9-r1.ebuild
deleted file mode 100644
index 08e67171bb0f..000000000000
--- a/app-shells/zsh/zsh-3.1.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-3.1.9-r1.ebuild,v 1.2 2001/11/10 03:07:01 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz"
-HOMEPAGE="www.zsh.org/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1"
-
-src_compile() {
-
-    try ./configure --prefix=/ --mandir=/usr/share/man \
-	    --libdir=/usr/lib --host=${CHOST}
-	try make
-}
-
-src_install() {
-
-	try make prefix=${D} mandir=${D}/usr/share/man \
-		libdir=${D}/usr/lib \
-		install.bin install.man install.modules
-
-	dodoc ChangeLog META-FAQ README
-	docinto StartupFiles
- 	dodoc StartupFiles/z*
-
-}
-
-
-
-
diff --git a/app-shells/zsh/zsh-4.0.2.ebuild b/app-shells/zsh/zsh-4.0.4.ebuild
index fc22f134e5aa..764ec0cefc7b 100644
--- a/app-shells/zsh/zsh-4.0.2.ebuild
+++ b/app-shells/zsh/zsh-4.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # This ebuild by Parag Mehta <pm@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.2.ebuild,v 1.6 2001/11/10 03:07:01 hallski Exp $
+# /space/gentoo/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.2.ebuild,v 1.6 2001/11/10 03:07:01 hallski Exp
 
 
 S=${WORKDIR}/${P}
@@ -13,33 +13,32 @@ HOMEPAGE="www.zsh.org/"
 DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1"
 
-src_compile() {
 
-    try ./configure --prefix=/ --mandir=/usr/share/man \
-	--libdir=/usr/lib --host=${CHOST} --infodir=/usr/share/info \
-        --enable-maildir-support --enable-etcdir=/etc/zsh \
-	--enable-zshenv=/etc/zsh/zshenv --enable-zshlogin=/etc/zsh/zshlogin \
-	--enable-zshrc=/etc/zsh/zshrc --enable-fndir=/usr/share \
-	--enable-function-subdirs
-	try make 
-	try make check
+src_compile() {
+	./configure --prefix=/ --host=${CHOST} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/lib \
+		--infodir=/usr/share/info \
+		--enable-maildir-support \
+		--enable-etcdir=/etc/zsh \
+		--enable-zshenv=/etc/zsh/zshenv \
+		--enable-zshlogin=/etc/zsh/zshlogin \
+		--enable-zshrc=/etc/zsh/zshrc \
+		--enable-fndir=/usr/share \
+		--enable-function-subdirs || die
+	emake || die
+	make check || die
 }
 
 src_install() {
-
-	try make prefix=${D} mandir=${D}/usr/share/man \
+	make prefix=${D} mandir=${D}/usr/share/man \
 		libdir=${D}/usr/lib fndir=${D}/usr/share \
 		install.bin install.man install.modules \
-		install.info 
+		install.info || die
 		
 	dodoc ChangeLog META-FAQ README INSTALL LICENCE config.modules
 	docinto StartupFiles
  	dodoc StartupFiles/z*
 	dodir /etc/zsh
 	cp ${S}/StartupFiles/z* ${D}/etc/zsh
-	
 }
-
-
-
-
diff --git a/media-video/xawtv/files/digest-xawtv-3.45 b/media-video/xawtv/files/digest-xawtv-3.45
deleted file mode 100644
index a259e0c662ce..000000000000
--- a/media-video/xawtv/files/digest-xawtv-3.45
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad3f41257a7e54f39779f7d6baef85c5 xawtv_3.45.tar.gz 380928
diff --git a/media-video/xawtv/files/digest-xawtv-3.53 b/media-video/xawtv/files/digest-xawtv-3.53
deleted file mode 100644
index 46b94f673966..000000000000
--- a/media-video/xawtv/files/digest-xawtv-3.53
+++ /dev/null
@@ -1 +0,0 @@
-MD5 278c06b2f3d0408647f6a59a7805fceb xawtv_3.53.tar.gz 401408
diff --git a/media-video/xawtv/files/digest-xawtv-3.60 b/media-video/xawtv/files/digest-xawtv-3.60
deleted file mode 100644
index 07a9edfadd6f..000000000000
--- a/media-video/xawtv/files/digest-xawtv-3.60
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c0852b4e1ca990e02812626f6075ad40 xawtv_3.60.tar.gz 442368
diff --git a/media-video/xawtv/files/digest-xawtv-3.64 b/media-video/xawtv/files/digest-xawtv-3.64
new file mode 100644
index 000000000000..f3f9c6908039
--- /dev/null
+++ b/media-video/xawtv/files/digest-xawtv-3.64
@@ -0,0 +1 @@
+MD5 4efe15fcf2f61cb4accbcf6f3b81e57e xawtv_3.64.tar.gz 454656
diff --git a/media-video/xawtv/xawtv-3.45.ebuild b/media-video/xawtv/xawtv-3.45.ebuild
deleted file mode 100644
index 953a1a36b87e..000000000000
--- a/media-video/xawtv/xawtv-3.45.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.45.ebuild,v 1.2 2001/05/16 11:36:45 achim Exp $
-
-A=xawtv_${PV}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="TV application for the bttv driver"
-SRC_URI="http://www.strusel007.de/linux/xawtv/${A}"
-HOMEPAGE="http://www.strusel007.de/linux/xawtv/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=media-libs/jpeg-6b
-        >=media-libs/libpng-1.0.8
-	>=x11-base/xfree-4.0.1"
-
-src_compile() {
-
-  unset DEPEND
-  try ./configure --host=${CHOST} --prefix=/usr \
-	--enable-jpeg --enable-xfree-ext --enable-xvideo --with-x
-  try make
-}
-
-src_install() {
-
-  try make prefix=${D}/usr mandir=${D}/usr/share/man \
-	resdir=${D}/etc/X11/app-defaults install
-
-  dodoc COPYING Changes KNOWN_PROBLEMS Miro_gpio.txt Programming-FAQ
-  dodoc README* Sound-FAQ TODO Trouble-Shooting UPDATE_TO_v3.0
-  insinto /usr/local/httpd/cgi-bin
-  insopts -m 755
-  doins webcam/webcam.cgi
-
-}
-
-
-
-
-
-
diff --git a/media-video/xawtv/xawtv-3.53.ebuild b/media-video/xawtv/xawtv-3.53.ebuild
deleted file mode 100644
index b62395db74cf..000000000000
--- a/media-video/xawtv/xawtv-3.53.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.53.ebuild,v 1.2 2001/06/21 15:59:30 achim Exp $
-
-A=xawtv_${PV}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="TV application for the bttv driver"
-SRC_URI="http://www.strusel007.de/linux/xawtv/${A}"
-HOMEPAGE="http://www.strusel007.de/linux/xawtv/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=media-libs/jpeg-6b
-        >=media-libs/libpng-1.0.8
-	>=x11-base/xfree-4.0.1
-	motif? ( x11-libs/openmotif )
-	aalib? ( media-libs/aalib )
-	quicktime? ( media-libs/quicktime4linux )"
-
-src_compile() {
-
-  unset DEPEND
-  if [ "`use motif`" ] ; then
-    myconf="--enable-motif"
-  else
-    myconf="--disable-motif"
-  fi
-  if [ "`use aalib`" ] ; then
-    myconf="$myconf --enable-aa"
-  else
-    myconf="$myconf --disable-aa"
-  fi
-  if [ "`use quicktime`" ] ; then
-    myconf="$myconf --enable-quicktime"
-  else
-    myconf="$myconf --disable-quicktime"
-  fi
-  touch src/Xawtv.h src/MoTV.h
-  try ./configure --host=${CHOST} --prefix=/usr --disable-lirc \
-	--enable-jpeg --enable-xfree-ext --enable-xvideo --with-x ${myconf}
-  try make
-}
-
-src_install() {
-
-  try make prefix=${D}/usr mandir=${D}/usr/share/man \
-	resdir=${D}/etc/X11/app-defaults install
-
-  dodoc COPYING Changes KNOWN_PROBLEMS Miro_gpio.txt Programming-FAQ
-  dodoc README* Sound-FAQ TODO Trouble-Shooting UPDATE_TO_v3.0
-  insinto /usr/local/httpd/cgi-bin
-  insopts -m 755
-  doins webcam/webcam.cgi
-
-}
-
-
-
-
-
-
diff --git a/media-video/xawtv/xawtv-3.60.ebuild b/media-video/xawtv/xawtv-3.60.ebuild
deleted file mode 100644
index 99dd4abddd6b..000000000000
--- a/media-video/xawtv/xawtv-3.60.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.60.ebuild,v 1.1 2001/08/25 21:26:32 achim Exp $
-
-A=xawtv_${PV}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="TV application for the bttv driver"
-SRC_URI="http://www.strusel007.de/linux/xawtv/${A}"
-HOMEPAGE="http://www.strusel007.de/linux/xawtv/"
-
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.1
-	>=media-libs/jpeg-6b
-        >=media-libs/libpng-1.0.8
-	>=x11-base/xfree-4.0.1
-	motif? ( x11-libs/openmotif )
-	aalib? ( media-libs/aalib )
-	quicktime? ( media-libs/quicktime4linux )"
-
-src_compile() {
-
-  unset DEPEND
-  if [ "`use motif`" ] ; then
-    myconf="--enable-motif"
-  else
-    myconf="--disable-motif"
-  fi
-  if [ "`use aalib`" ] ; then
-    myconf="$myconf --enable-aa"
-  else
-    myconf="$myconf --disable-aa"
-  fi
-  if [ "`use quicktime`" ] ; then
-    myconf="$myconf --enable-quicktime"
-  else
-    myconf="$myconf --disable-quicktime"
-  fi
-  touch src/Xawtv.h src/MoTV.h
-  try ./configure --host=${CHOST} --prefix=/usr --disable-lirc \
-	--enable-jpeg --enable-xfree-ext --enable-xvideo --with-x ${myconf}
-  try make
-}
-
-src_install() {
-
-  try make prefix=${D}/usr mandir=${D}/usr/share/man \
-	resdir=${D}/etc/X11/app-defaults install
-
-  dodoc COPYING Changes KNOWN_PROBLEMS Miro_gpio.txt Programming-FAQ
-  dodoc README* Sound-FAQ TODO Trouble-Shooting UPDATE_TO_v3.0
-  insinto /usr/local/httpd/cgi-bin
-  insopts -m 755
-  doins webcam/webcam.cgi
-
-}
-
-
-
-
-
-
diff --git a/media-video/xawtv/xawtv-3.64.ebuild b/media-video/xawtv/xawtv-3.64.ebuild
new file mode 100644
index 000000000000..599aa98772cf
--- /dev/null
+++ b/media-video/xawtv/xawtv-3.64.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# /space/gentoo/cvsroot/gentoo-x86/media-video/xawtv/xawtv-3.60.ebuild,v 1.1 2001/08/25 21:26:32 achim Exp
+
+S=${WORKDIR}/${P}
+DESCRIPTION="TV application for the bttv driver"
+SRC_URI="http://bytesex.org/xawtv/xawtv_3.64.tar.gz"
+HOMEPAGE="http://bytesex.org/xawtv/"
+
+DEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	>=media-libs/libpng-1.0.8
+	>=x11-base/xfree-4.0.1
+	motif? ( x11-libs/openmotif )
+	aalib? ( media-libs/aalib )
+	quicktime? ( media-libs/quicktime4linux )"
+
+
+src_compile() {
+	local myconf
+	use motif && myconf="--enable-motif" \
+		|| myconf="--disable-motif"
+	use aalib && myconf="$myconf --enable-aa" \
+		|| myconf="$myconf --disable-aa"
+	use quicktime && myconf="$myconf --enable-quicktime" \
+		|| myconf="$myconf --disable-quicktime"
+
+	touch src/Xawtv.h src/MoTV.h
+
+	./configure  --prefix=/usr --host=${CHOST} \
+		--disable-lirc \
+		--enable-jpeg \
+		--enable-xfree-ext \
+		--enable-xvideo \
+		--with-x \
+		$myconf
+
+	emake || die
+}
+
+src_install() {
+	make prefix=${D}/usr mandir=${D}/usr/share/man \
+		resdir=${D}/etc/X11/app-defaults install
+
+	dodoc COPYING Changes KNOWN_PROBLEMS Miro_gpio.txt
+	dodoc Programming-FAQ README* Sound-FAQ TODO
+	dodoc Trouble-Shooting UPDATE_TO_v3.0
+
+	insinto /usr/local/httpd/cgi-bin
+	insopts -m 755
+	doins webcam/webcam.cgi
+}
diff --git a/x11-terms/aterm/aterm-0.4.0.ebuild b/x11-terms/aterm/aterm-0.4.0.ebuild
deleted file mode 100644
index 6b19dfd20235..000000000000
--- a/x11-terms/aterm/aterm-0.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Aaron Blew <moath@oddbox.org>
-# /home/cvsroot/gentoo-x86/x11-terms/aterm/,v 1.2 2001/02/15 18:17:31 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.0.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatability"
-SRC_URI="http://prdownloads.sourceforge.net/aterm/${A}"
-HOMEPAGE="http://aterm.sourceforge.net"
-
-DEPEND=">=media-libs/jpeg-6b-r2
-		>=media-libs/libpng-1.0.11
-		virtual/x11"
-
-src_compile() {
-
-    try ./configure --prefix=/usr --host=${CHOST} --enable-transparency \
-	--enable-background-image --enable-menubar \
-	--enable-graphics --with-x
-    try make
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc TODO ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.menu
-    docinto menu
-    dodoc doc/menu/*
-    docinto html
-    dodoc *.html
-
-}
-
diff --git a/x11-terms/aterm/aterm-0.4.2.ebuild b/x11-terms/aterm/aterm-0.4.2.ebuild
new file mode 100644
index 000000000000..5472e5f76be2
--- /dev/null
+++ b/x11-terms/aterm/aterm-0.4.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Aaron Blew <moath@oddbox.org>
+# /home/cvsroot/gentoo-x86/x11-terms/aterm/,v 1.2 2001/02/15 18:17:31 achim Exp
+# /space/gentoo/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.0.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatability"
+SRC_URI="http://prdownloads.sf.net/aterm/${P}.tar.gz"
+HOMEPAGE="http://aterm.sourceforge.net"
+
+DEPEND=">=media-libs/jpeg-6b-r2
+	>=media-libs/libpng-1.0.11
+	virtual/x11"
+
+
+src_compile() {
+	./configure --prefix=/usr --host=${CHOST} \
+		--enable-transparency \
+		--enable-background-image \
+		--enable-menubar \
+		--enable-graphics \
+		--with-x
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	dodoc TODO ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.menu
+	docinto menu
+	dodoc doc/menu/*
+	docinto html
+	dodoc *.html
+}
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.0 b/x11-terms/aterm/files/digest-aterm-0.4.0
deleted file mode 100644
index 2ca1e038fbed..000000000000
--- a/x11-terms/aterm/files/digest-aterm-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae09530c1721681e151a2048146d7fd0 aterm-0.4.0.tar.gz 307200
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2 b/x11-terms/aterm/files/digest-aterm-0.4.2
new file mode 100644
index 000000000000..78e6c266b19b
--- /dev/null
+++ b/x11-terms/aterm/files/digest-aterm-0.4.2
@@ -0,0 +1 @@
+MD5 d046fcf7fadd661dd5efb393a43c57b1 aterm-0.4.2.tar.gz 319488
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.0-r1 b/x11-wm/fvwm/files/digest-fvwm-2.4.0-r1
deleted file mode 100644
index 5dc2a40fe19e..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 897f7fb2c4f23bc246eeb36d0dd1a2c2 fvwm-2.4.0.tar.bz2 1265664
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.4.3 b/x11-wm/fvwm/files/digest-fvwm-2.4.3
new file mode 100644
index 000000000000..320e2c496b44
--- /dev/null
+++ b/x11-wm/fvwm/files/digest-fvwm-2.4.3
@@ -0,0 +1 @@
+MD5 3fd013d29242570359028ec0096f8ae6 fvwm-2.4.3.tar.bz2 1306624
diff --git a/x11-wm/fvwm/fvwm-2.4.0-r1.ebuild b/x11-wm/fvwm/fvwm-2.4.3.ebuild
index 0a40a89d19ab..fe17ddd52c35 100644
--- a/x11-wm/fvwm/fvwm-2.4.0-r1.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Prakash Shetty <crux@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.0-r1.ebuild,v 1.3 2001/10/12 01:07:55 hallski Exp $
+# /space/gentoo/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.0-r1.ebuild,v 1.3 2001/10/12 01:07:55 hallski Exp
 
 
 S=${WORKDIR}/${P}
@@ -15,19 +15,23 @@ DEPEND="virtual/glibc
 	>=dev-libs/libstroke-0.4
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
 
+
 src_compile() {
-    local myconf
-    if [ -n "$( use gnome )" ]
-    then
-	myconf="--with-gnome"
-    else
-	myconf="--without-gnome"
-    fi
-    try ./configure --prefix=/usr --libexecdir=/usr/lib \
-	--mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST} ${myconf}
-    try make
+	local myconf
+	if [ -n "$( use gnome )" ]; then
+		myconf="--with-gnome"
+	else
+		myconf="--without-gnome"
+	fi
+
+	./configure --prefix=/usr --host=${CHOST} \
+		--libexecdir=/usr/lib \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info ${myconf}
+
+	emake || die
 }
 
 src_install () {
-    try make DESTDIR=${D} install
+	make DESTDIR=${D} install || die
 }