cleaning

Package-Manager: portage-2.0.51.20-r4

52 files changed, 168 insertions, 219 deletions

diff --git a/dev-perl/File-BaseDir/ChangeLog b/dev-perl/File-BaseDir/ChangeLog
index 8fc140f5d0b8..8a3d3184d14c 100644
--- a/dev-perl/File-BaseDir/ChangeLog
+++ b/dev-perl/File-BaseDir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/File-BaseDir
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-BaseDir/ChangeLog,v 1.8 2005/04/07 15:42:30 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-BaseDir/ChangeLog,v 1.9 2005/04/25 15:40:51 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org>
+  File-BaseDir-0.02.ebuild:
+  cleaning
 
   08 Apr 2005; Yuta SATOH <nigoro@gentoo.org> File-BaseDir-0.02.ebuild:
   Stable on ppc64
diff --git a/dev-perl/File-BaseDir/File-BaseDir-0.02.ebuild b/dev-perl/File-BaseDir/File-BaseDir-0.02.ebuild
index 909628df4d7b..692550c7a94d 100644
--- a/dev-perl/File-BaseDir/File-BaseDir-0.02.ebuild
+++ b/dev-perl/File-BaseDir/File-BaseDir-0.02.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-BaseDir/File-BaseDir-0.02.ebuild,v 1.10 2005/04/07 15:42:30 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-BaseDir/File-BaseDir-0.02.ebuild,v 1.11 2005/04/25 15:40:51 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="The Perl File-BaseDir Module"
-SRC_URI="http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/${PN}/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/P/PA/PARDUS/${PN}/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/${PN}/${P}.readme"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
diff --git a/dev-perl/File-Flat/ChangeLog b/dev-perl/File-Flat/ChangeLog
index 970b36a0a9c7..d1e6a81d2a7d 100644
--- a/dev-perl/File-Flat/ChangeLog
+++ b/dev-perl/File-Flat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/File-Flat
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Flat/ChangeLog,v 1.9 2005/04/09 01:09:49 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Flat/ChangeLog,v 1.10 2005/04/25 15:43:24 mcummings Exp $
+
+*File-Flat-0.95 (25 Apr 2005)
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org> -File-Flat-0.91.ebuild,
+  +File-Flat-0.95.ebuild:
+  cleaning
 
   09 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> File-Flat-0.8.ebuild:
   Stable on sparc
diff --git a/dev-perl/File-Flat/File-Flat-0.91.ebuild b/dev-perl/File-Flat/File-Flat-0.95.ebuild
index c91da5525839..95e702683948 100644
--- a/dev-perl/File-Flat/File-Flat-0.91.ebuild
+++ b/dev-perl/File-Flat/File-Flat-0.95.ebuild
@@ -1,21 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Flat/File-Flat-0.91.ebuild,v 1.5 2005/03/14 15:45:11 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Flat/File-Flat-0.95.ebuild,v 1.1 2005/04/25 15:43:24 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="Implements a flat filesystem"
-SRC_URI="http://www.cpan.org/modules/by-authors/id/A/AD/ADAMK/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/A/AD/ADAMK/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-authors/id/A/AD/ADAMK/${P}.readme"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~x86 ~amd64 ~alpha ~ppc ~sparc"
 IUSE=""
+SRC_TEST="do"
 
 DEPEND=">=dev-perl/Class-Autouse-1*
+	dev-perl/module-build
+	dev-perl/File-Remove
 	dev-perl/File-Spec
-	dev-perl/File-Temp
+	>=dev-perl/File-Temp-0.14
 	dev-perl/File-NCopy
-	dev-perl/File-Remove
+	>=dev-perl/File-Remove-0.21
+	dev-perl/Test-ClassAPI
+	dev-perl/File-Slurp
 	dev-perl/Class-Inspector"
diff --git a/dev-perl/File-Flat/Manifest b/dev-perl/File-Flat/Manifest
index b7ba197e305c..fa302e74b07d 100644
--- a/dev-perl/File-Flat/Manifest
+++ b/dev-perl/File-Flat/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f6ab25d64c82907fca101a92a2c9390f File-Flat-0.94.ebuild 781
-MD5 47b9971e1f9a203e3f2c88b808703000 File-Flat-0.91.ebuild 680
-MD5 7561491cd632120625767fdbd0c0a7d3 File-Flat-0.8.ebuild 618
 MD5 f44213669a231f5dcb45d70e2b768d28 ChangeLog 1107
+MD5 7561491cd632120625767fdbd0c0a7d3 File-Flat-0.8.ebuild 618
+MD5 e1eb8b02c42bd536e15204f1ba3a5e36 File-Flat-0.95.ebuild 676
+MD5 f6ab25d64c82907fca101a92a2c9390f File-Flat-0.94.ebuild 781
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 2f423057fa0dffb2a92b90b5eb3887c4 files/digest-File-Flat-0.94 65
 MD5 0ae089b4507e301fddf90b96313235cd files/digest-File-Flat-0.8 64
-MD5 7ea4a8b5360aedabcb15a904ef330c39 files/digest-File-Flat-0.91 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCVytpKRy60XGEcJIRAjaxAKCPheD6lTy6H6web3wY85QN9OZcCACgsoHS
-rLmg5ANAFvbW98OTQW0tiPE=
-=7eL6
------END PGP SIGNATURE-----
+MD5 6e86155fa50b7735b09f078fe6f1781c files/digest-File-Flat-0.95 65
+MD5 2f423057fa0dffb2a92b90b5eb3887c4 files/digest-File-Flat-0.94 65
diff --git a/dev-perl/File-Flat/files/digest-File-Flat-0.91 b/dev-perl/File-Flat/files/digest-File-Flat-0.91
deleted file mode 100644
index 321223513e50..000000000000
--- a/dev-perl/File-Flat/files/digest-File-Flat-0.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 619cb6b5ab73f9c6073916ccea5a5a2f File-Flat-0.91.tar.gz 36039
diff --git a/dev-perl/File-Flat/files/digest-File-Flat-0.95 b/dev-perl/File-Flat/files/digest-File-Flat-0.95
new file mode 100644
index 000000000000..2dcf6c70a517
--- /dev/null
+++ b/dev-perl/File-Flat/files/digest-File-Flat-0.95
@@ -0,0 +1 @@
+MD5 4b018c9d2a366cfd15c920f3544e9cf1 File-Flat-0.95.tar.gz 43521
diff --git a/dev-perl/File-MMagic/ChangeLog b/dev-perl/File-MMagic/ChangeLog
index d0fd48cc516f..725d6c3c4c8c 100644
--- a/dev-perl/File-MMagic/ChangeLog
+++ b/dev-perl/File-MMagic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/File-MMagic
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/ChangeLog,v 1.21 2005/04/10 18:42:23 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/ChangeLog,v 1.22 2005/04/25 15:45:26 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org>
+  -File-MMagic-1.15-r1.ebuild, -File-MMagic-1.15.ebuild,
+  -File-MMagic-1.19.ebuild, File-MMagic-1.20.ebuild, File-MMagic-1.22.ebuild:
+  cleaning
 
   10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   File-MMagic-1.20.ebuild:
diff --git a/dev-perl/File-MMagic/File-MMagic-1.15-r1.ebuild b/dev-perl/File-MMagic/File-MMagic-1.15-r1.ebuild
deleted file mode 100644
index 46bc044c7f3a..000000000000
--- a/dev-perl/File-MMagic/File-MMagic-1.15-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/File-MMagic-1.15-r1.ebuild,v 1.9 2004/10/16 23:57:21 rac Exp $
-
-inherit perl-module
-
-CATEGORY="dev-perl"
-DESCRIPTION="The Perl Image-Info Module"
-SRC_URI="http://www.cpan.org/modules/by-module/File/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/modules/by-module/File/${P}.readme"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="x86 amd64 ppc sparc alpha"
-IUSE=""
diff --git a/dev-perl/File-MMagic/File-MMagic-1.15.ebuild b/dev-perl/File-MMagic/File-MMagic-1.15.ebuild
deleted file mode 100644
index 36a8ba30ce83..000000000000
--- a/dev-perl/File-MMagic/File-MMagic-1.15.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/File-MMagic-1.15.ebuild,v 1.16 2004/10/16 23:57:21 rac Exp $
-
-inherit perl-module
-
-CATEGORY="dev-perl"
-DESCRIPTION="The Perl Image-Info Module"
-SRC_URI="http://www.cpan.org/modules/by-module/File/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/modules/by-module/File/${P}.readme"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="x86 amd64 ppc sparc alpha"
-IUSE=""
diff --git a/dev-perl/File-MMagic/File-MMagic-1.19.ebuild b/dev-perl/File-MMagic/File-MMagic-1.19.ebuild
deleted file mode 100644
index 2e216ed6f480..000000000000
--- a/dev-perl/File-MMagic/File-MMagic-1.19.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/File-MMagic-1.19.ebuild,v 1.6 2004/10/16 23:57:21 rac Exp $
-
-inherit perl-module
-
-CATEGORY="dev-perl"
-DESCRIPTION="The Perl Image-Info Module"
-SRC_URI="http://www.cpan.org/modules/by-module/File/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/modules/by-module/File/${P}.readme"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
-IUSE=""
diff --git a/dev-perl/File-MMagic/File-MMagic-1.20.ebuild b/dev-perl/File-MMagic/File-MMagic-1.20.ebuild
index fd55fc63bd5b..3d267545a3e0 100644
--- a/dev-perl/File-MMagic/File-MMagic-1.20.ebuild
+++ b/dev-perl/File-MMagic/File-MMagic-1.20.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/File-MMagic-1.20.ebuild,v 1.9 2005/04/10 18:42:23 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/File-MMagic-1.20.ebuild,v 1.10 2005/04/25 15:45:26 mcummings Exp $
 
 inherit perl-module
 
 CATEGORY="dev-perl"
 DESCRIPTION="The Perl Image-Info Module"
-SRC_URI="http://search.cpan.org/CPAN/authors/id/K/KN/KNOK/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/K/KN/KNOK/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/File/${P}.readme"
 
 SLOT="0"
diff --git a/dev-perl/File-MMagic/File-MMagic-1.22.ebuild b/dev-perl/File-MMagic/File-MMagic-1.22.ebuild
index 60910fe08c50..01d1ad8f446f 100644
--- a/dev-perl/File-MMagic/File-MMagic-1.22.ebuild
+++ b/dev-perl/File-MMagic/File-MMagic-1.22.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/File-MMagic-1.22.ebuild,v 1.6 2004/12/16 10:46:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MMagic/File-MMagic-1.22.ebuild,v 1.7 2005/04/25 15:45:26 mcummings Exp $
 
 inherit perl-module
 
 CATEGORY="dev-perl"
 DESCRIPTION="The Perl Image-Info Module"
-SRC_URI="http://search.cpan.org/CPAN/authors/id/K/KN/KNOK/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/K/KN/KNOK/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/File/${P}.readme"
 SRC_TEST="do"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ppc64"
+KEYWORDS="x86 ~amd64 ~ppc sparc ~alpha ppc64"
 IUSE=""
diff --git a/dev-perl/File-MMagic/files/digest-File-MMagic-1.15 b/dev-perl/File-MMagic/files/digest-File-MMagic-1.15
deleted file mode 100644
index 611c0aa63d39..000000000000
--- a/dev-perl/File-MMagic/files/digest-File-MMagic-1.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8cd5f2040aa4146ac287f0f9a823a2a File-MMagic-1.15.tar.gz 21220
diff --git a/dev-perl/File-MMagic/files/digest-File-MMagic-1.15-r1 b/dev-perl/File-MMagic/files/digest-File-MMagic-1.15-r1
deleted file mode 100644
index 611c0aa63d39..000000000000
--- a/dev-perl/File-MMagic/files/digest-File-MMagic-1.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8cd5f2040aa4146ac287f0f9a823a2a File-MMagic-1.15.tar.gz 21220
diff --git a/dev-perl/File-MMagic/files/digest-File-MMagic-1.19 b/dev-perl/File-MMagic/files/digest-File-MMagic-1.19
deleted file mode 100644
index 7bc421071e5f..000000000000
--- a/dev-perl/File-MMagic/files/digest-File-MMagic-1.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 217dfb45125e7bb290bccf63383df2c4 File-MMagic-1.19.tar.gz 20094
diff --git a/dev-perl/File-MimeInfo/ChangeLog b/dev-perl/File-MimeInfo/ChangeLog
index 6bfb1494366e..104fa549c751 100644
--- a/dev-perl/File-MimeInfo/ChangeLog
+++ b/dev-perl/File-MimeInfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/File-MimeInfo
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/ChangeLog,v 1.7 2004/12/23 07:37:40 nigoro Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/ChangeLog,v 1.8 2005/04/25 15:48:50 mcummings Exp $
+
+*File-MimeInfo-0.11 (25 Apr 2005)
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org>
+  File-MimeInfo-0.10.ebuild, +File-MimeInfo-0.11.ebuild:
+  cleaning
 
   23 Dec 2004; Yuta SATOH <nigoro@gentoo.org> File-MimeInfo-0.10.ebuild:
   added ~ppc64
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.10.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.10.ebuild
index c03cee0b860d..b24578ea7e8c 100644
--- a/dev-perl/File-MimeInfo/File-MimeInfo-0.10.ebuild
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/File-MimeInfo-0.10.ebuild,v 1.9 2004/12/23 07:37:40 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/File-MimeInfo-0.10.ebuild,v 1.10 2005/04/25 15:48:50 mcummings Exp $
 
 inherit perl-module
 
-DESCRIPTION="The Perl File-MimeInfo Module"
-SRC_URI="http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/${PN}/${P}.tar.gz"
+DESCRIPTION="Determine file type"
+SRC_URI="mirror://cpan/authors/id/P/PA/PARDUS/${PN}/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/${PN}/${P}.readme"
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
diff --git a/dev-perl/File-MimeInfo/File-MimeInfo-0.11.ebuild b/dev-perl/File-MimeInfo/File-MimeInfo-0.11.ebuild
new file mode 100644
index 000000000000..091d402cb0c1
--- /dev/null
+++ b/dev-perl/File-MimeInfo/File-MimeInfo-0.11.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-MimeInfo/File-MimeInfo-0.11.ebuild,v 1.1 2005/04/25 15:48:50 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Determine file type"
+SRC_URI="mirror://cpan/authors/id/P/PA/PARDUS/${PN}/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/CPAN/authors/id/P/PA/PARDUS/${PN}/${P}.readme"
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND="dev-perl/File-BaseDir
+	x11-misc/shared-mime-info"
diff --git a/dev-perl/File-MimeInfo/Manifest b/dev-perl/File-MimeInfo/Manifest
index 282f24b18938..885a2532775a 100644
--- a/dev-perl/File-MimeInfo/Manifest
+++ b/dev-perl/File-MimeInfo/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bb9c40c48125d28edec3015eea2d5fb7 ChangeLog 1064
 MD5 2eab6db9d214dfbf5036efb6c420a686 File-MimeInfo-0.10.ebuild 609
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 17c63e4acf41abe96bacfb5e3c799107 File-MimeInfo-0.11.ebuild 478
 MD5 c13ab58d6a628b17059931f1b13a790e files/digest-File-MimeInfo-0.10 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBynXQ60LfUIagIAkRAvGiAKCc2pa7Va7P8lCc3YzqEzWFQOJhIgCfVNdV
-8lyxoRcdPM7B7Y8zcXt+d4A=
-=PyeK
------END PGP SIGNATURE-----
+MD5 a12598ee4d7fe759b6116a118aaa9c4a files/digest-File-MimeInfo-0.11 69
diff --git a/dev-perl/File-MimeInfo/files/digest-File-MimeInfo-0.11 b/dev-perl/File-MimeInfo/files/digest-File-MimeInfo-0.11
new file mode 100644
index 000000000000..b0c58189c8d2
--- /dev/null
+++ b/dev-perl/File-MimeInfo/files/digest-File-MimeInfo-0.11
@@ -0,0 +1 @@
+MD5 7e87be2dc62865591557fdddca67925b File-MimeInfo-0.11.tar.gz 18550
diff --git a/dev-perl/File-NCopy/ChangeLog b/dev-perl/File-NCopy/ChangeLog
index 5707c22455d5..13e92e7fae1f 100644
--- a/dev-perl/File-NCopy/ChangeLog
+++ b/dev-perl/File-NCopy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/File-NCopy
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-NCopy/ChangeLog,v 1.7 2005/04/09 01:12:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-NCopy/ChangeLog,v 1.8 2005/04/25 15:49:35 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org> File-NCopy-0.34.ebuild:
+  cleaning
 
   09 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   File-NCopy-0.34.ebuild:
diff --git a/dev-perl/File-NCopy/File-NCopy-0.34.ebuild b/dev-perl/File-NCopy/File-NCopy-0.34.ebuild
index 29f2c572eb2d..6d9e0f60e191 100644
--- a/dev-perl/File-NCopy/File-NCopy-0.34.ebuild
+++ b/dev-perl/File-NCopy/File-NCopy-0.34.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-NCopy/File-NCopy-0.34.ebuild,v 1.10 2005/04/09 01:12:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-NCopy/File-NCopy-0.34.ebuild,v 1.11 2005/04/25 15:49:35 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="Copy file, file Copy file[s] | dir[s], dir"
-SRC_URI="http://www.cpan.org/modules/by-authors/id/M/MZ/MZSANFORD/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/M/MZ/MZSANFORD/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-authors/id/M/MZ/MZSANFORD/${P}.readme"
 
 SLOT="0"
diff --git a/dev-perl/File-Remove/ChangeLog b/dev-perl/File-Remove/ChangeLog
index aa09bcf5f815..e4afd01c398e 100644
--- a/dev-perl/File-Remove/ChangeLog
+++ b/dev-perl/File-Remove/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/File-Remove
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/ChangeLog,v 1.8 2005/04/24 13:10:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/ChangeLog,v 1.9 2005/04/25 15:52:06 mcummings Exp $
+
+*File-Remove-0.29 (25 Apr 2005)
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org>
+  File-Remove-0.20.ebuild, +File-Remove-0.29.ebuild:
+  cleaning
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   File-Remove-0.20.ebuild:
diff --git a/dev-perl/File-Remove/File-Remove-0.20.ebuild b/dev-perl/File-Remove/File-Remove-0.20.ebuild
index bcd158ef258c..77ea3bb38045 100644
--- a/dev-perl/File-Remove/File-Remove-0.20.ebuild
+++ b/dev-perl/File-Remove/File-Remove-0.20.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-0.20.ebuild,v 1.9 2005/04/24 13:10:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-0.20.ebuild,v 1.10 2005/04/25 15:52:06 mcummings Exp $
 
 inherit perl-module
 
 MY_P=File-Remove${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Remove files and directories"
-SRC_URI="http://www.cpan.org/modules/by-authors/id/G/GA/GABOR/${MY_P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/G/GA/GABOR/${MY_P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-authors/id/G/GA/GABOR/${MY_P}.readme"
 
 SLOT="0"
diff --git a/dev-perl/File-Remove/File-Remove-0.21.ebuild b/dev-perl/File-Remove/File-Remove-0.21.ebuild
index 8367b6a7264f..f4745a2af58e 100644
--- a/dev-perl/File-Remove/File-Remove-0.21.ebuild
+++ b/dev-perl/File-Remove/File-Remove-0.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-0.21.ebuild,v 1.2 2004/12/23 07:33:26 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-0.21.ebuild,v 1.3 2005/04/25 15:52:06 mcummings Exp $
 
 inherit perl-module
 
diff --git a/dev-perl/File-Remove/File-Remove-0.29.ebuild b/dev-perl/File-Remove/File-Remove-0.29.ebuild
new file mode 100644
index 000000000000..ec4fde9c3df1
--- /dev/null
+++ b/dev-perl/File-Remove/File-Remove-0.29.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Remove/File-Remove-0.29.ebuild,v 1.1 2005/04/25 15:52:06 mcummings Exp $
+
+inherit perl-module
+
+DESCRIPTION="Remove files and directories"
+SRC_URI="mirror://cpan/authors/id/R/RS/RSOD/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~rsod/${P}/"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~mips ~ppc ~sparc ~ppc64"
+IUSE=""
+
+SRC_TEST="do"
+
+DEPEND=">=dev-perl/File-Spec-0.84"
diff --git a/dev-perl/File-Remove/Manifest b/dev-perl/File-Remove/Manifest
index b9737f8e4078..371849a674cf 100644
--- a/dev-perl/File-Remove/Manifest
+++ b/dev-perl/File-Remove/Manifest
@@ -1,6 +1,8 @@
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 95fc8f43609339d16066cf9107feb21f File-Remove-0.21.ebuild 556
 MD5 8e678ae6f6fd925689820bc7c7cedb10 ChangeLog 994
 MD5 db74cf07ebebc4952f343b75e8d423db File-Remove-0.20.ebuild 590
-MD5 6b270e3cb4b8efd02e008f12ac5baa33 files/digest-File-Remove-0.21 66
+MD5 95fc8f43609339d16066cf9107feb21f File-Remove-0.21.ebuild 556
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 391cc620da59ce8ae4178c9baa139813 File-Remove-0.29.ebuild 450
 MD5 8c0ccdccb87f15924ea07db8c351ac26 files/digest-File-Remove-0.20 65
+MD5 6b270e3cb4b8efd02e008f12ac5baa33 files/digest-File-Remove-0.21 66
+MD5 c3933831892b78883367423c819e7d42 files/digest-File-Remove-0.29 66
diff --git a/dev-perl/File-Remove/files/digest-File-Remove-0.29 b/dev-perl/File-Remove/files/digest-File-Remove-0.29
new file mode 100644
index 000000000000..473898c4904f
--- /dev/null
+++ b/dev-perl/File-Remove/files/digest-File-Remove-0.29
@@ -0,0 +1 @@
+MD5 18cba769137c68ad056125786f61d49b File-Remove-0.29.tar.gz 5000
diff --git a/dev-perl/File-Spec/ChangeLog b/dev-perl/File-Spec/ChangeLog
index d7c583cfed93..6f06a715549e 100644
--- a/dev-perl/File-Spec/ChangeLog
+++ b/dev-perl/File-Spec/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/File-Spec
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Spec/ChangeLog,v 1.20 2005/04/17 15:03:38 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Spec/ChangeLog,v 1.21 2005/04/25 15:54:31 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org> -File-Spec-0.82.ebuild,
+  -File-Spec-0.84.ebuild:
+  cleaning
 
 *File-Spec-3.06 (17 Apr 2005)
 *File-Spec-3.01 (17 Apr 2005)
diff --git a/dev-perl/File-Spec/File-Spec-0.82.ebuild b/dev-perl/File-Spec/File-Spec-0.82.ebuild
deleted file mode 100644
index fd3c0961b612..000000000000
--- a/dev-perl/File-Spec/File-Spec-0.82.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Spec/File-Spec-0.82.ebuild,v 1.14 2005/03/09 18:33:19 corsair Exp $
-
-inherit perl-module
-
-S=${WORKDIR}/File-Spec-0.82
-DESCRIPTION="Handling files and directories portably"
-SRC_URI="http://www.cpan.org/modules/by-authors/id/R/RB/RBS/File-Spec-0.82.tar.gz"
-HOMEPAGE="http://www.cpan.org/modules/by-authors/id/R/RB/RBS/${P}.readme"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="x86 amd64 alpha hppa ~mips ~ppc sparc"
-IUSE=""
diff --git a/dev-perl/File-Spec/File-Spec-0.84.ebuild b/dev-perl/File-Spec/File-Spec-0.84.ebuild
deleted file mode 100644
index db36706d8c86..000000000000
--- a/dev-perl/File-Spec/File-Spec-0.84.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Spec/File-Spec-0.84.ebuild,v 1.7 2005/03/09 18:33:19 corsair Exp $
-
-inherit perl-module
-
-DESCRIPTION="Handling files and directories portably"
-SRC_URI="http://www.cpan.org/modules/by-authors/id/K/KW/KWILLIAMS/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/modules/by-authors/id/K/KW/KWILLIAMS/${P}.readme"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~x86 ~amd64 ~alpha ~hppa ~mips ~ppc ~sparc"
-IUSE=""
diff --git a/dev-perl/File-Spec/files/digest-File-Spec-0.82 b/dev-perl/File-Spec/files/digest-File-Spec-0.82
deleted file mode 100644
index 348243ee7ae7..000000000000
--- a/dev-perl/File-Spec/files/digest-File-Spec-0.82
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df27080f675cdd6299c4f6b87ea859bd File-Spec-0.82.tar.gz 16855
diff --git a/dev-perl/File-Spec/files/digest-File-Spec-0.84 b/dev-perl/File-Spec/files/digest-File-Spec-0.84
deleted file mode 100644
index f739eafcab95..000000000000
--- a/dev-perl/File-Spec/files/digest-File-Spec-0.84
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2fc4e1c89b47dd95eb03b6ca508e4e25 File-Spec-0.84.tar.gz 27889
diff --git a/dev-perl/File-Sync/ChangeLog b/dev-perl/File-Sync/ChangeLog
index a95b0acef74b..1154ea7a53c7 100644
--- a/dev-perl/File-Sync/ChangeLog
+++ b/dev-perl/File-Sync/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/File-Sync
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Sync/ChangeLog,v 1.6 2005/04/24 13:11:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Sync/ChangeLog,v 1.7 2005/04/25 15:55:20 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org> File-Sync-0.09.ebuild:
+  cleaning
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> File-Sync-0.09.ebuild:
   Stable on ppc.
diff --git a/dev-perl/File-Sync/File-Sync-0.09.ebuild b/dev-perl/File-Sync/File-Sync-0.09.ebuild
index c559138895f7..e35dfdc43fe4 100644
--- a/dev-perl/File-Sync/File-Sync-0.09.ebuild
+++ b/dev-perl/File-Sync/File-Sync-0.09.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Sync/File-Sync-0.09.ebuild,v 1.7 2005/04/24 13:11:43 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Sync/File-Sync-0.09.ebuild,v 1.8 2005/04/25 15:55:20 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="Perl access to fsync() and sync() function calls"
 HOMEPAGE="http://search.cpan.org/~cevans/${P}/"
-SRC_URI="http://www.cpan.org/authors/id/C/CE/CEVANS/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/C/CE/CEVANS/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~ppc64 ~sparc"
+KEYWORDS="x86 ppc ~ppc64 sparc"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/File-Tail/ChangeLog b/dev-perl/File-Tail/ChangeLog
index ea30e579d3bf..5b10ab697f6a 100644
--- a/dev-perl/File-Tail/ChangeLog
+++ b/dev-perl/File-Tail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/File-Tail
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Tail/ChangeLog,v 1.13 2004/12/05 14:02:56 mcummings Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Tail/ChangeLog,v 1.14 2005/04/25 15:56:58 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org>
+  -File-Tail-0.98-r2.ebuild, File-Tail-0.98-r3.ebuild,
+  File-Tail-0.99.1.ebuild:
+  cleaning
 
 *File-Tail-0.99.1 (05 Dec 2004)
 
diff --git a/dev-perl/File-Tail/File-Tail-0.98-r2.ebuild b/dev-perl/File-Tail/File-Tail-0.98-r2.ebuild
deleted file mode 100644
index 8e6840a7761d..000000000000
--- a/dev-perl/File-Tail/File-Tail-0.98-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Tail/File-Tail-0.98-r2.ebuild,v 1.15 2004/10/16 23:57:22 rac Exp $
-
-inherit perl-module
-
-DESCRIPTION="File::Tail module for perl"
-SRC_URI="http://www.cpan.org/authors/id/MGRABNAR/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/authors/id/MGRABNAR/${P}.readme"
-
-SLOT="0"
-LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="x86 amd64 ppc sparc alpha"
-IUSE=""
-
-DEPEND="${DEPEND} dev-perl/Time-HiRes"
-
-export OPTIMIZE="$CFLAGS"
-mydoc="ToDo"
diff --git a/dev-perl/File-Tail/File-Tail-0.98-r3.ebuild b/dev-perl/File-Tail/File-Tail-0.98-r3.ebuild
index a95f97a00790..1cd9bf9444eb 100644
--- a/dev-perl/File-Tail/File-Tail-0.98-r3.ebuild
+++ b/dev-perl/File-Tail/File-Tail-0.98-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Tail/File-Tail-0.98-r3.ebuild,v 1.8 2004/10/16 23:57:22 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Tail/File-Tail-0.98-r3.ebuild,v 1.9 2005/04/25 15:56:58 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="File::Tail module for perl"
-SRC_URI="http://www.cpan.org/authors/id/MGRABNAR/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/MGRABNAR/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/authors/id/MGRABNAR/${P}.readme"
 
 SLOT="0"
diff --git a/dev-perl/File-Tail/File-Tail-0.99.1.ebuild b/dev-perl/File-Tail/File-Tail-0.99.1.ebuild
index 4919b8be3d67..1e01696d7da0 100644
--- a/dev-perl/File-Tail/File-Tail-0.99.1.ebuild
+++ b/dev-perl/File-Tail/File-Tail-0.99.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Tail/File-Tail-0.99.1.ebuild,v 1.1 2004/12/05 14:02:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Tail/File-Tail-0.99.1.ebuild,v 1.2 2005/04/25 15:56:58 mcummings Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.cpan.org/authors/id/MGRABNAR/${P}.readme"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~amd64 ~ppc sparc ~alpha"
 IUSE=""
 
 DEPEND="dev-perl/Time-HiRes"
diff --git a/dev-perl/File-Tail/files/digest-File-Tail-0.98-r2 b/dev-perl/File-Tail/files/digest-File-Tail-0.98-r2
deleted file mode 100644
index a091e4e35601..000000000000
--- a/dev-perl/File-Tail/files/digest-File-Tail-0.98-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d16d67052577a5cdcde03d5cd2dc5569 File-Tail-0.98.tar.gz 14149
diff --git a/dev-perl/File-Temp/ChangeLog b/dev-perl/File-Temp/ChangeLog
index d6d2386824ac..2a8e1ccf0fd2 100644
--- a/dev-perl/File-Temp/ChangeLog
+++ b/dev-perl/File-Temp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/File-Temp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Temp/ChangeLog,v 1.14 2005/04/10 18:18:24 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Temp/ChangeLog,v 1.15 2005/04/25 15:57:54 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org> -File-Temp-0.12.ebuild:
+  cleaning
 
   10 Apr 2005; Simon Stelling <blubb@gentoo.org> File-Temp-0.14.ebuild:
   stable on amd64
diff --git a/dev-perl/File-Temp/File-Temp-0.12.ebuild b/dev-perl/File-Temp/File-Temp-0.12.ebuild
deleted file mode 100644
index de70bc068634..000000000000
--- a/dev-perl/File-Temp/File-Temp-0.12.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Temp/File-Temp-0.12.ebuild,v 1.14 2005/03/09 18:05:38 corsair Exp $
-
-inherit perl-module
-
-MY_P=File-Temp-${PV}
-S=${WORKDIR}/${MY_P}
-CATEGORY="dev-perl"
-
-DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
-HOMEPAGE="http://www.cpan.org/modules/by-module/File/${MY_P}.readme"
-SRC_URI="http://www.cpan.org/modules/by-module/File/${MY_P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha"
-IUSE=""
diff --git a/dev-perl/File-Temp/files/digest-File-Temp-0.12 b/dev-perl/File-Temp/files/digest-File-Temp-0.12
deleted file mode 100644
index 42e9b0f16c8d..000000000000
--- a/dev-perl/File-Temp/files/digest-File-Temp-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5e292917da811e0290f6c74aaa9b0f8a File-Temp-0.12.tar.gz 25898
diff --git a/dev-perl/File-Which/ChangeLog b/dev-perl/File-Which/ChangeLog
index a033b176105f..5b795d877bec 100644
--- a/dev-perl/File-Which/ChangeLog
+++ b/dev-perl/File-Which/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/File-Which
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Which/ChangeLog,v 1.4 2004/12/14 16:35:37 corsair Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Which/ChangeLog,v 1.5 2005/04/25 15:58:39 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org> File-Which-0.05.ebuild:
+  cleaning
 
   14 Dec 2004; Markus Rothe <corsair@gentoo.org> File-Which-0.05.ebuild:
   Stable on ppc64
diff --git a/dev-perl/File-Which/File-Which-0.05.ebuild b/dev-perl/File-Which/File-Which-0.05.ebuild
index 506071e04199..727a5e32d3f0 100644
--- a/dev-perl/File-Which/File-Which-0.05.ebuild
+++ b/dev-perl/File-Which/File-Which-0.05.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Which/File-Which-0.05.ebuild,v 1.4 2004/12/14 16:35:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Which/File-Which-0.05.ebuild,v 1.5 2005/04/25 15:58:39 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="Perl module implementing \`which' internally"
-SRC_URI="http://www.cpan.org/authors/id/J/JM/JMUHLICH/${P}.tar.gz"
-SRC_URI="http://www.cpan.org/authors/id/P/PE/PEREINAR/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/P/PE/PEREINAR/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/search?module=File::Which"
 
 SLOT="0"
diff --git a/dev-perl/FileHandle-Deluxe/ChangeLog b/dev-perl/FileHandle-Deluxe/ChangeLog
index 387cc8981537..f701cfa29872 100644
--- a/dev-perl/FileHandle-Deluxe/ChangeLog
+++ b/dev-perl/FileHandle-Deluxe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/FileHandle-Deluxe
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Deluxe/ChangeLog,v 1.4 2004/06/25 00:28:40 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Deluxe/ChangeLog,v 1.5 2005/04/25 15:59:37 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org>
+  FileHandle-Deluxe-0.92.ebuild:
+  cleaning
 
   31 Dec 2003; Michael Cummings,,, <mcummings@gentoo.org>
   FileHandle-Deluxe-0.92.ebuild:
diff --git a/dev-perl/FileHandle-Deluxe/FileHandle-Deluxe-0.92.ebuild b/dev-perl/FileHandle-Deluxe/FileHandle-Deluxe-0.92.ebuild
index 5dd108e559ef..df091d2813e2 100644
--- a/dev-perl/FileHandle-Deluxe/FileHandle-Deluxe-0.92.ebuild
+++ b/dev-perl/FileHandle-Deluxe/FileHandle-Deluxe-0.92.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Deluxe/FileHandle-Deluxe-0.92.ebuild,v 1.4 2004/07/14 17:31:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Deluxe/FileHandle-Deluxe-0.92.ebuild,v 1.5 2005/04/25 15:59:37 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="FileHandle with commit and rollback"
-SRC_URI="http://www.cpan.org/modules/by-module/FileHandle/${P}.tar.gz"
+SRC_URI="mirror://cpan/authors/id/M/MI/MIKO/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/"
 
 SLOT="0"
diff --git a/dev-perl/FileHandle-Rollback/ChangeLog b/dev-perl/FileHandle-Rollback/ChangeLog
index 9ca2e71b34e6..0e77c0dfd22d 100644
--- a/dev-perl/FileHandle-Rollback/ChangeLog
+++ b/dev-perl/FileHandle-Rollback/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/FileHandle-Rollback
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Rollback/ChangeLog,v 1.7 2005/04/24 13:12:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Rollback/ChangeLog,v 1.8 2005/04/25 16:01:00 mcummings Exp $
+
+  25 Apr 2005; Michael Cummings <mcummings@gentoo.org>
+  -FileHandle-Rollback-1.04.ebuild, FileHandle-Rollback-1.05.ebuild:
+  cleaning
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   FileHandle-Rollback-1.05.ebuild:
diff --git a/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.04.ebuild b/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.04.ebuild
deleted file mode 100644
index 97d88e1e985b..000000000000
--- a/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.04.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.04.ebuild,v 1.4 2004/07/14 17:32:18 agriffis Exp $
-
-inherit perl-module
-
-DESCRIPTION="FileHandle with commit and rollback"
-SRC_URI="http://www.cpan.org/modules/by-module/FileHandle/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="~x86"
-IUSE=""
diff --git a/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.05.ebuild b/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.05.ebuild
index daca10ff0254..1f7f2fff3eef 100644
--- a/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.05.ebuild
+++ b/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.05.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.05.ebuild,v 1.6 2005/04/24 13:12:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FileHandle-Rollback/FileHandle-Rollback-1.05.ebuild,v 1.7 2005/04/25 16:01:00 mcummings Exp $
 
 inherit perl-module
 
 DESCRIPTION="FileHandle with commit and rollback"
 SRC_URI="http://www.cpan.org/modules/by-module/FileHandle/${P}.tar.gz"
-HOMEPAGE="http://www.cpan.org/"
+SRC_URI="mirror://cpan/authors/id/M/MI/MIKO/${P}.tar.gz"
+HOMEPAGE="http://search.cpan.org/~miko/${P}"
 
 SLOT="0"
 LICENSE="Artistic"
diff --git a/dev-perl/FileHandle-Rollback/files/digest-FileHandle-Rollback-1.04 b/dev-perl/FileHandle-Rollback/files/digest-FileHandle-Rollback-1.04
deleted file mode 100644
index 07a60e102f5d..000000000000
--- a/dev-perl/FileHandle-Rollback/files/digest-FileHandle-Rollback-1.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1418937fb01214b33817f245ea40b9c8 FileHandle-Rollback-1.04.tar.gz 6629