* Update python 1.5.1 -> 1.5.2

* Remove python-beta

3 files changed, 14 insertions, 23 deletions

diff --git a/lang/python15/files/Setup b/lang/python15/files/Setup
index 4d5c2fad8efd..e804c4266748 100644
--- a/lang/python15/files/Setup
+++ b/lang/python15/files/Setup
@@ -313,7 +313,7 @@ curses cursesmodule.c -lncurses -ltermcap
 
 # Tommy Burnette's 'new' module (creates new empty objects of certain kinds):
 
-new newmodule.c
+#new newmodule.c
 
 
 # Generic (SunOS / SVR4) dynamic loading module.
@@ -356,13 +356,13 @@ bsddb bsddbmodule.o
 
 
 # David Wayne Williams' soundex module
-soundex soundex.c
+#soundex soundex.c
 
 # Helper module for various ascii-encoders
 binascii binascii.c
 
 # Fred Drake's interface to the Python parser.
-parser parsermodule.c
+#parser parsermodule.c
 
 # Digital Creations' cStringIO and cPickle
 cStringIO cStringIO.c
diff --git a/lang/python15/files/patch-ab b/lang/python15/files/patch-ab
deleted file mode 100644
index 9ed08036511d..000000000000
--- a/lang/python15/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-*** Python/importdl.c.orig	Tue Sep 29 12:17:52 1998
---- Python/importdl.c	Tue Sep 29 12:18:40 1998
-***************
-*** 211,217 ****
-  extern char *Py_GetProgramName();
-  
-  #ifndef FUNCNAME_PATTERN
-! #if defined(__hp9000s300) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__BORLANDC__)
-  #define FUNCNAME_PATTERN "_init%.200s"
-  #else
-  #define FUNCNAME_PATTERN "init%.200s"
---- 211,217 ----
-  extern char *Py_GetProgramName();
-  
-  #ifndef FUNCNAME_PATTERN
-! #if defined(__hp9000s300) || defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(__ELF__)) || defined(__OpenBSD__) || defined(__BORLANDC__)
-  #define FUNCNAME_PATTERN "_init%.200s"
-  #else
-  #define FUNCNAME_PATTERN "init%.200s"
-
diff --git a/lang/python15/files/patch-ad b/lang/python15/files/patch-ad
new file mode 100644
index 000000000000..ad8e5bff1f9f
--- /dev/null
+++ b/lang/python15/files/patch-ad
@@ -0,0 +1,11 @@
+--- Lib/tempfile.py-	Fri Apr 16 15:22:41 1999
++++ Lib/tempfile.py	Fri Apr 16 15:23:16 1999
+@@ -24,7 +24,7 @@
+         pwd = os.getcwd()
+     except (AttributeError, os.error):
+         pwd = os.curdir
+-    attempdirs = ['/usr/tmp', '/tmp', pwd]
++    attempdirs = ['/var/tmp', '/usr/tmp', '/tmp', pwd]
+     if os.name == 'nt':
+         attempdirs.insert(0, 'C:\\TEMP')
+         attempdirs.insert(0, '\\TEMP')