commit: cc111234cff15e049c774e1259001627a9c072ef Author: Kent Fredric <kentfredric <AT> gmail <DOT> com> AuthorDate: Thu Mar 19 09:47:43 2015 +0000 Commit: Kent Fredric <kentfredric <AT> gmail <DOT> com> CommitDate: Thu Mar 19 09:47:43 2015 +0000 URL: https://gitweb.gentoo.org/proj/perl-overlay.git/commit/?id=cc111234
[fixup] Catalyst-Plugin-SubRequest-0.200.0-r1: EAPI5, fixup tests, deps, and Modern Catalyst compatibility Package-Manager: portage-2.2.17 .../Catalyst-Plugin-SubRequest-0.200.0-r1.ebuild | 28 +++++++++++++++ .../Catalyst-Plugin-SubRequest-0.200.0.ebuild | 36 ------------------- .../files/0.20/Cat-5.9.patch | 40 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 36 deletions(-) diff --git a/dev-perl/Catalyst-Plugin-SubRequest/Catalyst-Plugin-SubRequest-0.200.0-r1.ebuild b/dev-perl/Catalyst-Plugin-SubRequest/Catalyst-Plugin-SubRequest-0.200.0-r1.ebuild new file mode 100644 index 0000000..0c6813d --- /dev/null +++ b/dev-perl/Catalyst-Plugin-SubRequest/Catalyst-Plugin-SubRequest-0.200.0-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +EAPI=5 +MODULE_AUTHOR=EDENC +MODULE_VERSION=0.20 +inherit perl-module + +DESCRIPTION='Make subrequests to actions in Catalyst' +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +PERL_RM_FILES=( + t/03pod.t + t/04podcoverage.t +) +PATCHES=( + # https://rt.cpan.org/Ticket/Display.html?id=94392 + "${FILESDIR}/${MODULE_VERSION}/Cat-5.9.patch" +) +RDEPEND=" + >=dev-perl/Catalyst-Runtime-5.900.0 +" +DEPEND=" + ${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.360.0 + test? ( virtual/perl-Test-Simple ) +" diff --git a/dev-perl/Catalyst-Plugin-SubRequest/Catalyst-Plugin-SubRequest-0.200.0.ebuild b/dev-perl/Catalyst-Plugin-SubRequest/Catalyst-Plugin-SubRequest-0.200.0.ebuild deleted file mode 100644 index 2ad93d2..0000000 --- a/dev-perl/Catalyst-Plugin-SubRequest/Catalyst-Plugin-SubRequest-0.200.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=4 -MODULE_AUTHOR=EDENC -MODULE_VERSION=0.20 -inherit perl-module - -DESCRIPTION='Make subrequests to actions in Catalyst' -LICENSE=" || ( Artistic GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -perl_meta_configure() { - # ExtUtils::MakeMaker 6.36 ( 6.360.0 ) - echo \>=virtual/perl-ExtUtils-MakeMaker-6.36 -} -perl_meta_build() { - # ExtUtils::MakeMaker 6.36 ( 6.360.0 ) - echo \>=virtual/perl-ExtUtils-MakeMaker-6.36 -} -perl_meta_runtime() { - # Catalyst::Runtime 5.9 ( 5.900.0 ) - echo \>=dev-perl/Catalyst-Runtime-5.900.0 - # Test::More - echo virtual/perl-Test-Simple -} -DEPEND=" - $(perl_meta_configure) - $(perl_meta_build) - $(perl_meta_runtime) -" -RDEPEND=" - $(perl_meta_runtime) -" -SRC_TEST="do" diff --git a/dev-perl/Catalyst-Plugin-SubRequest/files/0.20/Cat-5.9.patch b/dev-perl/Catalyst-Plugin-SubRequest/files/0.20/Cat-5.9.patch new file mode 100644 index 0000000..6d8f217 --- /dev/null +++ b/dev-perl/Catalyst-Plugin-SubRequest/files/0.20/Cat-5.9.patch @@ -0,0 +1,40 @@ +Description: compatibility with Catalyst 5.9 + Taken from https://gist.github.com/jjn1056/9947765 +Author: John Napiorkowski +Bug: https://rt.cpan.org/Public/Bug/Display.html?id=94392 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747502 + +--- a/lib/Catalyst/Plugin/SubRequest.pm ++++ b/lib/Catalyst/Plugin/SubRequest.pm +@@ -102,18 +102,29 @@ sub sub_request_response { + + # need this so that + my $writer = Catalyst::Plugin::SubRequest::Writer->new; +- my $response_cb = sub { $writer }; ++ my $response_cb = sub { ++ my $response = shift; ++ my ($status, $headers, $body) = @$response; ++ if($body) { ++ return; ++ } else { ++ return $writer; ++ } ++ }; ++ + my $i_ctx = $class->prepare( env => $env, response_cb => $response_cb ); + $i_ctx->stash($stash); + $i_ctx->dispatch; + $i_ctx->finalize; + $c->stats->profile( end => 'subrequest: ' . $path ) if $c->debug; + +- $i_ctx->response->body($writer->body); ++ if($writer->body) { ++ $i_ctx->response->body($writer->body); ++ } + + return $i_ctx->response; + } + + package Catalyst::Plugin::SubRequest::Writer; + use Moose; + has body => (
