File 61f086b1fe03fab5a96a999f7b21768504d7089c.patch of Package perl-MooseX-App-Cmd

diff --git a/dist.ini b/dist.ini
index 5fa73d5..d77ee54 100644
--- a/dist.ini
+++ b/dist.ini
@@ -16,6 +16,8 @@ copyright_holder = Infinity Interactive, Yuval Kogman
 [@Filter]
 -bundle = @Basic
 -remove = Readme
+-remove = MakeMaker
+[=inc::MooseMouseMakeMaker / MooseMouseMakeMaker]
 [AutoPrereqs]
 skip = ^Moose
 skip = ^Mouse
@@ -23,8 +25,6 @@ skip = ^Mouse
 perl = 5.006
 App::Cmd = 0.321
 Getopt::Long::Descriptive = 0.091
-Test::use::ok = 0
-MouseX::Getopt = 0
 [OptionalFeature / ConfigFromFile]
 -description = Command line options can be set from a configuration file
 -always_recommend = 1
@@ -35,7 +35,12 @@ MouseX::ConfigFromFile = 0
 Moose = 0.86
 MooseX::ConfigFromFile = 0.08
 MooseX::Getopt = 0.18
+[OptionalFeature / Mouse]
+-description = Support for the Mouse lightweight object system
+-always_recommend = 1
+MouseX::Getopt = 0
 [MetaProvides::Package]
+[Meta::Dynamic::Config]
 [Prereqs / ConfigureRequires]
 ExtUtils::MakeMaker = 0
 [Prereqs / BuildRequires]
@@ -81,7 +86,6 @@ location = root
 [ReportVersions]
 [Test::LocalBrew]
 brews = perl-latest-TEST
-[InstallGuide]
 [MetaJSON]
 [@Git]
 allow_dirty = README.pod
@@ -101,3 +105,4 @@ fork = 0
 ;authordep Perl::Critic::StricterSubs
 ;authordep MooseX::SimpleConfig
 ;authordep Test::Pod::Coverage
+;authordep Dist::Zilla::Plugin::MakeMaker::Awesome
diff --git a/inc/MooseMouseMakeMaker.pm b/inc/MooseMouseMakeMaker.pm
new file mode 100644
index 0000000..f0ecab5
--- /dev/null
+++ b/inc/MooseMouseMakeMaker.pm
@@ -0,0 +1,28 @@
+package inc::MooseMouseMakeMaker;
+use Moose;
+use MooseX::AttributeShortcuts;
+use MooseX::Types::Moose 'Bool';
+
+extends 'Dist::Zilla::Plugin::MakeMaker::Awesome';
+
+override _build_WriteMakefile_dump => sub {
+    my $self = shift;
+
+    my $args = super();
+    $args .= <<'END_WRITEMAKEFILE';
+if (eval {require Mouse; 1}) {
+    $WriteMakefileArgs{PREREQ_PM}{'MouseX::Getopt'} = 0;
+}
+if (eval {require Moose; 1}) {
+    $WriteMakefileArgs{PREREQ_PM}{'MooseX::Getopt'} = '0.18';
+}
+if (not grep {/^Mo(?:o|u)seX::Getopt$/} keys %{$WriteMakefileArgs{PREREQ_PM}}) {
+    $WriteMakefileArgs{PREREQ_PM}{'MouseX::Getopt'} = 0;
+}
+END_WRITEMAKEFILE
+
+    return $args;
+};
+
+__PACKAGE__->meta->make_immutable;
+1;
diff --git a/t/basic.t b/t/basic.t
index b64f658..6c175e8 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -70,7 +70,7 @@ is_deeply(
 
     like(
         $@,
-        qr/Mandatory parameter 'wow' missing in call to \(eval\)/,
+        qr/Mandatory parameter 'wow' missing in call to ["(]eval[)"]/,
         'required option field is missing',
     );
 }
diff --git a/t/configfile.t b/t/configfile.t
index 6c88e79..481e4dd 100644
--- a/t/configfile.t
+++ b/t/configfile.t
@@ -27,7 +27,7 @@ my $cmd = Test::ConfigFromFile->new;
 
     like(
         $@,
-        qr/Mandatory parameter 'moo' missing in call to \(eval\)/,
+        qr/Mandatory parameter 'moo' missing in call to ["(]eval[)"]/,
         'command died with the correct string',
     );
 }
diff --git a/t/lib/Test/ConfigFromFile.pm b/t/lib/Test/ConfigFromFile.pm
index 55a5e68..9195c05 100644
--- a/t/lib/Test/ConfigFromFile.pm
+++ b/t/lib/Test/ConfigFromFile.pm
@@ -1,6 +1,6 @@
 package Test::ConfigFromFile;
 use Any::Moose;
 
-extends qw(MooseX::App::Cmd);
+extends any_moose('X::App::Cmd');
 
 1;
diff --git a/t/lib/Test/ConfigFromFile/Command/boo.pm b/t/lib/Test/ConfigFromFile/Command/boo.pm
index 1ee0342..a1214a7 100644
--- a/t/lib/Test/ConfigFromFile/Command/boo.pm
+++ b/t/lib/Test/ConfigFromFile/Command/boo.pm
@@ -2,7 +2,7 @@ package Test::ConfigFromFile::Command::boo;
 use Any::Moose;
 use YAML();
 
-extends qw(MooseX::App::Cmd::Command);
+extends any_moose('X::App::Cmd::Command');
 with any_moose('X::ConfigFromFile');
 
 =head1 NAME
diff --git a/t/lib/Test/ConfigFromFile/Command/moo.pm b/t/lib/Test/ConfigFromFile/Command/moo.pm
index 34fef52..4aeab79 100644
--- a/t/lib/Test/ConfigFromFile/Command/moo.pm
+++ b/t/lib/Test/ConfigFromFile/Command/moo.pm
@@ -2,7 +2,7 @@ package Test::ConfigFromFile::Command::moo;
 use Any::Moose;
 use YAML();
 
-extends 'MooseX::App::Cmd::Command';
+extends any_moose('X::App::Cmd::Command');
 with any_moose('X::ConfigFromFile');
 
 =head1 NAME
diff --git a/t/lib/Test/MyCmd.pm b/t/lib/Test/MyCmd.pm
index 4f6baea..e9de904 100644
--- a/t/lib/Test/MyCmd.pm
+++ b/t/lib/Test/MyCmd.pm
@@ -1,6 +1,6 @@
 package Test::MyCmd;
 use Any::Moose;
 
-extends qw(MooseX::App::Cmd);
+extends any_moose('X::App::Cmd');
 
 1;
diff --git a/t/lib/Test/MyCmd/Command/bark.pm b/t/lib/Test/MyCmd/Command/bark.pm
index 22631b8..76b1fcb 100644
--- a/t/lib/Test/MyCmd/Command/bark.pm
+++ b/t/lib/Test/MyCmd/Command/bark.pm
@@ -1,7 +1,7 @@
 package Test::MyCmd::Command::bark;
 use Any::Moose;
 
-extends qw(MooseX::App::Cmd::Command);
+extends any_moose('X::App::Cmd::Command');
 
 =head1 NAME
 
diff --git a/t/lib/Test/MyCmd/Command/frobulate.pm b/t/lib/Test/MyCmd/Command/frobulate.pm
index 7e111d5..bafec1e 100644
--- a/t/lib/Test/MyCmd/Command/frobulate.pm
+++ b/t/lib/Test/MyCmd/Command/frobulate.pm
@@ -1,7 +1,7 @@
 package Test::MyCmd::Command::frobulate;
 use Any::Moose;
 
-extends qw(MooseX::App::Cmd::Command);
+extends any_moose('X::App::Cmd::Command');
 
 sub command_names {
     return qw(frobulate frob);
diff --git a/t/lib/Test/MyCmd/Command/justusage.pm b/t/lib/Test/MyCmd/Command/justusage.pm
index 0847509..27a92d7 100644
--- a/t/lib/Test/MyCmd/Command/justusage.pm
+++ b/t/lib/Test/MyCmd/Command/justusage.pm
@@ -1,7 +1,7 @@
 package Test::MyCmd::Command::justusage;
 use Any::Moose;
 
-extends qw(MooseX::App::Cmd::Command);
+extends any_moose('X::App::Cmd::Command');
 
 =head1 NAME
 
diff --git a/t/lib/Test/MyCmd/Command/stock.pm b/t/lib/Test/MyCmd/Command/stock.pm
index 45d985a..34f64b8 100644
--- a/t/lib/Test/MyCmd/Command/stock.pm
+++ b/t/lib/Test/MyCmd/Command/stock.pm
@@ -1,7 +1,7 @@
 package Test::MyCmd::Command::stock;
 use Any::Moose;
 
-extends qw(MooseX::App::Cmd::Command);
+extends any_moose('X::App::Cmd::Command');
 
 =head1 NAME