summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Veller <tove@gentoo.org>2008-08-26 13:48:00 +0000
committerTorsten Veller <tove@gentoo.org>2008-08-26 13:48:00 +0000
commit7eb2c039385732a98af1dbf9061db17cb022e0ce (patch)
tree73bcddb65a7c84838ac66e79171de5f5ffd1fc57 /dev-perl
parentFix path to perl binary (#211058) (diff)
downloadgentoo-2-7eb2c039385732a98af1dbf9061db17cb022e0ce.tar.gz
gentoo-2-7eb2c039385732a98af1dbf9061db17cb022e0ce.tar.bz2
gentoo-2-7eb2c039385732a98af1dbf9061db17cb022e0ce.zip
Add another patch from Mandriva. Run tests.
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-tuxonice i686)
Diffstat (limited to 'dev-perl')
-rw-r--r--dev-perl/Data-ShowTable/ChangeLog6
-rw-r--r--dev-perl/Data-ShowTable/Data-ShowTable-3.3-r2.ebuild5
-rw-r--r--dev-perl/Data-ShowTable/files/3.3.patch (renamed from dev-perl/Data-ShowTable/files/3.3-perlpath.patch)28
3 files changed, 32 insertions, 7 deletions
diff --git a/dev-perl/Data-ShowTable/ChangeLog b/dev-perl/Data-ShowTable/ChangeLog
index fc5bc594b3b3..badac34c51e0 100644
--- a/dev-perl/Data-ShowTable/ChangeLog
+++ b/dev-perl/Data-ShowTable/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-perl/Data-ShowTable
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-ShowTable/ChangeLog,v 1.17 2008/08/26 13:34:24 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-ShowTable/ChangeLog,v 1.18 2008/08/26 13:48:00 tove Exp $
+
+ 26 Aug 2008; Torsten Veller <tove@gentoo.org> -files/3.3-perlpath.patch,
+ +files/3.3.patch, Data-ShowTable-3.3-r2.ebuild:
+ Add another patch from Mandriva. Run tests.
26 Aug 2008; Torsten Veller <tove@gentoo.org> +files/3.3-perlpath.patch,
Data-ShowTable-3.3-r2.ebuild:
diff --git a/dev-perl/Data-ShowTable/Data-ShowTable-3.3-r2.ebuild b/dev-perl/Data-ShowTable/Data-ShowTable-3.3-r2.ebuild
index 000d79f21b5a..34aca2f9bb68 100644
--- a/dev-perl/Data-ShowTable/Data-ShowTable-3.3-r2.ebuild
+++ b/dev-perl/Data-ShowTable/Data-ShowTable-3.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-ShowTable/Data-ShowTable-3.3-r2.ebuild,v 1.14 2008/08/26 13:34:24 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Data-ShowTable/Data-ShowTable-3.3-r2.ebuild,v 1.15 2008/08/26 13:48:00 tove Exp $
MODULE_AUTHOR=AKSTE
inherit perl-module
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 ia64 ppc sparc x86"
IUSE=""
DEPEND="dev-lang/perl"
-PATCHES="${FILESDIR}/${PV}-perlpath.patch"
+PATCHES="${FILESDIR}/${PV}.patch"
+SRC_TEST=do
src_install () {
perl-module_src_install
diff --git a/dev-perl/Data-ShowTable/files/3.3-perlpath.patch b/dev-perl/Data-ShowTable/files/3.3.patch
index 740f01486fe0..4a9e2d402125 100644
--- a/dev-perl/Data-ShowTable/files/3.3-perlpath.patch
+++ b/dev-perl/Data-ShowTable/files/3.3.patch
@@ -1,13 +1,13 @@
---- libdata-showtable-perl-3.3.orig/showtable
-+++ libdata-showtable-perl-3.3/showtable
+--- showtable
++++ showtable
@@ -1,4 +1,4 @@
-#!/usr/bin/perl5
+#!/usr/bin/perl
# showtable - read data and show it
#
# Copyright (C) 1996,1997 Alan K. Stebbens <aks@sgi.com>
---- libdata-showtable-perl-3.3.orig/ShowTable.pm
-+++ libdata-showtable-perl-3.3/ShowTable.pm
+--- ShowTable.pm
++++ ShowTable.pm
@@ -721,7 +721,7 @@
S< >B<ShowHTMLTable> I<\@titles>, I<\@types>, I<\@widths>, I<\&row_sub>
@@ -17,3 +17,23 @@
The B<ShowHTMLTable> displays one or more rows of columns of data using
the HTML C<\<TABLE\>> feature. In addition to the usual parameter arguments
+--- t/Test-Setup.pl
++++ t/Test-Setup.pl
+@@ -19,7 +19,7 @@
+
+ sub talk { print STDERR @_; }
+
+-sub start_tests {
++sub start_tests($) {
+ my $count = shift; # how many tests?
+ mkdir("$testdir/out",0755) unless -d "$testdir/out";
+ print "1..$count\n"; # tell harness how many tests
+@@ -50,7 +50,7 @@
+
+ # run_test $num, \&sub;
+
+-sub run_test {
++sub run_test($&) {
+ my $num = shift;
+ my $sub = shift;
+