8 files changed, 16 insertions, 26 deletions
diff --git a/app-arch/dump/dump-0.4.21-r2.ebuild b/app-arch/dump/dump-0.4.21-r2.ebuild
index 44762c45ba65..ca8a6f0e1695 100644
--- a/app-arch/dump/dump-0.4.21-r2.ebuild
+++ b/app-arch/dump/dump-0.4.21-r2.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-arch/dump/dump-0.4.21-r2.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.21-r2.ebuild,v 1.3 2001/11/10 02:33:03 hallski Exp $
 
 P=dump-0.4b21
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Dump/restore ext2fs backup utilities"
-SRC_URI="http://download.sourceforge.net/dump/${A}"
+SRC_URI="http://download.sourceforge.net/dump/${P}.tar.gz"
 HOMEPAGE="http://dump.sourceforge.net"
 
 DEPEND=">=sys-apps/e2fsprogs-1.19
diff --git a/app-arch/dump/dump-0.4.24.ebuild b/app-arch/dump/dump-0.4.24.ebuild
index 8eca0d19ddb7..2cf9d09d19d0 100644
--- a/app-arch/dump/dump-0.4.24.ebuild
+++ b/app-arch/dump/dump-0.4.24.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-arch/dump/dump-0.4.24.ebuild,v 1.1 2001/09/29 15:13:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dump/dump-0.4.24.ebuild,v 1.2 2001/11/10 02:33:03 hallski Exp $
 
 P=dump-0.4b24
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Dump/restore ext2fs backup utilities"
-SRC_URI="http://download.sourceforge.net/dump/${A}"
+SRC_URI="http://download.sourceforge.net/dump/${P}.tar.gz"
 HOMEPAGE="http://dump.sourceforge.net"
 
 DEPEND=">=sys-apps/e2fsprogs-1.19
diff --git a/app-arch/kfilecoder/kfilecoder-0.5.0-r1.ebuild b/app-arch/kfilecoder/kfilecoder-0.5.0-r1.ebuild
index 0a3440945212..6c1909edac08 100644
--- a/app-arch/kfilecoder/kfilecoder-0.5.0-r1.ebuild
+++ b/app-arch/kfilecoder/kfilecoder-0.5.0-r1.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 Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-arch/kfilecoder/kfilecoder-0.5.0-r1.ebuild,v 1.6 2001/09/19 19:37:47 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/kfilecoder/kfilecoder-0.5.0-r1.ebuild,v 1.7 2001/11/10 02:33:03 hallski Exp $
 
 
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="Archiver with passwd management "
-SRC_URI="http://download.sourceforge.net/kfilecoder/${A}"
+SRC_URI="http://download.sourceforge.net/kfilecoder/${P}.tar.bz2"
 HOMEPAGE="http://kfilecoder.sourceforge.net"
 
 DEPEND=">=kde-base/kdebase-2.1.1"
diff --git a/app-arch/rpm/rpm-3.0.6-r1.ebuild b/app-arch/rpm/rpm-3.0.6-r1.ebuild
index 34f971455e33..44d3a6e46d25 100644
--- a/app-arch/rpm/rpm-3.0.6-r1.ebuild
+++ b/app-arch/rpm/rpm-3.0.6-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-arch/rpm/rpm-3.0.6-r1.ebuild,v 1.4 2001/05/28 05:24:13 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-3.0.6-r1.ebuild,v 1.5 2001/11/10 02:33:03 hallski Exp $
 
-A="${P}.tar.gz"
 S=${WORKDIR}/${P}
 DESCRIPTION="Red Hat Package Management Utils"
-SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${A}"
+SRC_URI="ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/${P}.tar.gz"
 HOMEPAGE="http://www.rpm.org/"
 
 RDEPEND="=sys-libs/db-1.85-r1
diff --git a/app-arch/unrar/unrar-2.50.ebuild b/app-arch/unrar/unrar-2.50.ebuild
index 6a44d0b873ba..cc129b115826 100644
--- a/app-arch/unrar/unrar-2.50.ebuild
+++ b/app-arch/unrar/unrar-2.50.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 Joe Bormolini <lordjoe@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-2.50.ebuild,v 1.4 2001/09/10 17:39:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-2.50.ebuild,v 1.5 2001/11/10 02:33:03 hallski Exp $
 
-A=unrar250.zip
 S=${WORKDIR}/${P}
 DESCRIPTION="Uncompress rar files"
-SRC_URI="ftp://ftp.elf.stuba.sk/pub/pc/pack/${A}"
+SRC_URI="ftp://ftp.elf.stuba.sk/pub/pc/pack/unrar250.zip"
 HOMEPAGE="ftp://ftp.elf.stuba.sk/pub/pc/pack"
 
 DEPEND="virtual/glibc app-arch/unzip"
diff --git a/app-arch/unzip/unzip-5.41-r2.ebuild b/app-arch/unzip/unzip-5.41-r2.ebuild
index a01a6f0214f2..8ac9fe42613a 100644
--- a/app-arch/unzip/unzip-5.41-r2.ebuild
+++ b/app-arch/unzip/unzip-5.41-r2.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-arch/unzip/unzip-5.41-r2.ebuild,v 1.1 2001/02/09 10:01:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.41-r2.ebuild,v 1.2 2001/11/10 02:33:03 hallski Exp $
 
-A=unzip541.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Unzipper for pkzip-compressed files"
-SRC_URI="ftp://ftp.freesoftware.com/pub/infozip/src/${A}"
+SRC_URI="ftp://ftp.freesoftware.com/pub/infozip/src/unzip541.tar.gz"
 HOMEPAGE="ftp://ftp.info-zip.org/pub/infozip/UnZip.html"
 
 DEPEND="virtual/glibc"
diff --git a/app-arch/unzip/unzip-5.42.ebuild b/app-arch/unzip/unzip-5.42.ebuild
index 4dbf76b054a6..c7de843344a2 100644
--- a/app-arch/unzip/unzip-5.42.ebuild
+++ b/app-arch/unzip/unzip-5.42.ebuild
@@ -1,14 +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-arch/unzip/unzip-5.42.ebuild,v 1.3 2001/11/01 19:47:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.42.ebuild,v 1.4 2001/11/10 02:33:03 hallski Exp $
 
-A=unzip542.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Unzipper for pkzip-compressed files"
-#SRC_URI="ftp://ftp.freesoftware.com/pub/infozip/src/${A}"
-SRC_URI="http://soft.ivanovo.ru/Linux/${A}"
-#         http://mirrors.rcn.com/pub/OpenBSD/distfiles/${A}"
+SRC_URI="http://soft.ivanovo.ru/Linux/unzip542.tar.gz"
 
 HOMEPAGE="ftp://ftp.info-zip.org/pub/infozip/UnZip.html"
 
diff --git a/app-arch/zip/zip-2.3-r1.ebuild b/app-arch/zip/zip-2.3-r1.ebuild
index c6507187841b..e6feba2a0e1a 100644
--- a/app-arch/zip/zip-2.3-r1.ebuild
+++ b/app-arch/zip/zip-2.3-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-arch/zip/zip-2.3-r1.ebuild,v 1.2 2001/08/29 01:49:51 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.3-r1.ebuild,v 1.3 2001/11/10 02:33:03 hallski Exp $
 
-A=zip23.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Info ZIP"
-SRC_URI="http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${A}"
+SRC_URI="http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${PN}23.tar.gz"
 HOMEPAGE="ftp://ftp.freesoftware.com/pub/infozip/Zip.html"
 
 DEPEND="virtual/glibc"