--- /usr/portage/dev-perl/HTML-Mason/HTML-Mason-1.29_beta02.ebuild	2005-08-08 11:09:16.000000000 +0100
+++ HTML-Mason-1.30.ebuild	2005-08-14 06:09:05.000000000 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.29_beta02.ebuild,v 1.1 2005/08/08 10:09:16 mcummings Exp $
+# $Header: $
 
 inherit perl-module
 
@@ -17,18 +17,17 @@
 SRC_TEST="do"
 
 DEPEND="${DEPEND}
-	|| ( perl-core/CGI
-		modperl?
-			(
-			!apache2? ( =net-www/apache-1* >=www-apache/libapreq-1.0-r2 )
-			apache2? ( >=net-www/apache-2 www-apache/libapreq2 )
-			)
-		)
-	>=dev-perl/Params-Validate-0.24-r2
+	modperl?
+	(
+		!apache2? ( =net-www/apache-1* >=www-apache/libapreq-1.0-r3 )
+		apache2? ( >=net-www/apache-2 >=www-apache/libapreq2 )
+	)
+	!modperl? ( perl-core/CGI )
+	>=dev-perl/Params-Validate-0.70
 	>=dev-perl/Class-Container-0.08
-	>=dev-perl/Exception-Class-1.14
+	>=dev-perl/Exception-Class-1.15
 	dev-perl/Scalar-List-Utils
-	|| ( perl-core/File-Spec >=dev-lang/perl-5.8.0-r12 )
+	>=dev-lang/perl-5.8.6-r5
 	>=dev-perl/Cache-Cache-1.01"
 
 mydoc="CREDITS UPGRADE"
@@ -70,11 +69,6 @@
 }
 
 src_install () {
-	# rendhalver - these bits arent needed for this version
-	#This is a nasty fix for a sandbox violation that Mason wants to do
-	#mv -f install/delete_old_pods.pl install/delete_old_pods.pl2
-	#sed -e "s/use strict/exit()/" install/delete_old_pods.pl2 > install/delete_old_pods.pl
-
 	perl-module_src_install
 	# rendhalver - the html docs have subdirs so this gets all of them
 	dohtml -r htdocs/*