Add hostname.t patch. Cleanup

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 35 insertions, 24 deletions

diff --git a/perl-core/libnet/ChangeLog b/perl-core/libnet/ChangeLog
index 8100b0ba555e..1a6e128ea1e0 100644
--- a/perl-core/libnet/ChangeLog
+++ b/perl-core/libnet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for perl-core/libnet
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/ChangeLog,v 1.23 2009/03/26 12:29:40 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/ChangeLog,v 1.24 2009/06/09 08:16:58 tove Exp $
+
+  09 Jun 2009; Torsten Veller <tove@gentoo.org> +files/1.22-hostname.patch,
+  libnet-1.22.ebuild, -files/Net-CMD-UTF8.patch:
+  Add hostname.t patch. Cleanup
 
   26 Mar 2009; Raúl Porcel <armin76@gentoo.org> libnet-1.21.ebuild,
   libnet-1.22.ebuild:
diff --git a/perl-core/libnet/files/1.22-hostname.patch b/perl-core/libnet/files/1.22-hostname.patch
new file mode 100644
index 000000000000..60440e287977
--- /dev/null
+++ b/perl-core/libnet/files/1.22-hostname.patch
@@ -0,0 +1,25 @@
+commit adeb94125ab7de8d20c129a905a5159972ad9fd1
+Author: Ricardo SIGNES <rjbs@cpan.org>
+Date:   Mon Oct 22 05:01:09 2007 -0400
+
+    hostname.t busted
+    Message-ID: <20071022130109.GA16748@knight>
+    
+    p4raw-id: //depot/perl@32180
+
+diff --git a/lib/Net/t/hostname.t b/lib/Net/t/hostname.t
+index 758d304..4013d74 100644
+--- a/lib/Net/t/hostname.t
++++ b/lib/Net/t/hostname.t
+@@ -26,7 +26,10 @@ print "1..5\n";
+ $domain = domainname();
+ 
+ if(defined $domain && $domain ne "") {
+- print "ok 1\n";
++ print "ok 1 - defined, non-empty domainname\n";
++}
++elsif (not defined $domain) {
++ print "ok 1 # SKIP domain not fully defined\n";
+ }
+ else {
+  print "not ok 1\n";
diff --git a/perl-core/libnet/files/Net-CMD-UTF8.patch b/perl-core/libnet/files/Net-CMD-UTF8.patch
deleted file mode 100644
index 23272e5068de..000000000000
--- a/perl-core/libnet/files/Net-CMD-UTF8.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naurp libnet-1.20.old/Net/Cmd.pm libnet-1.20/Net/Cmd.pm
---- libnet-1.20.old/Net/Cmd.pm	2006-10-27 07:08:07.000000000 -0400
-+++ libnet-1.20/Net/Cmd.pm	2007-03-25 08:02:38.000000000 -0400
-@@ -21,7 +21,6 @@ BEGIN {
-   }
- }
- 
--my $doUTF8 = eval { require utf8 };
- 
- $VERSION = "2.27";
- @ISA     = qw(Exporter);
-@@ -395,8 +394,6 @@ sub datasend
-  my $arr = @_ == 1 && ref($_[0]) ? $_[0] : \@_;
-  my $line = join("" ,@$arr);
- 
-- utf8::encode($line) if $doUTF8;
--
-  return 0 unless defined(fileno($cmd));
- 
-  my $last_ch = ${*$cmd}{'net_cmd_last_ch'};
diff --git a/perl-core/libnet/libnet-1.22.ebuild b/perl-core/libnet/libnet-1.22.ebuild
index 2c0ceb3e38aa..8cb234050aae 100644
--- a/perl-core/libnet/libnet-1.22.ebuild
+++ b/perl-core/libnet/libnet-1.22.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/libnet-1.22.ebuild,v 1.4 2009/03/26 12:29:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/libnet/libnet-1.22.ebuild,v 1.5 2009/06/09 08:16:58 tove Exp $
 
-inherit perl-module
+inherit eutils perl-module
 
 DESCRIPTION="A URI Perl Module"
 HOMEPAGE="http://search.cpan.org/~gbarr/"
@@ -20,5 +20,7 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	perl-module_src_unpack
+	cd "${S}"
 	cp "${FILESDIR}"/libnet.cfg "${S}"
+	epatch "${FILESDIR}"/${PV}-hostname.patch
 }