Add hostname.t patch. Cleanup

Package-Manager: portage-2.2_rc33/cvs/Linux i686

5 files changed, 48 insertions, 27 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/Manifest b/perl-core/libnet/Manifest
index 22de4c78bc31..0255f8e6ead2 100644
--- a/perl-core/libnet/Manifest
+++ b/perl-core/libnet/Manifest
@@ -1,8 +1,18 @@
-AUX Net-CMD-UTF8.patch 551 RMD160 d30685bf01fa314ff6ff8bc0aba30ab0e18c8dae SHA1 386ea03b480f3dc0e1b6d0dfd6385bfa80650964 SHA256 852d8f123e4cbee224e4d8b3729b491365d42da825149b689f4d5176da188458
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.22-hostname.patch 664 RMD160 ad37b560cc432181368752e66d9e86e9479925d7 SHA1 f1103f95ea21bfbbe571795eea09872ac914168f SHA256 486d779faa86ae275e8800d83bd67329634b2782de6908512b6bf8380d389a96
 AUX libnet.cfg 268 RMD160 6c5fd8a093897165d5cb6b7db955fc8c55827799 SHA1 867e77e3e6a7c7d81e9cb7bf235d6e2340b629e8 SHA256 e07de290e7651f580bd587231655b8bf9c2b4ae7d77e650ccfa28c25ad705912
 DIST libnet-1.21.tar.gz 67693 RMD160 8c6f5746ceb2bdd9b179d1034e586bc9085db38a SHA1 7e9d2b8dcbb0e78e59481851c230fe76c7ce4e9d SHA256 f18d936a7337300e648684b8c74cda3046030a3ce6895a6578c8852038ee6f48
 DIST libnet-1.22.tar.gz 67836 RMD160 52c254997440b95e195bd54d04dca5d736788e21 SHA1 d3a84aa06da70f59598d6a49d70507a5b9a6e869 SHA256 372c581d0c6b256952c774bfdbd8714e2a20d41251d4097d326d2f1ab1196c84
 EBUILD libnet-1.21.ebuild 661 RMD160 6c85b8038778b274a5267d5976cce15a79a1382a SHA1 f0851bf62768243c29ca1b8150947eb137818c3e SHA256 dae6203c7b4b166a14973e0047d9ec5e09d8c19336579255e8909086b2cc9c5e
-EBUILD libnet-1.22.ebuild 665 RMD160 1532d93777ccfe86d1dd0f70470110bfd0a5f9d9 SHA1 6aa46f8615f4c20e111599d76bdffd8ae73a8d0b SHA256 26f686f8b468c45d026e773330f085e22c3a828066f55f0b68f4e4e046b9c5db
-MISC ChangeLog 6988 RMD160 481d32434720cd1b21c6cae0b91204f11d7515cc SHA1 cce5c9b26b3bc3d30c3049740884e4afba07ceae SHA256 61a47c04582e9e18c66402fa692c6f2d6a68d99c485269cb0c2ae7ffd6ca996f
+EBUILD libnet-1.22.ebuild 723 RMD160 7683757e68367d6b0f3c387f00548d299e8b522a SHA1 4936832d9910204419d7c6815139cc300ad3cb8d SHA256 d3834bfb3a9a0baed71073bb94d2f7d6662d4f982e9e0bf1deb8e630f0861835
+MISC ChangeLog 7143 RMD160 e6607ad00df5dc6feb1de9af058f9ed2b580d3b1 SHA1 63dcd8e85d903652f8eed86272a53aff1faf5a11 SHA256 0be2a25e6a7409401673317a2b8dcdd3a742552b667c483bec5ce702982eb92a
 MISC metadata.xml 485 RMD160 dc9ff8eef00c1c6914a4497e51751e9a81a2307d SHA1 e4c865b0087cf5db1110db7241266565b8402034 SHA256 ea552fea0b170b64896d3bf87cdc3a7e3a494501d2d9cb9c5e46635f8eaea2be
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkouGpUACgkQV3J2n04Eaux1zwCgyVckt6OQOf4oY0rhJEax1DAZ
+0qUAoM2BdVJPI64t6waJGaDviKH/ywCH
+=WKno
+-----END PGP SIGNATURE-----
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
 }