The Perl Toolchain Summit needs more sponsors. If your company depends on Perl, please support this very important event.
Changes 013
MANIFEST 11
META.json 097
META.yml 370
Makefile.PL 04
lib/MIME/Charset.pm 43
6 files changed (This is a version diff) 42118
@@ -1,5 +1,18 @@
 Revision history for Perl module MIME::Charset.
 
+1.011.3  2014-12-10  Hatuka*nezumi - IKEDA Soji  <hatuka(at)nezumi.nu>
+
+    * Use "eval 'require ...'" to import optional encoding modules.
+      Overridden $SIG{__DIE__} can pass "eval 'use ...'".
+    * Replace META.yml with META.json.
+
+1.011.2  2014-11-27  Hatuka*nezumi - IKEDA Soji  <hatuka(at)nezumi.nu>
+
+    * Added module CPAN to configure_require for inc::Test::AutoInstall.
+    * Added POD2::Base to recommended feature.
+    * Fix: wrong prototype for _resolve_S().
+    * Move repository to github.
+
 1.011.1 2013-10-07  Hatuka*nezumi - IKEDA Soji  <hatuka(at)nezumi.nu>
 
     * Fix: "shift_jis-2004" did not depend on Encode::JISX0213 but
@@ -19,7 +19,7 @@ lib/MIME/Charset/UTF.pm
 lib/POD2/JA/MIME/Charset.pod
 Makefile.PL
 MANIFEST			This list of files
-META.yml
+META.json
 README
 t/01encode.t
 t/01ooencode.t
@@ -0,0 +1,97 @@
+{
+   "abstract" : "Charset Information for MIME",
+   "author" : [
+      "Hatuka*nezumi - IKEDA Soji <hatuka(at)nezumi.nu>"
+   ],
+   "dynamic_config" : 0,
+   "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.120630",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "MIME-Charset",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "optional_features" : {
+      "ja_extended" : {
+         "description" : "Extended mappings by Japanese codepages",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Encode::EUCJPASCII" : "0.02"
+               }
+            }
+         }
+      },
+      "jis2000" : {
+         "description" : "Additional mappings for JIS X 0213",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Encode::JISX0213" : "0.03"
+               }
+            }
+         }
+      },
+      "zh_extra" : {
+         "description" : "Additional mappings for Chinese standards",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Encode::HanExtra" : "0.20"
+               }
+            }
+         }
+      },
+      "pod2" : {
+         "description" : 'Support for POD2 - translations of Perl documentation',
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "POD2::Base" : "0.041"
+               }
+            }
+         }
+      }
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "CPAN" : "0",
+            "ExtUtils::MakeMaker" : "6.42",
+            "Test::More" : "0"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "0"
+         }
+      },
+      "runtime" : {
+         "requires" : {
+            "Encode" : "1.98",
+            "perl" : "5.005"
+         }
+      }
+   },
+   "provides" : {
+      "MIME::Charset" : {
+         "file" : "lib/MIME/Charset.pm",
+         "version" : "1.011.3"
+      }
+   },
+   "release_status" : "stable",
+   "resources" : {
+      "repository" : {
+         "url" : "https://github.com/hatukanezumi/MIME-Charset.git"
+      }
+   },
+   "version" : "1.011.3"
+}
@@ -1,37 +0,0 @@
---- #YAML:1.0
-name:         MIME-Charset
-abstract:     Charset Information for MIME
-version:      1.011.1
-author:
-  - Hatuka*nezumi - IKEDA Soji <hatuka(at)nezumi.nu>
-license:      perl
-distribution_type: module
-requires:
-    Encode:                        1.98
-    perl:                          5.005
-optional_features:
-  ja_extended:
-    description: Extended mappings by Japanese codepages
-    requires:
-        Encode::EUCJPASCII:        0.02
-  jis2000:
-    description: Additional mappings for JIS X 0213
-    requires:
-        Encode::JISX0213:          0.03
-  zh_extra:
-    description: Additional mappings for Chinese standards
-    requires:
-        Encode::HanExtra:          0.20
-build_requires:
-    Test::More:                    0
-provides:
-    MIME::Charset:
-        file:                      lib/MIME/Charset.pm
-        version:                   1.011.1
-resources:
-    repository: http://hatuka.nezumi.nu/repos/MIME-Charset/
-meta-spec:
-   version: 1.3
-   url: http://module-build.sourceforge.net/META-spec-v1.3.html
-generated_by: author
-
@@ -8,6 +8,7 @@ license 'perl';
 check_nmake;
 
 # Specific dependencies
+configure_requires 'CPAN' => 0; # for inc::Module::AutoInstall
 test_requires 'Test::More' => '0';
 if ( $] >= 5.007003 ) {
     requires 'Encode' => '1.98';
@@ -21,6 +22,9 @@ if ( $] >= 5.007003 ) {
     feature 'Additional mappings for Chinese standards',
       -default           => 0,
       'Encode::HanExtra' => '0.20';
+    feature 'Support for POD2 - translations of Perl documentation',
+      -default           => 0,
+      'POD2::Base'       => '0.041';
 }
 
 # Write out
@@ -132,7 +132,7 @@ if (USE_ENCODE) {
     }
 }
 
-$VERSION = '1.011.1';
+$VERSION = '1.011.3';
 
 ######## Private Attributes ########
 
@@ -460,8 +460,7 @@ sub _find_encoder($$) {
 	foreach my $s (@{$spec}) {
 	    ($name, $module) = @{$s};
 	    if ($module) {
-		eval "use $module;";
-		next if $@;
+		next unless eval "require $module;";
 	    }
 	    $encoder = Encode::find_encoding($name);
 	    last if ref $encoder;
@@ -830,7 +829,7 @@ sub _enclen_Q($;$) {
     length($s) + scalar(@o) * 2;
 }
 
-sub _resolve_S($) {
+sub _resolve_S($;$) {
     my $s = shift;
     my $in_body = shift;
     my $e;