Added a fix for a NLS-related shtool bug (#121025).

(Portage version: 2.1_pre4-r1)

5 files changed, 35 insertions, 5 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index c7ac9aa0d0bd..76d07c64f366 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.108 2006/02/02 15:37:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.109 2006/02/04 10:54:53 spock Exp $
+
+  04 Feb 2006; Michał Januszewski <spock@gentoo.org>
+  +files/nmap-shtool-nls.patch, nmap-3.95.ebuild, nmap-3.9999.ebuild,
+  nmap-4.00.ebuild:
+  Added a fix for a NLS-related shtool bug (#121025).
 
 *nmap-4.00 (02 Feb 2006)
 
diff --git a/net-analyzer/nmap/files/nmap-shtool-nls.patch b/net-analyzer/nmap/files/nmap-shtool-nls.patch
new file mode 100644
index 000000000000..69890218d98d
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-shtool-nls.patch
@@ -0,0 +1,22 @@
+--- shtool.orig	2006-02-03 22:49:06.000000000 -0500
++++ shtool	2006-02-03 22:49:28.000000000 -0500
+@@ -59,6 +59,19 @@
+ ##    path       Deal with program paths
+ ##
+ 
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    unset $as_var
++  fi
++done
++
+ if [ $# -eq 0 ]; then
+     echo "$0:Error: invalid command line" 1>&2
+     echo "$0:Hint:  run \`$0 -h' for usage" 1>&2
diff --git a/net-analyzer/nmap/nmap-3.95.ebuild b/net-analyzer/nmap/nmap-3.95.ebuild
index cb5300212003..36f0a512452b 100644
--- a/net-analyzer/nmap/nmap-3.95.ebuild
+++ b/net-analyzer/nmap/nmap-3.95.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.95.ebuild,v 1.1 2005/12/10 17:47:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.95.ebuild,v 1.2 2006/02/04 10:54:53 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	sed 's:Icon=icon-network:Icon=nmap-logo-64.png:' -i nmapfe.desktop
 	echo ";" >> nmapfe.desktop
+	epatch ${FILESDIR}/nmap-shtool-nls.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/nmap/nmap-3.9999.ebuild b/net-analyzer/nmap/nmap-3.9999.ebuild
index cd8c4bb4981b..fe23321628b0 100644
--- a/net-analyzer/nmap/nmap-3.9999.ebuild
+++ b/net-analyzer/nmap/nmap-3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.9999.ebuild,v 1.1 2006/01/29 22:49:44 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.9999.ebuild,v 1.2 2006/02/04 10:54:53 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	sed 's:Icon=icon-network:Icon=nmap-logo-64.png:' -i nmapfe.desktop
 	echo ";" >> nmapfe.desktop
+	epatch ${FILESDIR}/nmap-shtool-nls.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/nmap/nmap-4.00.ebuild b/net-analyzer/nmap/nmap-4.00.ebuild
index 7d9eacee8f32..c7873763bc71 100644
--- a/net-analyzer/nmap/nmap-4.00.ebuild
+++ b/net-analyzer/nmap/nmap-4.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.00.ebuild,v 1.1 2006/02/02 15:37:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.00.ebuild,v 1.2 2006/02/04 10:54:53 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	sed 's:Icon=icon-network:Icon=nmap-logo-64.png:' -i nmapfe.desktop
 	echo ";" >> nmapfe.desktop
+	epatch ${FILESDIR}/nmap-shtool-nls.patch
 }
 
 src_compile() {