Depend on HTML-Form for >libwww-perl-6 (#358617). Cleanup

(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

5 files changed, 11 insertions, 127 deletions

diff --git a/dev-perl/WWW-Mechanize/ChangeLog b/dev-perl/WWW-Mechanize/ChangeLog
index 1e836013005e..7b5a6d6ddff5 100644
--- a/dev-perl/WWW-Mechanize/ChangeLog
+++ b/dev-perl/WWW-Mechanize/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/WWW-Mechanize
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/ChangeLog,v 1.76 2011/02/13 12:35:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/ChangeLog,v 1.77 2011/03/16 09:03:31 tove Exp $
+
+  16 Mar 2011; Torsten Veller <tove@gentoo.org> -WWW-Mechanize-1.60.ebuild,
+  -WWW-Mechanize-1.62.ebuild, -WWW-Mechanize-1.64.ebuild,
+  WWW-Mechanize-1.66.ebuild:
+  Depend on HTML-Form for >libwww-perl-6 (#358617). Cleanup
 
   13 Feb 2011; Raúl Porcel <armin76@gentoo.org> WWW-Mechanize-1.66.ebuild:
   sparc stable wrt #341295
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.60.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.60.ebuild
deleted file mode 100644
index 1fe322b2403a..000000000000
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.60.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.60.ebuild,v 1.7 2010/01/14 16:21:07 grobian Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="Handy web browsing in a Perl object"
-
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-# Bug in the tests - improper use of HTTP::Server
-SRC_TEST="do"
-
-# configure to run the local tests, but not the ones which access the Internet
-myconf="--local --nolive"
-
-RDEPEND="dev-perl/IO-Socket-SSL
-	>=dev-perl/libwww-perl-5.829
-	>=dev-perl/URI-1.36
-	>=dev-perl/HTML-Parser-3.34
-	dev-perl/Test-LongString"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod
-		dev-perl/Test-Taint
-		>=dev-perl/Test-Warn-0.11
-		dev-perl/Test-Memory-Cycle )"
-#		dev-perl/HTTP-Server-Simple )"
-
-# Remove test until the bug is fixed:
-# http://rt.cpan.org/Public/Bug/Display.html?id=41673
-src_unpack() {
-	perl-module_src_unpack
-	mv "${S}"/t/cookies.t{,.disable} || die
-	sed -i "/cookies.t/d" "${S}/MANIFEST" || die
-}
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.62.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.62.ebuild
deleted file mode 100644
index 775b0d092fd5..000000000000
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.62.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.62.ebuild,v 1.1 2010/04/15 06:40:57 tove Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="Handy web browsing in a Perl object"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-# Bug in the tests - improper use of HTTP::Server
-SRC_TEST="do"
-
-# configure to run the local tests, but not the ones which access the Internet
-myconf="--local --nolive"
-
-RDEPEND="dev-perl/IO-Socket-SSL
-	>=dev-perl/libwww-perl-5.829
-	>=dev-perl/URI-1.36
-	>=dev-perl/HTML-Parser-3.34
-	dev-perl/Test-LongString"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Taint
-		>=dev-perl/Test-Warn-0.11
-		dev-perl/Test-Memory-Cycle )"
-#		dev-perl/HTTP-Server-Simple )"
-
-# Remove test until the bug is fixed:
-# http://rt.cpan.org/Public/Bug/Display.html?id=41673
-src_prepare() {
-	mv "${S}"/t/cookies.t{,.disable} || die
-	sed -i "/cookies.t/d" "${S}/MANIFEST" || die
-	perl-module_src_prepare
-}
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.64.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.64.ebuild
deleted file mode 100644
index 6ef0b07d57d3..000000000000
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.64.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.64.ebuild,v 1.1 2010/08/10 15:37:20 robbat2 Exp $
-
-EAPI=2
-
-MODULE_AUTHOR=PETDANCE
-inherit perl-module
-
-DESCRIPTION="Handy web browsing in a Perl object"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-# Bug in the tests - improper use of HTTP::Server
-SRC_TEST="do"
-
-# configure to run the local tests, but not the ones which access the Internet
-myconf="--local --nolive"
-
-RDEPEND="dev-perl/IO-Socket-SSL
-	>=dev-perl/libwww-perl-5.829
-	>=dev-perl/URI-1.36
-	>=dev-perl/HTML-Parser-3.34
-	dev-perl/Test-LongString"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-NoWarnings
-		dev-perl/Test-Taint
-		>=dev-perl/Test-Warn-0.11
-		dev-perl/Test-Memory-Cycle )"
-#		dev-perl/HTTP-Server-Simple )"
-
-# Remove test until the bug is fixed:
-# http://rt.cpan.org/Public/Bug/Display.html?id=41673
-src_prepare() {
-	mv "${S}"/t/cookies.t{,.disable} || die
-	sed -i "/cookies.t/d" "${S}/MANIFEST" || die
-	perl-module_src_prepare
-}
diff --git a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild
index d8d6f64d6628..596d463d830a 100644
--- a/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild
+++ b/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild,v 1.6 2011/02/13 12:35:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/WWW-Mechanize/WWW-Mechanize-1.66.ebuild,v 1.7 2011/03/16 09:03:31 tove Exp $
 
 EAPI=3
 
@@ -20,7 +20,10 @@ SRC_TEST="do"
 myconf="--local --nolive"
 
 RDEPEND="dev-perl/IO-Socket-SSL
-	>=dev-perl/libwww-perl-5.829
+	|| (
+		( >dev-perl/libwww-perl-6 dev-perl/HTML-Form )
+		<dev-perl/libwww-perl-6
+	)
 	>=dev-perl/URI-1.36
 	>=dev-perl/HTML-Parser-3.34
 	dev-perl/Test-LongString"