[bump] HTML-FormFu-2.10.0

Package-Manager: portage-2.2.17

4 files changed, 144 insertions, 151 deletions

diff --git a/dev-perl/HTML-FormFu/HTML-FormFu-0.90.100-r1.ebuild b/dev-perl/HTML-FormFu/HTML-FormFu-0.90.100-r1.ebuild
deleted file mode 100644
index 2b385a8f6..000000000
--- a/dev-perl/HTML-FormFu/HTML-FormFu-0.90.100-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=5
-MODULE_AUTHOR=CFRANKS
-MODULE_VERSION=0.09010
-inherit perl-module
-
-DESCRIPTION='HTML Form Creation, Rendering and Validation Framework'
-LICENSE=" || ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-perl_meta_configure() {
-	# ExtUtils::MakeMaker 6.59 ( 6.590.0 )
-	echo \>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-}
-perl_meta_build() {
-	# CGI 3.37 ( 3.370.0 )
-	echo \>=virtual/perl-CGI-3.370
-	# ExtUtils::MakeMaker 6.59 ( 6.590.0 )
-	echo \>=virtual/perl-ExtUtils-MakeMaker-6.590.0
-	# POSIX
-	echo dev-lang/perl
-	# Test::Exception
-	echo dev-perl/Test-Exception
-	# Test::More 0.92 ( 0.920.0 )
-	echo \>=virtual/perl-Test-Simple-0.92
-}
-perl_meta_runtime() {
-	# Captcha::reCAPTCHA 0.93 ( 0.930.0 )
-	echo \>=dev-perl/Captcha-reCAPTCHA-0.930.0
-	# Carp
-	echo dev-lang/perl
-	# Class::Accessor::Chained::Fast
-	echo dev-perl/Class-Accessor-Chained
-	# Class::MOP::Method
-	echo dev-perl/Moose
-	# Clone 0.31 ( 0.310.0 )
-	echo \>=dev-perl/Clone-0.310.0
-	# Config::Any 0.18 ( 0.180.0 )
-	echo \>=dev-perl/Config-Any-0.180.0
-	# Crypt::CBC
-	echo dev-perl/crypt-cbc
-	# Crypt::DES
-	echo dev-perl/Crypt-DES
-	# Cwd
-	echo virtual/perl-File-Spec
-	# Data::Visitor 0.26 ( 0.260.0 )
-	echo \>=dev-perl/Data-Visitor-0.260.0
-	# Data::Visitor::Callback
-	echo dev-perl/Data-Visitor
-	# Date::Calc
-	echo dev-perl/Date-Calc
-	# DateTime 0.54 ( 0.540.0 )
-	echo \>=dev-perl/DateTime-0.54
-	# DateTime::Format::Builder 0.7901 ( 0.790.100 )
-	echo \>=dev-perl/DateTime-Format-Builder-0.790.100
-	# DateTime::Format::Natural
-	echo dev-perl/DateTime-Format-Natural
-	# DateTime::Format::Strptime
-	echo dev-perl/DateTime-Format-Strptime
-	# DateTime::Locale 0.45 ( 0.450.0 )
-	echo \>=dev-perl/DateTime-Locale-0.450.0
-	# Email::Valid
-	echo dev-perl/Email-Valid
-	# Encode
-	echo virtual/perl-Encode
-	# Exporter 5.57 ( 5.570.0 )
-	echo \>=virtual/perl-Exporter-5.570.0
-	# Fatal
-	echo virtual/perl-autodie
-	# File::Copy
-	echo dev-lang/perl
-	# File::Find
-	echo dev-lang/perl
-	# File::ShareDir
-	echo dev-perl/File-ShareDir
-	# File::Spec
-	echo virtual/perl-File-Spec
-	# File::Temp
-	echo virtual/perl-File-Temp
-	# HTML::Scrubber
-	echo dev-perl/HTML-Scrubber
-	# HTML::TokeParser::Simple 3.14 ( 3.140.0 )
-	echo \>=dev-perl/HTML-TokeParser-Simple-3.140.0
-	# HTTP::Headers 1.64 ( 1.640.0 )
-	echo \>=dev-perl/HTTP-Message-1.640.0
-	# Hash::Flatten
-	echo dev-perl/Hash-Flatten
-	# IO::File
-	echo virtual/perl-IO
-	# List::MoreUtils
-	echo dev-perl/List-MoreUtils
-	# List::Util
-	echo virtual/perl-Scalar-List-Utils
-	# Locale::Maketext
-	echo virtual/perl-Locale-Maketext
-	# Module::Pluggable
-	echo virtual/perl-Module-Pluggable
-	# Moose 1.00 ( 1.0.0 )
-	echo \>=dev-perl/Moose-1.0.0
-	# Moose::Role
-	echo dev-perl/Moose
-	# Moose::Util
-	echo dev-perl/Moose
-	# MooseX::Aliases
-	echo dev-perl/MooseX-Aliases
-	# MooseX::Attribute::Chained v1.0.1 ( 1.0.1 )
-	echo \>=dev-perl/MooseX-Attribute-Chained-1.0.1
-	# MooseX::SetOnce
-	echo dev-perl/MooseX-SetOnce
-	# Number::Format
-	echo dev-perl/Number-Format
-	# Path::Class::File
-	echo dev-perl/Path-Class
-	# Readonly
-	echo dev-perl/Readonly
-	# Regexp::Common
-	echo dev-perl/regexp-common
-	# Scalar::Util
-	echo virtual/perl-Scalar-List-Utils
-	# Storable
-	echo virtual/perl-Storable
-	# Task::Weaken
-	echo dev-perl/Task-Weaken
-	# Template
-	echo dev-perl/Template-Toolkit
-	# YAML::XS 0.32 ( 0.320.0 )
-	echo \>=dev-perl/YAML-LibYAML-0.320.0
-	# perl v5.8.1 ( 5.8.1 )
-	echo \>=dev-lang/perl-5.8.1
-}
-DEPEND="
-	$(perl_meta_configure)
-	$(perl_meta_build)
-	$(perl_meta_runtime)
-"
-RDEPEND="
-	$(perl_meta_runtime)
-"
-
-pkg_pretend() {
-	if has_version "<=dev-perl/HTML-FormFu-0.90.0"; then
-		eerror "Sorry, in order to upgrade to HTML-FormFu 0.90.0 or greater you"
-		eerror "need to first remove older versions."
-		die "Installation requirements not met"
-	fi
-}
-SRC_TEST="do"
diff --git a/dev-perl/HTML-FormFu/HTML-FormFu-2.10.0.ebuild b/dev-perl/HTML-FormFu/HTML-FormFu-2.10.0.ebuild
new file mode 100644
index 000000000..d12347b94
--- /dev/null
+++ b/dev-perl/HTML-FormFu/HTML-FormFu-2.10.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI=5
+MODULE_AUTHOR=CFRANKS
+MODULE_VERSION=2.01
+inherit perl-module
+
+DESCRIPTION='HTML Form Creation, Rendering and Validation Framework'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=(
+	"${FILESDIR}/${MODULE_VERSION}/gh-25-cgiwarns.patch"
+)
+# Class::MOP::Method -> Moose
+# Cwd -> File-Spec
+# Data::Visitor::Callback -> Data-Visitor
+# Fatal -> autodie
+# File::Copy -> perl
+# File::Find -> perl
+# HTTP::Headers -> HTTP-Message
+# IO::File -> IO
+# List::Util -> Scalar-List-Utils
+# Moose::Role -> Moose
+# Moose::Util -> Moose
+# POSIX -> perl
+# Path::Class::File -> Path-Class
+# Scalar::Util -> Scalar-List-Utils
+# YAML::XS -> YAML-LibYAML
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Clone-0.310.0
+	>=dev-perl/Config-Any-0.180.0
+	>=dev-perl/Data-Visitor-0.260.0
+	>=dev-perl/DateTime-0.540.0
+	>=dev-perl/DateTime-Format-Builder-0.790.100
+	dev-perl/DateTime-Format-Natural
+	>=dev-perl/DateTime-Format-Strptime-1.200.0
+	>=dev-perl/DateTime-Locale-0.450.0
+	dev-perl/Email-Valid
+	virtual/perl-Encode
+	>=virtual/perl-Exporter-5.570.0
+	dev-perl/File-ShareDir
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/HTML-Scrubber
+	>=dev-perl/HTML-TokeParser-Simple-3.140.0
+	>=dev-perl/HTTP-Message-1.640.0
+	dev-perl/Hash-Flatten
+	virtual/perl-IO
+	dev-perl/List-MoreUtils
+	virtual/perl-Locale-Maketext
+	virtual/perl-Module-Pluggable
+	>=dev-perl/Moose-1.0.0
+	dev-perl/MooseX-Aliases
+	dev-perl/Number-Format
+	dev-perl/Path-Class
+	dev-perl/Readonly
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Storable
+	dev-perl/Task-Weaken
+	>=dev-perl/YAML-LibYAML-0.320.0
+	virtual/perl-autodie
+	dev-perl/regexp-common
+"
+DEPEND="
+	${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	>=dev-perl/File-ShareDir-Install-0.30.0
+	test? (
+		>=virtual/perl-CGI-3.370.0
+		>=dev-perl/Test-Aggregate-0.371.0
+		dev-perl/Test-Exception
+		>=virtual/perl-Test-Simple-0.920.0
+	)
+"
+pkg_pretend() {
+	if has_version "<=dev-perl/HTML-FormFu-0.90.0"; then
+		eerror "Sorry, in order to upgrade to HTML-FormFu 0.90.0 or greater you"
+		eerror "need to first remove older versions."
+		die "Installation requirements not met"
+	fi
+}
diff --git a/dev-perl/HTML-FormFu/Manifest b/dev-perl/HTML-FormFu/Manifest
index 81e87de59..8aa5114ff 100644
--- a/dev-perl/HTML-FormFu/Manifest
+++ b/dev-perl/HTML-FormFu/Manifest
@@ -1 +1 @@
-DIST HTML-FormFu-0.09010.tar.gz 313176 SHA256 33441bf1f629d6d68cc33ae941cc4c009ec52f2c1ddd184409cd415fc6370e22 SHA512 9c30d536ad44a5adcaca3a05e44f46a62157f93e526ddcabba9cf092f8a2314a23c0fa56c83847372011b8e70426471147aa8054f14eae5ba898acd4b13d681a WHIRLPOOL cbb4057813ad090f057cf99beec3c1ee63c85b4eaea65cfe8a33795964fc309cbeca7ed82e3941b502b2f190accbcbee1abca25a1c7c8bb13753a8e87120d6d8
+DIST HTML-FormFu-2.01.tar.gz 337865 SHA256 5cffd87addca1cf940d0421e0a15ace374486e3d1d25a4ec2d86f1829ea5713b SHA512 89541a20c321c8f0f50c94e074f6ab5185b9238a6bd653fed02a03884816183e0afe6a0053c26c74f392857cb1adb5f004de32ad5517cceb2660ccd63451e701 WHIRLPOOL b6311fae327ae8303b6f640f6e2407021faef2687304cf05fd5e6b3d381b079ffeae15e99ef6b5a1fa06753a93b75ceab0e67af48d002b64638cf21d4206e199
diff --git a/dev-perl/HTML-FormFu/files/2.01/gh-25-cgiwarns.patch b/dev-perl/HTML-FormFu/files/2.01/gh-25-cgiwarns.patch
new file mode 100644
index 000000000..0c00d8a33
--- /dev/null
+++ b/dev-perl/HTML-FormFu/files/2.01/gh-25-cgiwarns.patch
@@ -0,0 +1,58 @@
+From ee79cf689f075f8a64d96a5e467875242caa9078 Mon Sep 17 00:00:00 2001
+From: Dean Hamstead <dean@fragfest.com.au>
+Date: Tue, 17 Mar 2015 09:42:08 +1100
+Subject: [PATCH] Changes to shut up CGI warnings. See also
+ http://search.cpan.org/~leejo/CGI-4.13/lib/CGI.pm#Fetching_the_names_of_all_the_parameters_passed_to_your_script:
+
+---
+ lib/HTML/FormFu.pm               | 46 ++++
+ lib/HTML/FormFu/FakeQuery.pm     |  2 ++
+ lib/HTML/FormFu/QueryType/CGI.pm |  4 ++++
+ 3 files changed, 31 insertions(+), 21 deletions(-)
+
+diff --git a/lib/HTML/FormFu.pm b/lib/HTML/FormFu.pm
+index d19f4a3..271f234 100644
+--- a/lib/HTML/FormFu.pm
++++ b/lib/HTML/FormFu.pm
+@@ -301,6 +301,10 @@ sub process {
+             next if !defined $name;
+             next if none { $name eq $_ } @params;
+ 
++            ## CGI wants you to use $query->multi_param($foo).
++            ## doing so breaks CGI::Simple. So shoosh it up for now.
++            local $CGI::LIST_CONTEXT_WARN = 0;
++
+             if ( $field->nested ) {
+ 
+                 # call in list context so we know if there's more than 1 value
+diff --git a/lib/HTML/FormFu/FakeQuery.pm b/lib/HTML/FormFu/FakeQuery.pm
+index 0e481f7..77ad514 100644
+--- a/lib/HTML/FormFu/FakeQuery.pm
++++ b/lib/HTML/FormFu/FakeQuery.pm
+@@ -29,6 +29,8 @@ sub new {
+     return bless $self, $class;
+ }
+ 
++sub multi_param { goto &param }
++
+ sub param {
+     my $self = shift;
+ 
+diff --git a/lib/HTML/FormFu/QueryType/CGI.pm b/lib/HTML/FormFu/QueryType/CGI.pm
+index 8dc42c0..8895995 100644
+--- a/lib/HTML/FormFu/QueryType/CGI.pm
++++ b/lib/HTML/FormFu/QueryType/CGI.pm
+@@ -11,6 +11,10 @@ sub parse_uploads {
+     my ( $class, $form, $name ) = @_;
+ 
+     my $query  = $form->query;
++    ## CGI wants you to use $query->multi_param($foo).
++    ## doing so breaks CGI::Simple. So shoosh it up for now.
++    local $CGI::LIST_CONTEXT_WARN = 0; 
++
+     my @params = $query->param($name);
+     my @new;
+ 
+-- 
+2.3.4
+