Add gentoo/obsd

patch, bug 117261.
(Portage version: 2.1_pre7-r5)

6 files changed, 103 insertions, 20 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 7b43bd39086c..b51819f047ed 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.192 2006/04/13 10:55:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.193 2006/04/14 12:54:54 kloeri Exp $
+
+  14 Apr 2006; Bryan Østergaard <kloeri@gentoo.org
+  +files/python-2.4.2-gentoo_obsd.patch,
+  +files/python-2.4.3-gentoo_obsd.patch, python-2.4.2-r1.ebuild,
+  python-2.4.3.ebuild:
+  Add gentoo/obsd patch, bug 117261.
 
 *python-2.4.3 (13 Apr 2006)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index d92e109ee97d..94a75fd32f14 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5541f54031efac9304a85bbdafad106a ChangeLog 32330
 RMD160 95eb54a7e977236ca138f0f74e89a98bb5e3855b ChangeLog 32330
 SHA256 161ad6759c4cf032323ffb13790cbe21921614eb977733f191453b51f3d9c4b6 ChangeLog 32330
@@ -28,9 +25,15 @@ SHA256 3de51f78c316afe5c15cc2ab80088eeb2bdab1674ac979814eea0b00f1abb480 files/di
 MD5 074466092860a2451d114cf7fad357f2 files/digest-python-2.4.3 503
 RMD160 71a7eceb40337728f36e0d2970e1fb3956b7496a files/digest-python-2.4.3 503
 SHA256 cb1f85d43ffcb62f214711b3ab7231ad711ac382ab729dc9013e4e482eaaf238 files/digest-python-2.4.3 503
+MD5 28820c76c538a4a9d3fb4ef860ac3370 files/python-2.4.2-gentoo_obsd.patch 1554
+RMD160 c93e34df155440e68e7db283d709c3ef301933d2 files/python-2.4.2-gentoo_obsd.patch 1554
+SHA256 89a870d045246c66a67e7931afd38260c8b1e3d0c8f2db9b73e36cf014e98dee files/python-2.4.2-gentoo_obsd.patch 1554
 MD5 99edd492f449d6b61456ea8d5fd71ee9 files/python-2.4.3-db4.patch 1602
 RMD160 59a533ba6dc0ee4702c22ecd1b28c1b95a54e4c7 files/python-2.4.3-db4.patch 1602
 SHA256 6366623ed12d682210931211d8dc0edb78c4ea9256fd2357661762864f5a7611 files/python-2.4.3-db4.patch 1602
+MD5 bc6e04d48b56dad72d894d0c143371df files/python-2.4.3-gentoo_obsd.patch 1023
+RMD160 8d467ff543a86ad6fd554071e502f6f73dc806d9 files/python-2.4.3-gentoo_obsd.patch 1023
+SHA256 fe23caefc82bf813481839fb87df7c0bdb28f67897daddaeebfa8fd1b94c980f files/python-2.4.3-gentoo_obsd.patch 1023
 MD5 b530d6f9dbcf30239061be3de80932cc files/python-config-2.2 178
 RMD160 3e69689ed295971149007f5db27b1fbd345d6d60 files/python-config-2.2 178
 SHA256 77a801661f573c04b0afe36bb94a7deb0885c90b69872a9825f2a2e2ba0e1141 files/python-config-2.2 178
@@ -58,19 +61,12 @@ SHA256 c7a10e8195449160f2c19a74d66e4a367107e2f197571b8b052f01d33f162174 python-2
 MD5 111d0fe04be52386fcc80b7bab28e003 python-2.3.5-r2.ebuild 8330
 RMD160 300ba245465531193a8f5cd23f2025a5ddcc4d37 python-2.3.5-r2.ebuild 8330
 SHA256 ad899576c9160ee0fdf519c41fc3c25dbc32ccbb7efa3d9b46434cd760f8eb26 python-2.3.5-r2.ebuild 8330
-MD5 5c3df991cf4558960fc141ed5ff9b51b python-2.4.2-r1.ebuild 9902
-RMD160 19840b50380f69cff81c98065bbf2eeaa55f0f41 python-2.4.2-r1.ebuild 9902
-SHA256 11b98d4b168924a3d8d912b9b48ea89c8118a6eab7ff81e46e72e41393e66b2c python-2.4.2-r1.ebuild 9902
+MD5 704334a2f066435920770622d77da15f python-2.4.2-r1.ebuild 10004
+RMD160 bd08cd35eb1d4ef6ee03d3151492500d7299954a python-2.4.2-r1.ebuild 10004
+SHA256 904105eefb11f1eccc0e17d0169c4d38335763ca3386411eff61e9d12205bf0a python-2.4.2-r1.ebuild 10004
 MD5 c39f1b9e762a9b08dc70f53719e09583 python-2.4.2.ebuild 9547
 RMD160 1196d63070f8667afc63008ec79b8544a3906d20 python-2.4.2.ebuild 9547
 SHA256 7395e5e8f8b702ded8911958866b8096ccd204f1195bb2d18e18c38d62c38d9d python-2.4.2.ebuild 9547
-MD5 2f0ec8149a2fb84ac4173152d58602da python-2.4.3.ebuild 9744
-RMD160 8c83855e9441baca8242db97e9ad981899cc5c1d python-2.4.3.ebuild 9744
-SHA256 07baa5889537517a514e96b04d92df85a5ff05881b4afb9906ee8f2bc7c44aed python-2.4.3.ebuild 9744
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEPi5OugEuf3OQ0akRAg+XAKCiJe8IUgvDxa4zEXD4tpyo9BwMsACfaiBs
-pfvQepOBqg8txIgiuuNPUds=
-=5UvU
------END PGP SIGNATURE-----
+MD5 59dcb8626dbbdf6ccf80a07c3bc07634 python-2.4.3.ebuild 9839
+RMD160 6fb605ec08fd3b78cbc559362c52d24c77257090 python-2.4.3.ebuild 9839
+SHA256 c85b9241f9e84d2116fec9288f5414f47afc8eafd15f3929521d882004db4888 python-2.4.3.ebuild 9839
diff --git a/dev-lang/python/files/python-2.4.2-gentoo_obsd.patch b/dev-lang/python/files/python-2.4.2-gentoo_obsd.patch
new file mode 100644
index 000000000000..69c59747a423
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.2-gentoo_obsd.patch
@@ -0,0 +1,42 @@
+diff -ruN Python-2.4.2.orig/Include/Python.h Python-2.4.2/Include/Python.h
+--- Python-2.4.2.orig/Include/Python.h	2004-07-27 17:57:23 +0200
++++ Python-2.4.2/Include/Python.h	2006-01-01 17:50:35 +0100
+@@ -2,6 +2,9 @@
+ #define Py_PYTHON_H
+ /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
+ 
++/* Required on Gentoo/OpenBSD */
++#include <sys/types.h>
++
+ /* Include nearly all Python header files */
+ 
+ #include "patchlevel.h"
+diff -ruN Python-2.4.2.orig/configure.in Python-2.4.2/configure.in
+--- Python-2.4.2.orig/configure.in	2005-08-07 23:08:53 +0200
++++ Python-2.4.2/configure.in	2006-01-01 17:53:27 +0100
+@@ -140,7 +140,7 @@
+   # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined,
+   # even though select is a POSIX function. Reported by J. Ribbens.
+   # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
+-  OpenBSD/2.* | OpenBSD/3.@<:@0123456@:>@) 
++  OpenBSD/2.* | OpenBSD/3.@<:@012345678@:>@) 
+     define_xopen_source=no;;
+   # On Solaris 2.6, sys/wait.h is inconsistent in the usage
+   # of union __?sigval. Reported by Stuart Bishop.
+@@ -1517,9 +1517,16 @@
+ 
+ # only check for sem_ini if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
++  case "$ac_sys_system" in
++  OpenBSD*)
++    LIBS="-pthread ${LIBS}"
++    ;;
++  *)
+     AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
+ 						# posix4 on Solaris 2.6
+ 						# pthread (first!) on Linux
++    ;;
++  esac
+ fi
+ 
+ # check if we need libintl for locale functions
diff --git a/dev-lang/python/files/python-2.4.3-gentoo_obsd.patch b/dev-lang/python/files/python-2.4.3-gentoo_obsd.patch
new file mode 100644
index 000000000000..5fe4c01d755c
--- /dev/null
+++ b/dev-lang/python/files/python-2.4.3-gentoo_obsd.patch
@@ -0,0 +1,33 @@
+diff -ruN Python-2.4.3.orig/Include/Python.h Python-2.4.3/Include/Python.h
+--- Include/Python.h	2004-07-27 17:57:23 +0200
++++ Include/Python.h	2006-01-01 17:50:35 +0100
+@@ -2,6 +2,9 @@
+ #define Py_PYTHON_H
+ /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
+ 
++/* Required on Gentoo/OpenBSD */
++#include <sys/types.h>
++
+ /* Include nearly all Python header files */
+ 
+ #include "patchlevel.h"
+diff -ruN Python-2.4.3.orig/configure.in Python-2.4.3/configure.in
+--- configure.in	2005-08-07 23:08:53 +0200
++++ configure.in	2006-01-01 17:53:27 +0100
+@@ -1517,9 +1517,16 @@
+ 
+ # only check for sem_ini if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
++  case "$ac_sys_system" in
++  OpenBSD*)
++    LIBS="-pthread ${LIBS}"
++    ;;
++  *)
+     AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
+ 						# posix4 on Solaris 2.6
+ 						# pthread (first!) on Linux
++    ;;
++  esac
+ fi
+ 
+ # check if we need libintl for locale functions
diff --git a/dev-lang/python/python-2.4.2-r1.ebuild b/dev-lang/python/python-2.4.2-r1.ebuild
index 7cdbeb37d022..7254c117e41f 100644
--- a/dev-lang/python/python-2.4.2-r1.ebuild
+++ b/dev-lang/python/python-2.4.2-r1.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/dev-lang/python/python-2.4.2-r1.ebuild,v 1.4 2006/03/30 17:41:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.2-r1.ebuild,v 1.5 2006/04/14 12:54:54 kloeri Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -102,6 +102,9 @@ src_unpack() {
 		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-bindir-libdir.patch
 		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
 	fi
+
+	# fix gentoo/obsd problems (bug 117261)
+	epatch "${FILESDIR}/python-2.4.2-gentoo_obsd.patch"
 }
 
 src_configure() {
@@ -279,7 +282,7 @@ src_test() {
 
 	#skip all tests that fail during emerge but pass without emerge:
 	#(See bug# 67970)
-	local skip_tests="distutils global mimetools minidom mmap strptime subprocess tcl time urllib urllib2"
+	local skip_tests="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2"
 
 	for test in ${skip_tests} ; do
 		mv ${S}/Lib/test/test_${test}.py ${T}
diff --git a/dev-lang/python/python-2.4.3.ebuild b/dev-lang/python/python-2.4.3.ebuild
index 918b3fb78632..e9a78c3164ea 100644
--- a/dev-lang/python/python-2.4.3.ebuild
+++ b/dev-lang/python/python-2.4.3.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/dev-lang/python/python-2.4.3.ebuild,v 1.1 2006/04/13 10:55:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3.ebuild,v 1.2 2006/04/14 12:54:54 kloeri Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -96,6 +96,9 @@ src_unpack() {
 		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-bindir-libdir.patch
 		epatch "${WORKDIR}/${PATCHTAR}"/python-2.4.1-crosscompile.patch
 	fi
+
+	# fix gentoo/obsd problems (bug 117261)
+	epatch "${FILESDIR}/python-2.4.3-gentoo_obsd.patch"
 }
 
 src_configure() {