fix license/repoman

38 files changed, 161 insertions, 201 deletions

diff --git a/dev-perl/Archive-Rar/Archive-Rar-1.9.ebuild b/dev-perl/Archive-Rar/Archive-Rar-1.9.ebuild
index bf83e1262be3..39c6a6cc1168 100644
--- a/dev-perl/Archive-Rar/Archive-Rar-1.9.ebuild
+++ b/dev-perl/Archive-Rar/Archive-Rar-1.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Rar/Archive-Rar-1.9.ebuild,v 1.7 2003/06/21 21:36:35 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Archive-Rar/Archive-Rar-1.9.ebuild,v 1.8 2003/08/07 02:11:46 vapier Exp $
 
 inherit perl-module
 
 DESCRIPTION="Archive::Rar - Interface with the rar command"
-SRC_URI="http://www.cpan.org/modules/by-module/Archive/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Acrhive/${P}.readme"
-IUSE=""
-SLOT="0"
+SRC_URI="http://www.cpan.org/modules/by-module/Archive/${P}.tar.gz"
+
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
diff --git a/dev-perl/BSD-Resource/BSD-Resource-1.22.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.22.ebuild
index 53e8b0303518..0720e37c483e 100644
--- a/dev-perl/BSD-Resource/BSD-Resource-1.22.ebuild
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.22.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/BSD-Resource/BSD-Resource-1.22.ebuild,v 1.2 2003/06/21 21:36:35 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/BSD-Resource/BSD-Resource-1.22.ebuild,v 1.3 2003/08/07 02:12:05 vapier Exp $
 
 inherit perl-module
 
 CATEGORY="dev-perl"
 DESCRIPTION="Perl module for BSD process resource limit and priority functions"
-SRC_URI="http://www.cpan.org/modules/by-module/BSD/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/BSD/${P}.readme"
+SRC_URI="http://www.cpan.org/modules/by-module/BSD/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic | GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
diff --git a/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06-r1.ebuild b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06-r1.ebuild
index 8760c119e937..874e13bddfe0 100644
--- a/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06-r1.ebuild
+++ b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06-r1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06-r1.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06-r1.ebuild,v 1.6 2003/08/07 02:12:33 vapier Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
 CATEGORY="dev-perl"
 DESCRIPTION="Digest::Nilsimsa - Perl version of Nilsimsa code"
-SRC_URI="http://www.cpan.org/modules/by-module/Digest/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Digest/${P}.readme"
+SRC_URI="http://www.cpan.org/modules/by-module/Digest/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic | GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc alpha"
diff --git a/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06.ebuild b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06.ebuild
index 8ec8d10ba8a5..bd40c0c46835 100644
--- a/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06.ebuild
+++ b/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2.
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06.ebuild,v 1.9 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Digest-Nilsimsa/Digest-Nilsimsa-0.06.ebuild,v 1.10 2003/08/07 02:12:33 vapier Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
 CATEGORY="dev-perl"
 DESCRIPTION="Digest::Nilsimsa - Perl version of Nilsimsa code"
-SRC_URI="http://www.cpan.org/modules/by-module/Digest/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Digest/${P}.readme"
+SRC_URI="http://www.cpan.org/modules/by-module/Digest/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic | GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc alpha"
diff --git a/dev-perl/Festival-Client-Async/Festival-Client-Async-0.0303.ebuild b/dev-perl/Festival-Client-Async/Festival-Client-Async-0.0303.ebuild
index 16e7b3a13d87..7081af2de918 100644
--- a/dev-perl/Festival-Client-Async/Festival-Client-Async-0.0303.ebuild
+++ b/dev-perl/Festival-Client-Async/Festival-Client-Async-0.0303.ebuild
@@ -1,11 +1,13 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Festival-Client-Async/Festival-Client-Async-0.0303.ebuild,v 1.2 2003/08/07 02:24:11 vapier Exp $
+
 inherit perl-module
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Festival-Async -  Non-blocking interface to a Festival server."
-SRC_URI="http://www.cpan.org/modules/by-module/Festival/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/"
+SRC_URI="http://www.cpan.org/modules/by-module/Festival/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="~x86"
-
diff --git a/dev-perl/File-Temp/File-Temp-0.12.ebuild b/dev-perl/File-Temp/File-Temp-0.12.ebuild
index 4d13ed39cf57..c9e925e74b60 100644
--- a/dev-perl/File-Temp/File-Temp-0.12.ebuild
+++ b/dev-perl/File-Temp/File-Temp-0.12.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Temp/File-Temp-0.12.ebuild,v 1.6 2003/06/21 21:36:36 drobbins Exp $
-
-IUSE=""
+# 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.7 2003/08/07 02:12:51 vapier Exp $
 
 inherit perl-module
 
@@ -11,9 +9,9 @@ S=${WORKDIR}/${MY_P}
 CATEGORY="dev-perl"
 
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
-SRC_URI="http://www.cpan.org/modules/by-module/File/${MY_P}.tar.gz"
 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"
 
-SLOT="0"
 LICENSE="Artistic | GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.07.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.07.ebuild
index 6675d94c0e9a..bf562af23bd0 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.07.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Finance-Quote/Finance-Quote-1.07.ebuild,v 1.7 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Finance-Quote/Finance-Quote-1.07.ebuild,v 1.8 2003/08/07 02:13:34 vapier Exp $
 
 inherit perl-module
 
@@ -8,17 +8,14 @@ MY_P=${P/.3_/c-}
 S=${WORKDIR}/${MY_P}
 CATEGORY="dev-perl"
 DESCRIPTION="The Perl Finance-Quote Module"
-SRC_URI="http://www.cpan.org/modules/by-module/Finance/${MY_P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Finance/${MY_P}.readme"
-IUSE=""
-SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="x86 amd64 ppc sparc "
+SRC_URI="http://www.cpan.org/modules/by-module/Finance/${MY_P}.tar.gz"
 
-DEPEND="${DEPEND}
-		dev-perl/libwww-perl
-		dev-perl/HTML-TableExtract"
+LICENSE="Artistic | GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 ppc sparc"
 
-RDEPEND="${DEPEND}"
+DEPEND="dev-perl/libwww-perl
+	dev-perl/HTML-TableExtract"
 
 mydoc="TODO"
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.08.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.08.ebuild
index 0b1f71e95575..0fc2cbe7e3b7 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.08.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.08.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Finance-Quote/Finance-Quote-1.08.ebuild,v 1.1 2003/07/28 09:59:22 mcummings Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Finance-Quote/Finance-Quote-1.08.ebuild,v 1.2 2003/08/07 02:13:34 vapier Exp $
 
 inherit perl-module
 
@@ -8,17 +8,14 @@ MY_P=${P/.3_/c-}
 S=${WORKDIR}/${MY_P}
 CATEGORY="dev-perl"
 DESCRIPTION="The Perl Finance-Quote Module"
-SRC_URI="http://www.cpan.org/modules/by-module/Finance/${MY_P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Finance/${MY_P}.readme"
-IUSE=""
-SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc "
+SRC_URI="http://www.cpan.org/modules/by-module/Finance/${MY_P}.tar.gz"
 
-DEPEND="${DEPEND}
-		dev-perl/libwww-perl
-		dev-perl/HTML-TableExtract"
+LICENSE="Artistic | GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 
-RDEPEND="${DEPEND}"
+DEPEND="dev-perl/libwww-perl
+	dev-perl/HTML-TableExtract"
 
 mydoc="TODO"
diff --git a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.008.ebuild b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.008.ebuild
index 145e7850ae95..82f3e63d53d3 100644
--- a/dev-perl/Getopt-Mixed/Getopt-Mixed-1.008.ebuild
+++ b/dev-perl/Getopt-Mixed/Getopt-Mixed-1.008.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Getopt-Mixed/Getopt-Mixed-1.008.ebuild,v 1.4 2003/06/21 21:36:36 drobbins Exp $
-
-IUSE=""
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Getopt-Mixed/Getopt-Mixed-1.008.ebuild,v 1.5 2003/08/07 02:15:13 vapier Exp $
 
 inherit perl-module
 
 DESCRIPTION="Getopt::Mixed is used for parsing mixed options"
-SRC_URI="http://www.cpan.org/modules/by-module/Getopt/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Getopt/${P}.readme"
+SRC_URI="http://www.cpan.org/modules/by-module/Getopt/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc ~alpha"
diff --git a/dev-perl/HTML-Clean/HTML-Clean-0.8-r1.ebuild b/dev-perl/HTML-Clean/HTML-Clean-0.8-r1.ebuild
index 76ba36045ed9..c54a2f818c35 100644
--- a/dev-perl/HTML-Clean/HTML-Clean-0.8-r1.ebuild
+++ b/dev-perl/HTML-Clean/HTML-Clean-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Clean/HTML-Clean-0.8-r1.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Clean/HTML-Clean-0.8-r1.ebuild,v 1.6 2003/08/07 02:13:57 vapier Exp $
 
 inherit perl-module
 
@@ -11,5 +11,3 @@ SRC_URI="http://cpan.org/modules/by-module/HTML/${P}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc ~alpha ~ppc"
-
-DEPEND="${DEPEND}"
diff --git a/dev-perl/HTML-Clean/HTML-Clean-0.8.ebuild b/dev-perl/HTML-Clean/HTML-Clean-0.8.ebuild
index ea3eef0adc28..9823125199df 100644
--- a/dev-perl/HTML-Clean/HTML-Clean-0.8.ebuild
+++ b/dev-perl/HTML-Clean/HTML-Clean-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Clean/HTML-Clean-0.8.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Clean/HTML-Clean-0.8.ebuild,v 1.6 2003/08/07 02:13:57 vapier Exp $
 
 inherit perl-module
 
@@ -11,5 +11,3 @@ SRC_URI="http://cpan.org/modules/by-module/HTML/${P}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc ~alpha ~ppc"
-
-DEPEND="${DEPEND}"
diff --git a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.10.ebuild b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.10.ebuild
index 59adad468d48..21bdeaf20d8c 100644
--- a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.10.ebuild
+++ b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.10.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.10.ebuild,v 1.4 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.10.ebuild,v 1.5 2003/08/07 02:14:56 vapier Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions."
-SRC_URI="http://www.cpan.org/authors/id/KWILLIAMS/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/authors/id/KWILLIAMS/${P}.readme"
-IUSE=""
-SLOT="0"
+SRC_URI="http://www.cpan.org/authors/id/KWILLIAMS/${P}.tar.gz"
+
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc alpha"
diff --git a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.11.ebuild b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.11.ebuild
index 3dd834253a58..8d58f8e8bd4c 100644
--- a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.11.ebuild
+++ b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.11.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.11.ebuild,v 1.3 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.11.ebuild,v 1.4 2003/08/07 02:14:56 vapier Exp $
 
 inherit perl-module
 
 DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions."
-SRC_URI="http://www.cpan.org/modules/by-module/HTML/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/HTML/${P}.readme"
-IUSE=""
-SLOT="0"
+SRC_URI="http://www.cpan.org/modules/by-module/HTML/${P}.tar.gz"
+
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc alpha"
diff --git a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.12.ebuild b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.12.ebuild
index 093d2d813f7a..ec36a7ad7048 100644
--- a/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.12.ebuild
+++ b/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.12.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.12.ebuild,v 1.1 2003/07/09 19:14:51 mcummings Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-SimpleParse/HTML-SimpleParse-0.12.ebuild,v 1.2 2003/08/07 02:14:56 vapier Exp $
 
 inherit perl-module
 
 DESCRIPTION="A bare-bones HTML parser, similar to HTML::Parser, but with a couple important distinctions."
-SRC_URI="http://www.cpan.org/modules/by-module/HTML/${P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/HTML/${P}.readme"
-IUSE=""
-SLOT="0"
+SRC_URI="http://www.cpan.org/modules/by-module/HTML/${P}.tar.gz"
+
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc alpha"
diff --git a/dev-perl/ImageSize/ImageSize-2.99-r1.ebuild b/dev-perl/ImageSize/ImageSize-2.99-r1.ebuild
index 1757008ce3ee..459637104fc0 100644
--- a/dev-perl/ImageSize/ImageSize-2.99-r1.ebuild
+++ b/dev-perl/ImageSize/ImageSize-2.99-r1.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ImageSize/ImageSize-2.99-r1.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ImageSize/ImageSize-2.99-r1.ebuild,v 1.6 2003/08/07 02:15:37 vapier Exp $
 
 inherit perl-module
 
 MY_P=Image-Size-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="The Perl Image-Size Module"
-SRC_URI="http://www.cpan.org/modules/by-module/Image/${MY_P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Image/${MY_P}.readme"
+SRC_URI="http://www.cpan.org/modules/by-module/Image/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 amd64 sparc ~alpha ~ppc"
 
-DEPEND="${DEPEND}"
-
 mydoc="ToDo"
diff --git a/dev-perl/ImageSize/ImageSize-2.99.ebuild b/dev-perl/ImageSize/ImageSize-2.99.ebuild
index d65c9b1b269f..f71bb312a96a 100644
--- a/dev-perl/ImageSize/ImageSize-2.99.ebuild
+++ b/dev-perl/ImageSize/ImageSize-2.99.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/ImageSize/ImageSize-2.99.ebuild,v 1.6 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/ImageSize/ImageSize-2.99.ebuild,v 1.7 2003/08/07 02:15:37 vapier Exp $
 
 inherit perl-module
 
 MY_P=Image-Size-${PV}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="The Perl Image-Size Module"
-SRC_URI="http://www.cpan.org/modules/by-module/Image/${MY_P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Image/${MY_P}.readme"
+SRC_URI="http://www.cpan.org/modules/by-module/Image/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 amd64 sparc ~alpha ~ppc"
 
-DEPEND="${DEPEND}"
-
 mydoc="ToDo"
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.01-r1.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.01-r1.ebuild
index 03849ad8d8f0..e7f8f9ec70c6 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.01-r1.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Locale-gettext/Locale-gettext-1.01-r1.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Locale-gettext/Locale-gettext-1.01-r1.ebuild,v 1.6 2003/08/07 02:16:22 vapier Exp $
 
 inherit perl-module
 
@@ -15,5 +15,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc ~ppc ~alpha"
 
-DEPEND="${DEPEND}
-	sys-devel/gettext"
+DEPEND="sys-devel/gettext"
diff --git a/dev-perl/Locale-gettext/Locale-gettext-1.01.ebuild b/dev-perl/Locale-gettext/Locale-gettext-1.01.ebuild
index 05de8765b287..b5a71da020aa 100644
--- a/dev-perl/Locale-gettext/Locale-gettext-1.01.ebuild
+++ b/dev-perl/Locale-gettext/Locale-gettext-1.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Locale-gettext/Locale-gettext-1.01.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Locale-gettext/Locale-gettext-1.01.ebuild,v 1.6 2003/08/07 02:16:22 vapier Exp $
 
 inherit perl-module
 
@@ -15,5 +15,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc ~ppc ~alpha"
 
-DEPEND="${DEPEND}
-	sys-devel/gettext"
+DEPEND="sys-devel/gettext"
diff --git a/dev-perl/Parse-Yapp/Parse-Yapp-1.05-r1.ebuild b/dev-perl/Parse-Yapp/Parse-Yapp-1.05-r1.ebuild
index 9611da95f572..990d798e07a1 100644
--- a/dev-perl/Parse-Yapp/Parse-Yapp-1.05-r1.ebuild
+++ b/dev-perl/Parse-Yapp/Parse-Yapp-1.05-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-Yapp/Parse-Yapp-1.05-r1.ebuild,v 1.4 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-Yapp/Parse-Yapp-1.05-r1.ebuild,v 1.5 2003/08/07 02:16:44 vapier Exp $
 
 inherit perl-module
 
@@ -14,6 +14,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc  ~ppc ~alpha"
 
-DEPEND="${DEPEND}"
-
 S=${WORKDIR}/${MY_P}
diff --git a/dev-perl/Parse-Yapp/Parse-Yapp-1.05.ebuild b/dev-perl/Parse-Yapp/Parse-Yapp-1.05.ebuild
index bc6b46d24b4d..fb9b9397a582 100644
--- a/dev-perl/Parse-Yapp/Parse-Yapp-1.05.ebuild
+++ b/dev-perl/Parse-Yapp/Parse-Yapp-1.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-Yapp/Parse-Yapp-1.05.ebuild,v 1.4 2003/06/21 21:36:36 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Parse-Yapp/Parse-Yapp-1.05.ebuild,v 1.5 2003/08/07 02:16:44 vapier Exp $
 
 inherit perl-module
 
@@ -14,6 +14,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc  ~ppc ~alpha"
 
-DEPEND="${DEPEND}"
-
 S=${WORKDIR}/${MY_P}
diff --git a/dev-perl/Safe/Safe-2.09.ebuild b/dev-perl/Safe/Safe-2.09.ebuild
index c877f05bbdd0..4ad706ff0b02 100644
--- a/dev-perl/Safe/Safe-2.09.ebuild
+++ b/dev-perl/Safe/Safe-2.09.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Safe/Safe-2.09.ebuild,v 1.8 2003/06/21 21:36:37 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Safe/Safe-2.09.ebuild,v 1.9 2003/08/07 02:16:57 vapier Exp $
 
 inherit perl-module
 
 DESCRIPTION="Compile and execute code in restricted compartments"
-SRC_URI="http://www.cpan.org/modules/by-module/Safe/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/ABERGMAN/${P}/"
-IUSE=""
-SLOT="0"
+SRC_URI="http://www.cpan.org/modules/by-module/Safe/${P}.tar.gz"
+
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc alpha mips hppa arm"
diff --git a/dev-perl/Text-Iconv/Text-Iconv-1.2-r1.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.2-r1.ebuild
index 1f327b7ce6ae..8b4c42b738d4 100644
--- a/dev-perl/Text-Iconv/Text-Iconv-1.2-r1.ebuild
+++ b/dev-perl/Text-Iconv/Text-Iconv-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Iconv/Text-Iconv-1.2-r1.ebuild,v 1.4 2003/06/21 21:36:38 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Iconv/Text-Iconv-1.2-r1.ebuild,v 1.5 2003/08/07 02:17:21 vapier Exp $
 
 inherit perl-module
 
@@ -11,5 +11,3 @@ SRC_URI="http://cpan.org/modules/by-module/Text/${P}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc  ~ppc ~alpha"
-
-DEPEND="${DEPEND}"
diff --git a/dev-perl/Text-Iconv/Text-Iconv-1.2.ebuild b/dev-perl/Text-Iconv/Text-Iconv-1.2.ebuild
index c69af948029c..b38d8c098fb5 100644
--- a/dev-perl/Text-Iconv/Text-Iconv-1.2.ebuild
+++ b/dev-perl/Text-Iconv/Text-Iconv-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Iconv/Text-Iconv-1.2.ebuild,v 1.4 2003/06/21 21:36:38 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Iconv/Text-Iconv-1.2.ebuild,v 1.5 2003/08/07 02:17:21 vapier Exp $
 
 inherit perl-module
 
@@ -11,5 +11,3 @@ SRC_URI="http://cpan.org/modules/by-module/Text/${P}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc  ~ppc ~alpha"
-
-DEPEND="${DEPEND}"
diff --git a/dev-perl/Text-Kakasi/Text-Kakasi-2.04.ebuild b/dev-perl/Text-Kakasi/Text-Kakasi-2.04.ebuild
index ef8a29688b27..68494037d15d 100644
--- a/dev-perl/Text-Kakasi/Text-Kakasi-2.04.ebuild
+++ b/dev-perl/Text-Kakasi/Text-Kakasi-2.04.ebuild
@@ -1,23 +1,21 @@
 # Copyright 2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Kakasi/Text-Kakasi-2.04.ebuild,v 1.3 2003/06/21 21:36:38 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Text-Kakasi/Text-Kakasi-2.04.ebuild,v 1.4 2003/08/07 02:24:41 vapier Exp $
 
-inherit perl-module
+inherit perl-module eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="This module provides libkakasi interface for Perl."
-SRC_URI="http://search.cpan.org/CPAN/authors/id/D/DA/DANKOGAI/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/dist/Text-Kakasi/"
+SRC_URI="http://search.cpan.org/CPAN/authors/id/D/DA/DANKOGAI/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE=""
 
 DEPEND=">=app-i18n/kakasi-2.3.4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILEDIR}/Text-Kakasi-1.05-gentoo.diff
+	epatch ${FILESDIR}/Text-Kakasi-1.05-gentoo.diff
 }
diff --git a/dev-perl/Time-HiRes/Time-HiRes-1.42.ebuild b/dev-perl/Time-HiRes/Time-HiRes-1.42.ebuild
index 57dcb1929fa4..8e3a36d74d21 100644
--- a/dev-perl/Time-HiRes/Time-HiRes-1.42.ebuild
+++ b/dev-perl/Time-HiRes/Time-HiRes-1.42.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Time-HiRes/Time-HiRes-1.42.ebuild,v 1.3 2003/06/21 21:36:38 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Time-HiRes/Time-HiRes-1.42.ebuild,v 1.4 2003/08/07 02:18:03 vapier Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Perl Time::HiRes. High resolution alarm, sleep, gettimeofday, interval timers" 
-SRC_URI="http://search.cpan.org/CPAN/authors/id/J/JH/JHI/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/JHI/${P}/"
+SRC_URI="http://search.cpan.org/CPAN/authors/id/J/JH/JHI/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
+
 DEPEND=""
 RDEPEND=""
 
-
 mydoc="TODO"
diff --git a/dev-perl/Time-HiRes/Time-HiRes-1.47.ebuild b/dev-perl/Time-HiRes/Time-HiRes-1.47.ebuild
index b98f9a96abd0..c960299ea5a7 100644
--- a/dev-perl/Time-HiRes/Time-HiRes-1.47.ebuild
+++ b/dev-perl/Time-HiRes/Time-HiRes-1.47.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Time-HiRes/Time-HiRes-1.47.ebuild,v 1.2 2003/06/21 21:36:38 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Time-HiRes/Time-HiRes-1.47.ebuild,v 1.3 2003/08/07 02:18:03 vapier Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Perl Time::HiRes. High resolution alarm, sleep, gettimeofday, interval timers" 
-SRC_URI="http://search.cpan.org/CPAN/authors/id/J/JH/JHI/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/JHI/${P}/"
+SRC_URI="http://search.cpan.org/CPAN/authors/id/J/JH/JHI/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc alpha ~mips ~hppa ~arm"
+
 DEPEND=""
 RDEPEND=""
 
-
 mydoc="TODO"
diff --git a/dev-perl/Time-HiRes/Time-HiRes-1.50.ebuild b/dev-perl/Time-HiRes/Time-HiRes-1.50.ebuild
index cd4400c22aab..05ee813edce6 100644
--- a/dev-perl/Time-HiRes/Time-HiRes-1.50.ebuild
+++ b/dev-perl/Time-HiRes/Time-HiRes-1.50.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Time-HiRes/Time-HiRes-1.50.ebuild,v 1.1 2003/08/03 11:36:18 mcummings Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Time-HiRes/Time-HiRes-1.50.ebuild,v 1.2 2003/08/07 02:18:03 vapier Exp $
 
 inherit perl-module
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Perl Time::HiRes. High resolution alarm, sleep, gettimeofday, interval timers" 
-SRC_URI="http://search.cpan.org/CPAN/authors/id/J/JH/JHI/${P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/JHI/${P}/"
+SRC_URI="http://search.cpan.org/CPAN/authors/id/J/JH/JHI/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+
 DEPEND=""
 RDEPEND=""
 
-
 mydoc="TODO"
diff --git a/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r1.ebuild b/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r1.ebuild
index ab42ca30b2f0..59ab0da1e21a 100644
--- a/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r1.ebuild
+++ b/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r1.ebuild,v 1.4 2003/06/21 21:36:44 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r1.ebuild,v 1.5 2003/08/07 02:18:47 vapier Exp $
 
 inherit perl-module
 
@@ -15,5 +15,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc"
 
-DEPEND="${DEPEND}
-	>=libxml-perl-0.07-r1"
+DEPEND=">=dev-perl/libxml-perl-0.07-r1"
diff --git a/dev-perl/XML-Grove/XML-Grove-0.46_alpha.ebuild b/dev-perl/XML-Grove/XML-Grove-0.46_alpha.ebuild
index 50bfa502bdd9..7bc126bb4280 100644
--- a/dev-perl/XML-Grove/XML-Grove-0.46_alpha.ebuild
+++ b/dev-perl/XML-Grove/XML-Grove-0.46_alpha.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Grove/XML-Grove-0.46_alpha.ebuild,v 1.4 2003/06/21 21:36:44 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Grove/XML-Grove-0.46_alpha.ebuild,v 1.5 2003/08/07 02:18:47 vapier Exp $
 
 inherit perl-module
 
@@ -15,5 +15,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc"
 
-DEPEND="${DEPEND}
-	>=libxml-perl-0.07-r1"
+DEPEND=">=dev-perl/libxml-perl-0.07-r1"
diff --git a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23-r1.ebuild b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23-r1.ebuild
index ea2ae2f87b15..6afc12bbdb7e 100644
--- a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23-r1.ebuild
+++ b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23-r1.ebuild,v 1.4 2003/06/21 21:36:44 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23-r1.ebuild,v 1.5 2003/08/07 02:19:16 vapier Exp $
 
 inherit perl-module
 
@@ -15,5 +15,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc"
 
-DEPEND="${DEPEND}
-	>=libxml-perl-0.07-r1"
+DEPEND=">=dev-perl/libxml-perl-0.07-r1"
diff --git a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23.ebuild b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23.ebuild
index ec66f6da04f7..227d4eb7e11e 100644
--- a/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23.ebuild
+++ b/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23.ebuild,v 1.4 2003/06/21 21:36:44 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Handler-YAWriter/XML-Handler-YAWriter-0.23.ebuild,v 1.5 2003/08/07 02:19:16 vapier Exp $
 
 inherit perl-module
 
@@ -15,5 +15,4 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc"
 
-DEPEND="${DEPEND}
-	>=libxml-perl-0.07-r1"
+DEPEND=">=dev-perl/libxml-perl-0.07-r1"
diff --git a/dev-perl/XML-Twig/XML-Twig-3.09.ebuild b/dev-perl/XML-Twig/XML-Twig-3.09.ebuild
index 5d76d0620fff..fe194118b0f2 100644
--- a/dev-perl/XML-Twig/XML-Twig-3.09.ebuild
+++ b/dev-perl/XML-Twig/XML-Twig-3.09.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Twig/XML-Twig-3.09.ebuild,v 1.6 2003/07/16 15:28:33 mcummings Exp $
-
-IUSE="nls"
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-Twig/XML-Twig-3.09.ebuild,v 1.7 2003/08/07 02:19:50 vapier Exp $
 
 inherit perl-module
 
@@ -11,12 +9,13 @@ S=${WORKDIR}/${MY_P}
 CATEGORY="dev-perl"
 
 DESCRIPTION="This module provides a way to process XML documents. It is build on top of XML::Parser"
-SRC_URI="http://www.cpan.org/modules/by-module/XML/${MY_P}.tar.gz"
 HOMEPAGE="http://www.cpan.org/modules/by-module/XML/${MY_P}.readme"
+SRC_URI="http://www.cpan.org/modules/by-module/XML/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic | GPL-2"
+SLOT="0"
 KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
+IUSE="nls"
 
 # Twig ONLY works with expat 1.95.5
 DEPEND="${DEPEND} 
diff --git a/dev-perl/XML-XQL/XML-XQL-0.67-r1.ebuild b/dev-perl/XML-XQL/XML-XQL-0.67-r1.ebuild
index 37115ba43890..a4e556e1fbf4 100644
--- a/dev-perl/XML-XQL/XML-XQL-0.67-r1.ebuild
+++ b/dev-perl/XML-XQL/XML-XQL-0.67-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-XQL/XML-XQL-0.67-r1.ebuild,v 1.4 2003/06/21 21:36:44 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-XQL/XML-XQL-0.67-r1.ebuild,v 1.5 2003/08/07 02:20:23 vapier Exp $
 
 inherit perl-module
 
@@ -15,8 +15,7 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc  ~ppc ~alpha"
 
-DEPEND="${DEPEND}
-	>=dev-perl/libxml-perl-0.07-r1
+DEPEND=">=dev-perl/libxml-perl-0.07-r1
 	>=dev-perl/XML-DOM-1.39-r1
 	>=dev-perl/Parse-Yapp-1.05
 	>=dev-perl/DateManip-5.40-r1"
diff --git a/dev-perl/XML-XQL/XML-XQL-0.67.ebuild b/dev-perl/XML-XQL/XML-XQL-0.67.ebuild
index 5f9652e1c29d..d0a8f23e1f9d 100644
--- a/dev-perl/XML-XQL/XML-XQL-0.67.ebuild
+++ b/dev-perl/XML-XQL/XML-XQL-0.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-XQL/XML-XQL-0.67.ebuild,v 1.4 2003/06/21 21:36:44 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-XQL/XML-XQL-0.67.ebuild,v 1.5 2003/08/07 02:20:23 vapier Exp $
 
 inherit perl-module
 
@@ -15,8 +15,7 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 sparc  ~ppc ~alpha"
 
-DEPEND="${DEPEND}
-	>=dev-perl/libxml-perl-0.07-r1
+DEPEND=">=dev-perl/libxml-perl-0.07-r1
 	>=dev-perl/XML-DOM-1.39-r1
 	>=dev-perl/Parse-Yapp-1.05
 	>=dev-perl/DateManip-5.40-r1"
diff --git a/dev-perl/XML-XQL/XML-XQL-0.68.ebuild b/dev-perl/XML-XQL/XML-XQL-0.68.ebuild
index 8d5318e0f68b..9438ad6355a7 100644
--- a/dev-perl/XML-XQL/XML-XQL-0.68.ebuild
+++ b/dev-perl/XML-XQL/XML-XQL-0.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-XQL/XML-XQL-0.68.ebuild,v 1.2 2003/06/21 21:36:44 drobbins Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-XQL/XML-XQL-0.68.ebuild,v 1.3 2003/08/07 02:20:23 vapier Exp $
 
 inherit perl-module
 
@@ -15,8 +15,7 @@ LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="x86 amd64 ~sparc ~ppc ~alpha"
 
-DEPEND="${DEPEND}
-	>=dev-perl/libxml-perl-0.07-r1
+DEPEND=">=dev-perl/libxml-perl-0.07-r1
 	>=dev-perl/XML-DOM-1.39-r1
 	>=dev-perl/Parse-Yapp-1.05
 	dev-perl/libwww-perl
diff --git a/dev-perl/Xmms-Perl/Xmms-Perl-0.12.ebuild b/dev-perl/Xmms-Perl/Xmms-Perl-0.12.ebuild
index c0f7b6cb3458..ee474afdfdf2 100644
--- a/dev-perl/Xmms-Perl/Xmms-Perl-0.12.ebuild
+++ b/dev-perl/Xmms-Perl/Xmms-Perl-0.12.ebuild
@@ -1,17 +1,20 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Xmms-Perl/Xmms-Perl-0.12.ebuild,v 1.2 2003/08/07 02:25:19 vapier Exp $
+
 inherit perl-module eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A  Perl extension interface to XMMS."
+DESCRIPTION="A Perl extension interface to XMMS"
 HOMEPAGE="http://www.cpan.org/modules/by-module/Xmms/${P}.readme"
 SRC_URI="http://www.cpan.org/modules/by-module/Xmms/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="Artistic"
+SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND="media-sound/xmms 
-		dev-perl/MP3-Info
-		dev-perl/Term-ReadLine-Perl"
+	dev-perl/MP3-Info
+	dev-perl/Term-ReadLine-Perl"
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/dev-perl/jcode_pl/jcode_pl-2.13.ebuild b/dev-perl/jcode_pl/jcode_pl-2.13.ebuild
index 5a05f7f339e1..5f79c5ad3c7a 100644
--- a/dev-perl/jcode_pl/jcode_pl-2.13.ebuild
+++ b/dev-perl/jcode_pl/jcode_pl-2.13.ebuild
@@ -1,25 +1,25 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/jcode_pl/jcode_pl-2.13.ebuild,v 1.1 2003/06/30 14:14:10 yakina Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/jcode_pl/jcode_pl-2.13.ebuild,v 1.2 2003/08/07 02:26:01 vapier Exp $
 
 DESCRIPTION="Japanese Kanji code converter for Perl"
-SRC_URI="http://srekcah.org/jcode/${P/_/.}"
 HOMEPAGE="http://srekcah.org/jcode/"
+SRC_URI="http://srekcah.org/jcode/${P/_/.}"
+
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="x86"
+
 DEPEND="virtual/glibc"
 RDEPEND=">=dev-lang/perl-5"
-S=${WORKDIR}/${P}
-IUSE=""
+
+S=${WORKDIR}
 
 src_unpack() {
-	mkdir -p ${S}
-	cd ${S}
 	cp ${DISTDIR}/${A} jcode.pl
 }
 
-src_install () {
+src_install() {
 	insinto /usr/lib/perl5/site_perl
 	doins jcode.pl
 }
diff --git a/dev-perl/perlsieve/perlsieve-0.4.9b.ebuild b/dev-perl/perlsieve/perlsieve-0.4.9b.ebuild
index 7ba279a4496f..66b8d9066d44 100644
--- a/dev-perl/perlsieve/perlsieve-0.4.9b.ebuild
+++ b/dev-perl/perlsieve/perlsieve-0.4.9b.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc. 
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/perlsieve/perlsieve-0.4.9b.ebuild,v 1.1 2003/07/20 14:01:30 mcummings Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/perlsieve/perlsieve-0.4.9b.ebuild,v 1.2 2003/08/07 02:26:22 vapier Exp $
  
 inherit perl-module 
   
-S=${WORKDIR}/perlsieve-0.4.9 
+S=${WORKDIR}/perlsieve-0.4.9
 DESCRIPTION="Access Sieve services" 
-SRC_URI="http://lists.opensoftwareservices.com/websieve/${P}.tar.gz" 
 HOMEPAGE="http://sourceforge.net/projects/websieve/" 
+SRC_URI="http://lists.opensoftwareservices.com/websieve/${P}.tar.gz" 
    
-SLOT="0" 
 LICENSE="Artistic | GPL-2" 
+SLOT="0" 
 KEYWORDS="x86 ~amd64 ~alpha ~arm ~hppa ~mips ~ppc ~sparc" 
-