[gentoo-commits] gentoo-x86 commit in dev-python/pycxx/files: pycxx-6.2.3-python-3.patch pycxx-6.2.3-installation.patch

[gentoo-commits] gentoo-x86 commit in dev-python/pycxx/files: pycxx-6.2.3-python-3.patch pycxx-6.2.3-installation.patch

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    11/03/09 13:11:43

  Added:                pycxx-6.2.3-python-3.patch
                        pycxx-6.2.3-installation.patch
  Log:
  Reorganize patches.
  
  (Portage version: 2.2.0_alpha26_p10/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/pycxx/files/pycxx-6.2.3-python-3.patch

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

Index: pycxx-6.2.3-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.
-"""
+""")
--- setup.py
+++ setup.py
@@ -12,13 +12,13 @@
 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.2.3-installation.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycxx/files/pycxx-6.2.3-installation.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycxx/files/pycxx-6.2.3-installation.patch?rev=1.1&content-type=text/plain

Index: pycxx-6.2.3-installation.patch
===================================================================
--- setup.py
+++ setup.py
@@ -3,10 +3,12 @@
 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):