commit: c43eed8679ce98131b983607e5da2d4d03fd0193
Author: Kent Fredric <kentfredric <AT> gmail <DOT> com>
AuthorDate: Wed Apr 29 16:23:10 2015 +0000
Commit: Kent Fredric <kentfredric <AT> gmail <DOT> com>
CommitDate: Wed Apr 29 16:23:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/perl-overlay.git/commit/?id=c43eed86
[fixup] CGI-Application-Dispatch: EAPI5, Fixup deps, make depending on apache
for testing optional
Package-Manager: portage-2.2.17
.../CGI-Application-Dispatch-3.120.0-r1.ebuild | 53 ++++++++++++++++
.../CGI-Application-Dispatch-3.120.0.ebuild | 74 ----------------------
dev-perl/CGI-Application-Dispatch/metadata.xml | 5 +-
3 files changed, 57 insertions(+), 75 deletions(-)
diff --git
a/dev-perl/CGI-Application-Dispatch/CGI-Application-Dispatch-3.120.0-r1.ebuild
b/dev-perl/CGI-Application-Dispatch/CGI-Application-Dispatch-3.120.0-r1.ebuild
new file mode 100644
index 0000000..19ee4bf
--- /dev/null
+++
b/dev-perl/CGI-Application-Dispatch/CGI-Application-Dispatch-3.120.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI=5
+MODULE_AUTHOR=MARKSTOS
+MODULE_VERSION=3.12
+inherit perl-module
+
+DESCRIPTION='Dispatch requests to CGI::Application based objects'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test apache_test"
+
+# Test::More -> Test-Simple
+TEST_DEPEND_APACHE="dev-perl/Apache-Test"
+RDEPEND="
+ >=virtual/perl-version-0.820.0
+ >=dev-perl/CGI-Application-4.500.0
+ dev-perl/HTTP-Exception
+ >=dev-perl/Exception-Class-1.200.0
+ dev-perl/Try-Tiny
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-Module-Build-0.380.0
+ test? (
+ apache_test? (
+ ${TEST_DEPEND_APACHE}
+ )
+ dev-perl/CGI-PSGI
+ virtual/perl-Test-Simple
+ dev-perl/Test-LongString
+ >=dev-perl/Plack-0.995.600
+ )
+"
+apache_env() {
+ # This jiggerypokery appears to be required if Apache::Test
+ # is present. If it is not present or not use test? then we're ok,
+ # but otherwise, we need to specify where apache is, or it will
+ # for some reason, get stuck in a death loop and fill your log file
+ # and your hard drive. JOY! http://gist.github.com/447135
+ APACHE_TEST_HTTPD=/usr/sbin/apache2
+ export APACHE_TEST_HTTPD
+}
+src_prepare() {
+ if ! use apache_test || ! use test; then
+ PERL_RM_FILES=( "t/handler.t" )
+ fi
+ perl-module_src_prepare
+}
+src_test() {
+ use apache_test && apache_env;
+ perl-module_src_test;
+}
diff --git
a/dev-perl/CGI-Application-Dispatch/CGI-Application-Dispatch-3.120.0.ebuild
b/dev-perl/CGI-Application-Dispatch/CGI-Application-Dispatch-3.120.0.ebuild
deleted file mode 100644
index 12ee796..0000000
--- a/dev-perl/CGI-Application-Dispatch/CGI-Application-Dispatch-3.120.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=4
-MODULE_AUTHOR=MARKSTOS
-MODULE_VERSION=3.12
-inherit perl-module
-
-DESCRIPTION='Dispatch requests to CGI::Application based objects'
-LICENSE=" || ( Artistic GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-apache_test_deps() {
- echo "dev-perl/Apache-Test"
-}
-apache_test_code() {
- # This jiggerypokery appears to be required if Apache::Test
- # is present. If it is not present or not use test? then we're ok,
- # but otherwise, we need to specify where apache is, or it will
- # for some reason, get stuck in a death loop and fill your log file
- # and your hard drive. JOY! http://gist.github.com/447135
-
- # NB. Because I have no way of conditionally triggering this code
- # whether or not Apache-Test is installed ( like the code does )
- # I have test-depped on it basically forcing a known circuit.
-
- APACHE_TEST_HTTPD=/usr/sbin/apache2
- export APACHE_TEST_HTTPD
- perl-module_src_test
-}
-perl_meta_configure() {
- # Module::Build 0.38 ( 0.380.0 )
- echo \>=virtual/perl-Module-Build-0.380.0
-
-}
-perl_meta_build() {
- # CGI::PSGI
- echo dev-perl/CGI-PSGI
- # Plack 0.9956 ( 0.995.600 )
- echo \>=dev-perl/Plack-0.995.600
- # Test::LongString
- echo dev-perl/Test-LongString
- # Test::More
- echo virtual/perl-Test-Simple
-}
-perl_meta_runtime() {
- # CGI::Application 4.50 ( 4.500.0 )
- echo \>=dev-perl/CGI-Application-4.500.0
- # Exception::Class 1.2 ( 1.200.0 )
- echo \>=dev-perl/Exception-Class-1.200.0
- # HTTP::Exception
- echo dev-perl/HTTP-Exception
- # Try::Tiny
- echo dev-perl/Try-Tiny
- # perl v5.6.0 ( 5.6.0 )
- echo \>=dev-lang/perl-5.6.0
- # version 0.82 ( 0.820.0 )
- echo \>=virtual/perl-version-0.820.0
-}
-DEPEND="
- $(perl_meta_configure)
- $(perl_meta_build)
- $(perl_meta_runtime)
-"
-RDEPEND="
- $(perl_meta_runtime)
-"
-SRC_TEST="do"
-
-DEPEND="${DEPEND} test? ( $(apache_test_deps) )"
-src_test() {
- apache_test_code;
-}
diff --git a/dev-perl/CGI-Application-Dispatch/metadata.xml
b/dev-perl/CGI-Application-Dispatch/metadata.xml
index 748bae6..ce4526d 100644
--- a/dev-perl/CGI-Application-Dispatch/metadata.xml
+++ b/dev-perl/CGI-Application-Dispatch/metadata.xml
@@ -11,5 +11,8 @@
<remote-id type="cpan-module">CGI::Application::Dispatch</remote-id>
<remote-id
type="cpan-module">CGI::Application::Dispatch::PSGI</remote-id>
<remote-id
type="cpan-module">CGI::Application::Dispatch::Regexp</remote-id>
- </upstream>
+ </upstream>
+ <use>
+ <flag name="apache_test">With FEATURES=test, do tests using
Apache</flag>
+ </use>
</pkgmetadata>
