Cleanup

(Portage version: 2.2_rc20/cvs/Linux 2.6.27-tuxonice i686)

3 files changed, 4 insertions, 180 deletions

diff --git a/dev-perl/HTTP-Server-Simple/ChangeLog b/dev-perl/HTTP-Server-Simple/ChangeLog
index ec887ada8227..935df59cae6b 100644
--- a/dev-perl/HTTP-Server-Simple/ChangeLog
+++ b/dev-perl/HTTP-Server-Simple/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for dev-perl/HTTP-Server-Simple
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Server-Simple/ChangeLog,v 1.33 2008/12/30 16:06:34 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Server-Simple/ChangeLog,v 1.34 2008/12/30 16:08:05 tove Exp $
 
-  30 Dec 2008; Torsten Veller <tove@gentoo.org>
-  -HTTP-Server-Simple-0.34.ebuild, -HTTP-Server-Simple-0.35.ebuild:
+  30 Dec 2008; Torsten Veller <tove@gentoo.org> -files/0.34-debian.patch,
+  -files/0.35-debian.patch, -HTTP-Server-Simple-0.34.ebuild,
+  -HTTP-Server-Simple-0.35.ebuild:
   Cleanup
 
 *HTTP-Server-Simple-0.36 (25 Nov 2008)
diff --git a/dev-perl/HTTP-Server-Simple/files/0.34-debian.patch b/dev-perl/HTTP-Server-Simple/files/0.34-debian.patch
deleted file mode 100644
index 26922ac8781f..000000000000
--- a/dev-perl/HTTP-Server-Simple/files/0.34-debian.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-http://rt.cpan.org/Public/Bug/Display.html?id=28122
-patches from libhttp-server-simple-perl_0.34-1.diff.gz
-
---- libhttp-server-simple-perl.orig/t/01live.t
-+++ libhttp-server-simple-perl/t/01live.t
-@@ -34,11 +34,7 @@
- }
- 
- 
--TODO: { 
--    local $TODO = "We don't currently wait for 'server is running' responses from the client";
--    run_server_tests('SlowServer');
--
--}
-+run_server_tests('SlowServer');
- 
- 
- 
---- libhttp-server-simple-perl.orig/lib/HTTP/Server/Simple.pm
-+++ libhttp-server-simple-perl/lib/HTTP/Server/Simple.pm
-@@ -6,6 +6,7 @@
- use Socket;
- use Carp;
- use URI::Escape;
-+use IO::Select;
- 
- use vars qw($VERSION $bad_request_doc);
- $VERSION = '0.34';
-@@ -215,15 +216,36 @@
- 
- sub background {
-     my $self  = shift;
-+
-+    # set up a pipe so the child can tell the parent when it's ready
-+    # to accept requests
-+    my ($readfh, $writefh) = FileHandle::pipe;
-+
-     my $child = fork;
-     die "Can't fork: $!" unless defined($child);
--    return $child if $child;
-+    if ($child) { # parent
-+        my $s = IO::Select->new;
-+        $s->add($readfh);
-+	my $now = time; my $left = 0;
-+	my @ready;
-+	while(not @ready and $left < 5) {
-+		@ready = $s->can_read($left);
-+		$left = time - $now;
-+	}
-+        die("child unresponsive for 5 seconds") if(not @ready);
-+        my $response = <$readfh>;
-+        chomp $response;
-+        die("child is confused: answer '$response' != 'OK'")
-+            if $response ne "OK";
-+        return $child;
-+    }
- 
-     if ( $^O !~ /MSWin32/ ) {
-         require POSIX;
-         POSIX::setsid()
-             or die "Can't start a new session: $!";
-     }
-+    $self->{_parent_handle} = $writefh;
-     $self->run();
- }
- 
-@@ -270,6 +292,7 @@
- 	$self->after_setup_listener();
-         *{"$pkg\::run"} = $self->_default_run;
-     }
-+    $self->_maybe_tell_parent();
- 
-     local $SIG{HUP} = sub { $SERVER_SHOULD_RUN = 0; };
- 
-@@ -407,6 +430,15 @@
-         }
- }
- 
-+sub _maybe_tell_parent {
-+    # inform the parent process that we're ready, if applicable
-+    my $self = shift;
-+    my $handle = $self->{_parent_handle};
-+    return if !$handle;
-+    print $handle "OK\n";
-+    close $handle;
-+    delete $self->{_parent_handle};
-+}
- 
- 
- 
diff --git a/dev-perl/HTTP-Server-Simple/files/0.35-debian.patch b/dev-perl/HTTP-Server-Simple/files/0.35-debian.patch
deleted file mode 100644
index 800a2667c6c2..000000000000
--- a/dev-perl/HTTP-Server-Simple/files/0.35-debian.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- a/t/01live.t
-+++ b/t/01live.t
-@@ -34,11 +34,7 @@ for my $class (@classes) {
- }
- 
- 
--TODO: { 
--    local $TODO = "We don't currently wait for 'server is running' responses from the client";
--    run_server_tests('SlowServer');
--
--}
-+run_server_tests('SlowServer');
- 
- 
- 
---- libhttp-server-simple-perl.orig/lib/HTTP/Server/Simple.pm
-+++ libhttp-server-simple-perl/lib/HTTP/Server/Simple.pm
-@@ -6,6 +6,7 @@
- use Socket;
- use Carp;
- use URI::Escape;
-+use IO::Select;
- 
- use vars qw($VERSION $bad_request_doc);
- $VERSION = '0.35';
-@@ -215,15 +216,36 @@
- 
- sub background {
-     my $self  = shift;
-+
-+    # set up a pipe so the child can tell the parent when it's ready
-+    # to accept requests
-+    my ($readfh, $writefh) = FileHandle::pipe;
-+
-     my $child = fork;
-     die "Can't fork: $!" unless defined($child);
--    return $child if $child;
-+    if ($child) { # parent
-+        my $s = IO::Select->new;
-+        $s->add($readfh);
-+	my $now = time; my $left = 0;
-+	my @ready;
-+	while(not @ready and $left < 5) {
-+		@ready = $s->can_read($left);
-+		$left = time - $now;
-+	}
-+        die("child unresponsive for 5 seconds") if(not @ready);
-+        my $response = <$readfh>;
-+        chomp $response;
-+        die("child is confused: answer '$response' != 'OK'")
-+            if $response ne "OK";
-+        return $child;
-+    }
- 
-     if ( $^O !~ /MSWin32/ ) {
-         require POSIX;
-         POSIX::setsid()
-             or die "Can't start a new session: $!";
-     }
-+    $self->{_parent_handle} = $writefh;
-     $self->run(@_);
- }
- 
-@@ -270,6 +292,7 @@
- 	$self->after_setup_listener();
-         *{"$pkg\::run"} = $self->_default_run;
-     }
-+    $self->_maybe_tell_parent();
- 
-     local $SIG{HUP} = sub { $SERVER_SHOULD_RUN = 0; };
- 
-@@ -407,6 +430,15 @@
-         }
- }
- 
-+sub _maybe_tell_parent {
-+    # inform the parent process that we're ready, if applicable
-+    my $self = shift;
-+    my $handle = $self->{_parent_handle};
-+    return if !$handle;
-+    print $handle "OK\n";
-+    close $handle;
-+    delete $self->{_parent_handle};
-+}
- 
- 
-