X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=c1b6be51826f87dc948c61c1e4be2116b4854632;hb=9720202815dbafee0d9e944e3f8258d4aca446d4;hp=281d30ab29b3da0ddbd26441018ef7e6097a2d76;hpb=3d4c5a8439e2c5f6b74e6c8f52117ececd9e20fa;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index 281d30a..c1b6be5 100644
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -106,11 +106,11 @@ my $rdbms_firebird_odbc = {
 };
 
 my $reqs = {
-  dist => {
+  dist_podinherit => {
     req => {
-      'Pod::Inherit' => '0.16',
+      'Pod::Inherit' => '0.90',
       'Pod::Tree'    => '0',
-  },
+    }
   },
 
   replicated => {
@@ -149,13 +149,6 @@ my $reqs = {
     },
   },
 
-  test_admin_script => {
-    req => {
-      %$admin_script,
-      ($^O eq 'MSWin32' ? ('Win32::ShellQuote' => 0) : ()),
-    }
-  },
-
   deploy => {
     req => {
       'SQL::Translator'           => '0.11006',
@@ -205,6 +198,20 @@ my $reqs = {
     req => $json_any,
   },
 
+  test_admin_script => {
+    req => {
+      %$admin_script,
+      'JSON' => 0,
+      'JSON::XS' => 0,
+      $^O eq 'MSWin32'
+        # for t/admin/10script.t
+        ? ('Win32::ShellQuote' => 0)
+        # DWIW does not compile (./configure even) on win32
+        : ('JSON::DWIW' => 0 )
+      ,
+    }
+  },
+
   test_leaks => {
     req => {
       'Test::Memory::Cycle'       => '0',
@@ -807,7 +814,7 @@ EOD
     '=head2 req_group_list',
     '=over',
     '=item Arguments: none',
-    '=item Returns: \%list_of_requirement_groups',
+    '=item Return Value: \%list_of_requirement_groups',
     '=back',
     <<'EOD',
 This method should be used by DBIx::Class packagers, to get a hashref of all
@@ -818,7 +825,7 @@ EOD
     '=head2 req_list_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: \%list_of_module_version_pairs',
+    '=item Return Value: \%list_of_module_version_pairs',
     '=back',
     <<'EOD',
 This method should be used by DBIx::Class extension authors, to determine the
@@ -830,7 +837,7 @@ EOD
     '=head2 req_ok_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: 1|0',
+    '=item Return Value: 1|0',
     '=back',
     <<'EOD',
 Returns true or false depending on whether all modules required by
@@ -840,7 +847,7 @@ EOD
     '=head2 req_missing_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: $error_message_string',
+    '=item Return Value: $error_message_string',
     '=back',
     <<"EOD",
 Returns a single line string suitable for inclusion in larger error messages.
@@ -860,7 +867,7 @@ EOD
     '=head2 req_errorlist_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: \%list_of_loaderrors_per_module',
+    '=item Return Value: \%list_of_loaderrors_per_module',
     '=back',
     <<'EOD',
 Returns a hashref containing the actual errors that occured while attempting