Fix merge conflicts, remove extra files, match upstream perl-5.20.1

ok deraadt@ sthen@ espie@ miod@

69 files changed, 0 insertions, 1771 deletions

diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/01use.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/01use.t
deleted file mode 100755
index be0b8481acf..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/01use.t
+++ /dev/null
@@ -1,9 +0,0 @@
-#!perl -w
-
-use strict;
-use Test::More tests => 3;
-
-use_ok('Module::Pluggable');
-use_ok('Module::Pluggable::Object');
-use_ok('Devel::InnerPackage');
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02alsoworks.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02alsoworks.t
deleted file mode 100755
index 131df29da0b..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02alsoworks.t
+++ /dev/null
@@ -1,42 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 5;
-
-my $foo;
-ok($foo = MyOtherTest->new());
-
-my @plugins;
-my @expected = qw(MyOtherTest::Plugin::Bar MyOtherTest::Plugin::Foo  MyOtherTest::Plugin::Quux MyOtherTest::Plugin::Quux::Foo);
-ok(@plugins = sort $foo->plugins);
-
-
-
-is_deeply(\@plugins, \@expected, "is deeply");
-
-@plugins = ();
-
-ok(@plugins = sort MyOtherTest->plugins);
-
-
-
-
-is_deeply(\@plugins, \@expected, "is deeply class");
-
-
-
-package MyOtherTest;
-
-use strict;
-use Module::Pluggable;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02works.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02works.t
deleted file mode 100755
index f748344a7ab..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02works.t
+++ /dev/null
@@ -1,42 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 5;
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Foo MyTest::Plugin::Quux::Foo);
-ok(@plugins = sort $foo->plugins);
-
-
-
-is_deeply(\@plugins, \@expected, "is deeply");
-
-@plugins = ();
-
-ok(@plugins = sort MyTest->plugins);
-
-
-
-
-is_deeply(\@plugins, \@expected, "is deeply class");
-
-
-
-package MyTest;
-
-use strict;
-use Module::Pluggable;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02works_taint.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02works_taint.t
deleted file mode 100755
index 0e1baa3dc0f..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/02works_taint.t
+++ /dev/null
@@ -1,41 +0,0 @@
-#!perl -wT
-
-# NOTE: Module::Pluggable is going into core
-# and CORE tests can't modify @INC under taint 
-# so this is a work around to make sure it
-# still works under taint checking.
-
-use strict;
-use Test::More tests => 5;
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(Module::Pluggable::Object);
-ok(@plugins = sort $foo->plugins);
-
-
-ok(grep {/Module::Pluggable::Object/} @plugins, "Contains Module::Pluggable::Object");
-
-@plugins = ();
-
-ok(@plugins = sort MyTest->plugins);
-
-ok(grep {/Module::Pluggable::Object/} @plugins, "Contains Module::Pluggable::Object under class method");
-
-
-
-package MyTest;
-
-use strict;
-use Module::Pluggable search_path => 'Module::Pluggable';
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/03diffname.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/03diffname.t
deleted file mode 100755
index d449fd0e04f..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/03diffname.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Foo MyTest::Plugin::Quux::Foo);
-ok(@plugins = sort $foo->foo);
-is_deeply(\@plugins, \@expected);
-
-
-
-package MyTest;
-
-use strict;
-use Module::Pluggable ( sub_name => 'foo');
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmedir.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmedir.t
deleted file mode 100755
index e2572feb486..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmedir.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(Acme::MyTest::Plugin::Foo);
-ok(@plugins = sort $foo->plugins);
-is_deeply(\@plugins, \@expected);
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use Module::Pluggable search_path => ["Acme::MyTest::Plugin"], search_dirs => [ "t/acme" ];
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmedir_single.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmedir_single.t
deleted file mode 100755
index adc5304b69c..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmedir_single.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(Acme::MyTest::Plugin::Foo);
-ok(@plugins = sort $foo->plugins);
-is_deeply(\@plugins, \@expected);
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use Module::Pluggable search_path => "Acme::MyTest::Plugin", search_dirs => "t/acme" ;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmepath.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmepath.t
deleted file mode 100755
index 540158c4969..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmepath.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(Acme::MyTest::Plugin::Foo);
-ok(@plugins = sort $foo->plugins);
-is_deeply(\@plugins, \@expected);
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use Module::Pluggable (search_path => ["Acme::MyTest::Plugin"]);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmepath_single.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmepath_single.t
deleted file mode 100755
index 976e77ec260..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/04acmepath_single.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(Acme::MyTest::Plugin::Foo);
-ok(@plugins = sort $foo->plugins);
-is_deeply(\@plugins, \@expected);
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use Module::Pluggable search_path => "Acme::MyTest::Plugin";
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/05postpath.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/05postpath.t
deleted file mode 100755
index 08c4052d269..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/05postpath.t
+++ /dev/null
@@ -1,31 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(MyTest::Extend::Plugin::Bar);
-ok(@plugins = sort $foo->plugins);
-is_deeply(\@plugins, \@expected);
-
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"]);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/06multipath.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/06multipath.t
deleted file mode 100755
index 6f74591289a..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/06multipath.t
+++ /dev/null
@@ -1,33 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(Acme::MyTest::Plugin::Foo MyTest::Extend::Plugin::Bar);
-ok(@plugins = sort $foo->plugins);
-
-is_deeply(\@plugins, \@expected);
-
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use File::Spec::Functions qw(catdir);
-use Module::Pluggable (search_path => ["MyTest::Extend::Plugin", "Acme::MyTest::Plugin"]);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/07instantiate.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/07instantiate.t
deleted file mode 100755
index 352d4d0926a..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/07instantiate.t
+++ /dev/null
@@ -1,40 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 6;
-
-my $foo;
-ok($foo = MyTest->new());
-
-
-
-my @plugins;
-ok(@plugins = sort $foo->booga(nork => 'fark'));
-is(ref $plugins[0],'MyTest::Extend::Plugin::Bar');
-is($plugins[0]->nork,'fark');
-
-
-@plugins = ();
-eval { @plugins = $foo->wooga( nork => 'fark') };
-is($@, '');
-is(scalar(@plugins),0);
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'booga', instantiate => 'new');
-use Module::Pluggable (search_path => ["MyTest::Extend::Plugin"], sub_name => 'wooga', instantiate => 'nosomuchmethod');
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/08nothing.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/08nothing.t
deleted file mode 100755
index f5c6487189c..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/08nothing.t
+++ /dev/null
@@ -1,30 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 2;
-
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @expected = ();
-my @plugins = sort $foo->plugins;
-is_deeply(\@plugins, \@expected);
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use Module::Pluggable (search_path => ["No::Such::Modules"]);
-use base qw(Module::Pluggable);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/09require.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/09require.t
deleted file mode 100755
index af5de5fd926..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/09require.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 2;
-
-my $t = MyTest->new();
-
-
-ok($t->plugins());
-
-ok(keys %{MyTest::Plugin::Foo::});
-
-
-package MyTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use Module::Pluggable (require => 1);
-use base qw(Module::Pluggable);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack.t
deleted file mode 100755
index 0653fc84f18..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack.t
+++ /dev/null
@@ -1,35 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 4;
-
-
-
-my $t = InnerTest->new();
-
-my %plugins = map { $_ => 1 } $t->plugins;
-
-ok(keys %plugins, "Got some plugins");
-ok($plugins{'InnerTest::Plugin::Foo'}, "Got Foo");
-ok($plugins{'InnerTest::Plugin::Bar'}, "Got Bar - the inner package");
-ok($plugins{'InnerTest::Plugin::Quux'}, "Got Quux - the other inner package");
-
-
-
-package InnerTest;
-use strict;
-use Module::Pluggable require => 1;
-use base qw(Module::Pluggable);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_inner.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_inner.t
deleted file mode 100755
index 054d9b67d7a..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_inner.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-
-my $t = InnerTest->new();
-
-my %plugins = map { $_ => 1 } $t->plugins;
-
-ok(keys %plugins, "Got some plugins");
-ok($plugins{'InnerTest::Plugin::Foo'}, "Got Foo");
-ok($plugins{'InnerTest::Plugin::Bar'}, "Got Bar - the inner package");
-
-
-
-package InnerTest;
-use strict;
-use Module::Pluggable inner => 1;
-use base qw(Module::Pluggable);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_noinner.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_noinner.t
deleted file mode 100755
index 1d670b02c30..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_noinner.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-
-my $t = InnerTest->new();
-
-my %plugins = map { $_ => 1 } $t->plugins;
-
-ok(keys %plugins, "Got some plugins");
-ok($plugins{'InnerTest::Plugin::Foo'}, "Got Foo");
-ok(!$plugins{'InnerTest::Plugin::Bar'}, "Didn't get Bar - the inner package");
-
-
-
-package InnerTest;
-use strict;
-use Module::Pluggable require => 1, inner => 0;
-use base qw(Module::Pluggable);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_onefile.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_onefile.t
deleted file mode 100755
index 01caf3738e8..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_onefile.t
+++ /dev/null
@@ -1,27 +0,0 @@
-#!perl -wT
-
-use strict;
-use Test::More tests => 2;
-use Data::Dumper;
-
-my $mc  = MyClass->new();
-my $mc2 = MyClass2->new();
-
-
-is_deeply([$mc->plugins],  [qw(MyClass::Plugin::MyPlugin)], "Got inner plugin");
-is_deeply([$mc2->plugins], [],                              "Didn't get plugin");
-
-package MyClass::Plugin::MyPlugin;
-sub pretty { print "I am pretty" };
-
-package MyClass;
-use Module::Pluggable inner => 1;
-
-sub new { return bless {}, $_[0] }
-
-package MyClass2;
-use Module::Pluggable search_path => "MyClass::Plugin", inner => 0;
-
-sub new { return bless {}, $_[0] }
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_override.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_override.t
deleted file mode 100755
index f9e863e9306..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_override.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-
-
-my $t = InnerTest->new();
-
-my %plugins = map { $_ => 1 } $t->plugins;
-
-ok(keys %plugins, "Got some plugins");
-ok($plugins{'InnerTest::Plugin::Foo'}, "Got Foo");
-ok($plugins{'InnerTest::Plugin::Bar'}, "Got Bar - the inner package");
-
-
-
-package InnerTest;
-use strict;
-use Module::Pluggable require => 0, inner => 1;
-use base qw(Module::Pluggable);
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_super.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_super.t
deleted file mode 100755
index e9a58bd8fab..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/10innerpack_super.t
+++ /dev/null
@@ -1,29 +0,0 @@
-#!perl -wT
-
-use Test::More tests => 3;
-use strict;
-use_ok('Devel::InnerPackage');
-Bar->whee;
-is_deeply([Devel::InnerPackage::list_packages("Bar")],[], "Don't pick up ::SUPER pseudo stash"); 
-is_deeply([Devel::InnerPackage::list_packages("Foo")],['Foo::Bar'], "Still pick up other inner package");
-
-package Foo;
-
-sub whee {
-    1;
-}
-
-package Foo::Bar;
-
-sub whee {}
-
-package Bar;
-use base 'Foo';
-
-sub whee {
-    shift->SUPER::whee;
-    2;
-}
-
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/11usetwice.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/11usetwice.t
deleted file mode 100755
index 8240318a4a4..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/11usetwice.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 3;
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(MyTest::Extend::Plugin::Bar MyTest::Plugin::Bar MyTest::Plugin::Foo MyTest::Plugin::Quux::Foo);
-
-push @plugins,  $foo->plugins;
-push @plugins, $foo->foo;
-
-@plugins = sort @plugins;
-is_deeply(\@plugins, \@expected);
-
-@plugins = ();
-
-push @plugins,  MyTest->plugins;
-push @plugins,  MyTest->foo; 
-@plugins = sort @plugins;
-is_deeply(\@plugins, \@expected);
-
-
-
-package MyTest;
-
-use strict;
-use Module::Pluggable;
-use Module::Pluggable ( search_path => [ "MyTest::Extend::Plugin" ] , sub_name => 'foo' );
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12only.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12only.t
deleted file mode 100755
index 1150b60793d..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12only.t
+++ /dev/null
@@ -1,64 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 10;
-
-{
-    my $foo;
-    ok($foo = MyTest->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Foo);
-    ok(@plugins = sort $foo->plugins);
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTest->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-{
-    my $foo;
-    ok($foo = MyTestSub->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Foo);
-    ok(@plugins = sort $foo->plugins);
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTestSub->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-package MyTest;
-
-use strict;
-use Module::Pluggable only => "MyTest::Plugin::Foo";
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-package MyTestSub;
-
-use strict;
-use Module::Pluggable search_path => "MyTest::Plugin";
-
-
-sub new {
-    my $class = shift;
-    my $self = bless {}, $class;
-
-    $self->only("MyTest::Plugin::Foo");
-
-    return $self;
-}
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyarray.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyarray.t
deleted file mode 100755
index a37e7771d20..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyarray.t
+++ /dev/null
@@ -1,65 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 10;
-
-{
-    my $foo;
-    ok($foo = MyTest->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Foo);
-    ok(@plugins = sort $foo->plugins);
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTest->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-{
-    my $foo;
-    ok($foo = MyTestSub->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Foo);
-    ok(@plugins = sort $foo->plugins);
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTestSub->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-package MyTest;
-
-use strict;
-use Module::Pluggable only => [ "MyTest::Plugin::Foo" ];
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-package MyTestSub;
-
-use strict;
-use Module::Pluggable search_path => "MyTest::Plugin";
-
-
-sub new {
-    my $class = shift;
-    my $self = bless {}, $class;
-
-    $self->only(["MyTest::Plugin::Foo"]);
-
-    return $self;
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyregex.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyregex.t
deleted file mode 100755
index 78a9bd554f0..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyregex.t
+++ /dev/null
@@ -1,65 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 10;
-
-{
-    my $foo;
-    ok($foo = MyTest->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Foo);
-    ok(@plugins = sort $foo->plugins);
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTest->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-{
-    my $foo;
-    ok($foo = MyTestSub->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Foo);
-    ok(@plugins = sort $foo->plugins);
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTestSub->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-package MyTest;
-
-use strict;
-use Module::Pluggable only => qr/MyTest::Plugin::Foo$/;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-package MyTestSub;
-
-use strict;
-use Module::Pluggable search_path => "MyTest::Plugin";
-
-
-sub new {
-    my $class = shift;
-    my $self = bless {}, $class;
-
-    $self->only(qr/MyTest::Plugin::Foo$/);
-
-    return $self;
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyrequire.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyrequire.t
deleted file mode 100755
index cf76b4dd03c..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/12onlyrequire.t
+++ /dev/null
@@ -1,21 +0,0 @@
-#!perl -w
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 2;
-
-my @packages = eval { Zot->_dist_types };
-is($@, '',                "No warnings");
-is(scalar(@packages), 0,  "Correctly only got 1 package");
-
-
-package Zot;
-use strict;
-use Module::Pluggable (
-        sub_name => '_dist_types',
-        search_path => __PACKAGE__,
-        only => qr/Zot::\w+$/,
-        require => 1,
-    );
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13except.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13except.t
deleted file mode 100755
index e08ffa905f9..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13except.t
+++ /dev/null
@@ -1,68 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 10;
-
-{
-    my $foo;
-    ok($foo = MyTest->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Quux::Foo);
-    ok(@plugins = sort $foo->plugins);
-
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTest->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-{
-    my $foo;
-    ok($foo = MyTestSub->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Quux::Foo);
-    ok(@plugins = sort $foo->plugins);
-
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTestSub->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-package MyTest;
-
-use strict;
-use Module::Pluggable except => "MyTest::Plugin::Foo";
-
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-package MyTestSub;
-
-use strict;
-use Module::Pluggable search_path => "MyTest::Plugin";
-
-
-sub new {
-    my $class = shift;
-    my $self = bless {}, $class;
-
-    $self->except("MyTest::Plugin::Foo");
-
-    return $self;
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13exceptarray.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13exceptarray.t
deleted file mode 100755
index ec61ff4dae9..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13exceptarray.t
+++ /dev/null
@@ -1,68 +0,0 @@
-#!perl -wT
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 10;
-
-{
-    my $foo;
-    ok($foo = MyTest->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Quux::Foo);
-    ok(@plugins = sort $foo->plugins);
-
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTest->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-{
-    my $foo;
-    ok($foo = MyTestSub->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Quux::Foo);
-    ok(@plugins = sort $foo->plugins);
-
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTestSub->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-package MyTest;
-
-use strict;
-use Module::Pluggable except => [ "MyTest::Plugin::Foo" ];
-
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-package MyTestSub;
-
-use strict;
-use Module::Pluggable search_path => "MyTest::Plugin";
-
-
-sub new {
-    my $class = shift;
-    my $self = bless {}, $class;
-
-    $self->except(["MyTest::Plugin::Foo"]);
-
-    return $self;
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13exceptregex.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13exceptregex.t
deleted file mode 100755
index 2d842b387f6..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/13exceptregex.t
+++ /dev/null
@@ -1,68 +0,0 @@
-#!perl -wT
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 10;
-
-{
-    my $foo;
-    ok($foo = MyTest->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Quux::Foo);
-    ok(@plugins = sort $foo->plugins);
-
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTest->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-{
-    my $foo;
-    ok($foo = MyTestSub->new());
-
-    my @plugins;
-    my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Quux::Foo);
-    ok(@plugins = sort $foo->plugins);
-
-    is_deeply(\@plugins, \@expected);
-
-    @plugins = ();
-
-    ok(@plugins = sort MyTestSub->plugins);
-    is_deeply(\@plugins, \@expected);
-}
-
-package MyTest;
-
-use strict;
-use Module::Pluggable except => qr/MyTest::Plugin::Foo/;
-
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-package MyTestSub;
-
-use strict;
-use Module::Pluggable search_path => "MyTest::Plugin";
-
-
-sub new {
-    my $class = shift;
-    my $self = bless {}, $class;
-
-    $self->except(qr/MyTest::Plugin::Foo/);
-
-    return $self;
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/14package.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/14package.t
deleted file mode 100755
index aaca94ceab5..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/14package.t
+++ /dev/null
@@ -1,34 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 5;
-
-my $foo;
-ok($foo = MyTest->new());
-
-my @plugins;
-my @expected = qw(MyTest::Plugin::Bar MyTest::Plugin::Foo MyTest::Plugin::Quux::Foo);
-ok(@plugins = sort $foo->plugins);
-is_deeply(\@plugins, \@expected);
-
-@plugins = ();
-
-ok(@plugins = sort MyTest->plugins);
-is_deeply(\@plugins, \@expected);
-
-
-
-package MyTest;
-use strict;
-sub new { return bless {}, $_[0] }
-
-package MyOtherTest;
-use strict;
-use Module::Pluggable ( package => "MyTest" );
-sub new { return bless {}, $_[0] }
-
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/15topicsafe.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/15topicsafe.t
deleted file mode 100755
index 49305f28845..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/15topicsafe.t
+++ /dev/null
@@ -1,16 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More 'no_plan';
-
-use Module::Pluggable search_path => 'Acme::MyTest';
-
-my $topic = "topic";
-
-for ($topic) {
-  main->plugins;
-}
-
-is($topic, 'topic', "we've got the right topic");
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/16different_extension.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/16different_extension.t
deleted file mode 100755
index f628a7cd67b..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/16different_extension.t
+++ /dev/null
@@ -1,42 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 5;
-
-my $foo;
-ok($foo = ExtTest->new());
-
-my @plugins;
-my @expected = qw(ExtTest::Plugin::Bar ExtTest::Plugin::Foo ExtTest::Plugin::Quux::Foo);
-ok(@plugins = sort $foo->plugins);
-
-
-
-is_deeply(\@plugins, \@expected, "is deeply");
-
-@plugins = ();
-
-ok(@plugins = sort ExtTest->plugins);
-
-
-
-
-is_deeply(\@plugins, \@expected, "is deeply class");
-
-
-
-package ExtTest;
-
-use strict;
-use Module::Pluggable file_regex => qr/\.plugin$/;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/17devel_inner_package.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/17devel_inner_package.t
deleted file mode 100755
index 30f32560d8e..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/17devel_inner_package.t
+++ /dev/null
@@ -1,15 +0,0 @@
-#!perl -w
-use Test::More tests => 3;
-
-use Devel::InnerPackage qw(list_packages);
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-
-my @packages;
-
-use_ok("TA::C::A::I");
-ok(@packages = list_packages("TA::C::A::I"));
-
-is_deeply([sort @packages], [qw(TA::C::A::I::A TA::C::A::I::A::B)]);
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/18skipped_package.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/18skipped_package.t
deleted file mode 100755
index c580d68cbbf..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/18skipped_package.t
+++ /dev/null
@@ -1,11 +0,0 @@
-#!perl -w
-
-use Test::More tests => 1;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-
-use Devel::InnerPackage qw(list_packages);
-use No::Middle;
-
-my @p = list_packages("No::Middle");
-is_deeply([ sort @p ], [ qw(No::Middle::Package::A No::Middle::Package::B) ]);
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/19can_ok_clobber.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/19can_ok_clobber.t
deleted file mode 100755
index 60616f6a300..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/19can_ok_clobber.t
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl
-use strict; 
-use warnings;
-use Data::Dumper;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-
-use Test::More tests=>5;
-
-#use_ok( 'MyTest' );
-#diag "Module::Pluggable::VERSION $Module::Pluggable::VERSION";
-
-my @plugins = sort MyTest->plugins;
-my @plugins_after;
-
-use_ok( 'MyTest::Plugin::Foo' );
-ok( my $foo = MyTest::Plugin::Foo->new() );
-
-@plugins_after = MyTest->plugins;
-is_deeply(
-    \@plugins_after,
-    \@plugins,
-    "plugins haven't been clobbered",
-) or diag Dumper(\@plugins_after,\@plugins);
-
-can_ok ($foo, 'frobnitz');
-
-@plugins_after = sort MyTest->plugins;
-is_deeply(
-    \@plugins_after,
-    \@plugins,
-    "plugins haven't been clobbered",
-) or diag Dumper(\@plugins_after,\@plugins);
-
-
-
-package MyTest;
-
-use strict;
-use Module::Pluggable;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/20dodgy_files.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/20dodgy_files.t
deleted file mode 100755
index 8c0eb8e76ec..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/20dodgy_files.t
+++ /dev/null
@@ -1,84 +0,0 @@
-#!perl -w
-
-BEGIN {
-    if ($^O eq 'VMS' || $^O eq 'VOS') {
-        print "1..0 # Skip: can't handle misspelled plugin names\n";
-        exit;
-    }
-}
-
-use strict;
-use FindBin;
-use Test::More;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use File::Spec::Functions qw(catfile);
-
-
-my ($dodgy_file) = (catfile($FindBin::Bin, "lib", "OddTest", "Plugin", "-Dodgy.pm")=~/^(.*)$/);
-unless (-f $dodgy_file) {
-        plan skip_all => "Can't handle misspelled plugin names\n";
-} else {
-        plan tests => 5;
-}
-
-
-my $foo;
-ok($foo = OddTest->new());
-
-my @plugins;
-my @expected = ('OddTest::Plugin::-Dodgy', 'OddTest::Plugin::Foo');
-ok(@plugins = sort $foo->plugins);
-is_deeply(\@plugins, \@expected, "is deeply");
-
-my @odd_plugins;
-my @odd_expected = qw(OddTest::Plugin::Foo);
-ok(@odd_plugins = sort $foo->odd_plugins);
-is_deeply(\@odd_plugins, \@odd_expected, "is deeply");
-
-
-package OddTest::Pluggable;
-
-use Data::Dumper;
-use base qw(Module::Pluggable::Object);
-
-
-sub find_files { 
-    my $self = shift;
-    my @files = $self->SUPER::find_files(@_);
-    return grep { !/(^|\/)-/ } $self->SUPER::find_files(@_) ;
-}
-
-package OddTest;
-
-use strict;
-use Module::Pluggable;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-
-sub odd_plugins {
-    my $self = shift;
-    my %opts;
-    my ($pkg, $file) = caller; 
-    # the default name for the method is 'plugins'
-    my $sub          = $opts{'sub_name'}  || 'plugins';
-    # get our package 
-    my ($package)    = $opts{'package'} || "OddTest";
-    $opts{filename}  = $file;
-    $opts{package}   = $package;
-
-
-
-    my $op   = OddTest::Pluggable->new( package => ref($self) );
-    return $op->plugins(@_);
-    
-
-}
-
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/21editor_junk.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/21editor_junk.t
deleted file mode 100755
index 5f4b52b32e3..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/21editor_junk.t
+++ /dev/null
@@ -1,53 +0,0 @@
-#!perl -w
-
-use Test::More;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Module::Pluggable::Object;
-use File::Spec::Functions qw(catfile);
-
-my ($dodgy_file) = (catfile($FindBin::Bin,"lib", "EditorJunk", "Plugin", "#Bar.pm#")=~/^(.*)$/);
-unless (-f $dodgy_file) {
-        plan skip_all => "Can't handle plugin names with octothorpes\n";
-} else {
-        plan tests => 4;
-}
-
-
-
-my $foo;
-ok($foo = EditorJunk->new());
-
-my @plugins;
-my @expected = qw(EditorJunk::Plugin::Bar EditorJunk::Plugin::Foo);
-ok(@plugins = sort $foo->plugins);
-
-is_deeply(\@plugins, \@expected, "is deeply");
-
-
-my $mpo = Module::Pluggable::Object->new(
-    package             => 'EditorJunk',
-    filename            => __FILE__,
-    include_editor_junk => 1,
-);
-
-@expected = ('EditorJunk::Plugin::.#Bar', 'EditorJunk::Plugin::Bar', 'EditorJunk::Plugin::Foo');
-@plugins = sort $mpo->plugins();
-is_deeply(\@plugins, \@expected, "is deeply");
-
-
-
-package EditorJunk;
-
-use strict;
-use Module::Pluggable;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-
-}
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/22trigger.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/22trigger.t
deleted file mode 100644
index 819e9ef20f0..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/22trigger.t
+++ /dev/null
@@ -1,54 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 7;
-
-my $foo;
-my @plugins;
-my @errors;
-ok($foo = TriggerTest->new(), "Created new TriggerTest");
-ok(@plugins = $foo->plugins,  "Ran plugins");
-ok(@errors  = $foo->errors,   "Got errors");
-is_deeply([sort @plugins], ['TriggerTest::Plugin::After', 'TriggerTest::Plugin::CallbackAllow'], "Got the correct plugins");
-is_deeply([@errors], ['TriggerTest::Plugin::Error'], "Got the correct errors");
-ok(_is_loaded('TriggerTest::Plugin::CallbackDeny'), "CallbackDeny has been required");
-ok(!_is_loaded('TriggerTest::Plugin::Deny'), "Deny has not been required");
-
-
-# Stolen from Module::Loaded by Chris Williams (bingOs)
-sub _is_loaded {
-    my $pm      = shift;
-    my $file    = __PACKAGE__->_pm_to_file( $pm ) or return;
-    return $INC{$file} if exists $INC{$file};
-    return;
-}
-
-sub _pm_to_file {
-    my $pkg = shift;
-    my $pm  = shift or return;
-    my $file = join '/', split '::', $pm;
-    $file .= '.pm';
-    return $file;
-}
-
-package TriggerTest;
-
-our @ERRORS;
-use strict;
-use Module::Pluggable require          => 1,
-                      on_require_error => sub { my $p = shift; push @ERRORS, $p; return 0 },
-                      before_require   => sub { my $p = shift; return !($p eq "TriggerTest::Plugin::Deny") },
-                      after_require    => sub { my $p = shift; return !($p->can('exclude') && $p->exclude) };
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-}
-
-sub errors {
-    @ERRORS;
-}
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/23depth.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/23depth.t
deleted file mode 100644
index ef3fb31f49a..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/23depth.t
+++ /dev/null
@@ -1,38 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use lib (($FindBin::Bin."/lib")=~/^(.*)$/);
-use Test::More tests => 2;
-
-
-my $min = MinTest->new();
-my $max = MaxTest->new();
-is_deeply([sort qw(MyOtherTest::Plugin::Bar MyOtherTest::Plugin::Foo  MyOtherTest::Plugin::Quux)], [sort $max->plugins], "min depth");
-is_deeply([qw(MyOtherTest::Plugin::Quux::Foo)], [sort $min->plugins], "max depth");
-
-
-package MinTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use File::Spec::Functions qw(catdir);
-use Module::Pluggable search_path => "MyOtherTest::Plugin", min_depth => 4;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-}
-
-package MaxTest;
-use File::Spec::Functions qw(catdir);
-use strict;
-use File::Spec::Functions qw(catdir);
-use Module::Pluggable search_path => "MyOtherTest::Plugin", max_depth => 3;
-
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-}
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/24local_inc_object.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/24local_inc_object.t
deleted file mode 100644
index c8e00facfce..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/24local_inc_object.t
+++ /dev/null
@@ -1,23 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use Test::More tests => 2;
-
-my $inc  = IncTest->new();
-my ($ta) = grep { ref($_) eq 'Text::Abbrev'} eval { local ($^W) = 0; $inc->plugins };
-ok($ta);
-is($ta->MPCHECK, "HELLO");
-
-package IncTest;
-use Module::Pluggable search_path => "Text", 
-                      search_dirs => "t/lib", 
-                      instantiate => 'module_pluggable', 
-                      on_require_error     => sub { },
-                      on_instantiate_error => sub { };
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-}
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/24local_inc_package.t b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/24local_inc_package.t
deleted file mode 100644
index ef0f330f1d2..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/24local_inc_package.t
+++ /dev/null
@@ -1,17 +0,0 @@
-#!perl -w
-
-use strict;
-use FindBin;
-use Test::More tests => 1;
-
-IncTest->new()->plugins;
-is(Text::Abbrev->MPCHECK, "HELLO");
-
-package IncTest;
-use Module::Pluggable search_path => "Text", search_dirs => "t/lib", require => 1;
-
-sub new {
-    my $class = shift;
-    return bless {}, $class;
-}
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/acme/Acme/MyTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/acme/Acme/MyTest/Plugin/Foo.pm
deleted file mode 100644
index 29c888baf7a..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/acme/Acme/MyTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package Acme::MyTest::Plugin::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/Foo-Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/Foo-Bar.pm
deleted file mode 100644
index 4fc48c6a188..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/Foo-Bar.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package Acme::FooBar;
-
-our $quux = "hello";
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/MyTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/MyTest/Plugin/Foo.pm
deleted file mode 100644
index 29c888baf7a..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/MyTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package Acme::MyTest::Plugin::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm
deleted file mode 100644
index dcc870c4e55..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swo b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swo
deleted file mode 100644
index dcc870c4e55..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swo
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swp b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swp
deleted file mode 100644
index dcc870c4e55..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swp
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Foo.pm
deleted file mode 100644
index 64b8bf4c7b5..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Foo.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Bar.plugin b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Bar.plugin
deleted file mode 100644
index 2f9b6db0b0f..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Bar.plugin
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Foo.plugin b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Foo.plugin
deleted file mode 100644
index 5386ba5b809..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Foo.plugin
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Quux/Foo.plugin b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Quux/Foo.plugin
deleted file mode 100644
index bb6e08667bd..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Quux/Foo.plugin
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Quux::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/InnerTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/InnerTest/Plugin/Foo.pm
deleted file mode 100644
index 4f5825ea655..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/InnerTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package InnerTest::Plugin::Foo;
-use strict;
-
-our $FOO = 1;
-
-package InnerTest::Plugin::Bar;
-use strict;
-
-sub bar {}
-
-package InnerTest::Plugin::Quux;
-use strict;
-use base qw(InnerTest::Plugin::Bar);
-
-
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Bar.pm
deleted file mode 100644
index 3c5d79dc9bb..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Bar.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Bar;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Foo.pm
deleted file mode 100644
index 14825724b32..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Foo;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux.pm
deleted file mode 100644
index 22fd55d3b9c..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Quux;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux/Foo.pm
deleted file mode 100644
index a8ecd69f114..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux/Foo.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Quux::Foo;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Extend/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Extend/Plugin/Bar.pm
deleted file mode 100644
index 6d112cf39fb..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Extend/Plugin/Bar.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package MyTest::Extend::Plugin::Bar;
-use strict;
-
-sub new {
-	my $class = shift;
-	my %self = @_;
-
-	return bless \%self, $class;
-}
-
-
-sub nork {
-	return $_[0]->{'nork'};
-}
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Bar.pm
deleted file mode 100644
index 2f9b6db0b0f..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Bar.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Foo.pm
deleted file mode 100644
index 6ca83175079..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,10 +0,0 @@
-package MyTest::Plugin::Foo;
-
-
-use strict;
-
-sub new { return bless {}, $_[0]; }
-sub frobnitz {}
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Quux/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Quux/Foo.pm
deleted file mode 100644
index bb6e08667bd..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Quux/Foo.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Quux::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/No/Middle.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/No/Middle.pm
deleted file mode 100644
index 9d0e31ac128..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/No/Middle.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-package No::Middle;
-
-sub foo {}
-
-package No::Middle::Package::A;
-
-sub foo {}
-
-
-package No::Middle::Package::B;
-
-sub foo {}
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/OddTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/OddTest/Plugin/Foo.pm
deleted file mode 100644
index bcf37e34bf0..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/OddTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package OddFiles/Plugin/Foo.pm
-
-sub new {}
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TA/C/A/I.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TA/C/A/I.pm
deleted file mode 100644
index 35575dfdde7..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TA/C/A/I.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package TA::C::A::I;
-
-sub foo { }
-
-package TA::C::A::I::A;
-
-sub foo { }
-
-package TA::C::A::I::A::B;
-
-sub foo { }
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
deleted file mode 100644
index 8417072f3ec..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
+++ /dev/null
@@ -1,10 +0,0 @@
-package Text::Abbrev;
-use strict;
-
-sub module_pluggable {
-    return bless {}, shift;
-}
-
-sub MPCHECK { "HELLO" }
-
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/After.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/After.pm
deleted file mode 100644
index b5f69015575..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/After.pm
+++ /dev/null
@@ -1,3 +0,0 @@
-package TriggerTest::Plugin::After;
-
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackAllow.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackAllow.pm
deleted file mode 100644
index 589b154ca4d..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackAllow.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package TriggerTest::Plugin::CallbackAllow;
-
-sub exclude {
-    return 0;
-}
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackDeny.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackDeny.pm
deleted file mode 100644
index e63227f59c1..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackDeny.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package TriggerTest::Plugin::CallbackDeny;
-
-sub exclude {
-    return 1;
-}
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Deny.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Deny.pm
deleted file mode 100644
index 311e2a07a04..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Deny.pm
+++ /dev/null
@@ -1,3 +0,0 @@
-package TriggerTest::Plugin::Deny;
-
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Error.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Error.pm
deleted file mode 100644
index 620465a942c..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Error.pm
+++ /dev/null
@@ -1,2 +0,0 @@
-package TriggerTest::Plugin::Error;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Zot/.Zork.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Zot/.Zork.pm
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Zot/.Zork.pm
+++ /dev/null