[gentoo-commits] gentoo-x86 commit in dev-python/pycxx/files: pycxx-6.1.0-setup.py.patch pycxx-6.1.0-C_compatible_headers.patch pycxx-6.1.0-python-3.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/08/05 02:54:41

  Added:                pycxx-6.1.0-setup.py.patch
                        pycxx-6.1.0-C_compatible_headers.patch
                        pycxx-6.1.0-python-3.patch
  Log:
  Version bump. Set SUPPORT_PYTHON_ABIS.
  (Portage version: 13918-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/pycxx/files/pycxx-6.1.0-setup.py.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pycxx/files/pycxx-6.1.0-setup.py.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pycxx/files/pycxx-6.1.0-setup.py.patch?rev=1.1&content-type=text/plain

Index: pycxx-6.1.0-setup.py.patch
===================================================================
--- setup.py
+++ setup.py
@@ -3,22 +3,24 @@
 from distutils.command.install import install
 from distutils.core import setup
 
-headers = (glob( os.path.join( "CXX","*.hxx" ) )
-          +glob( os.path.join( "CXX","*.h" ) ))
-sources = (glob( os.path.join( "Src", "*.cxx" ) )
-          +glob( os.path.join( "Src", "*.c" ) ))
+headers = (glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.hxx" ) )
+          +glob( os.path.join( "CXX", "Python%s" % sys.version_info[0], "*.h" ) )
+          +[os.path.join( "CXX", "Version.hxx" )]
+          +[os.path.join( "CXX", "WrapPython.h" )])
+sources = (glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.cxx" ) )
+          +glob( os.path.join( "Src", "Python%s" % sys.version_info[0], "*.c" ) ))
 
 
 class my_install (install):
 
     def finalize_options (self):
-	if not self.install_data or (len(self.install_data) < 8) :
-	    self.install_data = "$base/share/python$py_version_short"
+        if not self.install_data or (len(self.install_data) < 8):
+            self.install_data = "$base/share/python$py_version_short"
         install.finalize_options (self)
 
     def run (self):
-	self.distribution.data_files = [("CXX", sources)]
-	self.distribution.headers = headers
+        self.distribution.data_files = [("CXX", sources)]
+        self.distribution.headers = headers
         install.run (self)
 
 



1.1                  dev-python/pycxx/files/pycxx-6.1.0-C_compatible_headers.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pycxx/files/pycxx-6.1.0-C_compatible_headers.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pycxx/files/pycxx-6.1.0-C_compatible_headers.patch?rev=1.1&content-type=text/plain

Index: pycxx-6.1.0-C_compatible_headers.patch
===================================================================
--- CXX/WrapPython.h
+++ CXX/WrapPython.h
@@ -1,3 +1,4 @@
+/*
 //-----------------------------------------------------------------------------
 //
 // Copyright (c) 1998 - 2007, The Regents of the University of California
@@ -34,27 +35,28 @@
 // DAMAGE.
 //
 //-----------------------------------------------------------------------------
+*/
 
 #ifndef __PyCXX_wrap_python_hxx__
 #define __PyCXX_wrap_python_hxx__
 
-// On some platforms we have to include time.h to get select defined
+/* On some platforms we have to include time.h to get select defined */
 #if !defined(__WIN32__) && !defined(WIN32) && !defined(_WIN32) && !defined(_WIN64)
 #include <sys/time.h>
 #endif
 
-// Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h
+/* Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h */
 #if defined(__sun) || defined(sun)
 #if defined(_XPG4)
 #undef _XPG4
 #endif
 #endif
 
-// Python.h will redefine these and generate warning in the process
+/* Python.h will redefine these and generate warning in the process */
 #undef _XOPEN_SOURCE
 #undef _POSIX_C_SOURCE
 
-// pull in python definitions
+/* pull in python definitions */
 #include <Python.h>
 
 #endif



1.1                  dev-python/pycxx/files/pycxx-6.1.0-python-3.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pycxx/files/pycxx-6.1.0-python-3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pycxx/files/pycxx-6.1.0-python-3.patch?rev=1.1&content-type=text/plain

Index: pycxx-6.1.0-python-3.patch
===================================================================
--- Lib/__init__.py
+++ Lib/__init__.py
@@ -34,8 +34,8 @@
 # DAMAGE.
 #
 #-----------------------------------------------------------------------------
-print """CXX is installed. 
+print("""CXX is installed. 
 The support files you need are in the PYTHON/etc/CXX directory. 
 The include files are in the distutils include path already.
 Just refer to them as "CXX/CXX_Objects.h", etc.
-"""
+""")