commit: cdb05dce6e1f7772f985879658ca3b12d42c10da Author: Kent Fredric <kentfredric <AT> gmail <DOT> com> AuthorDate: Mon Sep 1 16:48:15 2014 +0000 Commit: Kent Fredric <kentfredric <AT> gmail <DOT> com> CommitDate: Mon Sep 1 16:48:15 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/perl-overlay.git;a=commit;h=cdb05dce
[fixup] dev-perl/HTML-Widget EAPI5, Normalise, Fixup deps and tests Package-Manager: portage-2.2.10 --- dev-perl/HTML-Widget/ChangeLog | 9 +++- dev-perl/HTML-Widget/HTML-Widget-1.11.ebuild | 27 ----------- dev-perl/HTML-Widget/HTML-Widget-1.110.0.ebuild | 47 ++++++++++++++++++ .../files/1.11/5.17-hash-random-rt-85970.patch | 56 ++++++++++++++++++++++ .../files/1.11/HTML-Tree-4-rt-63853.patch | 34 +++++++++++++ 5 files changed, 145 insertions(+), 28 deletions(-) diff --git a/dev-perl/HTML-Widget/ChangeLog b/dev-perl/HTML-Widget/ChangeLog index 5d639ca..070eb56 100644 --- a/dev-perl/HTML-Widget/ChangeLog +++ b/dev-perl/HTML-Widget/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-perl/HTML-Widget -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*HTML-Widget-1.110.0 (01 Sep 2014) + + 01 Sep 2014; Kent Fredric <kentfred...@gmail.com> -HTML-Widget-1.11.ebuild, + +HTML-Widget-1.110.0.ebuild, +files/1.11/HTML-Tree-4-rt-63853.patch, + +files/1.11/5.17-hash-random-rt-85970.patch: + EAPI5, Normalise, Fixup deps and tests + 28 Oct 2012; Kent Fredric <kentfred...@gmail.com> HTML-Widget-1.11.ebuild: Fix dependency on HTML-Tree ( normalize ) diff --git a/dev-perl/HTML-Widget/HTML-Widget-1.11.ebuild b/dev-perl/HTML-Widget/HTML-Widget-1.11.ebuild deleted file mode 100644 index bd11ff9..0000000 --- a/dev-perl/HTML-Widget/HTML-Widget-1.11.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -MODULE_AUTHOR=CFRANKS -inherit perl-module - -DESCRIPTION="HTML Widget And Validation Framework" -LICENSE="|| ( Artistic GPL-2 )" - -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" -DEPEND=" - >=dev-lang/perl-5.8.1 - dev-perl/Module-Install - >=dev-perl/HTML-Tree-3.230.0 - dev-perl/Class-Accessor - dev-perl/Class-Accessor-Chained - dev-perl/Class-Data-Accessor - dev-perl/HTML-Scrubber - dev-perl/Module-Pluggable-Fast - dev-perl/Email-Valid - dev-perl/Date-Calc - dev-perl/Test-NoWarnings -" diff --git a/dev-perl/HTML-Widget/HTML-Widget-1.110.0.ebuild b/dev-perl/HTML-Widget/HTML-Widget-1.110.0.ebuild new file mode 100644 index 0000000..5beaad1 --- /dev/null +++ b/dev-perl/HTML-Widget/HTML-Widget-1.110.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +EAPI=5 +MODULE_AUTHOR=CFRANKS +MODULE_VERSION=1.11 +inherit perl-module + +DESCRIPTION="HTML Widget And Validation Framework" +LICENSE="|| ( Artistic GPL-2 )" + +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="test" +# HTML::Element -> HTML-Tree +# Class::Accessor::Fast -> Class-Accessor +# Class::Accessor::Chained::Fast -> Class-Accessor-Chained +RDEPEND=" + >=dev-lang/perl-5.8.1 + >=dev-perl/HTML-Tree-3.220.0 + dev-perl/Class-Accessor + dev-perl/Class-Accessor-Chained + dev-perl/Class-Data-Accessor + dev-perl/HTML-Scrubber + virtual/perl-Storable + dev-perl/Module-Pluggable-Fast + dev-perl/Email-Valid + dev-perl/Date-Calc + virtual/perl-Scalar-List-Utils +" +DEPEND="$RDEPEND + dev-perl/Test-NoWarnings + test? ( + dev-perl/Test-Deep + ) +" +PATCHES=( + "${FILESDIR}/${MODULE_VERSION}/HTML-Tree-4-rt-63853.patch" + "${FILESDIR}/${MODULE_VERSION}/5.17-hash-random-rt-85970.patch" +) +PERL_RM_FILES=( + t/02pod.t + t/03podcoverage.t +) + +SRC_TEST="do parallel" diff --git a/dev-perl/HTML-Widget/files/1.11/5.17-hash-random-rt-85970.patch b/dev-perl/HTML-Widget/files/1.11/5.17-hash-random-rt-85970.patch new file mode 100644 index 0000000..3c77d4e --- /dev/null +++ b/dev-perl/HTML-Widget/files/1.11/5.17-hash-random-rt-85970.patch @@ -0,0 +1,56 @@ +Description: use Test::Deep against hash randomisation causing test failures +Origin: vendor +Bug: http://rt.cpan.org/Public/Bug/Display.html?id=85970 +Bug-Debian: http://bugs.debian.org/711572 +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2013-10-29 + +--- a/t/06bugs_select_zero_key_constraint.t ++++ b/t/06bugs_select_zero_key_constraint.t +@@ -1,7 +1,8 @@ + use strict; + use warnings; + +-use Test::More tests => 3; ++use Test::More tests => 2; ++use Test::Deep; + + use HTML::Widget; + use lib 't/lib'; +@@ -20,7 +21,5 @@ + + my $keys = $constraints[0]->in; + +-is( $keys->[0], 1, 'constraint value' ); +- +-is( $keys->[1], 0, 'constraint value' ); ++cmp_bag( $keys, [0, 1], 'constraint values' ); + +--- a/t/get_errors.t ++++ b/t/get_errors.t +@@ -2,6 +2,7 @@ + use warnings; + + use Test::More tests => 6; ++use Test::Deep; + + use HTML::Widget; + use lib 't/lib'; +@@ -27,7 +28,7 @@ + type => 'OtherType' + } ); + +- is_deeply( [ ++ cmp_bag( [ + new HTML::Widget::Error( { + type => 'OtherType', + name => 'baz', +@@ -85,7 +86,7 @@ + "Errors correct with name provided" + ); + +- is_deeply( [ ++ cmp_bag( [ + new HTML::Widget::Error( { + type => 'OtherType', + name => 'baz', \ No newline at end of file diff --git a/dev-perl/HTML-Widget/files/1.11/HTML-Tree-4-rt-63853.patch b/dev-perl/HTML-Widget/files/1.11/HTML-Tree-4-rt-63853.patch new file mode 100644 index 0000000..5688f0e --- /dev/null +++ b/dev-perl/HTML-Widget/files/1.11/HTML-Tree-4-rt-63853.patch @@ -0,0 +1,34 @@ +diff -Naur t/04basic.t t/04basic.t +--- t/04basic.t 2007-03-01 15:42:26.000000000 +0000 ++++ t/04basic.t 2014-09-01 16:31:49.592374273 +0000 +@@ -82,7 +82,7 @@ + is( $c->error_xml, <<EOF, 'Error XML output is ok' ); + <span class="error_messages" id="widget_age_errors"><span class="regex_errors" id="widget_age_error_regex">Contains digit characters.</span></span> + EOF +- is( $c->javascript_xml, <<EOF, 'JavScript XML output is ok' ); ++ is( $c->javascript_xml, ( substr <<EOF, 0, -1 ), 'JavScript XML output is ok' ); + <script type="text/javascript"> + <!-- + +diff -Naur t/06bugs_xml_escape.t t/06bugs_xml_escape.t +--- t/06bugs_xml_escape.t 2007-03-01 16:05:40.000000000 +0000 ++++ t/06bugs_xml_escape.t 2014-09-01 16:32:15.889098013 +0000 +@@ -23,5 +23,5 @@ + + like( "$f", qr'value="é"', 'utf-8 character ok' ); + +- like( "$f", qr'value="" foo >"', '' ); ++ like( "$f", qr'value="" foo >"', '' ); + } +diff -Naur t/07custom_render.t t/07custom_render.t +--- t/07custom_render.t 2007-03-01 15:42:26.000000000 +0000 ++++ t/07custom_render.t 2014-09-01 16:32:45.904641305 +0000 +@@ -119,7 +119,7 @@ + is( $c->error_xml, <<EOF, 'Error XML output is ok' ); + <span class="error_messages" id="widget_age_errors"><span class="regex_errors" id="widget_age_error_regex">Contains digit characters.</span></span> + EOF +- is( $c->javascript_xml, <<EOF, 'JavScript XML output is ok' ); ++ is( $c->javascript_xml, ( substr <<EOF, 0, -1 ), 'JavScript XML output is ok' ); + <script type="text/javascript"> + <!-- +