11 files changed, 33 insertions, 32 deletions
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
index b2053aff10..796aadb416 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm
@@ -9,7 +9,7 @@ use IO::Compress::Base::Common 2.021 qw(:Status);
 use Compress::Raw::Bzip2 2.021 ;
 
 our ($VERSION, @ISA);
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 sub mkUncompObject
 {
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
index 0df174320a..834eb5d230 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm
@@ -8,7 +8,7 @@ use IO::Compress::Base::Common  2.021 qw(:Status);
 
 our ($VERSION);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 use Compress::Raw::Zlib  2.021 ();
 
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
index d03148c0b4..5c67c1b6a8 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm
@@ -8,7 +8,7 @@ use IO::Compress::Base::Common  2.021 qw(:Status);
 use Compress::Raw::Zlib  2.021 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS);
 
 our ($VERSION);
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 
 
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
index e8ffc5c15b..900feda477 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm
@@ -21,7 +21,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $AnyInflateError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
index cc1ba24b47..c4406e55d5 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm
@@ -13,7 +13,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $AnyUncompressError = '';
 
 @ISA = qw( Exporter IO::Uncompress::Base );
@@ -31,8 +31,8 @@ BEGIN
    eval ' use IO::Uncompress::Adapter::Bunzip2 2.021 ;';
    eval ' use IO::Uncompress::Adapter::LZO 2.021 ;';
    eval ' use IO::Uncompress::Adapter::Lzf 2.021 ;';
-   eval ' use IO::Uncompress::Adapter::UnLzma 2.020 ;';
-   eval ' use IO::Uncompress::Adapter::UnXz 2.020 ;';
+   #eval ' use IO::Uncompress::Adapter::UnLzma 2.020 ;';
+   #eval ' use IO::Uncompress::Adapter::UnXz 2.020 ;';
 
    eval ' use IO::Uncompress::Bunzip2 2.021 ;';
    eval ' use IO::Uncompress::UnLzop 2.021 ;';
@@ -41,8 +41,8 @@ BEGIN
    eval ' use IO::Uncompress::RawInflate 2.021 ;';
    eval ' use IO::Uncompress::Unzip 2.021 ;';
    eval ' use IO::Uncompress::UnLzf 2.021 ;';
-   eval ' use IO::Uncompress::UnLzma 2.018 ;';
-   eval ' use IO::Uncompress::UnXz 2.018 ;';
+   #eval ' use IO::Uncompress::UnLzma 2.018 ;';
+   #eval ' use IO::Uncompress::UnXz 2.018 ;';
 }
 
 sub new
@@ -61,7 +61,8 @@ sub anyuncompress
 sub getExtraParams
 {
     use IO::Compress::Base::Common 2.021 qw(:Parse);
-    return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ) ;
+    return ( 'RawInflate' => [1, 1, Parse_boolean,  0] ,
+             'UnLzma'     => [1, 1, Parse_boolean,  0] ) ;
 }
 
 sub ckParams
@@ -107,7 +108,7 @@ sub mkUncomp
         }
      }
 
-#    if (defined $IO::Uncompress::UnLzma::VERSION )
+#    if (defined $IO::Uncompress::UnLzma::VERSION && $got->value('UnLzma'))
 #    {
 #        my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnLzma::mkUncompObject();
 #
@@ -125,21 +126,21 @@ sub mkUncomp
 #            return 1;
 #        }
 #     }
-
-     if (defined $IO::Uncompress::UnXz::VERSION and
-         $magic = $self->ckMagic('UnXz')) {
-        *$self->{Info} = $self->readHeader($magic)
-            or return undef ;
-
-        my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnXz::mkUncompObject();
-
-        return $self->saveErrorString(undef, $errstr, $errno)
-            if ! defined $obj;
-
-        *$self->{Uncomp} = $obj;
-
-         return 1;
-     }
+#
+#     if (defined $IO::Uncompress::UnXz::VERSION and
+#         $magic = $self->ckMagic('UnXz')) {
+#        *$self->{Info} = $self->readHeader($magic)
+#            or return undef ;
+#
+#        my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::UnXz::mkUncompObject();
+#
+#        return $self->saveErrorString(undef, $errstr, $errno)
+#            if ! defined $obj;
+#
+#        *$self->{Uncomp} = $obj;
+#
+#         return 1;
+#     }
 
      if (defined $IO::Uncompress::Bunzip2::VERSION and
          $magic = $self->ckMagic('Bunzip2')) {
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
index 8459ce0e05..eccff87b2c 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm
@@ -9,7 +9,7 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS);
 @ISA    = qw(Exporter IO::File);
 
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 use constant G_EOF => 0 ;
 use constant G_ERR => -1 ;
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
index ce483ea738..22cf65d450 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm
@@ -12,7 +12,7 @@ use IO::Uncompress::Adapter::Bunzip2 2.021 ;
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $Bunzip2Error = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
index 8922865d43..41b6d3d4f6 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm
@@ -28,7 +28,7 @@ Exporter::export_ok_tags('all');
 
 $GunzipError = '';
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 
 sub new
 {
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
index 20aecc7864..1a22263626 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm
@@ -13,7 +13,7 @@ use IO::Uncompress::RawInflate  2.021 ;
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $InflateError = '';
 
 @ISA    = qw( Exporter IO::Uncompress::RawInflate );
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
index 5727192e7c..3a45fcdde8 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm
@@ -14,7 +14,7 @@ use IO::Uncompress::Adapter::Inflate  2.021 ;
 require Exporter ;
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $RawInflateError = '';
 
 @ISA    = qw( Exporter IO::Uncompress::Base );
diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
index 7d08c84edc..c9f638ad2e 100644
--- a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
+++ b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm
@@ -30,7 +30,7 @@ require Exporter ;
 
 our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup);
 
-$VERSION = '2.021';
+$VERSION = '2.022';
 $UnzipError = '';
 
 @ISA    = qw(Exporter IO::Uncompress::RawInflate);