r54674 - in /branches/upstream/libgraphics-primitive-perl/current: ./ inc/Module/ inc/Module/Install/ lib/Graphics/ lib/Graphics/Primitive/ lib/Graphics/Primitive/Paint/ lib/Graphics/Primitive/Paint/Gradient/

bricas-guest at users.alioth.debian.org bricas-guest at users.alioth.debian.org
Tue Mar 23 15:37:14 UTC 2010


Author: bricas-guest
Date: Tue Mar 23 15:36:33 2010
New Revision: 54674

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54674
Log:
[svn-upgrade] Integrating new upstream version, libgraphics-primitive-perl (0.51)

Modified:
    branches/upstream/libgraphics-primitive-perl/current/Changes
    branches/upstream/libgraphics-primitive-perl/current/META.yml
    branches/upstream/libgraphics-primitive-perl/current/Makefile.PL
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install.pm
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Base.pm
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Can.pm
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Fetch.pm
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Makefile.pm
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Metadata.pm
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Win32.pm
    branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/WriteAll.pm
    branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive.pm
    branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Canvas.pm
    branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/ComponentList.pm
    branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient.pm
    branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Linear.pm
    branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Radial.pm
    branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Path.pm

Modified: branches/upstream/libgraphics-primitive-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/Changes?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/Changes (original)
+++ branches/upstream/libgraphics-primitive-perl/current/Changes Tue Mar 23 15:36:33 2010
@@ -1,6 +1,13 @@
 Revision history for Graphics-Primitive
 
-0.49    January 10th, 2009
+0.51    March 22, 2010
+  - Convert all remaining uses of AttributeHelpers with native traits
+    (Florian Ragwitz).
+
+0.50    March 9, 2010
+  - Convert Path to use Moose's native traits rather than AttributeHelpers
+
+0.49    January 10th, 2010
   - Remove typing for Path's primitives accessor
 
 0.48    December 24th, 2009

Modified: branches/upstream/libgraphics-primitive-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/META.yml?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/META.yml (original)
+++ branches/upstream/libgraphics-primitive-perl/current/META.yml Tue Mar 23 15:36:33 2010
@@ -8,7 +8,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.91'
+generated_by: 'Module::Install version 0.94'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -23,10 +23,10 @@
   Geometry::Primitive: 0.16
   Graphics::Color: 0.20
   JSON::Any: 1.22
-  Moose: 0.79
-  MooseX::AttributeHelpers: 0.17
+  Moose: 0.90
   MooseX::Clone: 0.04
   MooseX::Storage: 0.17
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.49
+  repository: git://github.com/gphat/graphics-primitive.git
+version: 0.51

Modified: branches/upstream/libgraphics-primitive-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/Makefile.PL?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/Makefile.PL (original)
+++ branches/upstream/libgraphics-primitive-perl/current/Makefile.PL Tue Mar 23 15:36:33 2010
@@ -8,11 +8,12 @@
 
 requires 'Geometry::Primitive' => '0.16';
 requires 'Graphics::Color' => '0.20';
-requires 'Moose' => '0.79';
+requires 'Moose' => '0.90';
 requires 'MooseX::Clone' => '0.04';
-requires 'MooseX::AttributeHelpers' => '0.17';
 requires 'MooseX::Storage' => '0.17';
 requires 'Forest' => '0.06';
 requires 'JSON::Any' => '1.22';
 
+repository 'git://github.com/gphat/graphics-primitive.git';
+
 WriteAll;

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install.pm Tue Mar 23 15:36:33 2010
@@ -28,7 +28,7 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '0.91';
+	$VERSION = '0.94';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -348,17 +348,24 @@
 	return $call;
 }
 
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
 sub _read {
 	local *FH;
-	if ( $] >= 5.006 ) {
-		open( FH, '<', $_[0] ) or die "open($_[0]): $!";
-	} else {
-		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
-	}
+	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
 	return $string;
 }
+END_NEW
+sub _read {
+	local *FH;
+	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
+	my $string = do { local $/; <FH> };
+	close FH or die "close($_[0]): $!";
+	return $string;
+}
+END_OLD
 
 sub _readperl {
 	my $string = Module::Install::_read($_[0]);
@@ -379,18 +386,26 @@
 	return $string;
 }
 
+# Done in evals to avoid confusing Perl::MinimumVersion
+eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
 sub _write {
 	local *FH;
-	if ( $] >= 5.006 ) {
-		open( FH, '>', $_[0] ) or die "open($_[0]): $!";
-	} else {
-		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
-	}
+	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";
 	}
 	close FH or die "close($_[0]): $!";
 }
+END_NEW
+sub _write {
+	local *FH;
+	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
+	foreach ( 1 .. $#_ ) {
+		print FH $_[$_] or die "print($_[0]): $!";
+	}
+	close FH or die "close($_[0]): $!";
+}
+END_OLD
 
 # _version is for processing module versions (eg, 1.03_05) not
 # Perl versions (eg, 5.8.1).
@@ -427,4 +442,4 @@
 
 1;
 
-# Copyright 2008 - 2009 Adam Kennedy.
+# Copyright 2008 - 2010 Adam Kennedy.

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Base.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Base.pm Tue Mar 23 15:36:33 2010
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.91';
+	$VERSION = '0.94';
 }
 
 # Suspend handler for "redefined" warnings

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Can.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Can.pm Tue Mar 23 15:36:33 2010
@@ -9,7 +9,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.91';
+	$VERSION = '0.94';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Fetch.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Fetch.pm Tue Mar 23 15:36:33 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.91';
+	$VERSION = '0.94';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Makefile.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Makefile.pm Tue Mar 23 15:36:33 2010
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.91';
+	$VERSION = '0.94';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -34,6 +34,17 @@
 	}
 }
 
+# Store a cleaned up version of the MakeMaker version,
+# since we need to behave differently in a variety of
+# ways based on the MM version.
+my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
+
+# If we are passed a param, do a "newer than" comparison.
+# Otherwise, just return the MakeMaker version.
+sub makemaker {
+	( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
+}
+
 sub makemaker_args {
 	my $self = shift;
 	my $args = ( $self->{makemaker_args} ||= {} );
@@ -44,7 +55,7 @@
 # For mm args that take multiple space-seperated args,
 # append an argument to the current list.
 sub makemaker_append {
-	my $self = sShift;
+	my $self = shift;
 	my $name = shift;
 	my $args = $self->makemaker_args;
 	$args->{name} = defined $args->{$name}
@@ -107,6 +118,9 @@
 	%test_dir = ();
 	require File::Find;
 	File::Find::find( \&_wanted_t, $dir );
+	if ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
+		File::Find::find( \&_wanted_t, 'xt' );
+	}
 	$self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
 }
 
@@ -130,12 +144,13 @@
 		# an underscore, even though its own version may contain one!
 		# Hence the funny regexp to get rid of it.  See RT #35800
 		# for details.
-		$self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
 	} else {
 		# Allow legacy-compatibility with 5.005 by depending on the
 		# most recent EU:MM that supported 5.005.
-		$self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
+		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
 		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
 	}
 
@@ -145,57 +160,87 @@
 	$args->{NAME}     = $self->module_name || $self->name;
 	$args->{VERSION}  = $self->version;
 	$args->{NAME}     =~ s/-/::/g;
+	$DB::single = 1;
 	if ( $self->tests ) {
-		$args->{test} = { TESTS => $self->tests };
+		$args->{test} = {
+			TESTS => $self->tests,
+		};
+	} elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) {
+		$args->{test} = {
+			TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ),
+		};
 	}
 	if ( $] >= 5.005 ) {
 		$args->{ABSTRACT} = $self->abstract;
 		$args->{AUTHOR}   = $self->author;
 	}
-	if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
-		$args->{NO_META} = 1;
-	}
-	if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
+	if ( $self->makemaker(6.10) ) {
+		$args->{NO_META}   = 1;
+		#$args->{NO_MYMETA} = 1;
+	}
+	if ( $self->makemaker(6.17) and $self->sign ) {
 		$args->{SIGN} = 1;
 	}
 	unless ( $self->is_admin ) {
 		delete $args->{SIGN};
 	}
 
-	# Merge both kinds of requires into prereq_pm
 	my $prereq = ($args->{PREREQ_PM} ||= {});
 	%$prereq = ( %$prereq,
-		map { @$_ }
+		map { @$_ } # flatten [module => version]
 		map { @$_ }
 		grep $_,
-		($self->configure_requires, $self->build_requires, $self->requires)
+		($self->requires)
 	);
 
 	# Remove any reference to perl, PREREQ_PM doesn't support it
 	delete $args->{PREREQ_PM}->{perl};
 
-	# merge both kinds of requires into prereq_pm
+	# Merge both kinds of requires into BUILD_REQUIRES
+	my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
+	%$build_prereq = ( %$build_prereq,
+		map { @$_ } # flatten [module => version]
+		map { @$_ }
+		grep $_,
+		($self->configure_requires, $self->build_requires)
+	);
+
+	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
+	delete $args->{BUILD_REQUIRES}->{perl};
+
+	# Delete bundled dists from prereq_pm
 	my $subdirs = ($args->{DIR} ||= []);
 	if ($self->bundles) {
 		foreach my $bundle (@{ $self->bundles }) {
 			my ($file, $dir) = @$bundle;
 			push @$subdirs, $dir if -d $dir;
-			delete $prereq->{$file};
+			delete $build_prereq->{$file}; #Delete from build prereqs only
 		}
+	}
+
+	unless ( $self->makemaker('6.55_03') ) {
+		%$prereq = (%$prereq,%$build_prereq);
+		delete $args->{BUILD_REQUIRES};
 	}
 
 	if ( my $perl_version = $self->perl_version ) {
 		eval "use $perl_version; 1"
 			or die "ERROR: perl: Version $] is installed, "
 			. "but we need version >= $perl_version";
+
+		if ( $self->makemaker(6.48) ) {
+			$args->{MIN_PERL_VERSION} = $perl_version;
+		}
 	}
 
 	$args->{INSTALLDIRS} = $self->installdirs;
 
-	my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
+	my %args = map {
+		( $_ => $args->{$_} ) } grep {defined($args->{$_} )
+	} keys %$args;
 
 	my $user_preop = delete $args{dist}->{PREOP};
-	if (my $preop = $self->admin->preop($user_preop)) {
+	if ( my $preop = $self->admin->preop($user_preop) ) {
 		foreach my $key ( keys %$preop ) {
 			$args{dist}->{$key} = $preop->{$key};
 		}
@@ -265,4 +310,4 @@
 
 __END__
 
-#line 394
+#line 439

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Metadata.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Metadata.pm Tue Mar 23 15:36:33 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.91';
+	$VERSION = '0.94';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -230,6 +230,8 @@
 		die("The path '$file' does not exist, or is not a file");
 	}
 
+	$self->{values}{all_from} = $file;
+
 	# Some methods pull from POD instead of code.
 	# If there is a matching .pod, use that instead
 	my $pod = $file;
@@ -385,11 +387,10 @@
 	}
 }
 
-sub perl_version_from {
-	my $self = shift;
+sub _extract_perl_version {
 	if (
-		Module::Install::_read($_[0]) =~ m/
-		^
+		$_[0] =~ m/
+		^\s*
 		(?:use|require) \s*
 		v?
 		([\d_\.]+)
@@ -398,6 +399,16 @@
 	) {
 		my $perl_version = $1;
 		$perl_version =~ s{_}{}g;
+		return $perl_version;
+	} else {
+		return;
+	}
+}
+
+sub perl_version_from {
+	my $self = shift;
+	my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
+	if ($perl_version) {
 		$self->perl_version($perl_version);
 	} else {
 		warn "Cannot determine perl version info from $_[0]\n";
@@ -425,13 +436,12 @@
 	}
 }
 
-sub license_from {
-	my $self = shift;
+sub _extract_license {
 	if (
-		Module::Install::_read($_[0]) =~ m/
+		$_[0] =~ m/
 		(
 			=head \d \s+
-			(?:licen[cs]e|licensing|copyright|legal)\b
+			(?:licen[cs]e|licensing|copyrights?|legal)\b
 			.*?
 		)
 		(=head\\d.*|=cut.*|)
@@ -439,7 +449,9 @@
 	/ixms ) {
 		my $license_text = $1;
 		my @phrases      = (
-			'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+			'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
+			'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+			'Artistic and GPL'                   => 'perl',        1,
 			'GNU general public license'         => 'gpl',         1,
 			'GNU public license'                 => 'gpl',         1,
 			'GNU lesser general public license'  => 'lgpl',        1,
@@ -456,20 +468,32 @@
 			'proprietary'                        => 'proprietary', 0,
 		);
 		while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
-			$pattern =~ s{\s+}{\\s+}g;
+			$pattern =~ s#\s+#\\s+#gs;
 			if ( $license_text =~ /\b$pattern\b/i ) {
-				$self->license($license);
-				return 1;
+			        return $license;
 			}
 		}
-	}
-
-	warn "Cannot determine license info from $_[0]\n";
-	return 'unknown';
+	} else {
+	        return;
+	}
+}
+
+sub license_from {
+	my $self = shift;
+	if (my $license=_extract_license(Module::Install::_read($_[0]))) {
+		$self->license($license);
+	} else {
+		warn "Cannot determine license info from $_[0]\n";
+		return 'unknown';
+	}
 }
 
 sub _extract_bugtracker {
-	my @links   = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g;
+	my @links   = $_[0] =~ m#L<(
+	 \Qhttp://rt.cpan.org/\E[^>]+|
+	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
+	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+	 )>#gx;
 	my %links;
 	@links{@links}=();
 	@links=keys %links;
@@ -485,7 +509,7 @@
 		return 0;
 	}
 	if ( @links > 1 ) {
-		warn "Found more than on rt.cpan.org link in $_[0]\n";
+		warn "Found more than one bugtracker link in $_[0]\n";
 		return 0;
 	}
 

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Win32.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/Win32.pm Tue Mar 23 15:36:33 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.91';
+	$VERSION = '0.94';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/WriteAll.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/inc/Module/Install/WriteAll.pm Tue Mar 23 15:36:33 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.91';;
+	$VERSION = '0.94';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive.pm Tue Mar 23 15:36:33 2010
@@ -1,7 +1,7 @@
 package Graphics::Primitive;
 use Moose;
 
-our $VERSION = '0.49';
+our $VERSION = '0.51';
 
 __PACKAGE__->meta->make_immutable;
 
@@ -87,6 +87,10 @@
 
 Cory Watson, C<< <gphat at cpan.org> >>
 
+=head1 CONTRIBUTORS
+
+Florian Ragwitz
+
 =head1 ACKNOWLEDGEMENTS
 
 Many of the ideas here come from my experience using the Cairo library.

Modified: branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Canvas.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Canvas.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Canvas.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Canvas.pm Tue Mar 23 15:36:33 2010
@@ -1,6 +1,5 @@
 package Graphics::Primitive::Canvas;
 use Moose;
-use MooseX::AttributeHelpers;
 use MooseX::Storage;
 
 extends 'Graphics::Primitive::Component';
@@ -21,28 +20,26 @@
 );
 
 has paths => (
-    metaclass => 'Collection::Array',
+    traits => [qw(Array Clone)],
     isa => 'ArrayRef',
     is  => 'rw',
-    traits => [qw(Clone)],
     default =>  sub { [] },
-    provides => {
-        push => 'add_path',
-        count=> 'path_count',
-        get => 'get_path'
+    handles => {
+        add_path => 'push',
+        path_count => 'count',
+        get_path => 'get',
     }
 );
 
 has saved_paths => (
-    metaclass => 'Collection::Array',
+    traits => [qw(Array Copy)],
     isa => 'ArrayRef',
     is  => 'rw',
-    traits => [qw(Copy)],
     default =>  sub { [] },
-    provides => {
-        push => 'push_path',
-        pop  => 'pop_path',
-        count => 'saved_path_count'
+    handles => {
+        push_path => 'push',
+        pop_path => 'pop',
+        saved_path_count => 'count',
     }
 );
 
@@ -187,4 +184,4 @@
 Copyright 2008-2009 by Cory G Watson.
 
 You can redistribute and/or modify this code under the same terms as Perl
-itself.
+itself.

Modified: branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/ComponentList.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/ComponentList.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/ComponentList.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/ComponentList.pm Tue Mar 23 15:36:33 2010
@@ -1,33 +1,32 @@
 package Graphics::Primitive::ComponentList;
 use Moose;
-use MooseX::AttributeHelpers;
 use MooseX::Storage;
 
 with Storage (format => 'JSON', io => 'File');
 
 has 'components' => (
-    metaclass => 'Collection::Array',
+    traits => ['Array'],
     is => 'rw',
     isa => 'ArrayRef',
     default => sub { [] },
-    provides => {
-        'count'=> 'component_count',
-        'get' => 'get_component',
-        'push' => 'push_components',
-        'set'=> 'set_component'
+    handles => {
+        'component_count' => 'count',
+        'get_component' => 'get',
+        'push_components' => 'push',
+        'set_component' => 'set',
     },
 );
 
 has 'constraints' => (
-    metaclass => 'Collection::Array',
+    traits => ['Array'],
     is => 'rw',
     isa => 'ArrayRef',
     default => sub { [] },
-    provides => {
-        'count'=> 'constraint_count',
-        'get' => 'get_constraint',
-        'push' => 'push_constraints',
-        'set' => 'set_constraint'
+    handles => {
+        'constraint_count' => 'count',
+        'get_constraint' => 'get',
+        'push_constraints' => 'push',
+        'set_constraint' => 'set',
     },
 );
 
@@ -254,4 +253,4 @@
 Copyright 2008-2009 by Cory G Watson.
 
 This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+under the same terms as Perl itself.

Modified: branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient.pm Tue Mar 23 15:36:33 2010
@@ -1,22 +1,21 @@
 package Graphics::Primitive::Paint::Gradient;
 use Moose;
 use Moose::Util::TypeConstraints;
-use MooseX::AttributeHelpers;
 use MooseX::Storage;
 
 extends 'Graphics::Primitive::Paint';
 
 # FIXME key should be <= 1
 has color_stops => (
-    metaclass => 'Collection::Hash',
+    traits => ['Hash'],
     isa => 'HashRef',
     is  => 'rw',
     default =>  sub { {} },
-    provides => {
-        count => 'stop_count',
-        keys => 'stops',
-        get  => 'get_stop',
-        set  => 'add_stop'
+    handles => {
+        stop_count => 'count',
+        stops      => 'keys',
+        get_stop   => 'get',
+        add_stop   => 'set',
     }
 );
 

Modified: branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Linear.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Linear.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Linear.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Linear.pm Tue Mar 23 15:36:33 2010
@@ -1,7 +1,6 @@
 package Graphics::Primitive::Paint::Gradient::Linear;
 use Moose;
 use Moose::Util::TypeConstraints;
-use MooseX::AttributeHelpers;
 use MooseX::Storage;
 
 extends 'Graphics::Primitive::Paint::Gradient';

Modified: branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Radial.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Radial.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Radial.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Paint/Gradient/Radial.pm Tue Mar 23 15:36:33 2010
@@ -1,7 +1,6 @@
 package Graphics::Primitive::Paint::Gradient::Radial;
 use Moose;
 use Moose::Util::TypeConstraints;
-use MooseX::AttributeHelpers;
 use MooseX::Storage;
 
 extends 'Graphics::Primitive::Paint::Gradient';

Modified: branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Path.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Path.pm?rev=54674&op=diff
==============================================================================
--- branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Path.pm (original)
+++ branches/upstream/libgraphics-primitive-perl/current/lib/Graphics/Primitive/Path.pm Tue Mar 23 15:36:33 2010
@@ -4,8 +4,6 @@
 
 with 'MooseX::Clone';
 with Storage (format => 'JSON', io => 'File');
-
-use MooseX::AttributeHelpers;
 
 use Geometry::Primitive::Arc;
 use Geometry::Primitive::Bezier;
@@ -26,27 +24,25 @@
     default =>  sub { 0 },
 );
 has 'hints' => (
-    metaclass => 'Collection::Array',
     is => 'rw',
     isa => 'ArrayRef[HashRef]',
-    traits => [qw(Clone)],
+    traits => [qw(Array Clone)],
     default => sub { [] },
-    provides => {
-        push => 'add_hint',
-        get => 'get_hint',
+    handles => {
+        add_hint => 'push',
+        get_hint => 'get',
     }
 );
 has 'primitives' => (
-    metaclass => 'Collection::Array',
     is => 'rw',
     isa => 'ArrayRef',
-    traits => [qw(Clone)],
+    traits => [qw(Array Clone)],
     default => sub { [] },
-    provides => {
-        'push' => 'add_primitive',
-        'clear' => 'clear_primitives',
-        'count' => 'primitive_count',
-        'get' => 'get_primitive'
+    handles => {
+        add_primitive => 'push',
+        clear_primitives => 'clear',
+        primitive_count => 'count',
+        get_primitive => 'get'
     }
 );
 




More information about the Pkg-perl-cvs-commits mailing list