SRC_URI updates and patch to epatch conversions

60 files changed, 145 insertions, 143 deletions

diff --git a/app-admin/aide/Manifest b/app-admin/aide/Manifest
index 062df319c5e3..f424a3b1b57b 100644
--- a/app-admin/aide/Manifest
+++ b/app-admin/aide/Manifest
@@ -1,6 +1,6 @@
 MD5 c7b0e1d0ec7f540428ef6885aa929e19 ChangeLog 2035
 MD5 ae9b83ed9e8124e299cad5382611e97a aide-0.8.ebuild 1119
-MD5 03c14336929789f977b49244437acb50 aide-0.9.ebuild 1341
+MD5 5aefded90fd3c7339e09ceacbea0ec2c aide-0.9.ebuild 1337
 MD5 f07734c5b540f7a251d3d8139ef0f75f files/aide-0.9-gentoo.diff 2319
 MD5 0aaf7c0b95dbe77c4d731564a75306c2 files/digest-aide-0.8 60
 MD5 b26d49d6bcafd39178a0da345cb2985d files/digest-aide-0.9 60
diff --git a/app-admin/aide/aide-0.9.ebuild b/app-admin/aide/aide-0.9.ebuild
index b30b85a03127..75f99d3b13e0 100644
--- a/app-admin/aide/aide-0.9.ebuild
+++ b/app-admin/aide/aide-0.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.9.ebuild,v 1.12 2003/08/11 20:14:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/aide/aide-0.9.ebuild,v 1.13 2003/09/20 19:56:28 aliz Exp $
 
 inherit eutils
 
 DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
 HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 6d5a5ce2e216..58cd5475f7cb 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -1,9 +1,9 @@
+MD5 64deec868bc266d063c40fbd613b29d3 ChangeLog 1836
+MD5 1f44443b122802c6b405d8ef8aa37c23 analog-5.24.ebuild 1355
+MD5 14723a1e491bd4372a630ea3552c3f02 analog-5.31.ebuild 1366
+MD5 177bd79ef4967f4d9cf9b2844203e67c analog-5.32.ebuild 1355
 MD5 2fb240fa271f7dd72dd56552f60729ab files/analog-5.1-gentoo.diff 888
 MD5 bea5158163ebee10b42f2a008cf660d7 files/analog.cfg 3992
 MD5 bb35a653587a0ab64f0e515735cacc4e files/digest-analog-5.24 63
 MD5 fc11d5996b49d704c94fe9acec5dc0bb files/digest-analog-5.31 64
 MD5 680b3d1d4411710fa55b5ec607a66222 files/digest-analog-5.32 64
-MD5 17779b474599165b70b48825a08d041f analog-5.24.ebuild 1362
-MD5 687a0e957b806a38e40c43e206880a38 analog-5.31.ebuild 1371
-MD5 64deec868bc266d063c40fbd613b29d3 ChangeLog 1836
-MD5 177bd79ef4967f4d9cf9b2844203e67c analog-5.32.ebuild 1355
diff --git a/app-admin/analog/analog-5.24.ebuild b/app-admin/analog/analog-5.24.ebuild
index 91717c2354a1..ee67d4d3101f 100644
--- a/app-admin/analog/analog-5.24.ebuild
+++ b/app-admin/analog/analog-5.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.24.ebuild,v 1.11 2003/02/13 05:17:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.24.ebuild,v 1.12 2003/09/20 19:56:29 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The most popular logfile analyser in the world"
@@ -25,7 +25,7 @@ src_unpack() {
 		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE:' \
 		-e 's:^LIBS.*:LIBS = -lgd -lpng -ljpeg -lz -lpcre -lm:' \
 		src/Makefile.orig > src/Makefile
-	patch -p1 < ${FILESDIR}/${PN}-5.1-gentoo.diff
+	epatch ${FILESDIR}/${PN}-5.1-gentoo.diff
 }
 
 src_compile() {
diff --git a/app-admin/analog/analog-5.31.ebuild b/app-admin/analog/analog-5.31.ebuild
index 0db6395473e3..644a134e02a6 100644
--- a/app-admin/analog/analog-5.31.ebuild
+++ b/app-admin/analog/analog-5.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.31.ebuild,v 1.4 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.31.ebuild,v 1.5 2003/09/20 19:56:29 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The most popular logfile analyser in the world"
@@ -25,7 +25,7 @@ src_unpack() {
 		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE:' \
 		-e 's:^LIBS.*:LIBS = -lgd -lpng -ljpeg -lz -lpcre -lm:' \
 		src/Makefile.orig > src/Makefile
-	patch -p1 < ${FILESDIR}/${PN}-5.1-gentoo.diff
+	epatch ${FILESDIR}/${PN}-5.1-gentoo.diff
 }
 
 src_compile() {
diff --git a/app-admin/bacula/Manifest b/app-admin/bacula/Manifest
index 17335c8371a5..a7f8cd300bee 100644
--- a/app-admin/bacula/Manifest
+++ b/app-admin/bacula/Manifest
@@ -1,6 +1,6 @@
+MD5 13266e753d07d6d50f50d0359c3ed11f ChangeLog 835
+MD5 b593dd367bdd827cd0ff056c1ad213d3 bacula-1.29.ebuild 3178
+MD5 0c3cdb8adff9c80994a64e6ba92ddb7f bacula-1.31.ebuild 3603
 MD5 6c389eb1976a8e1131b6af4bdde9b6f3 files/bacula-init 1925
 MD5 6bd8611e451dde617342c14501fc36ba files/digest-bacula-1.29 64
 MD5 91ecc1b976fb0c99c2797d4c9bece479 files/digest-bacula-1.31 72
-MD5 8a6a53e5436f93f2a2f7bfadfbb34919 bacula-1.29.ebuild 3177
-MD5 13266e753d07d6d50f50d0359c3ed11f ChangeLog 835
-MD5 7157561ee7763ecedfc085d6ad988a2c bacula-1.31.ebuild 3606
diff --git a/app-admin/bacula/bacula-1.29.ebuild b/app-admin/bacula/bacula-1.29.ebuild
index 51cd06917a6b..e752d807c721 100644
--- a/app-admin/bacula/bacula-1.29.ebuild
+++ b/app-admin/bacula/bacula-1.29.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.29.ebuild,v 1.5 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.29.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="featureful client/server network backup suite"
 HOMEPAGE="http://www.bacula.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/bacula/${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc"
diff --git a/app-admin/bacula/bacula-1.31.ebuild b/app-admin/bacula/bacula-1.31.ebuild
index a6bde50ea62a..0784e4198333 100644
--- a/app-admin/bacula/bacula-1.31.ebuild
+++ b/app-admin/bacula/bacula-1.31.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.31.ebuild,v 1.1 2003/06/12 03:54:00 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.31.ebuild,v 1.2 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="Bacula is a featureful client/server network backup suite"
 HOMEPAGE="http://www.bacula.org/"
 
 NEWP=${P}-04Jun03
 S=${WORKDIR}/${NEWP}
-SRC_URI="mirror://sourceforge/${PN}/${NEWP}.tar.gz"
+SRC_URI="mirror://sourceforge/bacula/${NEWP}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
diff --git a/app-admin/chkrootkit/Manifest b/app-admin/chkrootkit/Manifest
index 5d896fd0629c..dca29c435d8e 100644
--- a/app-admin/chkrootkit/Manifest
+++ b/app-admin/chkrootkit/Manifest
@@ -1,10 +1,10 @@
 MD5 2034d6a16985cd6d16a73e77af0a18f5 ChangeLog 1715
-MD5 6897cb01f455fae612d141bfe6658704 chkrootkit-0.37.ebuild 747
+MD5 26f282566b1e92c5f8f767f428c18f48 chkrootkit-0.37.ebuild 731
 MD5 7b026c36ba7006dcc0b84db0c363789f chkrootkit-0.39a.ebuild 754
 MD5 b89099f5a93dbc9bd19b9bd5a1db5cab chkrootkit-0.41-r1.ebuild 846
 MD5 f97957a94793b86fd018b32e44811f89 files/chkrootkit-0.37-gentoo.diff 4531
-MD5 e9f2cc0eace779d1cad291deb9d9c7e1 files/chkrootkit-0.39a-gentoo.diff 28218
-MD5 4a7462549213c3ef88c11df667b2eeda files/chkrootkit-0.41-gentoo.diff 30253
 MD5 7cf45be07aafbbaa3252ce9ece31d5b6 files/digest-chkrootkit-0.37 66
+MD5 e9f2cc0eace779d1cad291deb9d9c7e1 files/chkrootkit-0.39a-gentoo.diff 28218
 MD5 eb3187ff68ea9e3a781396eef5c19861 files/digest-chkrootkit-0.39a 67
+MD5 4a7462549213c3ef88c11df667b2eeda files/chkrootkit-0.41-gentoo.diff 30253
 MD5 08a62e6267f83410bc08ecb9cb262b02 files/digest-chkrootkit-0.41-r1 66
diff --git a/app-admin/chkrootkit/chkrootkit-0.37.ebuild b/app-admin/chkrootkit/chkrootkit-0.37.ebuild
index e282a909919f..f6c37ee933ba 100644
--- a/app-admin/chkrootkit/chkrootkit-0.37.ebuild
+++ b/app-admin/chkrootkit/chkrootkit-0.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/chkrootkit/chkrootkit-0.37.ebuild,v 1.11 2003/09/06 22:08:31 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chkrootkit/chkrootkit-0.37.ebuild,v 1.12 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="a tool to locally check for signs of a rootkit"
 SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz"
@@ -15,7 +15,7 @@ DEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
+	epatch ${FILESDIR}/${PF}-gentoo.diff
 }
 
 src_compile() {
diff --git a/app-admin/cpu/Manifest b/app-admin/cpu/Manifest
index b82bfd2251fd..837321116ca1 100644
--- a/app-admin/cpu/Manifest
+++ b/app-admin/cpu/Manifest
@@ -1,5 +1,5 @@
 MD5 1f6dd828c9f3eeacece1baaddfdc47df ChangeLog 756
-MD5 13d44872d2fb16381aaf4cfee2caafa5 cpu-1.3.100-r1.ebuild 1333
-MD5 614a38eac6ae09506c59f225dda99c90 cpu-1.3.100.ebuild 1361
+MD5 b6e47987f1aca9e9b1cc2efd1d72055a cpu-1.3.100-r1.ebuild 1329
+MD5 658cffcb3bc34ed52a16589f46837abc cpu-1.3.100.ebuild 1355
 MD5 021b5afd2ac0d086a3400da75c9ce5db files/digest-cpu-1.3.100 64
 MD5 021b5afd2ac0d086a3400da75c9ce5db files/digest-cpu-1.3.100-r1 64
diff --git a/app-admin/cpu/cpu-1.3.100-r1.ebuild b/app-admin/cpu/cpu-1.3.100-r1.ebuild
index 83a526ab1cc7..49bdf8a76fce 100644
--- a/app-admin/cpu/cpu-1.3.100-r1.ebuild
+++ b/app-admin/cpu/cpu-1.3.100-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/cpu-1.3.100-r1.ebuild,v 1.3 2003/08/05 14:24:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/cpu-1.3.100-r1.ebuild,v 1.4 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="LDAP user management tool written in C and loosely based on FreeBSD's pw(8)"
 HOMEPAGE="http://cpu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/cpu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/cpu/cpu-1.3.100.ebuild b/app-admin/cpu/cpu-1.3.100.ebuild
index 01abdff33b8b..2d36dbf27fd6 100644
--- a/app-admin/cpu/cpu-1.3.100.ebuild
+++ b/app-admin/cpu/cpu-1.3.100.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/cpu-1.3.100.ebuild,v 1.4 2003/09/06 22:08:31 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/cpu/cpu-1.3.100.ebuild,v 1.5 2003/09/20 19:56:29 aliz Exp $
 
 inherit eutils
 
 DESCRIPTION="LDAP user management tool written in C and loosely based on FreeBSD's pw(8)"
 HOMEPAGE="http://cpu.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/cpu/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/fam-oss/Manifest b/app-admin/fam-oss/Manifest
index d40b3cac256f..8231b9ca11ae 100644
--- a/app-admin/fam-oss/Manifest
+++ b/app-admin/fam-oss/Manifest
@@ -1,21 +1,21 @@
 MD5 91ef6fd9a30d920e71a33b07f72f1e26 ChangeLog 4005
-MD5 696dc86a11cb002675f603d0a9ec662e fam-oss-2.6.10-r1.ebuild 1391
-MD5 cf1c77a6bdca8c08a491eb607e64d5c4 fam-oss-2.6.10.ebuild 1450
 MD5 75dfc859cba46a75cae06af2a02f996d fam-oss-2.6.9-r1.ebuild 1297
-MD5 e23322cd457f3552b6e78fa4fd1a50ce fam-oss-2.6.9-r2.ebuild 1437
-MD5 c208b5a4e5ff088dc5d54a0c37d9660a fam-oss-2.6.9-r3.ebuild 1486
-MD5 19a0d0533af21730b7415a0e5febb106 fam-oss-2.6.9.ebuild 1189
-MD5 0dba17f68005aa92b3903797dcc7c625 files/digest-fam-oss-2.6.10 62
-MD5 0dba17f68005aa92b3903797dcc7c625 files/digest-fam-oss-2.6.10-r1 62
+MD5 10509b222062c634f70b72a00a565556 fam-oss-2.6.9.ebuild 1161
+MD5 c10f9b4a5594a1444d28b4a413b64fef fam-oss-2.6.9-r2.ebuild 1432
+MD5 a58d08a23da3e7c16e748d57634fd508 fam-oss-2.6.9-r3.ebuild 1484
+MD5 cf1c77a6bdca8c08a491eb607e64d5c4 fam-oss-2.6.10.ebuild 1450
+MD5 696dc86a11cb002675f603d0a9ec662e fam-oss-2.6.10-r1.ebuild 1391
 MD5 0bf8d935c21bfe80427c982dc3d41357 files/digest-fam-oss-2.6.9 118
 MD5 0bf8d935c21bfe80427c982dc3d41357 files/digest-fam-oss-2.6.9-r1 118
-MD5 cf2ec68df6ce23777000ce8b78c49df1 files/digest-fam-oss-2.6.9-r2 61
-MD5 cf2ec68df6ce23777000ce8b78c49df1 files/digest-fam-oss-2.6.9-r3 61
 MD5 3f8fee0b9f3239d2c92623af9a2c4844 files/dnotify.patch 28983
-MD5 3cbaa44382dadea506e93bf3a97e35cc files/dnotify.patch.new 29321
 MD5 179cf9d7c004f510debb9f40bb21c34e files/fam 504
+MD5 b03797e114f768833ab0291a940e9038 files/fam-oss-2.6.9-gcc3.patch 435
+MD5 cf2ec68df6ce23777000ce8b78c49df1 files/digest-fam-oss-2.6.9-r2 61
+MD5 3cbaa44382dadea506e93bf3a97e35cc files/dnotify.patch.new 29321
 MD5 6d8076ab39e8b5432cf36468abe505b9 files/fam-2.6.7-cleanup.patch 1868
+MD5 cf2ec68df6ce23777000ce8b78c49df1 files/digest-fam-oss-2.6.9-r3 61
+MD5 28ba151456fe1d493cdbafe08c3c0e5e files/fam-oss-2.6.9-largefile.patch 525
+MD5 0dba17f68005aa92b3903797dcc7c625 files/digest-fam-oss-2.6.10 62
 MD5 28ba151456fe1d493cdbafe08c3c0e5e files/fam-oss-2.6.10-largefile.patch 525
+MD5 0dba17f68005aa92b3903797dcc7c625 files/digest-fam-oss-2.6.10-r1 62
 MD5 747869c90d342f2f0e375df87a0cd3a6 files/fam-oss-2.6.10-nostatvfs.patch 1813
-MD5 b03797e114f768833ab0291a940e9038 files/fam-oss-2.6.9-gcc3.patch 435
-MD5 28ba151456fe1d493cdbafe08c3c0e5e files/fam-oss-2.6.9-largefile.patch 525
diff --git a/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild b/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild
index 026c4ee8a9a5..9d1518a773ba 100644
--- a/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild
+++ b/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild,v 1.5 2003/09/04 05:16:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9-r2.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 inherit libtool eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="FAM, the File Alteration Monitor"
 SRC_URI="ftp://oss.sgi.com/projects/fam/download/${MY_P}.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/fam/"
 
-KEYWORDS="x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 ppc ~alpha ~sparc"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
 
diff --git a/app-admin/fam-oss/fam-oss-2.6.9-r3.ebuild b/app-admin/fam-oss/fam-oss-2.6.9-r3.ebuild
index 059919447433..9ad0d4b6bfbf 100644
--- a/app-admin/fam-oss/fam-oss-2.6.9-r3.ebuild
+++ b/app-admin/fam-oss/fam-oss-2.6.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9-r3.ebuild,v 1.5 2003/09/18 21:57:18 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9-r3.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 inherit libtool eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="FAM, the File Alteration Monitor"
 SRC_URI="ftp://oss.sgi.com/projects/fam/download/${MY_P}.tar.gz"
 HOMEPAGE="http://oss.sgi.com/projects/fam/"
 
-KEYWORDS="x86 ~ppc ~alpha ~sparc amd64 ia64"
+KEYWORDS="x86 ppc ~alpha ~sparc amd64 ia64"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
 
diff --git a/app-admin/fam-oss/fam-oss-2.6.9.ebuild b/app-admin/fam-oss/fam-oss-2.6.9.ebuild
index 7fffd784891e..1d6da2ac88be 100644
--- a/app-admin/fam-oss/fam-oss-2.6.9.ebuild
+++ b/app-admin/fam-oss/fam-oss-2.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9.ebuild,v 1.15 2003/09/04 05:16:02 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam-oss/fam-oss-2.6.9.ebuild,v 1.16 2003/09/20 19:56:29 aliz Exp $
 
 inherit libtool
 
@@ -22,8 +22,8 @@ src_unpack() {
 	unpack ${MY_P}.tar.gz
 
 	cd ${S}
-	patch -p1 < ${DISTDIR}/dnotify.patch || die
-	patch -p1 < ${FILESDIR}/${PF}-gcc3.patch || die
+	epatch ${DISTDIR}/dnotify.patch
+	epatch ${FILESDIR}/${PF}-gcc3.patch
 
 	elibtoolize
 
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 08d3c9410903..97531f43ad22 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,12 +1,12 @@
 MD5 52593b007ddd84dd466c5fe8f8f070e6 ChangeLog 8309
-MD5 09e02ffeb4992e1da5ee1889f9251ba5 gkrellm-1.2.13.ebuild 916
-MD5 b6a59d45c1bbe01ef124c20b07b309ed gkrellm-2.1.10.ebuild 1573
-MD5 f199be6069e25ba5432400e7bd9eb633 gkrellm-2.1.19.ebuild 1666
-MD5 e51c75e9237b7511d056d95aec0d17e4 gkrellm-2.1.16.ebuild 1665
-MD5 ca95e6d1ab180df8642e5a17eb575f68 gkrellm-2.1.15.ebuild 1652
+MD5 ba737436adbc080cfc32870c2cb440e3 gkrellm-1.2.13.ebuild 916
+MD5 4a4ce95da71c2154db517ca0d02d37c0 gkrellm-2.1.19.ebuild 1665
+MD5 0cbfbeeb375623e66000ec9d511e8b1a gkrellm-2.1.10.ebuild 1571
+MD5 b57c76f9c899495cd67a7fd0a02e1660 gkrellm-2.1.15.ebuild 1651
+MD5 9f2002965e0f283e7debe992ca708446 gkrellm-2.1.16.ebuild 1664
 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
-MD5 7080ee73719d75a573216e6661b04032 files/digest-gkrellm-2.1.10 67
-MD5 89d6f54c23b2093a0d9178d32bc4665e files/digest-gkrellm-2.1.19 67
 MD5 cafab2b9743941916312f01b8f64cffd files/gkrellmd 598
+MD5 89d6f54c23b2093a0d9178d32bc4665e files/digest-gkrellm-2.1.19 67
+MD5 7080ee73719d75a573216e6661b04032 files/digest-gkrellm-2.1.10 67
 MD5 04b1ddde8d427b96c5bdaeb5b2e5f145 files/digest-gkrellm-2.1.15 67
 MD5 2bc2bbd63d2c61b7db072bc1ae0aea75 files/digest-gkrellm-2.1.16 67
diff --git a/app-admin/gkrellm/gkrellm-1.2.13.ebuild b/app-admin/gkrellm/gkrellm-1.2.13.ebuild
index 00ac856d8305..dce7b22f91d1 100644
--- a/app-admin/gkrellm/gkrellm-1.2.13.ebuild
+++ b/app-admin/gkrellm/gkrellm-1.2.13.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.13.ebuild,v 1.14 2003/02/13 05:24:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-1.2.13.ebuild,v 1.15 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="1"
diff --git a/app-admin/gkrellm/gkrellm-2.1.10.ebuild b/app-admin/gkrellm/gkrellm-2.1.10.ebuild
index bf83e126e1c6..7781245548ca 100644
--- a/app-admin/gkrellm/gkrellm-2.1.10.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.10.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.10.ebuild,v 1.7 2003/09/05 01:23:29 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.10.ebuild,v 1.8 2003/09/20 19:56:29 aliz Exp $
 
 IUSE="gtk gtk2 nls"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
diff --git a/app-admin/gkrellm/gkrellm-2.1.15.ebuild b/app-admin/gkrellm/gkrellm-2.1.15.ebuild
index 12e2aa52b106..e9a54b388645 100644
--- a/app-admin/gkrellm/gkrellm-2.1.15.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.15.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.15.ebuild,v 1.4 2003/09/07 17:59:24 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.15.ebuild,v 1.5 2003/09/20 19:56:29 aliz Exp $
 
 IUSE="gtk gtk2 nls"
 
 S=${WORKDIR}/${P/a/}
 DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
diff --git a/app-admin/gkrellm/gkrellm-2.1.16.ebuild b/app-admin/gkrellm/gkrellm-2.1.16.ebuild
index 44f659f54171..8849bb6c5872 100644
--- a/app-admin/gkrellm/gkrellm-2.1.16.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.16.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.16.ebuild,v 1.4 2003/09/12 17:00:35 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.16.ebuild,v 1.5 2003/09/20 19:56:29 aliz Exp $
 
 IUSE="gtk gtk2 nls"
 
 S=${WORKDIR}/${P/a/}
 DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
diff --git a/app-admin/gkrellm/gkrellm-2.1.19.ebuild b/app-admin/gkrellm/gkrellm-2.1.19.ebuild
index 9c4824b36609..27e055a3df54 100644
--- a/app-admin/gkrellm/gkrellm-2.1.19.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.19.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.19.ebuild,v 1.1 2003/09/15 17:15:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.19.ebuild,v 1.2 2003/09/20 19:56:29 aliz Exp $
 
 IUSE="gtk gtk2 nls"
 
 S=${WORKDIR}/${P/a/}
 DESCRIPTION="Single process stack of various system monitors"
-SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2"
+SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
 HOMEPAGE="http://www.gkrellm.net/"
 
 SLOT="2"
diff --git a/app-admin/gps/Manifest b/app-admin/gps/Manifest
index 855f4f19b179..adf65e30b093 100644
--- a/app-admin/gps/Manifest
+++ b/app-admin/gps/Manifest
@@ -1,4 +1,4 @@
+MD5 3ffcdfd75a71618e01c6af1a4bd31388 ChangeLog 524
+MD5 8b8ffabd2a5f4bb700d79840829efb35 gps-1.1.0.ebuild 882
 MD5 295c42bfce76802d1c47dc605a22a12c files/digest-gps-1.1.0 61
 MD5 16492dba5588b34e5dae33450529776a files/rgpsp 529
-MD5 3820566eada75c0cbc024c5c20f3c09b gps-1.1.0.ebuild 884
-MD5 3ffcdfd75a71618e01c6af1a4bd31388 ChangeLog 524
diff --git a/app-admin/gps/gps-1.1.0.ebuild b/app-admin/gps/gps-1.1.0.ebuild
index 9f776e34b050..0fea8fc17fb2 100644
--- a/app-admin/gps/gps-1.1.0.ebuild
+++ b/app-admin/gps/gps-1.1.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gps/gps-1.1.0.ebuild,v 1.4 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gps/gps-1.1.0.ebuild,v 1.5 2003/09/20 19:56:29 aliz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Graphical (GTK+1.2) Process Statistics.  Like top, but can show
 processes for machines on the network as well."
 HOMEPAGE="http://gps.seul.org/"
-SRC_URI="ftp://ftp.seul.org/pub/${PN}/${P}.tar.gz"
+SRC_URI="ftp://ftp.seul.org/pub/gps/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-admin/gpsui/Manifest b/app-admin/gpsui/Manifest
index 388d306902f1..d7df717031d0 100644
--- a/app-admin/gpsui/Manifest
+++ b/app-admin/gpsui/Manifest
@@ -1,3 +1,3 @@
-MD5 01b3ecafb0fe51a5982fcd0e6eb2f332 files/digest-gpsui-2.2 61
-MD5 f8e527f7a1c79524e22e3c8fa29669eb gpsui-2.2.ebuild 771
 MD5 e2de36d0ca5224d4ca014eb68cfd550f ChangeLog 448
+MD5 010e025b6249cfb8da48d0188b01089f gpsui-2.2.ebuild 771
+MD5 01b3ecafb0fe51a5982fcd0e6eb2f332 files/digest-gpsui-2.2 61
diff --git a/app-admin/gpsui/gpsui-2.2.ebuild b/app-admin/gpsui/gpsui-2.2.ebuild
index 6de51e08fa75..22e9bf1af084 100644
--- a/app-admin/gpsui/gpsui-2.2.ebuild
+++ b/app-admin/gpsui/gpsui-2.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/gpsui-2.2.ebuild,v 1.5 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/gpsui-2.2.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="GUI program for managing running processes"
 HOMEPAGE="http://gpsui.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gpsui/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/gwcc/Manifest b/app-admin/gwcc/Manifest
index c71939715bdc..ff835cc1d5d2 100644
--- a/app-admin/gwcc/Manifest
+++ b/app-admin/gwcc/Manifest
@@ -1,3 +1,3 @@
 MD5 c1581d5a1b361e4f11814c2b8429b51a ChangeLog 982
-MD5 e57e6066f2eabf45b78aec7767327d1d gwcc-0.9.6-r2.ebuild 781
+MD5 4367f569924fbd117f1b96096f4b8b74 gwcc-0.9.6-r2.ebuild 776
 MD5 642ba942e51a533f7b9eb3c2d787db00 files/digest-gwcc-0.9.6-r2 62
diff --git a/app-admin/gwcc/gwcc-0.9.6-r2.ebuild b/app-admin/gwcc/gwcc-0.9.6-r2.ebuild
index 93726f1ea1e4..83d5f45d0d07 100644
--- a/app-admin/gwcc/gwcc-0.9.6-r2.ebuild
+++ b/app-admin/gwcc/gwcc-0.9.6-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gwcc/gwcc-0.9.6-r2.ebuild,v 1.5 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gwcc/gwcc-0.9.6-r2.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="GNOME Workstation Command Center"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/gwcc/${P}.tar.gz"
 HOMEPAGE="http://gwcc.sourceforge.net/"
 
 SLOT="0"
diff --git a/app-admin/lcap/Manifest b/app-admin/lcap/Manifest
index f58905a0af35..710d9876ca98 100644
--- a/app-admin/lcap/Manifest
+++ b/app-admin/lcap/Manifest
@@ -1,6 +1,6 @@
 MD5 0c63da71a7ab14a7d4831a42e97553f3 ChangeLog 708
-MD5 d1067bb9a347f8f748f699db83d2a0c2 lcap-0.0.6.ebuild 901
-MD5 cab01a20400e1ba4065b0329b2fa3c54 lcap-0.0.6-r1.ebuild 992
+MD5 2111f3fb3d5dfa19311e4a740cf813b7 lcap-0.0.6-r1.ebuild 949
+MD5 a275974bcb5e888c80827fd80d908fc6 lcap-0.0.6.ebuild 881
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 b147ed00fa64b3b0be0b78cf2617ce98 files/digest-lcap-0.0.6 66
 MD5 bf12167d46f239f3aa2b87d3686b6a36 files/README.gentoo 185
diff --git a/app-admin/lcap/lcap-0.0.6-r1.ebuild b/app-admin/lcap/lcap-0.0.6-r1.ebuild
index 61e8fd57ed12..98029e4c4fc7 100644
--- a/app-admin/lcap/lcap-0.0.6-r1.ebuild
+++ b/app-admin/lcap/lcap-0.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6-r1.ebuild,v 1.2 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6-r1.ebuild,v 1.3 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="kernel capability remover"
 
@@ -9,7 +9,7 @@ DESCRIPTION="kernel capability remover"
 HOMEPAGE="http://packages.debian.org/unstable/admin/lcap.html"
 
 # same for the sources
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/lcap/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/l/lcap/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
 
@@ -26,7 +26,7 @@ RDEPEND="virtual/glibc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch < ${FILESDIR}/${PF}.patch || die "patch failed"
+	epatch ${FILESDIR}/${PF}.patch
 	use lids || (sed < Makefile > Makefile.tmp -e "s:LIDS =:#\0:" && \
 				mv Makefile.tmp Makefile)
 }
diff --git a/app-admin/lcap/lcap-0.0.6.ebuild b/app-admin/lcap/lcap-0.0.6.ebuild
index 544e4c467261..2535baa12265 100644
--- a/app-admin/lcap/lcap-0.0.6.ebuild
+++ b/app-admin/lcap/lcap-0.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6.ebuild,v 1.3 2003/09/06 22:08:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lcap/lcap-0.0.6.ebuild,v 1.4 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="kernel capability remover"
 
@@ -9,7 +9,7 @@ DESCRIPTION="kernel capability remover"
 HOMEPAGE="http://packages.debian.org/unstable/admin/lcap.html"
 
 # same for the sources
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/lcap/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/l/lcap/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
 
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 399282e25ee1..88fc145dbe23 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,9 +1,9 @@
+MD5 fca2d73679c337cab29715ae11ea2eb7 ChangeLog 2877
+MD5 068279976e16f61f64a46e1a9c7eb6b9 logrotate-3.5.9-r1.ebuild 858
+MD5 ac6d294e245841f7dbd063e0a8c44f39 logrotate-3.6.5.ebuild 1107
+MD5 c60ccf72ed78f7d188b03f7a29f3e77b logrotate-3.6.5-r1.ebuild 1556
 MD5 60b5761bada5528ca3e3e9582b56dbfe files/digest-logrotate-3.5.9-r1 71
 MD5 c0d3db322cf626f01a0adea55cdf6b78 files/digest-logrotate-3.6.5 149
 MD5 c0d3db322cf626f01a0adea55cdf6b78 files/digest-logrotate-3.6.5-r1 149
 MD5 28159ca93a9002428ba650c15d5f0191 files/logrotate.conf 729
 MD5 cf1ca2cfa810abaefc504a76ca38b52a files/logrotate.cron 52
-MD5 7599319f14f7f967caa95fbdf1e5568d logrotate-3.5.9-r1.ebuild 872
-MD5 e68fe285a569ace8a22e574a62e082c6 logrotate-3.6.5.ebuild 1121
-MD5 fca2d73679c337cab29715ae11ea2eb7 ChangeLog 2877
-MD5 7eabe45f71c30272353051117a46fe4a logrotate-3.6.5-r1.ebuild 1570
diff --git a/app-admin/logrotate/logrotate-3.5.9-r1.ebuild b/app-admin/logrotate/logrotate-3.5.9-r1.ebuild
index 62a03ec1906a..13eac7827cc4 100644
--- a/app-admin/logrotate/logrotate-3.5.9-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.5.9-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.5.9-r1.ebuild,v 1.12 2003/08/05 14:25:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.5.9-r1.ebuild,v 1.13 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="Rotates, compresses, and mails system logs"
 HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/logrotate/logrotate-3.6.5-r1.ebuild b/app-admin/logrotate/logrotate-3.6.5-r1.ebuild
index d178c2747a54..b8dcb1947823 100644
--- a/app-admin/logrotate/logrotate-3.6.5-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.6.5-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5-r1.ebuild,v 1.5 2003/08/05 14:25:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5-r1.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 inherit eutils
 
 DESCRIPTION="Rotates, compresses, and mails system logs"
 HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/${PN}/${PN}_${PV}.orig.tar.gz
+SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz
 	selinux? http://www.nsa.gov/selinux/patches/${P}-2003011510.patch.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/logrotate/logrotate-3.6.5.ebuild b/app-admin/logrotate/logrotate-3.6.5.ebuild
index b6155c1fc9a0..30426e669c3c 100644
--- a/app-admin/logrotate/logrotate-3.6.5.ebuild
+++ b/app-admin/logrotate/logrotate-3.6.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5.ebuild,v 1.8 2003/08/05 14:25:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.6.5.ebuild,v 1.9 2003/09/20 19:56:29 aliz Exp $
 
 inherit eutils
 
 DESCRIPTION="Rotates, compresses, and mails system logs"
 HOMEPAGE="http://packages.debian.org/unstable/admin/logrotate.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/l/${PN}/${PN}_${PV}.orig.tar.gz
+SRC_URI="mirror://debian/pool/main/l/logrotate/${P/-/_}.orig.tar.gz
 	selinux? http://www.nsa.gov/selinux/patches/${P}-2003011510.patch.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
index 48c335ea30e1..8ed39c028acd 100644
--- a/app-admin/makepasswd/Manifest
+++ b/app-admin/makepasswd/Manifest
@@ -1,3 +1,3 @@
 MD5 fbe249baced9aab171d46fdb187426f7 ChangeLog 610
-MD5 9e37a7bd12e26c0c88823033aebae350 makepasswd-1.10.ebuild 606
+MD5 b6ae0ecd028fcd9a6976c7b88b634e29 makepasswd-1.10.ebuild 587
 MD5 4b27e20971f83863b7eeb1667989e770 files/digest-makepasswd-1.10 71
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index 0a74d9a73735..4713c8ba9de3 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/makepasswd/makepasswd-1.10.ebuild,v 1.10 2003/03/11 21:11:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/makepasswd/makepasswd-1.10.ebuild,v 1.11 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="Random password generator"
-SRC_URI="http://ftp.debian.org/debian/dists/stable/main/source/admin/${PN}_${PV}.orig.tar.gz"
+SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
 HOMEPAGE="http://packages.debian.org/stable/admin/makepasswd.html"
 
 SLOT="0"
diff --git a/app-admin/modconf/Manifest b/app-admin/modconf/Manifest
index 0f23ec236f9d..7da997688582 100644
--- a/app-admin/modconf/Manifest
+++ b/app-admin/modconf/Manifest
@@ -1,4 +1,4 @@
+MD5 38009b4dc76dfae2bfb87ce09d45162b ChangeLog 802
+MD5 6f134c0c906661e0d0a07a5a4e62bb2f modconf-0.2.43.ebuild 1100
 MD5 835eb4a6691bff9e97ae7f72962c1f6a files/digest-modconf-0.2.43 66
 MD5 2980e0a4bc14b2b992027feee59c47d0 files/modconf-0.2.43-gentoo.patch 1067
-MD5 38009b4dc76dfae2bfb87ce09d45162b ChangeLog 802
-MD5 76de3ad513e13ded7330ae2270149fb9 modconf-0.2.43.ebuild 1113
diff --git a/app-admin/modconf/modconf-0.2.43.ebuild b/app-admin/modconf/modconf-0.2.43.ebuild
index 24b48e2142ab..0f83cd4bbd4d 100644
--- a/app-admin/modconf/modconf-0.2.43.ebuild
+++ b/app-admin/modconf/modconf-0.2.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modconf/modconf-0.2.43.ebuild,v 1.4 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modconf/modconf-0.2.43.ebuild,v 1.5 2003/09/20 19:56:29 aliz Exp $
 
 # Some notes:  This should rather depend on dev-libs/newt, and use whiptail,
 #              not dev-util/dialog.
@@ -15,7 +15,7 @@ IUSE=""
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="Modconf provides a GUI for installing and configuring device driver modules."
-SRC_URI="http://ftp.debian.org/debian/pool/main/m/modconf/${P/-/_}.tar.gz"
+SRC_URI="mirror://debian/pool/main/m/modconf/${P/-/_}.tar.gz"
 HOMEPAGE="http://packages.debian.org/stable/base/modconf.html"
 
 LICENSE="GPL-2"
diff --git a/app-admin/msyslog/Manifest b/app-admin/msyslog/Manifest
index 6b1a5a84c9d4..3bf2eeb1ced3 100644
--- a/app-admin/msyslog/Manifest
+++ b/app-admin/msyslog/Manifest
@@ -1,7 +1,7 @@
-MD5 ba81105f7c195074039aaf342961684a msyslog-1.09a-r1.ebuild 2115
 MD5 ef732fe6159bbafe53ee0a6a27cd04f3 ChangeLog 2448
-MD5 39a234fe8245fd8c4ea7d59751002b52 files/msyslog-init 594
-MD5 b0e2e10a2d9ee2cd71c9f98dab38440f files/msyslog.conf 2798
-MD5 2edcd203cb92257f4628ecc2e05520c7 files/msyslog-1.09a-gentoo.diff 4304
+MD5 cd9dc0046642bb739faa096ce9310736 msyslog-1.09a-r1.ebuild 2114
 MD5 abc972b32ebeb711717856368d6eebd8 files/digest-msyslog-1.09a-r1 69
+MD5 2edcd203cb92257f4628ecc2e05520c7 files/msyslog-1.09a-gentoo.diff 4304
 MD5 ca890f415d810ad3a89d6101eeba95ec files/msyslog-confd 304
+MD5 39a234fe8245fd8c4ea7d59751002b52 files/msyslog-init 594
+MD5 b0e2e10a2d9ee2cd71c9f98dab38440f files/msyslog.conf 2798
diff --git a/app-admin/msyslog/msyslog-1.09a-r1.ebuild b/app-admin/msyslog/msyslog-1.09a-r1.ebuild
index 13a6b1ac978e..e714e2353f65 100644
--- a/app-admin/msyslog/msyslog-1.09a-r1.ebuild
+++ b/app-admin/msyslog/msyslog-1.09a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.1 2003/09/17 22:28:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/msyslog/msyslog-1.09a-r1.ebuild,v 1.2 2003/09/20 19:56:29 aliz Exp $
 
 IUSE="postgres mysql"
 
@@ -11,7 +11,7 @@ IUSE="postgres mysql"
 S=${WORKDIR}/${PN}-v${PV}
 DESCRIPTION="Flexible and easy to integrate syslog with modularized input/output"
 HOMEPAGE="http://sourceforge.net/projects/msyslog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+SRC_URI="mirror://sourceforge/msyslog/${P}-src.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/app-admin/passook/Manifest b/app-admin/passook/Manifest
index aee6dbaa87df..7baa7716b5c4 100644
--- a/app-admin/passook/Manifest
+++ b/app-admin/passook/Manifest
@@ -1,4 +1,4 @@
 MD5 38b59046a7fc4b8aec761b78921532d4 ChangeLog 765
-MD5 a05f6746c4dbd0b5e8495b35ab37e758 passook-1.0.0.ebuild 711
+MD5 920c09e4e18d8e1e54f3c559247feb10 passook-1.0.0.ebuild 710
 MD5 5db7ef9bcc7e703f3d1c38294506d8c3 files/digest-passook-1.0.0 57
 MD5 dea799398b05ab4dc9782c51ad3b316f files/passook.diff 663
diff --git a/app-admin/passook/passook-1.0.0.ebuild b/app-admin/passook/passook-1.0.0.ebuild
index 19009890e091..e1a12eb7636e 100644
--- a/app-admin/passook/passook-1.0.0.ebuild
+++ b/app-admin/passook/passook-1.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/passook-1.0.0.ebuild,v 1.10 2003/05/25 13:43:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/passook/passook-1.0.0.ebuild,v 1.11 2003/09/20 19:56:29 aliz Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords."
-SRC_URI="http://mackers.com/projects/${PN}/${PN}.tar.gz"
+SRC_URI="http://mackers.com/projects/passook/${PN}.tar.gz"
 HOMEPAGE="http://mackers.com/misc/scripts/passook/"
 IUSE=""
 
diff --git a/app-admin/petrovich/Manifest b/app-admin/petrovich/Manifest
index 43236efe288e..cbc9a0dfccaa 100644
--- a/app-admin/petrovich/Manifest
+++ b/app-admin/petrovich/Manifest
@@ -1,5 +1,5 @@
 MD5 7e7f0c434a22cbec27b8121e1ad2cf64 ChangeLog 915
-MD5 2d0050bfa810b5a62965ab4bbd1ece27 petrovich-1.0.0.ebuild 754
+MD5 e012304370072d937dccb45ecdfec75c petrovich-1.0.0.ebuild 756
 MD5 4ad2bc1c3193d65ab0ce4fe5c4a7d498 files/digest-petrovich-1.0.0 66
 MD5 01fd0ea51051bba336541cd62abbdde7 files/petrovich-1.0.0-gentoo.diff 1156
 MD5 918c34c936df186b11a213476167df78 files/petrovich.conf 135
diff --git a/app-admin/petrovich/petrovich-1.0.0.ebuild b/app-admin/petrovich/petrovich-1.0.0.ebuild
index 292cd640df34..835a124e2127 100644
--- a/app-admin/petrovich/petrovich-1.0.0.ebuild
+++ b/app-admin/petrovich/petrovich-1.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/petrovich/petrovich-1.0.0.ebuild,v 1.15 2003/02/13 05:28:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/petrovich/petrovich-1.0.0.ebuild,v 1.16 2003/09/20 19:56:29 aliz Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Filesystem Integrity Checker"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/petrovich/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/petrovich"
 
 SLOT="0"
diff --git a/app-admin/procman/Manifest b/app-admin/procman/Manifest
index 0900ad0eeb69..9cf8654c228a 100644
--- a/app-admin/procman/Manifest
+++ b/app-admin/procman/Manifest
@@ -1,5 +1,5 @@
 MD5 36488bc69876379d31bf1d25648f37b7 ChangeLog 1081
-MD5 5a2411e913a5a33df05f69b0b568db1d procman-0.99.0.ebuild 810
+MD5 389b6e7d269b34ae456fb6b45faf6b05 procman-0.99.0.ebuild 809
 MD5 113bdaf9c7f11b4f2e17eecaa85a1b00 procman-1.0.ebuild 792
 MD5 642d64aec8f88f31cbb96ec000c09529 files/digest-procman-0.99.0 66
 MD5 4e43867867179e603fbf302b06e33d0d files/digest-procman-1.0 63
diff --git a/app-admin/procman/procman-0.99.0.ebuild b/app-admin/procman/procman-0.99.0.ebuild
index 7f1c420aa435..981044a1a74a 100644
--- a/app-admin/procman/procman-0.99.0.ebuild
+++ b/app-admin/procman/procman-0.99.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procman/procman-0.99.0.ebuild,v 1.12 2003/06/10 13:14:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procman/procman-0.99.0.ebuild,v 1.13 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="Process viewer for GNOME"
-SRC_URI="http://www.personal.psu.edu/users/k/f/kfv101/${PN}/source/${P}.tar.gz"
+SRC_URI="http://www.personal.psu.edu/users/k/f/kfv101/procman/source/${P}.tar.gz"
 HOMEPAGE="http://www.personal.psu.edu/kfv101/procman"
 
 SLOT="0"
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 9ca4540e0a08..eb90c4b1bdd3 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,5 +1,5 @@
-MD5 76ec9ac51b2962aa02aadeee7c287a40 pwgen-2.01.ebuild 690
-MD5 685641ebe343f3cea7003f3b2c0b83f8 pwgen-2.03.ebuild 703
 MD5 9fa7ca52c01fc96ed4432cc2e07f3be4 ChangeLog 1247
+MD5 76ec9ac51b2962aa02aadeee7c287a40 pwgen-2.01.ebuild 690
+MD5 bd77c74c3ff772d0ec4eefa125af47e9 pwgen-2.03.ebuild 693
 MD5 4dad0b929b330e3134b59bc5590e626a files/digest-pwgen-2.01 61
 MD5 d4c95e5c5360c31261a443a3441add43 files/digest-pwgen-2.03 61
diff --git a/app-admin/pwgen/pwgen-2.03.ebuild b/app-admin/pwgen/pwgen-2.03.ebuild
index 0c20b3b76079..24d7029d16fd 100644
--- a/app-admin/pwgen/pwgen-2.03.ebuild
+++ b/app-admin/pwgen/pwgen-2.03.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.03.ebuild,v 1.5 2003/08/07 09:29:56 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.03.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="Password Generator"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/pwgen/"
 
 SLOT="0"
@@ -12,12 +12,14 @@ KEYWORDS="x86 ~ppc ~sparc hppa amd64 alpha"
 
 DEPEND="virtual/glibc"
 
-src_compile() {
-	# Fix the Makefile
-	cp Makefile.in Makefile.in.new
-	sed -e 's:$(prefix)/man/man1:$(mandir)/man1:g' \
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	sed -i -e 's:$(prefix)/man/man1:$(mandir)/man1:g' \
 		Makefile.in.new > Makefile.in
+}
 
+src_compile() {
 	econf --sysconfdir=/etc/pwgen
 	emake || die
 }
diff --git a/app-admin/realpath/Manifest b/app-admin/realpath/Manifest
index 6cfd9f4474f4..cb4736dbdb32 100644
--- a/app-admin/realpath/Manifest
+++ b/app-admin/realpath/Manifest
@@ -1,3 +1,3 @@
 MD5 64951163d803a96fea514af4810b2f20 ChangeLog 467
-MD5 74fe901156f461f14322c2b3adc971c2 realpath-1.9.3.ebuild 664
+MD5 652fb757d47e3bb5d9b827576c1deda4 realpath-1.9.3.ebuild 650
 MD5 ad4ce8882c1d563642c89dcd344e6b4d files/digest-realpath-1.9.3 61
diff --git a/app-admin/realpath/realpath-1.9.3.ebuild b/app-admin/realpath/realpath-1.9.3.ebuild
index acd20e0135c2..e11cbf1f5f42 100644
--- a/app-admin/realpath/realpath-1.9.3.ebuild
+++ b/app-admin/realpath/realpath-1.9.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.3.ebuild,v 1.3 2003/08/23 01:06:23 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/realpath/realpath-1.9.3.ebuild,v 1.4 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="Return the canonicalized absolute pathname"
 HOMEPAGE="http://packages.debian.org/unstable/utils/realpath.html"
-SRC_URI="http://ftp.debian.org/debian/pool/main/d/dwww/dwww_${PV}.tar.gz"
+SRC_URI="mirror://debian/pool/main/d/dwww/dwww_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc"
diff --git a/app-admin/swatch/Manifest b/app-admin/swatch/Manifest
index d95ee73d9270..f930db4870ce 100644
--- a/app-admin/swatch/Manifest
+++ b/app-admin/swatch/Manifest
@@ -1,5 +1,5 @@
 MD5 c0f11397c93d7601c1da9a7b5d93750b ChangeLog 587
-MD5 e826a18931b7562c282b74d0f3b54e77 swatch-3.0.4.ebuild 546
-MD5 adcc838d137da35af4e44c5ffe4e8bb6 swatch-3.0.8.ebuild 546
+MD5 5143e88ea1efba11fbf5ec4c8fa44a3e swatch-3.0.4.ebuild 543
+MD5 accc16b3dc2421642cd3152b24ac5ae2 swatch-3.0.8.ebuild 543
 MD5 6f4432984bf690b4be72b82a9975d4af files/digest-swatch-3.0.4 63
 MD5 e5376f12b545cf2fa24afc0819859935 files/digest-swatch-3.0.8 63
diff --git a/app-admin/swatch/swatch-3.0.4.ebuild b/app-admin/swatch/swatch-3.0.4.ebuild
index 5068048e4a17..98283f1bd369 100644
--- a/app-admin/swatch/swatch-3.0.4.ebuild
+++ b/app-admin/swatch/swatch-3.0.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.0.4.ebuild,v 1.5 2003/09/05 01:20:55 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.0.4.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 inherit perl-module
 
 DESCRIPTION="Perl-based system log watcher"
 HOMEPAGE="http://swatch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/swatch/swatch-3.0.8.ebuild b/app-admin/swatch/swatch-3.0.8.ebuild
index b002ab7010a6..439325c9515d 100644
--- a/app-admin/swatch/swatch-3.0.8.ebuild
+++ b/app-admin/swatch/swatch-3.0.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.0.8.ebuild,v 1.2 2003/09/05 01:20:55 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/swatch/swatch-3.0.8.ebuild,v 1.3 2003/09/20 19:56:29 aliz Exp $
 
 inherit perl-module
 
 DESCRIPTION="Perl-based system log watcher"
 HOMEPAGE="http://swatch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/swatch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 5150d8fdeb3a..7e2666518157 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,9 +1,9 @@
 MD5 c128c2f8b82e6dd17411076eb35e8b05 ChangeLog 1457
-MD5 912673a4634fe3f181da7b99ca9a8aaa ulogd-0.97-r1.ebuild 1122
-MD5 2950ff63d15e60c1dedf4c0efb63aac7 ulogd-0.98.ebuild 1168
+MD5 f278fc939d07207f5dc87b40832d89bf ulogd-0.97-r1.ebuild 1118
+MD5 c1aef7fe3a4035f21381bc3e1b4e64d4 ulogd-0.98.ebuild 1164
 MD5 94667f92497a7dae3db8e3bbf3f69b10 ulogd-1.01.ebuild 1077
 MD5 04005ad49c96b691ff84b1305379d3c8 files/digest-ulogd-0.97-r1 61
-MD5 7d8c6f58accc97b0ce3beb6fc172d5df files/digest-ulogd-0.98 62
 MD5 d21cc9239b60422b448ef743edaf9560 files/ulogd 755
+MD5 7d8c6f58accc97b0ce3beb6fc172d5df files/digest-ulogd-0.98 62
 MD5 86019df8b3674b4649f91134561f6c59 files/ulogd-0.98 763
 MD5 e346a1112f49dea95c9302f251dd3102 files/digest-ulogd-1.01 63
diff --git a/app-admin/ulogd/ulogd-0.97-r1.ebuild b/app-admin/ulogd/ulogd-0.97-r1.ebuild
index c716ed99c9d7..b07e9552222a 100644
--- a/app-admin/ulogd/ulogd-0.97-r1.ebuild
+++ b/app-admin/ulogd/ulogd-0.97-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.97-r1.ebuild,v 1.15 2003/09/04 05:17:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.97-r1.ebuild,v 1.16 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.gz"
+SRC_URI="ftp://ftp.netfilter.org/pub/ulogd/${P}.tar.gz"
 HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1"
 
 SLOT="0"
diff --git a/app-admin/ulogd/ulogd-0.98.ebuild b/app-admin/ulogd/ulogd-0.98.ebuild
index 5eaffdb110e2..fef597ac3bfe 100644
--- a/app-admin/ulogd/ulogd-0.98.ebuild
+++ b/app-admin/ulogd/ulogd-0.98.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.98.ebuild,v 1.5 2003/09/04 05:17:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-0.98.ebuild,v 1.6 2003/09/20 19:56:29 aliz Exp $
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.gz"
+SRC_URI="ftp://ftp.netfilter.org/pub/ulogd/${P}.tar.gz"
 HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1"
 
 SLOT="0"
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index d62d624dc17f..f1c4b230e31a 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,4 +1,4 @@
+MD5 96139e7a5328080482bd30b7ae526710 xstow-0.4.6.ebuild 756
+MD5 71bb1335e13679d5f92243262783e54f ChangeLog 405
 MD5 3e6e841329de70b113d46828506780d8 files/digest-xstow-0.4.6 63
 MD5 49825a24ed2a22d7f3c4f72daa0af9f1 files/xstow-0.4.6-configure-ncurses.diff 2211
-MD5 7477ab64d4c0f118dd2319db48c0dcef xstow-0.4.6.ebuild 756
-MD5 71bb1335e13679d5f92243262783e54f ChangeLog 405
diff --git a/app-admin/xstow/xstow-0.4.6.ebuild b/app-admin/xstow/xstow-0.4.6.ebuild
index f87ab1e6bce6..cb0b33627b8a 100644
--- a/app-admin/xstow/xstow-0.4.6.ebuild
+++ b/app-admin/xstow/xstow-0.4.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-0.4.6.ebuild,v 1.3 2003/06/29 15:24:08 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-0.4.6.ebuild,v 1.4 2003/09/20 19:56:29 aliz Exp $
 
 inherit eutils
 
 DESCRIPTION="replacement for GNU stow with extensions"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/xstow/${P}.tar.gz"
 HOMEPAGE="http://xstow.sourceforge.net/"
 
 SLOT="0"