Update devel/p5-Moose to version 2.0007

Changelog: http://cpansearch.perl.org/dist/Moose/Changes

See also UPDATING entry 20110607 about this.

4 files changed, 99 insertions, 36 deletions

diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile
index 14d34809bd1e..315abfe80a05 100644
--- a/devel/p5-Moose/Makefile
+++ b/devel/p5-Moose/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	Moose
-PORTVERSION=	1.25
+PORTVERSION=	2.0007
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../../authors/id/D/DR/DROLSKY
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:FLORA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -18,7 +19,11 @@ LICENSE_COMB=	dual
 LICENSE=	ART20 GPLv1
 
 BUILD_DEPENDS=	\
-	p5-Class-MOP>=1.11:${PORTSDIR}/devel/p5-Class-MOP \
+	p5-Devel-GlobalDestruction>=0:${PORTSDIR}/devel/p5-Devel-GlobalDestruction \
+	p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
+	p5-Package-Stash>=0:${PORTSDIR}/devel/p5-Package-Stash \
+	p5-Package-Stash-XS>=0:${PORTSDIR}/devel/p5-Package-Stash-XS \
+	p5-Eval-Closure>=0.04:${PORTSDIR}/devel/p5-Eval-Closure \
 	p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-DeprecationManager \
 	p5-List-MoreUtils>=0.12:${PORTSDIR}/lang/p5-List-MoreUtils \
 	p5-Params-Util>=1.00:${PORTSDIR}/devel/p5-Params-Util \
@@ -27,14 +32,42 @@ BUILD_DEPENDS=	\
 	p5-Try-Tiny>=0.02:${PORTSDIR}/lang/p5-Try-Tiny \
 	p5-Data-OptList>=0:${PORTSDIR}/devel/p5-Data-OptList \
 	p5-Sub-Name>=0:${PORTSDIR}/devel/p5-Sub-Name
+
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple \
-		p5-Test-Fatal>=0.001:${PORTSDIR}/devel/p5-Test-Fatal \
-		p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires
+
+TEST_DEPENDS=	\
+	p5-Test-Simple>=0.88:${PORTSDIR}/devel/p5-Test-Simple \
+	p5-Test-Fatal>=0.001:${PORTSDIR}/devel/p5-Test-Fatal \
+	p5-Test-Requires>=0.05:${PORTSDIR}/devel/p5-Test-Requires
 
 PERL_CONFIGURE=	5.8.4+
+CFLAGS+=	-I.	# mop.h
+
+CONFLICTS=     p5-Class-MOP*
 
-MAN3=	Moose.3 \
+MAN3=	Class::MOP::Mixin::HasAttributes.3 \
+	Class::MOP::MiniTrait.3 \
+	Class::MOP::Mixin::AttributeCore.3 \
+	Class::MOP::Method::Generated.3 \
+	Class::MOP::Mixin::HasMethods.3 \
+	Class::MOP::Package.3 \
+	Class::MOP.3 \
+	Class::MOP::Method::Accessor.3 \
+	Class::MOP::Method.3 \
+	Class::MOP::Mixin.3 \
+	Class::MOP::Module.3 \
+	Class::MOP::Method::Meta.3 \
+	Class::MOP::Attribute.3 \
+	Class::MOP::Method::Wrapped.3 \
+	Class::MOP::Deprecated.3 \
+	Class::MOP::Object.3 \
+	Class::MOP::Class::Immutable::Trait.3 \
+	Class::MOP::Method::Inlined.3 \
+	Class::MOP::Method::Constructor.3\
+	Class::MOP::Instance.3 \
+	Class::MOP::Class.3 \
+	metaclass.3 \
+	Moose.3 \
 	Moose::Cookbook.3 \
 	Moose::Cookbook::Basics::Recipe1.3 \
 	Moose::Cookbook::Basics::Recipe10.3 \
@@ -144,7 +177,7 @@ MAN3=	Moose.3 \
 	oose.3
 
 post-extract:
-	@${PERL} -i -ne 'print unless m,^(test_requires|check_conflicts),' ${WRKSRC}/Makefile.PL
+	@${PERL} -i -ne 'print unless m,^(check_conflicts),' ${WRKSRC}/Makefile.PL
 
 post-install:
 	@${CAT} ${PKGDIR}/pkg-message
diff --git a/devel/p5-Moose/distinfo b/devel/p5-Moose/distinfo
index b3cdd611f896..b720fe01f9c8 100644
--- a/devel/p5-Moose/distinfo
+++ b/devel/p5-Moose/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Moose-1.25.tar.gz) = f827070c0feae887d5c9b73f5b1c9121e7f407795a798421af1b6003e0d9d758
-SIZE (Moose-1.25.tar.gz) = 470300
+SHA256 (Moose-2.0007.tar.gz) = 352f3b81930f5843bea871adc39e200abfcda8131a64af9875a9135d0e369d83
+SIZE (Moose-2.0007.tar.gz) = 658467
diff --git a/devel/p5-Moose/pkg-message b/devel/p5-Moose/pkg-message
index bf9cf24dd537..61b0b7812ccf 100644
--- a/devel/p5-Moose/pkg-message
+++ b/devel/p5-Moose/pkg-message
@@ -1,31 +1,31 @@
 Note that this release of p5-Moose is incompatible with
 older versions of the following modules:
 
-	Catalyst			<= 5.80017
-	Devel::REPL			<= 1.003008
-	Fey::ORM			<= 0.23
-	File::ChangeNotify		<= 0.15
-	KiokuDB				<= 0.41
-	MooseX::Aliases			<= 0.07
-	MooseX::AttributeHelpers	<= 0.22
-	MooseX::AttributeInflate	<= 0.02
-	MooseX::Attribute::Prototype	<= 0.10
-	MooseX::ClassAttribute		<= 0.13
-	MooseX::FollowPBP		<= 0.02
-	MooseX::HasDefaults		<= 0.02
-	MooseX::InstanceTracking	<= 0.04
-	MooseX::LazyRequire		<= 0.05
-	MooseX::MethodAttributes	<= 0.22
-	MooseX::NonMoose		<= 0.13
-	MooseX::Params::Validate	<= 0.05
-	MooseX::Role::Cmd		<= 0.06
-	MooseX::Role::WithOverloading	<= 0.07
-	MooseX::SemiAffordanceAccessor	<= 0.05
-	MooseX::Singleton		<= 0.22
-	MooseX::StrictConstructor	<= 0.08
-	MooseX::Types			<= 0.19
-	MooseX::UndefTolerant		<= 0.04
-	namespace::autoclean		<= 0.08
-	Pod::Elemental			<= 0.093280
+       Catalyst                        <= 5.80017
+       Devel::REPL                     <= 1.003008
+       Fey::ORM                        <= 0.23
+       File::ChangeNotify              <= 0.15
+       KiokuDB                         <= 0.41
+       MooseX::Aliases                 <= 0.07
+       MooseX::AttributeHelpers        <= 0.22
+       MooseX::AttributeInflate        <= 0.02
+       MooseX::Attribute::Prototype    <= 0.10
+       MooseX::ClassAttribute          <= 0.13
+       MooseX::FollowPBP               <= 0.02
+       MooseX::HasDefaults             <= 0.02
+       MooseX::InstanceTracking        <= 0.04
+       MooseX::LazyRequire             <= 0.05
+       MooseX::MethodAttributes        <= 0.22
+       MooseX::NonMoose                <= 0.13
+       MooseX::Params::Validate        <= 0.05
+       MooseX::Role::Cmd               <= 0.06
+       MooseX::Role::WithOverloading   <= 0.07
+       MooseX::SemiAffordanceAccessor  <= 0.05
+       MooseX::Singleton               <= 0.22
+       MooseX::StrictConstructor       <= 0.08
+       MooseX::Types                   <= 0.19
+       MooseX::UndefTolerant           <= 0.04
+       namespace::autoclean            <= 0.08
+       Pod::Elemental                  <= 0.093280
 
 They will need to be updated.
diff --git a/devel/p5-Moose/pkg-plist b/devel/p5-Moose/pkg-plist
index 621348e078d2..61299f131555 100644
--- a/devel/p5-Moose/pkg-plist
+++ b/devel/p5-Moose/pkg-plist
@@ -1,3 +1,27 @@
+bin/moose-outdated
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class/Immutable/Trait.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Generated.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Accessor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Meta.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Wrapped.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Inlined.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method/Constructor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasAttributes.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/AttributeCore.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin/HasMethods.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/MiniTrait.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Package.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Module.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Attribute.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Deprecated.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Object.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Instance.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Moose/Conflicts.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/metaclass.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Cookbook/Basics/Recipe1.pod
@@ -182,6 +206,12 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Moose.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose/Moose.so
 %%SITE_PERL%%/%%PERL_ARCH%%/oose.pm
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Mixin
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Method
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class/Immutable
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP/Class
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class/MOP
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Class
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Moose
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Test
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Moose/Util/TypeConstraints