reversal of d6a4f71: use inc:: names again

new Config::MVP puts . in @inc during dzil build

Makefile.PL

@@ -35,12 +35,12 @@ BEGIN {
 
 system( $^X, 'author/extract-inline-tests', '--quiet' );
 
-use lib 'inc';
-use MMHelper;
+use lib '.';
+use inc::MMHelper;
 
-eval MMHelper::my_package_subs();
+eval inc::MMHelper::my_package_subs();
 
-my %args = MMHelper::mm_args();
+my %args = inc::MMHelper::mm_args();
 $args{clean}{FILES} = join(' ', ($args{clean}{FILES} || ()),
     (grep !/basics_genome_overloadingsubtypesandcoercion\.t\z/, glob('t/recipes/*')),
     'xs/*.c', 'xs/*.o',
@@ -50,7 +50,7 @@ WriteMakefile(
     NAME => 'Moose',
     VERSION_FROM => 'lib/Moose.pm',
     test => { TESTS => 't/*.t t/*/*.t' },
-    CCFLAGS => MMHelper::ccflags_static('dev'),
+    CCFLAGS => inc::MMHelper::ccflags_static('dev'),
     INSTALLMAN1DIR => 'none',
     INSTALLMAN3DIR => 'none',
     NORECURS => 1,

dist.ini

@@ -16,6 +16,8 @@ copyright_year = 2006
 ; $VERSION will be extracted from lib/Moose.pm,
 ; or override it with $ENV{V}
 
+; authordep Config::MVP = 2.200011
+
 [EnsurePrereqsInstalled]
 :version = 0.003
 build_phase = release ; be nice to travis
@@ -38,11 +40,11 @@ version = 3.35
 [License]
 [ExecDir]   ; bin/moose-outdated
 
-[lib]
-lib = inc
+;[lib]
+;lib = inc
 
 ; authordep Dist::Zilla::Plugin::MakeMaker::Awesome
-[=MakeMaker]
+[=inc::MakeMaker]
 default_jobs = 9
 
 ; authordep ExtUtils::HasCompiler = 0.022
@@ -55,7 +57,7 @@ background_perl = 5.008003
 
 [MetaConfig]
 
-[=SimpleAuthority]
+[=inc::SimpleAuthority]
 
 [MetaResources]
 bugtracker.web    = https://rt.cpan.org/Dist/Display.html?Name=Moose
@@ -70,7 +72,7 @@ x_MailingList = http://lists.perl.org/list/moose.html
 [UseUnsafeInc]
 dot_in_INC = 0
 
-[=Documentation]
+[=inc::Documentation]
 module = Moose::Manual
 module = Moose::Manual::Attributes
 module = Moose::Manual::BestPractices
@@ -133,7 +135,7 @@ finder = :InstallModules
 skip = \.pod$
 skip = ^lib/Moose/Conflicts.pm$
 
-[=SimpleProvides]
+[=inc::SimpleProvides]
 finder = PodModules
 
 [MetaProvides::Package]
@@ -179,7 +181,7 @@ on_package_line = 1
 ; authordep Test::Inline
 ; authordep File::Find::Rule
 ; authordep Test::Inline::Extract
-[=ExtractInlineTests]
+[=inc::ExtractInlineTests]
 
 [PromptIfStale]
 phase = release
@@ -257,7 +259,7 @@ skip = ^Moose::Meta::TypeConstraint::Parameterized$
 skip = ^Moose::Meta::TypeConstraint::Role$
 skip = ^Moose::Meta::TypeConstraint::Union$
 
-[=CheckReleaseType]
+[=inc::CheckReleaseType]
 [CheckVersionIncrement]
 
 ; we would like to have this, but currently there are false negatives:
@@ -485,10 +487,10 @@ conflicts_module = Module::Runtime::Conflicts
 ; authordep Dist::Zilla::Util::AuthorDeps = 5.021
 ; authordep CPAN::Meta::Requirements
 ; authordep Test::Deep
-[=CheckAuthorDeps]
+[=inc::CheckAuthorDeps]
 
-[=CheckDelta]
-[=GitUpToDate]
+[=inc::CheckDelta]
+[=inc::GitUpToDate]
 
 [Git::Remote::Check]
 branch = stable/2.20
@@ -556,9 +558,9 @@ run = git push
 ; authordep Path::Tiny
 ; authordep autodie
 ; authordep Module::Runtime
-[=GenerateDocs]
+[=inc::GenerateDocs]
 
-[=Clean]
+[=inc::Clean]
 
 ; last, so all before-release checks can occur first before prompting
 [ConfirmRelease]

inc/CheckAuthorDeps.pm

@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-package CheckAuthorDeps;
+package inc::CheckAuthorDeps;
 
 # our goal is to verify that the declared authordeps already reflect
 # everything in configure + runtime prerequisites -- otherwise, we won't be

inc/CheckDelta.pm

@@ -1,4 +1,4 @@
-package CheckDelta;
+package inc::CheckDelta;
 use Moose;
 
 with 'Dist::Zilla::Role::AfterBuild';

inc/CheckReleaseType.pm

@@ -1,4 +1,4 @@
-package CheckReleaseType;
+package inc::CheckReleaseType;
 use Moose;
 with 'Dist::Zilla::Role::BeforeRelease';
 

inc/Clean.pm

@@ -1,4 +1,4 @@
-package Clean;
+package inc::Clean;
 use Moose;
 
 with 'Dist::Zilla::Role::BeforeBuild',

inc/Documentation.pm

@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-package Documentation;
+package inc::Documentation;
 
 # add x_documentation metadata
 # see https://github.com/metacpan/metacpan-web/issues/1468#event-283925638

inc/ExtractInlineTests.pm

@@ -1,11 +1,11 @@
-package ExtractInlineTests;
+package inc::ExtractInlineTests;
 
 use Moose;
 
 with 'Dist::Zilla::Role::FileGatherer';
 
 use File::Find::Rule;
-use MyInline;  # contains My::Extract
+use inc::MyInline;  # contains My::Extract
 use Test::Inline;
 
 sub gather_files {

inc/GenerateDocs.pm

@@ -1,4 +1,4 @@
-package GenerateDocs;
+package inc::GenerateDocs;
 
 use Moose;
 with 'Dist::Zilla::Role::FileGatherer',

inc/GitUpToDate.pm

@@ -1,4 +1,4 @@
-package GitUpToDate;
+package inc::GitUpToDate;
 use Moose;
 
 with 'Dist::Zilla::Role::BeforeBuild';

inc/MMHelper.pm

@@ -1,4 +1,4 @@
-package MMHelper;
+package inc::MMHelper;
 
 use strict;
 use warnings;

inc/MakeMaker.pm

@@ -1,10 +1,8 @@
-package MakeMaker;
+package inc::MakeMaker;
 
 use Moose;
 
-use lib 'inc';
-
-use MMHelper;
+use inc::MMHelper;
 
 extends 'Dist::Zilla::Plugin::MakeMaker::Awesome';
 
@@ -28,10 +26,10 @@ ASSERT_COMPILER
 
 
     # TODO: splice this in using 'around _build_WriteMakefile_args'
-    my $ccflags = MMHelper::ccflags_dyn();
+    my $ccflags = inc::MMHelper::ccflags_dyn();
     $tmpl =~ s/^(WriteMakefile\()/\$WriteMakefileArgs{CCFLAGS} = $ccflags;\n\n$1/m;
 
-    return $tmpl . "\n\n" . MMHelper::my_package_subs();
+    return $tmpl . "\n\n" . inc::MMHelper::my_package_subs();
 };
 
 override _build_WriteMakefile_args => sub {
@@ -41,7 +39,7 @@ override _build_WriteMakefile_args => sub {
 
     return {
         %{$args},
-        MMHelper::mm_args(),
+        inc::MMHelper::mm_args(),
     };
 };
 

inc/MyInline.pm

@@ -1,4 +1,4 @@
-package MyInline;
+package inc::MyInline;
 
 use strict;
 use warnings;

inc/SimpleAuthority.pm

@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-package SimpleAuthority;
+package inc::SimpleAuthority;
 
 use Moose;
 with 'Dist::Zilla::Role::MetaProvider';

inc/SimpleProvides.pm

@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-package SimpleProvides;
+package inc::SimpleProvides;
 
 use Moose;
 with 'Dist::Zilla::Role::MetaProvider',

inc/TestRelease.pm

@@ -1,4 +1,4 @@
-package TestRelease;
+package inc::TestRelease;
 
 use Moose;