Cleanup. Fix #226041

(Portage version: 2.2_rc38/cvs/Linux x86_64)

3 files changed, 19 insertions, 47 deletions

diff --git a/dev-perl/Tk-TableMatrix/ChangeLog b/dev-perl/Tk-TableMatrix/ChangeLog
index 7a954396eb67..44f60c76c7a8 100644
--- a/dev-perl/Tk-TableMatrix/ChangeLog
+++ b/dev-perl/Tk-TableMatrix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/Tk-TableMatrix
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/ChangeLog,v 1.45 2008/09/15 11:37:48 tove Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/ChangeLog,v 1.46 2009/08/16 09:11:59 tove Exp $
+
+  16 Aug 2009; Torsten Veller <tove@gentoo.org> Tk-TableMatrix-1.2.3.ebuild,
+  -files/patch.diff:
+  Cleanup. Fix #226041
 
   15 Sep 2008; Torsten Veller <tove@gentoo.org> -Tk-TableMatrix-1.1.ebuild,
   -Tk-TableMatrix-1.1-r1.ebuild, -Tk-TableMatrix-1.2.ebuild,
diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild
index 1e2f03cdbc50..3d4f7b89a495 100644
--- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild
+++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild,v 1.7 2007/07/14 13:55:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild,v 1.8 2009/08/16 09:11:59 tove Exp $
 
-inherit versionator perl-module eutils
+EAPI=2
 
-MY_P="${PN}-$(delete_version_separator 2)"
-S="${WORKDIR}/${MY_P}"
+inherit versionator eutils
+MODULE_AUTHOR=CERNEY
+MY_P=${PN}-$(delete_version_separator 2)
+S=${WORKDIR}/${MY_P}
+inherit perl-module
 
 DESCRIPTION="Perl module for Tk-TableMatrix"
-HOMEPAGE="http://search.cpan.org/author/CERNEY/${MY_P}"
-SRC_URI="mirror://cpan/authors/id/C/CE/CERNEY/${MY_P}.tar.gz"
 
 #SRC_TEST="do"
 
@@ -18,29 +19,15 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
-DEPEND="dev-perl/perl-tk
-	dev-lang/perl"
+DEPEND="dev-perl/perl-tk"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/pTk-1.22.patch
-}
+PATCHES=( "${FILESDIR}/pTk-1.22.patch" )
 
 src_install() {
 	perl-module_src_install
+
 	# Clean out stray conflicting file - its generated by perl-tk already.
 	# Bug 169294
-	local version
-	eval `perl '-V:version'`
-	perl_version=${version}
-
-	local myarch
-	eval `perl '-V:archname'`
-	myarch=${archname}
-
-	if [ -f ${D}/usr/$(get_libdir)/perl5/vendor_perl/${perl_version}/${myarch}/auto/Tk/pTk/extralibs.ld ]; then
-		rm	${D}/usr/$(get_libdir)/perl5/vendor_perl/${perl_version}/${myarch}/auto/Tk/pTk/extralibs.ld
-	fi
-
+	rm	"${D}"/${VENDOR_ARCH}/auto/Tk/pTk/extralibs.ld || die
 }
diff --git a/dev-perl/Tk-TableMatrix/files/patch.diff b/dev-perl/Tk-TableMatrix/files/patch.diff
deleted file mode 100644
index 147b282fa3a0..000000000000
--- a/dev-perl/Tk-TableMatrix/files/patch.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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)