marking 5.8.0-r10 stable and removing 5.6.1 ebuilds

10 files changed, 12 insertions, 812 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 81d80e190d3d..12bf322116a5 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.12 2003/05/27 19:03:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.13 2003/05/31 00:46:50 rac Exp $
+
+  30 May 2003; <rac@gentoo.org> perl-5.6.1-r10.ebuild, perl-5.6.1-r11.ebuild,
+  perl-5.8.0-r10.ebuild, files/5.6.1-builtin-fixup.diff,
+  files/5.6.1-op-test-fix.diff:
+  Marking stable on mips, thanks to dragon and kumba for verification and
+  mcummings for coordination.  Also cleaning 5.6.1 ebuilds, as all marked
+  arches now have a stable 5.8 version
 
   27 May 2003; <rac@gentoo.org> perl-5.8.0-r10.ebuild, perl-5.8.0-r9.ebuild:
   Add threads to IUSE, thanks to liquidx for the catch
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 97b6bc8eb024..271c2d8dd337 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,18 +1,11 @@
-MD5 c6ca209645636db2a5764a7458d783b5 perl-5.8.0-r10.ebuild 13794
+MD5 227961c744001cba740b19e6cf3977fb perl-5.8.0-r10.ebuild 13793
 MD5 a3f762c7ce784283e55c6e6727aa99dd perl-5.8.0-r9.ebuild 13571
-MD5 4de48ad30fcdde726e932b9792180392 perl-5.6.1-r11.ebuild 6301
-MD5 dd905876814d54d9b3759c93e32482d4 ChangeLog 14649
-MD5 c1eec734338e6ffc036a7eef6794ce15 perl-5.6.1-r10.ebuild 6844
+MD5 fadefe2c1293dea632d6a5ee2535b9e0 ChangeLog 15004
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
 MD5 4e49da394d326bcb744c7990bd27d6ac files/perl-5.8.0-perldoc-emptydirs.patch 461
-MD5 6b85fd38953aa08ceab8d0fa92cdd2ac files/digest-perl-5.6.1-r10 859
-MD5 5dee2b8a9e5e840e7379f11ae07eb68c files/digest-perl-5.6.1-r11 859
-MD5 28fe3868fd4e47ca609f7af6156c94ea files/5.6.1-op-test-fix.diff 503
 MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 files/libperl_rebuilder 10260
-MD5 ea9bf02b28e73e19dc85eb07f2347460 files/5.6.1-builtin-fixup.diff 777
 MD5 9810be5a789a6d0bde088fef8fb261a4 files/digest-perl-5.8.0-r10 861
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
-MD5 5aa1a011eddb5b13299b63948230db33 files/stat.t 8884
 MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
 MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
 MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
diff --git a/dev-lang/perl/files/5.6.1-builtin-fixup.diff b/dev-lang/perl/files/5.6.1-builtin-fixup.diff
deleted file mode 100644
index a1f0735dda2a..000000000000
--- a/dev-lang/perl/files/5.6.1-builtin-fixup.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur perl-5.6.1.orig/makedepend.SH perl-5.6.1/makedepend.SH
---- perl-5.6.1.orig/makedepend.SH	2001-03-19 07:33:17.000000000 +0000
-+++ perl-5.6.1/makedepend.SH	2002-05-27 02:27:08.000000000 +0000
-@@ -141,6 +141,8 @@
-         $cppstdin $finc -I. $cppflags $cppminus <UU/$file.c |
-         $sed \
-     	    -e '/^#.*<stdin>/d' \
-+            -e '/^#.*<built-in>/d' \
-+            -e '/^#.*<command line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
- 	    -e 's/^[	 ]*#[	 ]*line/#/' \
-@@ -155,6 +157,8 @@
-         $sed \
- 	    -e '1d' \
- 	    -e '/^#.*<stdin>/d' \
-+            -e '/^#.*<built-in>/d' \
-+            -e '/^#.*<command line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
- 	    -e 's/^[	 ]*#[	 ]*line/#/' \
-
diff --git a/dev-lang/perl/files/5.6.1-op-test-fix.diff b/dev-lang/perl/files/5.6.1-op-test-fix.diff
deleted file mode 100644
index ab22b07b65b4..000000000000
--- a/dev-lang/perl/files/5.6.1-op-test-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- t/op/stat.t.orig	2003-02-14 18:38:23.000000000 +0000
-+++ t/op/stat.t	2003-02-14 18:39:34.000000000 +0000
-@@ -180,7 +180,7 @@
- die "Can't run op/stat.t test 35 without pwd working" unless $cwd;
- my @bin = grep {-d} ($^O eq 'machten' ?
- 		     qw(/usr/bin /bin) :
--		     qw(/sbin /usr/sbin /bin /usr/bin));
-+		     qw(/sbin /usr/sbin /bin /usr/bin /usr/lib/misc));
- unless (@bin) { print ("not ok 35\n"), goto tty_test; }
- for my $bin (@bin) {
-     opendir BIN, $bin or die "Can't opendir $bin: $!";
diff --git a/dev-lang/perl/files/digest-perl-5.6.1-r10 b/dev-lang/perl/files/digest-perl-5.6.1-r10
deleted file mode 100644
index c477a3294042..000000000000
--- a/dev-lang/perl/files/digest-perl-5.6.1-r10
+++ /dev/null
@@ -1,11 +0,0 @@
-MD5 ea9bf02b28e73e19dc85eb07f2347460 /files/5.6.1-builtin-fixup.diff 777
-MD5 28fe3868fd4e47ca609f7af6156c94ea /files/5.6.1-op-test-fix.diff 503
-MD5 d2af75f06a64c5934db314ff38939cdd /files/libperl-5.8.0-create-libperl-soname.patch 424
-MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 /files/libperl_rebuilder 10260
-MD5 060e9f10466fdc1268c75a7cf4dcbc7c /files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 4e49da394d326bcb744c7990bd27d6ac /files/perl-5.8.0-perldoc-emptydirs.patch 461
-MD5 4e99f7529e149661372283c981cf17ff /files/perl-5.8.0-prelink-lpthread.patch 476
-MD5 393b3dff879c892d461901183d3b0055 /files/perl-5.8.0-sockatmark-should-__THROW.patch 402
-MD5 5aa1a011eddb5b13299b63948230db33 /files/stat.t 8884
-MD5 c1eec734338e6ffc036a7eef6794ce15 /perl-5.6.1-r10.ebuild 6844
-MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695
diff --git a/dev-lang/perl/files/digest-perl-5.6.1-r11 b/dev-lang/perl/files/digest-perl-5.6.1-r11
deleted file mode 100644
index 12f9298b77db..000000000000
--- a/dev-lang/perl/files/digest-perl-5.6.1-r11
+++ /dev/null
@@ -1,11 +0,0 @@
-MD5 ea9bf02b28e73e19dc85eb07f2347460 /files/5.6.1-builtin-fixup.diff 777
-MD5 28fe3868fd4e47ca609f7af6156c94ea /files/5.6.1-op-test-fix.diff 503
-MD5 d2af75f06a64c5934db314ff38939cdd /files/libperl-5.8.0-create-libperl-soname.patch 424
-MD5 b8480b2ccbf7d5a7fe543b9e6f8dbc14 /files/libperl_rebuilder 10260
-MD5 060e9f10466fdc1268c75a7cf4dcbc7c /files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446
-MD5 4e49da394d326bcb744c7990bd27d6ac /files/perl-5.8.0-perldoc-emptydirs.patch 461
-MD5 4e99f7529e149661372283c981cf17ff /files/perl-5.8.0-prelink-lpthread.patch 476
-MD5 393b3dff879c892d461901183d3b0055 /files/perl-5.8.0-sockatmark-should-__THROW.patch 402
-MD5 5aa1a011eddb5b13299b63948230db33 /files/stat.t 8884
-MD5 4de48ad30fcdde726e932b9792180392 /perl-5.6.1-r11.ebuild 6301
-MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695
diff --git a/dev-lang/perl/files/stat.t b/dev-lang/perl/files/stat.t
deleted file mode 100644
index e2ef3289218e..000000000000
--- a/dev-lang/perl/files/stat.t
+++ /dev/null
@@ -1,289 +0,0 @@
-#!./perl
-
-# $RCSfile: stat.t,v $$Revision: 1.1 $$Date: 2003/03/11 21:11:45 $
-
-BEGIN {
-    chdir 't' if -d 't';
-    @INC = '../lib';
-}
-
-use Config;
-
-print "1..58\n";
-
-$Is_MSWin32 = $^O eq 'MSWin32';
-$Is_Dos = $^O eq 'dos';
-$Is_Dosish = $Is_Dos || $^O eq 'os2' || $Is_MSWin32;
-$Is_Cygwin = $^O eq 'cygwin';
-chop($cwd = ($Is_MSWin32 ? `cd` : `pwd`));
-
-$DEV = `ls -l /dev` unless $Is_Dosish or $Is_Cygwin;
-
-unlink "Op.stat.tmp";
-if (open(FOO, ">Op.stat.tmp")) {
-  # hack to make Apollo update link count:
-  $junk = `ls Op.stat.tmp` unless ($Is_MSWin32 || $Is_Dos);
-
-  ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
-   $blksize,$blocks) = stat(FOO);
-  if ($nlink == 1) {
-    print "ok 1\n";
-  }
-  else {
-    print "# res=$res, nlink=$nlink.\nnot ok 1\n";
-  }
-  if ($Is_MSWin32 or $Is_Cygwin or $Is_Dos || ($mtime && $mtime == $ctime)) {
-    print "ok 2\n";
-  }
-  else {
-    print "# |$mtime| vs |$ctime|\nnot ok 2\n";
-  }
-
-  my $funky_FAT_timestamps = $Is_Cygwin;
-
-  sleep 3 if $funky_FAT_timestamps;
-
-  print FOO "Now is the time for all good men to come to.\n";
-  close(FOO);
-
-  sleep 2 unless $funky_FAT_timestamps;
-
-} else {
-  print "# open failed: $!\nnot ok 1\nnot ok 2\n";
-}
-
-if ($Is_Dosish) { unlink "Op.stat.tmp2"}
-else {
-    `rm -f Op.stat.tmp2;ln Op.stat.tmp Op.stat.tmp2; chmod 644 Op.stat.tmp`;
-}
-
-($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
-    $blksize,$blocks) = stat('Op.stat.tmp');
-
-if ($Is_Dosish || $Config{dont_use_nlink})
-    {print "ok 3 # skipped: no link count\n";} 
-elsif ($nlink == 2)
-    {print "ok 3\n";} 
-else {print "# \$nlink is |$nlink|\nnot ok 3\n";}
-
-if (   $Is_Dosish
-        # Solaris tmpfs bug
-	|| ($cwd =~ m#^/tmp# and $mtime && $mtime==$ctime && $^O eq 'solaris')
-	|| $cwd =~ m#/afs/#
-	|| $^O eq 'amigaos') {
-    print "ok 4 # skipped: different semantic of mtime/ctime\n";
-}
-elsif (   ($mtime && $mtime != $ctime)  ) {
-    print "ok 4\n";
-}
-else {
-    print "not ok 4\n";
-    print "#4 If test op/stat.t fails test 4, check if you are on a tmpfs\n";
-    print "#4 of some sort.  Building in /tmp sometimes has this problem.\n";
-    print "#4 Also building on the ClearCase VOBS filesystem may cause this failure.\n";
-}
-print "#4	:$mtime: should != :$ctime:\n";
-
-unlink "Op.stat.tmp" or print "# unlink failed: $!\n";
-if ($Is_MSWin32) {  open F, '>Op.stat.tmp' and close F }
-else             { `touch Op.stat.tmp` }
-
-if (-z 'Op.stat.tmp') {print "ok 5\n";} else {print "not ok 5\n";}
-if (! -s 'Op.stat.tmp') {print "ok 6\n";} else {print "not ok 6\n";}
-
-$Is_MSWin32 ? `cmd /c echo hi > Op.stat.tmp` : `echo hi >Op.stat.tmp`;
-if (! -z 'Op.stat.tmp') {print "ok 7\n";} else {print "not ok 7\n";}
-if (-s 'Op.stat.tmp') {print "ok 8\n";} else {print "not ok 8\n";}
-
-unlink 'Op.stat.tmp' or print "# unlink failed: $!\n";
-$olduid = $>;		# can't test -r if uid == 0
-$Is_MSWin32 ? `cmd /c echo hi > Op.stat.tmp` : `echo hi >Op.stat.tmp`;
-chmod 0,'Op.stat.tmp';
-eval '$> = 1;';		# so switch uid (may not be implemented)
-if (!$> || $Is_Dos || ! -r 'Op.stat.tmp') {print "ok 9\n";} else {print "not ok 9\n";}
-if (!$> || ! -w 'Op.stat.tmp') {print "ok 10\n";} else {print "not ok 10\n";}
-eval '$> = $olduid;';		# switch uid back (may not be implemented)
-print "# olduid=$olduid, newuid=$>\n" unless ($> == $olduid);
-
-if (! -x 'Op.stat.tmp') {print "ok 11\n";}
-else                    {print "not ok 11\n";}
-
-foreach ((12,13,14,15,16,17)) {
-    print "ok $_\n";		#deleted tests
-}
-
-# in ms windows, Op.stat.tmp inherits owner uid from directory
-# not sure about os/2, but chown is harmless anyway
-eval { chown $>,'Op.stat.tmp'; 1 } or print "# $@" ;
-chmod 0700,'Op.stat.tmp';
-if (-r 'Op.stat.tmp') {print "ok 18\n";} else {print "not ok 18\n";}
-if (-w 'Op.stat.tmp') {print "ok 19\n";} else {print "not ok 19\n";}
-if ($Is_Dosish) {print "ok 20 # skipped: -x by extension\n";} 
-elsif (-x 'Op.stat.tmp') {print "ok 20\n";} 
-else {print "not ok 20\n";}
-
-if (-f 'Op.stat.tmp') {print "ok 21\n";} else {print "not ok 21\n";}
-if (! -d 'Op.stat.tmp') {print "ok 22\n";} else {print "not ok 22\n";}
-
-if (-d '.') {print "ok 23\n";} else {print "not ok 23\n";}
-if (! -f '.') {print "ok 24\n";} else {print "not ok 24\n";}
-
-if (!$Is_Dosish and `ls -l perl` =~ /^l.*->/) {
-    if (-l 'perl') {print "ok 25\n";} else {print "not ok 25\n";}
-}
-else {
-    print "ok 25\n";
-}
-
-if (-o 'Op.stat.tmp') {print "ok 26\n";} else {print "not ok 26\n";}
-
-if (-e 'Op.stat.tmp') {print "ok 27\n";} else {print "not ok 27\n";}
-unlink 'Op.stat.tmp2';
-if (! -e 'Op.stat.tmp2') {print "ok 28\n";} else {print "not ok 28\n";}
-
-if ($Is_MSWin32 || $Is_Dos)
-    {print "ok 29\n";}
-elsif ($DEV !~ /\nc.* (\S+)\n/)
-    {print "ok 29\n";}
-elsif (-c "/dev/$1")
-    {print "ok 29\n";}
-else
-    {print "not ok 29\n";}
-if (! -c '.') {print "ok 30\n";} else {print "not ok 30\n";}
-
-if ($Is_MSWin32 || $Is_Dos)
-    {print "ok 31\n";}
-elsif ($DEV !~ /\ns.* (\S+)\n/)
-    {print "ok 31\n";}
-elsif (-S "/dev/$1")
-    {print "ok 31\n";}
-else
-    {print "not ok 31\n";}
-if (! -S '.') {print "ok 32\n";} else {print "not ok 32\n";}
-
-if ($Is_MSWin32 || $Is_Dos)
-    {print "ok 33\n";}
-elsif ($DEV !~ /\nb.* (\S+)\n/)
-    {print "ok 33\n";}
-elsif (-b "/dev/$1")
-    {print "ok 33\n";}
-else
-    {print "not ok 33\n";}
-if (! -b '.') {print "ok 34\n";} else {print "not ok 34\n";}
-
-if ($^O eq 'mpeix' or $^O eq 'amigaos' or $Is_Dosish or $Is_Cygwin) {
-  print "ok 35 # skipped: no -u\n"; goto tty_test;
-}
-
-$cnt = $uid = 0;
-
-die "Can't run op/stat.t test 35 without pwd working" unless $cwd;
-my @bin = grep {-d} ($^O eq 'machten' ?
-		     qw(/usr/bin /bin) :
-		     qw(/sbin /usr/sbin /bin /usr/bin));
-unless (@bin) { print ("not ok 35\n"), goto tty_test; }
-for my $bin (@bin) {
-    opendir BIN, $bin or die "Can't opendir $bin: $!";
-    while (defined($_ = readdir BIN)) {
-        $_ = "$bin/$_";
-        $cnt++;
-        $uid++ if -u;
-        last if $uid && $uid < $cnt;
-    }
-}
-closedir BIN;
-
-# I suppose this is going to fail somewhere...
-if ($uid > 0 && $uid < $cnt)
-    {print "ok 35\n";}
-elsif ($uid == 0)
-    {print ("not ok 35\n"), goto tty_test; }
-else
-    {print "not ok 35 \n# ($uid $cnt)\n";}
-
-tty_test:
-
-# To assist in automated testing when a controlling terminal (/dev/tty)
-# may not be available (at, cron  rsh etc), the PERL_SKIP_TTY_TEST env var
-# can be set to skip the tests that need a tty.
-unless($ENV{PERL_SKIP_TTY_TEST}) {
-    if ($Is_MSWin32) {
-	print "ok 36\n";
-	print "ok 37\n";
-    }
-    else {
-	my $TTY = "/dev/tty";
-
-	$TTY = "/dev/ttyp0" if $^O eq 'rhapsody';
-
-	if (defined $TTY) {
-	    unless (open(TTY, $TTY)) {
-		print STDERR "Can't open $TTY--run t/TEST outside of make.\n";
-	    }
-	    if (-t TTY) {print "ok 36\n";} else {print "not ok 36\n";}
-	    if (-c TTY) {print "ok 37\n";} else {print "not ok 37\n";}
-	    close(TTY);
-	} else { # if some platform completely undefines $TTY
-	    print "ok 36 # skipped\n";
-	    print "ok 37 # skipped\n";
-	}
-    }
-    if (! -t TTY) {print "ok 38\n";} else {print "not ok 38\n";}
-    if (-t)       {print "ok 39\n";} else {print "not ok 39\n";}
-}
-else {
-    print "ok 36\n";
-    print "ok 37\n";
-    print "ok 38\n";
-    print "ok 39\n";
-}
-open(null,"/dev/null");
-if (! -t null || -e '/xenix' || $^O eq 'machten' || $Is_MSWin32)
-	{print "ok 40\n";} else {print "not ok 40\n";}
-close(null);
-
-# These aren't strictly "stat" calls, but so what?
-
-if (-T 'op/stat.t') {print "ok 41\n";} else {print "not ok 41\n";}
-if (! -B 'op/stat.t') {print "ok 42\n";} else {print "not ok 42\n";}
-
-if (-B './perl' || -B './perl.exe') {print "ok 43\n";} else {print "not ok 43\n";}
-if (! -T './perl' && ! -T './perl.exe') {print "ok 44\n";} else {print "not ok 44\n";}
-
-open(FOO,'op/stat.t');
-eval { -T FOO; };
-if ($@ =~ /not implemented/) {
-    print "# $@";
-    for (45 .. 54) {
-	print "ok $_\n";
-    }
-}
-else {
-    if (-T FOO) {print "ok 45\n";} else {print "not ok 45\n";}
-    if (! -B FOO) {print "ok 46\n";} else {print "not ok 46\n";}
-    $_ = <FOO>;
-    if (/perl/) {print "ok 47\n";} else {print "not ok 47\n";}
-    if (-T FOO) {print "ok 48\n";} else {print "not ok 48\n";}
-    if (! -B FOO) {print "ok 49\n";} else {print "not ok 49\n";}
-    close(FOO);
-
-    open(FOO,'op/stat.t');
-    $_ = <FOO>;
-    if (/perl/) {print "ok 50\n";} else {print "not ok 50\n";}
-    if (-T FOO) {print "ok 51\n";} else {print "not ok 51\n";}
-    if (! -B FOO) {print "ok 52\n";} else {print "not ok 52\n";}
-    seek(FOO,0,0);
-    if (-T FOO) {print "ok 53\n";} else {print "not ok 53\n";}
-    if (! -B FOO) {print "ok 54\n";} else {print "not ok 54\n";}
-}
-close(FOO);
-
-if (-T '/dev/null') {print "ok 55\n";} else {print "not ok 55\n";}
-if (-B '/dev/null') {print "ok 56\n";} else {print "not ok 56\n";}
-
-# and now, a few parsing tests:
-$_ = 'Op.stat.tmp';
-if (-f) {print "ok 57\n";} else {print "not ok 57\n";}
-if (-f()) {print "ok 58\n";} else {print "not ok 58\n";}
-
-unlink 'Op.stat.tmp' or print "# unlink failed: $!\n";
diff --git a/dev-lang/perl/perl-5.6.1-r10.ebuild b/dev-lang/perl/perl-5.6.1-r10.ebuild
deleted file mode 100644
index 8b73803a53e5..000000000000
--- a/dev-lang/perl/perl-5.6.1-r10.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r10.ebuild,v 1.3 2003/04/07 18:23:42 mholzer Exp $
-
-IUSE="berkdb gdbm"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
-
-RDEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-libs/db-3.2.3h-r3
-	=sys-libs/db-1.85-r1"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/portage-2.0.45-r5
-	${RDEPEND}"
-		
-
-PDEPEND=">=dev-perl/ExtUtils-MakeMaker-6.05-r4
-	>=dev-perl/Safe-2.09"
-
-src_compile() {
-	use gdbm || use berkdb || die "You must have either gdbm or berkdb installed and in your use flags."
-
-    #The following is to handle international users. Perl does nls post-install
-    export LC_ALL=C
-
-    if [ "${ARCH}" = "alpha" ]; then
-        CFLAGS="${CFLAGS} -fPIC"
-        CXXFLAGS="${CXXFLAGS} -fPIC"
-    fi  
-
-    local myconf
-    if [ "`use gdbm`" ]
-    then
-		myconf="-Di_gdbm"
-    fi
-
-    # It seems that perl config use the hostname instead of the osname on hppa
-    if [ "`use hppa`" ]
-    then
-        myconf="${myconf} -Dosname=linux"
-    fi
-
-    if [ "`use berkdb`" ]
-    then
-		myconf="${myconf} -Di_db -Di_ndbm"
-    else
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-    fi
-
-	# configure for libperl.so
-    sh Configure -des \
-		-Darchname=${CHOST%%-*}-linux \
-		-Dcccdlflags='-fPIC' \
-		-Dcc=gcc \
-		-Dccdlflags='-rdynamic' \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefixx='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Duseshrplib \
-		-Dman3ext=3pm \
-		-Dlibperl=libperl.so \
-		-Dd_dosuid \
-		-Dd_semctl_semun \
-		-Dcf_by=Gentoo \
-		-Ud_csh \
-		${myconf} || die
-	# add optimization flags
-    cp config.sh config.sh.orig
-    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
-	# create libperl.so and move it out of the way
-	mv -f Makefile Makefile_orig
-	sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \
-	    -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
-		Makefile_orig > Makefile
-    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
-	# fixes a bug in the make/testing on new systems
-	mv makefile makefile_orig
-	mv x2p/makefile x2p/makefile_orig
-		  egrep -v "(<built-in>|<command line>)" makefile_orig >makefile
-		  egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
-	make -f Makefile depend || die
-	make -f Makefile libperl.so || die
-	mv libperl.so ${WORKDIR}
-
-	# starting from scratch again
-	cd ${WORKDIR}
-	rm -rf ${S}
-	unpack ${A}
-	cd ${S}
-	
-	# configure for libperl.a
-# this is gross -- from Christian Gafton, Red Hat
-	cat > config.over <<EOF
-installprefix=${D}/usr
-#test -d \$installprefix || mkdir \$installprefix
-#test -d \$installprefix/bin || mkdir \$installprefix/bin
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-#installman1dir=\$installprefix/share/man/man1
-#installman3dir=\$installprefix/share/man/man3
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/man/!/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/man/!/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-
-    sh Configure -des \
-		-Dcc=gcc \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefixx='/usr' \
-		-Darchname=${CHOST%%-*}-linux \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_dosuid \
-		-Dlocincpth=' ' \
-		-Dd_semctl_semun \
-		-Dman3ext=3pm \
-		-Dcf_by=Gentoo \
-		-Ud_csh \
-		${myconf} || die
-
-    #Optimize ;)
-    cp config.sh config.sh.orig
-    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
-    #THIS IS USED LATER:
-    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
-
-# Umm, for some reason this doesn't want to work, so we'll just remove
-#  the makefiles and let make rebuild them itself. (It seems to do it
-#  right the second time... -- pete
-#    cp makefile makefile.orig
-#    sed -e "s:^0::" makefile.orig > makefile
-
-	mv Makefile Makefile_orig
-	sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
-		Makefile_orig > Makefile
-    
-    #for some reason, this rm -f doesn't seem to actually do anything. So we explicitly use "Makefile"
-    #(rather than the default "makefile") in all make commands below.
-    #rm -f makefile x2p/makefile
-	mv makefile makefile_orig
-	mv x2p/makefile x2p/makefile_orig
-		egrep -v "(<built-in>|<command line>)" makefile_orig >makefile
-		egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
-    #make -f Makefile depend || die
-    #make -f Makefile || die
-    make || die
-	cp ${O}/files/stat.t ./t/op/
-    # Parallel make fails
-	# dont use the || die since some tests fail on bootstrap
-	if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then
-		echo "Skipping tests on this platform"
-	else
-	    egrep -v "(<built-in>|<command line>)" x2p/makefile_orig >x2p/makefile
-    	make -f Makefile test 
-	fi
-}
-
-src_install() {
-#The following is to handle international users. Perl does nls post-install 
-    export LC_ALL=C 
-
-    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
-
-	insinto /usr/lib/perl5/${PV}/${PARCH}/CORE/
-	doins ${WORKDIR}/libperl.so
-	dosym /usr/lib/perl5/${PV}/${PARCH}/CORE/libperl.so /usr/lib/libperl.so
-	
-
-#    make -f Makefile \
-#		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-#		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-#		install || die
-
-	make \
-		DESTDIR=${D} \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		install || die "Unable to make install"
-    install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm
-
-	#man pages
-
-#	./perl installman \
-#		--man1dir=${D}/usr/share/man/man1 \
-#		--man1ext=1 \
-#		--man3dir=${D}/usr/share/man/man3 \
-#		--man3ext=3
-
-
-	# This removes ${D} from Config.pm
-
-	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm
-	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist
-
-	# DOCUMENTATION
-
-    dodoc Changes* Artistic Copying README Todo* AUTHORS
-    prepalldocs
-
-    
-	# HTML Documentation
-	dodir /usr/share/doc/${PF}/html
-	${D}/usr/bin/perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html
-
-}
-
-
-pkg_postinst() {
-	# generates the ph files for perl
-	cd /usr/include; h2ph *.h sys/*.h
-
-}
diff --git a/dev-lang/perl/perl-5.6.1-r11.ebuild b/dev-lang/perl/perl-5.6.1-r11.ebuild
deleted file mode 100644
index 25d9b5629539..000000000000
--- a/dev-lang/perl/perl-5.6.1-r11.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.6.1-r11.ebuild,v 1.4 2003/04/07 18:23:42 mholzer Exp $
-
-IUSE="berkdb gdbm"
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
-SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz"
-HOMEPAGE="http://www.perl.org"
-
-LICENSE="Artistic GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~sparc ~alpha mips ~hppa"
-
-RDEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	>=sys-libs/db-3.2.3h-r3
-	=sys-libs/db-1.85-r1"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/portage-2.0.45-r5
-	${RDEPEND}"
-		
-
-PDEPEND=">=dev-perl/ExtUtils-MakeMaker-6.05-r4
-	>=dev-perl/Safe-2.09"
-
-src_compile() {
-	use gdbm || use berkdb || die "You must have either gdbm or berkdb installed and in your use flags."
-
-    #The following is to handle international users. Perl does nls post-install
-    export LC_ALL=C
-
-    if [ "${ARCH}" = "alpha" ]; then
-        CFLAGS="${CFLAGS} -fPIC"
-        CXXFLAGS="${CXXFLAGS} -fPIC"
-    fi  
-
-    local myconf
-    if [ "`use gdbm`" ]
-    then
-		myconf="-Di_gdbm"
-    fi
-
-    # It seems that perl config use the hostname instead of the osname on hppa
-    if [ "`use hppa`" ]
-    then
-        myconf="${myconf} -Dosname=linux"
-    fi
-
-    if [ "`use berkdb`" ]
-    then
-		myconf="${myconf} -Di_db -Di_ndbm"
-    else
-		myconf="${myconf} -Ui_db -Ui_ndbm"
-    fi
-
-	# put in built-in removal patch
-	patch -p1 < ${FILESDIR}/${PV}-builtin-fixup.diff || die 
-	patch -p0 < ${FILESDIR}/${PV}-op-test-fix.diff || die
-
-	# configure for libperl.so
-    sh Configure -des \
-		-Darchname=${CHOST%%-*}-linux \
-		-Dcccdlflags='-fPIC' \
-		-Dcc=gcc \
-		-Dccdlflags='-rdynamic' \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefixx='/usr' \
-		-Dlocincpth=' ' \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Duseshrplib \
-		-Dman3ext=3pm \
-		-Dlibperl=libperl.so \
-		-Dd_dosuid \
-		-Dd_semctl_semun \
-		-Dcf_by=Gentoo \
-		-Ud_csh \
-		${myconf} || die
-	# add optimization flags
-    cp config.sh config.sh.orig
-    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
-	# create libperl.so and move it out of the way
-	mv -f Makefile Makefile_orig
-	sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \
-	    -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
-		Makefile_orig > Makefile
-    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
-
-	make -f Makefile depend || die
-	make -f Makefile libperl.so || die
-	mv libperl.so ${WORKDIR}
-
-	# starting from scratch again
-	cd ${WORKDIR}
-	rm -rf ${S}
-	unpack ${A}
-	cd ${S}
-
-	# put in built-in removal patch
-	patch -p1 < ${FILESDIR}/${PV}-builtin-fixup.diff || die 
-	patch -p0 < ${FILESDIR}/${PV}-op-test-fix.diff || die
-	
-	# configure for libperl.a
-# this is gross -- from Christian Gafton, Red Hat
-	cat > config.over <<EOF
-installprefix=${D}/usr
-#test -d \$installprefix || mkdir \$installprefix
-#test -d \$installprefix/bin || mkdir \$installprefix/bin
-installarchlib=\`echo \$installarchlib | sed "s!\$prefix!\$installprefix!"\`
-installbin=\`echo \$installbin | sed "s!\$prefix!\$installprefix!"\`
-#installman1dir=\$installprefix/share/man/man1
-#installman3dir=\$installprefix/share/man/man3
-installman1dir=\`echo \$installman1dir | sed "s!\$prefix!\$installprefix!"\`
-installman3dir=\`echo \$installman3dir | sed "s!\$prefix!\$installprefix!"\`
-installman1dir=\`echo \$installman1dir | sed "s!/man/!/share/man/!"\`
-installman3dir=\`echo \$installman3dir | sed "s!/man/!/share/man/!"\`
-man1ext=1
-man3ext=3pm
-installprivlib=\`echo \$installprivlib | sed "s!\$prefix!\$installprefix!"\`
-installscript=\`echo \$installscript | sed "s!\$prefix!\$installprefix!"\`
-installsitelib=\`echo \$installsitelib | sed "s!\$prefix!\$installprefix!"\`
-installsitearch=\`echo \$installsitearch | sed "s!\$prefix!\$installprefix!"\`
-EOF
-
-    sh Configure -des \
-		-Dcc=gcc \
-		-Dprefix='/usr' \
-		-Dvendorprefix='/usr' \
-		-Dsiteprefixx='/usr' \
-		-Darchname=${CHOST%%-*}-linux \
-		-Doptimize="${CFLAGS}" \
-		-Duselargefiles \
-		-Dd_dosuid \
-		-Dlocincpth=' ' \
-		-Dd_semctl_semun \
-		-Dman3ext=3pm \
-		-Dcf_by=Gentoo \
-		-Ud_csh \
-		${myconf} || die
-
-    #Optimize ;)
-    cp config.sh config.sh.orig
-    sed -e "s:optimize='-O2':optimize=\'${CFLAGS}\':" config.sh.orig > config.sh
-    #THIS IS USED LATER:
-    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
-
-# Umm, for some reason this doesn't want to work, so we'll just remove
-#  the makefiles and let make rebuild them itself. (It seems to do it
-#  right the second time... -- pete
-#    cp makefile makefile.orig
-#    sed -e "s:^0::" makefile.orig > makefile
-
-	mv Makefile Makefile_orig
-	sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \
-		Makefile_orig > Makefile
-    
-    make || die
-
-    # Parallel make fails
-	# dont use the || die since some tests fail on bootstrap
-	if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then
-		echo "Skipping tests on this platform"
-	else
-	    make test 
-	fi
-}
-
-src_install() {
-#The following is to handle international users. Perl does nls post-install 
-    export LC_ALL=C 
-
-    export PARCH=`grep myarchname config.sh | cut -f2 -d"'"`
-
-	insinto /usr/lib/perl5/${PV}/${PARCH}/CORE/
-	doins ${WORKDIR}/libperl.so
-	dosym /usr/lib/perl5/${PV}/${PARCH}/CORE/libperl.so /usr/lib/libperl.so
-	
-
-#    make -f Makefile \
-#		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-#		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-#		install || die
-
-	make \
-		DESTDIR=${D} \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		install || die "Unable to make install"
-    install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm
-
-	#man pages
-
-#	./perl installman \
-#		--man1dir=${D}/usr/share/man/man1 \
-#		--man1ext=1 \
-#		--man3dir=${D}/usr/share/man/man3 \
-#		--man3ext=3
-
-
-	# This removes ${D} from Config.pm
-
-	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm
-	dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist
-
-	# DOCUMENTATION
-
-    dodoc Changes* Artistic Copying README Todo* AUTHORS
-    prepalldocs
-
-    
-	# HTML Documentation
-	dodir /usr/share/doc/${PF}/html
-	${D}/usr/bin/perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html
-
-}
-
-
-pkg_postinst() {
-	# generates the ph files for perl
-	cd /usr/include; h2ph *.h sys/*.h
-
-}
diff --git a/dev-lang/perl/perl-5.8.0-r10.ebuild b/dev-lang/perl/perl-5.8.0-r10.ebuild
index f201c3c2b985..e9e1f73f52c2 100644
--- a/dev-lang/perl/perl-5.8.0-r10.ebuild
+++ b/dev-lang/perl/perl-5.8.0-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r10.ebuild,v 1.8 2003/05/27 19:03:08 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.0-r10.ebuild,v 1.9 2003/05/31 00:46:50 rac Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -83,7 +83,7 @@ fi
 LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
 
 LICENSE="Artistic GPL-2"
-KEYWORDS="x86 sparc ppc ~alpha ~mips ~hppa"
+KEYWORDS="x86 sparc ppc ~alpha mips ~hppa"
 
 DEPEND="sys-apps/groff
 	berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 )