lldb: don't conflict with py27-six

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Wed Feb 24 02:27:13 2016 +0100
Changeset:	caa569c8067a7031c38ad2d1eb379488042f83c4

Modified Files:
	lldb-git/PLIST
	lldb-git/distinfo
	lldb/distinfo
Added Files:
	lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
	lldb/patches/patch-scripts_Python_finishSwigPythonLLDB.py

Log Message:
lldb: don't conflict with py27-six

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=caa569c8067a7031c38ad2d1eb379488042f83c4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-git/PLIST                                          |  1 -
 lldb-git/distinfo                                       |  1 +
 .../patch-scripts_Python_finishSwigPythonLLDB.py        | 17 +++++++++++++++++
 lldb/distinfo                                           |  1 +
 .../patch-scripts_Python_finishSwigPythonLLDB.py        | 17 +++++++++++++++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diffs:
diff --git a/lldb-git/PLIST b/lldb-git/PLIST
index c5af54f..722533f 100644
--- a/lldb-git/PLIST
+++ b/lldb-git/PLIST
@@ -281,7 +281,6 @@ include/lldb/Host/linux/HostInfoLinux.h
 include/lldb/Host/linux/HostThreadLinux.h
 include/lldb/Host/linux/Personality.h
 include/lldb/Host/linux/Ptrace.h
-include/lldb/Host/linux/Signalfd.h
 include/lldb/Host/linux/Uio.h
 include/lldb/Host/macosx/Config.h
 include/lldb/Host/macosx/HostInfoMacOSX.h
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 8d28ee2..2b50501 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -20,6 +20,7 @@ SHA1 (patch-include_lldb_Utility_regex2.h) = 822a47b1221368ec5442bfbdbc20fe4e370
 SHA1 (patch-include_lldb_Utility_regex__impl.h) = 4d99669a756bd662ae28abc8cefe6e1538ef84b6
 SHA1 (patch-include_lldb_Utility_regutils.h) = ea36409f8cd05dcf9b81144cbc136abc5fc3a190
 SHA1 (patch-scripts_CMakeLists.txt) = 07043853b1a923aa8fcb9124b79453eca21c01fb
+SHA1 (patch-scripts_Python_finishSwigPythonLLDB.py) = e2ad536cf12cea251b2a2117091b970e3081fad6
 SHA1 (patch-source_Utility_CMakeLists.txt) = 5b10fe94d76135d8d5ba31862066841394dd45c1
 SHA1 (patch-source_Utility_regcomp.c) = bd315000773bab38b6fe6d119420afbcb5b83a59
 SHA1 (patch-source_Utility_regerror.c) = 6bbf8dc3f12e64515d166a475452f3f08d849ad3
diff --git a/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py b/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
new file mode 100644
index 0000000..2c7a5a2
--- /dev/null
+++ b/lldb-git/patches/patch-scripts_Python_finishSwigPythonLLDB.py
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Don't conflict with lang/py-six.
+
+--- scripts/Python/finishSwigPythonLLDB.py.orig	2016-02-21 02:08:07.000000000 +0000
++++ scripts/Python/finishSwigPythonLLDB.py
+@@ -719,8 +719,8 @@ def main(vDictArgs):
+     if bOk:
+         bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir)
+ 
+-    if bOk:
+-        bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
++    # if bOk:
++    #     bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
+ 
+     if bOk:
+         bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs,
diff --git a/lldb/distinfo b/lldb/distinfo
index 94c4193..0d78e4f 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -12,6 +12,7 @@ SHA1 (patch-include_lldb_Utility_regex2.h) = 822a47b1221368ec5442bfbdbc20fe4e370
 SHA1 (patch-include_lldb_Utility_regex__impl.h) = 4d99669a756bd662ae28abc8cefe6e1538ef84b6
 SHA1 (patch-include_lldb_Utility_regutils.h) = ea36409f8cd05dcf9b81144cbc136abc5fc3a190
 SHA1 (patch-scripts_CMakeLists.txt) = 07043853b1a923aa8fcb9124b79453eca21c01fb
+SHA1 (patch-scripts_Python_finishSwigPythonLLDB.py) = e2ad536cf12cea251b2a2117091b970e3081fad6
 SHA1 (patch-source_Utility_CMakeLists.txt) = 5b10fe94d76135d8d5ba31862066841394dd45c1
 SHA1 (patch-source_Utility_regcomp.c) = bd315000773bab38b6fe6d119420afbcb5b83a59
 SHA1 (patch-source_Utility_regerror.c) = 6bbf8dc3f12e64515d166a475452f3f08d849ad3
diff --git a/lldb/patches/patch-scripts_Python_finishSwigPythonLLDB.py b/lldb/patches/patch-scripts_Python_finishSwigPythonLLDB.py
new file mode 100644
index 0000000..2c7a5a2
--- /dev/null
+++ b/lldb/patches/patch-scripts_Python_finishSwigPythonLLDB.py
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Don't conflict with lang/py-six.
+
+--- scripts/Python/finishSwigPythonLLDB.py.orig	2016-02-21 02:08:07.000000000 +0000
++++ scripts/Python/finishSwigPythonLLDB.py
+@@ -719,8 +719,8 @@ def main(vDictArgs):
+     if bOk:
+         bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir)
+ 
+-    if bOk:
+-        bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
++    # if bOk:
++    #     bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir)
+ 
+     if bOk:
+         bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs,