don't do A=

19 files changed, 36 insertions, 60 deletions

diff --git a/app-admin/aide/aide-0.7.ebuild b/app-admin/aide/aide-0.7.ebuild
index 86dc9519f647..152e95d5f383 100644
--- a/app-admin/aide/aide-0.7.ebuild
+++ b/app-admin/aide/aide-0.7.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.7.ebuild,v 1.4 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.7.ebuild,v 1.5 2001/11/10 02:30:19 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a free replacement for Tripwire"
 SRC_URI="http://www.cs.tut.fi/~rammer/${P}.tar.gz"
diff --git a/app-admin/jinit/jinit-0.1.9-r1.ebuild b/app-admin/jinit/jinit-0.1.9-r1.ebuild
index 81b0d164e183..93642bf81f08 100644
--- a/app-admin/jinit/jinit-0.1.9-r1.ebuild
+++ b/app-admin/jinit/jinit-0.1.9-r1.ebuild
@@ -1,12 +1,11 @@
 # 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-admin/jinit/jinit-0.1.9-r1.ebuild,v 1.1 2001/05/28 05:24:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/jinit/jinit-0.1.9-r1.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
-SRC_URI="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/download/${A}"
+SRC_URI="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/download/${P}.tar.gz"
 HOMEPAGE="http://homepage.ntlworld.com/john.fremlin/programs/linux/jinit/
           http://www.atnf.csiro.au/~rgooch/linux/boot-scripts/"
 
diff --git a/app-admin/killproc/killproc-1.12-r2.ebuild b/app-admin/killproc/killproc-1.12-r2.ebuild
index 221755bdd7ab..d6ec84e28deb 100644
--- a/app-admin/killproc/killproc-1.12-r2.ebuild
+++ b/app-admin/killproc/killproc-1.12-r2.ebuild
@@ -1,13 +1,11 @@
 # 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-admin/killproc/killproc-1.12-r2.ebuild,v 1.1 2001/04/05 15:13:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-1.12-r2.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
-P=killproc-1.12
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="killproc and assorted tools for boot scripts"
-SRC_URI="ftp://ftp.suse.com/pub/projects/init/${A}"
+SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
 
 DEPEND="virtual/glibc"
 
diff --git a/app-admin/logrotate/logrotate-3.3-r2.ebuild b/app-admin/logrotate/logrotate-3.3-r2.ebuild
index 84e6f2947aaa..b7538d3839f5 100644
--- a/app-admin/logrotate/logrotate-3.3-r2.ebuild
+++ b/app-admin/logrotate/logrotate-3.3-r2.ebuild
@@ -1,14 +1,13 @@
 # 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-admin/logrotate/logrotate-3.3-r2.ebuild,v 1.2 2001/06/21 20:15:00 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.3-r2.ebuild,v 1.3 2001/11/10 02:30:19 hallski Exp $
 
-P=logrotate-3.3
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Rotates, compresses, and mails system logs"
-SRC_URI="ftp://ftp.redhat.com/redhat/linux/code/logrotate/${A}
-	ftp://ftp.valinux.com/pub/mirrors/redhat/redhat/linux/code/logrotate/${A}"
+SRC_URI="ftp://ftp.redhat.com/redhat/linux/code/${PN}/${P}.tar.gz
+	ftp://ftp.valinux.com/pub/mirrors/redhat/redhat/linux/code/${PN}/{P}.tar.gz"
 
 DEPEND="virtual/glibc
 	>=dev-libs/popt-1.5"
diff --git a/app-admin/metalog/metalog-0.6.ebuild b/app-admin/metalog/metalog-0.6.ebuild
index 18a1465c944d..ef34eb4339e9 100644
--- a/app-admin/metalog/metalog-0.6.ebuild
+++ b/app-admin/metalog/metalog-0.6.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry A! <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.6.ebuild,v 1.4 2001/09/04 02:19:23 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/metalog/metalog-0.6.ebuild,v 1.5 2001/11/10 02:30:19 hallski Exp $
 
-A="${P}.tar.gz"
 S=${WORKDIR}/${P}
-
 DESCRIPTION="A highly configurable replacement for syslogd/klogd"
 
-SRC_URI="http://prdownloads.sourceforge.net/metalog/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.gz"
 HOMEPAGE="http://metalog.sourceforge.net/"
 
 DEPEND="virtual/glibc
diff --git a/app-admin/modlogan/modlogan-0.5.7-r1.ebuild b/app-admin/modlogan/modlogan-0.5.7-r1.ebuild
index 517873d15da0..fb5b83fa5a69 100644
--- a/app-admin/modlogan/modlogan-0.5.7-r1.ebuild
+++ b/app-admin/modlogan/modlogan-0.5.7-r1.ebuild
@@ -1,9 +1,8 @@
 # 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-admin/modlogan/modlogan-0.5.7-r1.ebuild,v 1.3 2001/05/20 13:50:35 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.5.7-r1.ebuild,v 1.4 2001/11/10 02:30:19 hallski Exp $
 
-A="${P}.tar.gz gd-1.8.1.tar.gz"
 S=${WORKDIR}/${P}
 DESCRIPTION="Logfile Analyzer"
 SRC_URI="http://www.kneschke.de/projekte/modlogan/download/${P}.tar.gz
diff --git a/app-admin/modlogan/modlogan-0.7.4.ebuild b/app-admin/modlogan/modlogan-0.7.4.ebuild
index ea1fa4cf3dd8..0bbc541ccd8a 100644
--- a/app-admin/modlogan/modlogan-0.7.4.ebuild
+++ b/app-admin/modlogan/modlogan-0.7.4.ebuild
@@ -1,9 +1,8 @@
 # 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-admin/modlogan/modlogan-0.7.4.ebuild,v 1.1 2001/11/07 12:55:05 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.4.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
-A="${P}.tar.gz gd-1.8.1.tar.gz"
 S=${WORKDIR}/${P}
 DESCRIPTION="Logfile Analyzer"
 SRC_URI="http://www.kneschke.de/projekte/modlogan/download/${P}.tar.gz
diff --git a/app-admin/powertweak/powertweak-0.1.17-r1.ebuild b/app-admin/powertweak/powertweak-0.1.17-r1.ebuild
index 480ee8c0ac09..6e0596e1194f 100644
--- a/app-admin/powertweak/powertweak-0.1.17-r1.ebuild
+++ b/app-admin/powertweak/powertweak-0.1.17-r1.ebuild
@@ -1,14 +1,12 @@
 # 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-admin/powertweak/powertweak-0.1.17-r1.ebuild,v 1.2 2001/10/07 11:11:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/powertweak/powertweak-0.1.17-r1.ebuild,v 1.3 2001/11/10 02:30:19 hallski Exp $
 
 
-
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="Powertweak"
-SRC_URI="http://powertweak.sourceforge.net/files/"${A}
+SRC_URI="http://powertweak.sourceforge.net/files/${P}.tar.bz2"
 HOMEPAGE="http://powertweak.sourceforge.net"
 
 DEPEND=">=x11-libs/gtk+-1.2.10-r4
diff --git a/app-admin/qtsvc/qtsvc-0.1-r1.ebuild b/app-admin/qtsvc/qtsvc-0.1-r1.ebuild
index fd9d74da2f87..a66e73234071 100644
--- a/app-admin/qtsvc/qtsvc-0.1-r1.ebuild
+++ b/app-admin/qtsvc/qtsvc-0.1-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/qtsvc/qtsvc-0.1-r1.ebuild,v 1.1 2001/10/06 15:30:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/qtsvc/qtsvc-0.1-r1.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="A QT frontend for svc"
-SRC_URI="http://www.together.net/~plomp/${A}"
+SRC_URI="http://www.together.net/~plomp/${P}.tar.gz"
 HOMEPAGE="http://www.together.net/~plomp/qtsvc.html"
 
 DEPEND=">=x11-libs/qt-x11-2.2.3"
diff --git a/app-admin/runset/runset-1.4.ebuild b/app-admin/runset/runset-1.4.ebuild
index 5db6e746b4db..f0e300570613 100644
--- a/app-admin/runset/runset-1.4.ebuild
+++ b/app-admin/runset/runset-1.4.ebuild
@@ -1,12 +1,11 @@
 # 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-admin/runset/runset-1.4.ebuild,v 1.1 2001/04/08 18:46:29 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/runset/runset-1.4.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Runset Init suite, a replacement for sysv style initd"
-SRC_URI="ftp://ftp.ocis.net/pub/users/ldeutsch/release/${A}"
+SRC_URI="ftp://ftp.ocis.net/pub/users/ldeutsch/release/${P}.tar.gz"
 
 DEPEND="virtual/glibc"
 
diff --git a/app-admin/sudo/sudo-1.6.3_p7.ebuild b/app-admin/sudo/sudo-1.6.3_p7.ebuild
index 78a1f5171bf0..7ee4cb042e82 100644
--- a/app-admin/sudo/sudo-1.6.3_p7.ebuild
+++ b/app-admin/sudo/sudo-1.6.3_p7.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
 # Author Achim Gottinger <achim@gentoo.org> Update from p5 to p7
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.3_p7.ebuild,v 1.1 2001/04/09 20:11:58 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sudo/sudo-1.6.3_p7.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
 P=${PN}-1.6.3p7
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Allows certain users/groups to run commands as root"
-SRC_URI="http://www.courtesan.com/sudo/dist/${A}"
+SRC_URI="http://www.courtesan.com/sudo/dist/${P}.tar.gz"
 HOMEPAGE="http://www.courtesan.com/sudo/"
 
 DEPEND="virtual/glibc
diff --git a/app-admin/syslog-ng/syslog-ng-1.4.12-r7.ebuild b/app-admin/syslog-ng/syslog-ng-1.4.12-r7.ebuild
index 8dbfcd60ac36..86f1ac50b674 100644
--- a/app-admin/syslog-ng/syslog-ng-1.4.12-r7.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.4.12-r7.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.12-r7.ebuild,v 1.2 2001/09/10 06:19:41 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.12-r7.ebuild,v 1.3 2001/11/10 02:30:19 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Syslog-ng is a syslog replacement with advanced filtering features"
-SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.4/${A}"
+SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.4/${P}.tar.gz"
 HOMEPAGE="http://www.balabit.hu/en/products/syslog-ng/"
 
 RDEPEND="virtual/glibc >=dev-libs/libol-0.2.23"
diff --git a/app-admin/syslog-ng/syslog-ng-1.4.12.ebuild b/app-admin/syslog-ng/syslog-ng-1.4.12.ebuild
index f97c4e4ae337..8a6d0ee496fa 100644
--- a/app-admin/syslog-ng/syslog-ng-1.4.12.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-1.4.12.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.12.ebuild,v 1.4 2001/08/31 03:23:38 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-1.4.12.ebuild,v 1.5 2001/11/10 02:30:19 hallski Exp $
 
 
-
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Syslog-ng is a syslog replacement with advanced filtering features"
-SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.4/${A}"
+SRC_URI="http://www.balabit.hu/downloads/syslog-ng/1.4/${P}.tar.gz"
 HOMEPAGE="http://www.balabit.hu/en/products/syslog-ng/"
 
 RDEPEND="virtual/glibc >=dev-libs/libol-0.2.23"
diff --git a/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild b/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild
index c3a0be9e9ff0..e8d19aa0c0e1 100644
--- a/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild
+++ b/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild
@@ -1,12 +1,11 @@
 # 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-admin/tftp-hpa/tftp-hpa-0.16.ebuild,v 1.1 2001/04/16 10:14:02 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tftp-hpa/tftp-hpa-0.16.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="HPA's TFTP Daemon is a port of the OpenBSD TFTP server"
-SRC_URI="ftp://ftp.kernel.org/pub/software/network/tftp/${A}"
+SRC_URI="ftp://ftp.kernel.org/pub/software/network/tftp/${P}.tar.bz2"
 HOMEPAGE="http://"
 
 DEPEND="virtual/glibc"
diff --git a/app-admin/usbview/usbview-1.0-r1.ebuild b/app-admin/usbview/usbview-1.0-r1.ebuild
index 1ef498051216..b7912cebcd49 100644
--- a/app-admin/usbview/usbview-1.0-r1.ebuild
+++ b/app-admin/usbview/usbview-1.0-r1.ebuild
@@ -1,12 +1,11 @@
 # 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-admin/usbview/usbview-1.0-r1.ebuild,v 1.1 2001/10/06 13:20:34 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.0-r1.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Display the topology of devices on the USB bus"
-SRC_URI="http://www.kroah.com/linux-usb/${A}"
+SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
 HOMEPAGE="http://www.kroah.com/linux-usb/"
 
 DEPEND="virtual/glibc
diff --git a/app-admin/va-systemimager-client/va-systemimager-client-1.4.0.ebuild b/app-admin/va-systemimager-client/va-systemimager-client-1.4.0.ebuild
index 2941556d9357..1d4faacb92e3 100644
--- a/app-admin/va-systemimager-client/va-systemimager-client-1.4.0.ebuild
+++ b/app-admin/va-systemimager-client/va-systemimager-client-1.4.0.ebuild
@@ -1,13 +1,12 @@
 # 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-admin/va-systemimager-client/va-systemimager-client-1.4.0.ebuild,v 1.1 2001/04/17 15:54:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/va-systemimager-client/va-systemimager-client-1.4.0.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
 
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="VA SystemImager software automates the installation of Linux to masses of similar machines."
-SRC_URI="http://download.sourceforge.net/systemimager/${A}"
+SRC_URI="http://download.sourceforge.net/systemimager/${P}.tar.bz2"
 HOMEPAGE="http://systemimager.org"
 
 
diff --git a/app-admin/va-systemimager-server/va-systemimager-server-1.4.0.ebuild b/app-admin/va-systemimager-server/va-systemimager-server-1.4.0.ebuild
index 48b90dc198ac..2e8d644147ad 100644
--- a/app-admin/va-systemimager-server/va-systemimager-server-1.4.0.ebuild
+++ b/app-admin/va-systemimager-server/va-systemimager-server-1.4.0.ebuild
@@ -1,13 +1,12 @@
 # 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-admin/va-systemimager-server/va-systemimager-server-1.4.0.ebuild,v 1.1 2001/04/17 15:54:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/va-systemimager-server/va-systemimager-server-1.4.0.ebuild,v 1.2 2001/11/10 02:30:19 hallski Exp $
 
 
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="VA SystemImager software automates the installation of Linux to masses of similar machines."
-SRC_URI="http://download.sourceforge.net/systemimager/${A}"
+SRC_URI="http://download.sourceforge.net/systemimager/${P}.tar.bz2"
 HOMEPAGE="http://systemimager.org"
 
 
diff --git a/app-admin/webalizer/webalizer-2.01.06.ebuild b/app-admin/webalizer/webalizer-2.01.06.ebuild
index 7906f5eb16a4..39fd750e723e 100644
--- a/app-admin/webalizer/webalizer-2.01.06.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.06.ebuild
@@ -1,13 +1,12 @@
 # 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-admin/webalizer/webalizer-2.01.06.ebuild,v 1.2 2001/06/04 00:16:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.06.ebuild,v 1.3 2001/11/10 02:30:19 hallski Exp $
 
 P=webalizer-2.01-06
-A=${P}-src.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="Webalizer"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/"${A}
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${P}-src.tar.bz2"
 HOMEPAGE="http://www.mrunix.net/webalizer/"
 
 DEPEND="virtual/glibc
diff --git a/app-admin/whowatch/whowatch-1.5.2.ebuild b/app-admin/whowatch/whowatch-1.5.2.ebuild
index a6bca9ac7101..4b15a7c96e0b 100644
--- a/app-admin/whowatch/whowatch-1.5.2.ebuild
+++ b/app-admin/whowatch/whowatch-1.5.2.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author AJ Lewis <aj@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.5.2.ebuild,v 1.2 2001/07/15 18:15:46 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/whowatch-1.5.2.ebuild,v 1.3 2001/11/10 02:30:19 hallski Exp $
 
-#P=
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="an interactive who-like program that displays information
 about the users currently logged on to the machine, in real time."
-SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${A}"
+SRC_URI="http://wizard.ae.krakow.pl/~mike/download/${P}.tar.gz"
 HOMEPAGE="http://wizard.ae.krakow.pl/~mike/"
 
 DEPEND="virtual/glibc sys-libs/ncurses"