bug 34940

4 files changed, 37 insertions, 8 deletions

diff --git a/dev-perl/Tk-TableMatrix/ChangeLog b/dev-perl/Tk-TableMatrix/ChangeLog
index 9d539fca54cd..5ce342a0f793 100644
--- a/dev-perl/Tk-TableMatrix/ChangeLog
+++ b/dev-perl/Tk-TableMatrix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/Tk-TableMatrix
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/ChangeLog,v 1.3 2003/09/10 01:38:09 rac Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/ChangeLog,v 1.4 2004/01/20 14:02:36 mcummings Exp $
+
+  20 Jan 2004; Michael Cummings,,, <mcummings@gentoo.org>
+  Tk-TableMatrix-1.01.ebuild, files/patch.diff:
+  Patch addresses issues with newer versions of MakeMaker. Provided by Matt
+  Chorman <matt@legalizefreedom.org> in bug #34940. Tested with both MM 6.20 and
+  an older 6.03, no problems between the two.
 
   09 Sep 2003; <rac@gentoo.org> Tk-TableMatrix-1.01.ebuild:
   Block new MakeMaker, see bug 28282
diff --git a/dev-perl/Tk-TableMatrix/Manifest b/dev-perl/Tk-TableMatrix/Manifest
index 57963a962ce4..4cfe8b9da137 100644
--- a/dev-perl/Tk-TableMatrix/Manifest
+++ b/dev-perl/Tk-TableMatrix/Manifest
@@ -1,7 +1,5 @@
-MD5 10313405b70991b3fef21140097b65de ChangeLog 584
-MD5 f331d9b79acc8dee4274769833cb3d72 Tk-TableMatrix-1.01.ebuild 577
+MD5 d6337ea7c0caca835712fc62079af568 ChangeLog 900
+MD5 0b5282024f863082893c18a32a4bb1a6 Tk-TableMatrix-1.01.ebuild 654
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 06db4ef365dce64a1a06be5cb2c3fdf1 Tk-TableMatrix-1.01-r1.ebuild 658
 MD5 89f24085a2e7ef5b505d409705a6afbe files/digest-Tk-TableMatrix-1.01 71
 MD5 8a54e8fee478628d727c66043ddef456 files/patch.diff 566
-MD5 89f24085a2e7ef5b505d409705a6afbe files/digest-Tk-TableMatrix-1.01-r1 71
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.01.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.01.ebuild
index 112aadc27c86..8a7a353d0f45 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.01.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.01.ebuild,v 1.3 2003/09/10 01:38:09 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.01.ebuild,v 1.4 2004/01/20 14:02:36 mcummings Exp $
 
 inherit perl-module
 
@@ -14,3 +14,9 @@ LICENSE="Artistic"
 KEYWORDS="x86 amd64 ppc sparc alpha"
 
 DEPEND="dev-perl/perl-tk !=dev-perl/ExtUtils-MakeMaker-6.15"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/patch.diff
+}
diff --git a/dev-perl/Tk-TableMatrix/files/patch.diff b/dev-perl/Tk-TableMatrix/files/patch.diff
new file mode 100644
index 000000000000..147b282fa3a0
--- /dev/null
+++ b/dev-perl/Tk-TableMatrix/files/patch.diff
@@ -0,0 +1,19 @@
+--- pTk/Makefile.PL	2002-12-06 06:08:21.000000000 -0800
++++ pTk/Makefile.PL.new	2003-12-09 08:37:53.000000000 -0800
+@@ -228,12 +228,10 @@
+ my $self = shift;
+ my $dep = $self->Tk::MMutil::mTk_postamble;
+ 
+-$dep .= $self->dir_target(@{$self->{'dir_targets'}}); 
+-
+-$dep .= "config :: " . join(" \\\n\t",map($self->catfile($_,".exists"),@{$self->{'dir_targets'}})) .
+-        "\n\t".$self->{NOECHO}."\$(NOOP)\n";
+-
+-
++if ($Tk::MMutil::IsWin32 or ($win_arch eq 'MSWin32' and $^O eq 'cygwin'))
++ {
++  my $cc = $Config{'cc'};
++  }
+ $dep . '
+ 
+ 	'.$self->{NOECHO}.'$(NOOP)