Giving up on fixing this Build.PL - authors syntax is more than I can grok. Override in eclass for cases like this, now invoked

Package-Manager: portage-2.0.51.22-r1

5 files changed, 90 insertions, 25 deletions

diff --git a/dev-perl/Class-MethodMaker/ChangeLog b/dev-perl/Class-MethodMaker/ChangeLog
index 6a8725b5bf9e..17b6ec68cb03 100644
--- a/dev-perl/Class-MethodMaker/ChangeLog
+++ b/dev-perl/Class-MethodMaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/Class-MethodMaker
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-MethodMaker/ChangeLog,v 1.18 2005/07/19 11:21:39 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-MethodMaker/ChangeLog,v 1.19 2005/07/19 13:12:31 mcummings Exp $
+
+*Class-MethodMaker-2.07-r2 (19 Jul 2005)
+
+  19 Jul 2005; Michael Cummings <mcummings@gentoo.org> files/C-MM-Build.patch,
+  -Class-MethodMaker-2.07-r1.ebuild, +Class-MethodMaker-2.07-r2.ebuild:
+  Giving up on fixing this Build.PL - authors syntax is more than I can grok.
+  Override in eclass for cases like this, now invoked
 
 *Class-MethodMaker-2.07-r1 (19 Jul 2005)
 
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.07-r1.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.07-r2.ebuild
index 2cc4c059607f..6df022e0ba89 100644
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.07-r1.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.07-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-MethodMaker/Class-MethodMaker-2.07-r1.ebuild,v 1.1 2005/07/19 11:21:39 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-MethodMaker/Class-MethodMaker-2.07-r2.ebuild,v 1.1 2005/07/19 13:12:31 mcummings Exp $
 
 inherit perl-module eutils
 
@@ -15,17 +15,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 IUSE=""
 
 SRC_TEST="do"
+USE_BUILDER="no"
 
-DEPEND="dev-perl/module-build"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Correct bad Build.PL so that libs are found correctly for building -
-	# mcummings
-	epatch ${FILESDIR}/C-MM-Build.patch
-	# Wipe the signature file - we no longer match since we 'tampered' with the
-	# Build.PL above - mcummings
-	cp -f ${FILESDIR}/0-signature.t ${S}/t/0-signature.t
 
-}
+DEPEND="dev-perl/module-build"
diff --git a/dev-perl/Class-MethodMaker/Manifest b/dev-perl/Class-MethodMaker/Manifest
index 403c853d1ebf..155074ad27f3 100644
--- a/dev-perl/Class-MethodMaker/Manifest
+++ b/dev-perl/Class-MethodMaker/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e248f5298ffd75b4c56fba430f29b261 ChangeLog 2998
+MD5 a35dc79102ec317e36512e296215662f ChangeLog 3324
 MD5 863c1c3d604838110fc49f5ebc390871 Class-MethodMaker-2.07.ebuild 885
-MD5 2c3db64e9b5051b91e858c37b5c0dd13 Class-MethodMaker-2.07-r1.ebuild 888
 MD5 c3906a462f3e92f442550ed7884c79d7 Class-MethodMaker-1.11.ebuild 538
+MD5 5c649f11dab0e3dcfdeb5ae2e9a2a609 Class-MethodMaker-2.07-r2.ebuild 582
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 aa928f76f2d2487439ef3f4e5b43e360 files/0-signature.t 616
 MD5 8e850cd4da47af44dddb828b7d3f430e files/digest-Class-MethodMaker-2.07 73
-MD5 d8961ba39f7b4c438e50e2ea83300e50 files/C-MM-Build.patch 352
+MD5 a23bfad11a16bd6ea061864a78ed4892 files/C-MM-Build.patch 3223
 MD5 a2a1bcd1e4774ec6755462b1bc3795c2 files/digest-Class-MethodMaker-1.11 73
-MD5 8e850cd4da47af44dddb828b7d3f430e files/digest-Class-MethodMaker-2.07-r1 73
+MD5 8e850cd4da47af44dddb828b7d3f430e files/digest-Class-MethodMaker-2.07-r2 73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFC3OJatG5z4I8BtQoRAiM8AJ4qIrY6GyArCVx8arLAhhp42Fd1pQCghAXX
-4t1dnvIG3vAk5SrPXsvOEBQ=
-=MCxt
+iD8DBQFC3PxTtG5z4I8BtQoRAtPtAJ92EyqBJhf8rbI+VynkubvFUlssfgCfeeIP
+trjTRuRDw2YwgmTwBgqfWSc=
+=SWjY
 -----END PGP SIGNATURE-----
diff --git a/dev-perl/Class-MethodMaker/files/C-MM-Build.patch b/dev-perl/Class-MethodMaker/files/C-MM-Build.patch
index 03f8c52a2a8d..a9c3115f1586 100644
--- a/dev-perl/Class-MethodMaker/files/C-MM-Build.patch
+++ b/dev-perl/Class-MethodMaker/files/C-MM-Build.patch
@@ -1,12 +1,80 @@
 --- Build.PL.orig	2005-07-19 06:55:12.000000000 -0400
-+++ Build.PL	2005-07-19 06:55:16.000000000 -0400
-@@ -1,7 +1,7 @@
- use Module::Build;
++++ Build.PL	2005-07-19 08:34:47.000000000 -0400
+@@ -1,9 +1,30 @@
+-use Module::Build;
 -use File::Spec::Functions qw( catfile );
++use File::Basename        qw( basename );
++use File::Find            qw( find );
 +use File::Spec::Functions qw( catfile catdir );
++use lib File::Spec->catdir('lib');
  
 -use lib '.';
-+use lib File::Spec->catdir('lib');
++use Module::Build;
  use Generate qw( %GENERATE );
  
++use constant RAW_COMPS    => map(join('.', basename($_, '.m'), 'pm'),
++                                 glob(catfile qw(components *.m)));
++use constant COMPONENTS   =>
++  +{map {catfile('components', join('.',basename($_,'.pm'),'m')) =>
++         catfile(qw(MethodMaker), $_)} RAW_COMPS};
++use constant OPTEXT       => catfile qw( lib Class MethodMaker OptExt.pm );
++
++my %pm;
++find (sub {
++        $File::Find::prune = 1, return
++          if -d $_ and $_ eq 'CVS';
++        return unless /\.pm$/;
++	(my $target = $File::Find::name) =~ s!^$File::Find::topdir/Class/MethodMaker/!!;
++	$target =~ s!^$File::Find::topdir/Class/!!;
++	next if ($target =~ m!/Class!);
++        $pm{$target} = $File::Find::name;
++      },
++      'lib');
++
  my $class = Module::Build->subclass
+   (
+    class => 'CMM::AutoSplit',
+@@ -14,20 +35,20 @@ my $class = Module::Build->subclass
+                 # Create blib/arch to keep blib.pm happy
+                 my $blib = $self->blib;
+                 $self->add_to_cleanup($blib);
+-                File::Path::mkpath( File::Spec->catdir($blib, 'arch') );
++                File::Path::mkpath( File::Spec->catdir($blib, 'arch', 'lib') );
+ 
+                 foreach my $element (@{$self->build_elements}) {
+                   my $method = "process_${element}_files";
+                   $self->$method();
+                 }
+-                if ( my $autosplit = $self->autosplit ) {
+-                  if ( ref $autosplit eq 'ARRAY' ) {
+-                    $self->autosplit_file($_, $blib)
+-                      for @$autosplit;
+-                  } else {
+-                    $self->autosplit_file($autosplit, $blib);
+-                  }
+-                }
++		if ( my $autosplit = $self->autosplit ) {
++		if ( ref $autosplit eq 'ARRAY' ) {
++		$self->autosplit_file($_, $blib)
++		for @$autosplit;
++		} else {
++		$self->autosplit_file($autosplit, $blib);
++		}
++		}
+               }
+             },
+            );
+@@ -40,9 +61,10 @@ my $build = $class->new(
+                          sign          => 1,
+                          dist_author   => 'Martyn J. Pearce <fluffy@cpan.org>',
+                          dist_abstract => 'create generic class accessor methods',
+-                         PL_files      => +{ 'generate.PL', [ values %GENERATE ] },
+-                         autosplit     => [ values %GENERATE,
+-                                            catfile(qw(lib Class MethodMaker Engine.pm )) ],
++                         PL_files      => { 'generate.PL', [ values %GENERATE ] },
++			 pm_files      => %pm,
++	   		 autosplit     => [ values %GENERATE,
++	                                    catfile(qw(lib Class MethodMaker Engine.pm )) ],
+                          xs_files      => +{ 'MethodMaker.xs' => 'lib/Class/MethodMaker.xs' },
+                        );
+ 
diff --git a/dev-perl/Class-MethodMaker/files/digest-Class-MethodMaker-2.07-r1 b/dev-perl/Class-MethodMaker/files/digest-Class-MethodMaker-2.07-r2
index a18510615e19..a18510615e19 100644
--- a/dev-perl/Class-MethodMaker/files/digest-Class-MethodMaker-2.07-r1
+++ b/dev-perl/Class-MethodMaker/files/digest-Class-MethodMaker-2.07-r2