-python-ogre-1056.ebuild, -files/python-ogre-1056.patch, -python-ogre-1126.ebuild, -files/python-ogre-1126.patch, +python-ogre-1150.ebuild, +files/python-ogre-1150.patch

Bump to 1150, thanks to spom

7 files changed, 287 insertions, 388 deletions

diff --git a/dev-games/python-ogre/ChangeLog b/dev-games/python-ogre/ChangeLog
index 69afd99..2532cd0 100644
--- a/dev-games/python-ogre/ChangeLog
+++ b/dev-games/python-ogre/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*python-ogre-1150 (05 Aug 2011)
+
+  05 Aug 2011; Christoph Brill <egore911@egore911.de> -python-ogre-1056.ebuild,
+  -files/python-ogre-1056.patch, -python-ogre-1126.ebuild,
+  -files/python-ogre-1126.patch, +python-ogre-1150.ebuild,
+  +files/python-ogre-1150.patch:
+  Bump to 1150, thanks to spom
+
   07 Jun 2011; <egore911@egore911.de> python-ogre-1056.ebuild,
   python-ogre-1126.ebuild:
   Work around python slotting change
diff --git a/dev-games/python-ogre/Manifest b/dev-games/python-ogre/Manifest
index 420132d..775f3a8 100644
--- a/dev-games/python-ogre/Manifest
+++ b/dev-games/python-ogre/Manifest
@@ -1,6 +1,4 @@
-AUX python-ogre-1056.patch 4875 RMD160 8f3b6c9a860d217a7790fb54164eb19d596a8dcc SHA1 7a77f80b77a7ee72120a2520c95e638f8a5af008 SHA256 8131f0be45ecc051514eca7f96b552678ab641455c3ddcafac059c3e860447b8
-AUX python-ogre-1126.patch 8979 RMD160 9b04ae6ad0e45886fe717ed610c7140f97d5dfa9 SHA1 f876df06070575e32fc508f0fc83bdb9b61947e6 SHA256 1f17d36406852626b3700ce43692e0d74edfa12cf9848a8c2d7fd6530daee649
-EBUILD python-ogre-1056.ebuild 1134 RMD160 793b3e81567a4f4e4ceeb9a964d19878262fd54e SHA1 41b8f7227b4cd89cad5b01e1c12bd7cadd1f3dd3 SHA256 8c4bbbebc97afca04d44b9edcdbb95755cdc7f126911b0296409c9c1aa94da5e
-EBUILD python-ogre-1126.ebuild 1134 RMD160 98286cc0f930b77e838d56d6c7ef61402ffdc563 SHA1 7d1e429c3e40f96719205286022677aebe1cfc2c SHA256 3a50f6373e3f121977dfb20af9ed4ae6140b38fbbc1585f7a47d1f0cbad00844
-MISC ChangeLog 984 RMD160 5e1d606cb1ad6029c26f00b7d10ea7d4f61d2643 SHA1 36af3f6d38ae0e2094ab13643f1775680c573e92 SHA256 76afa51799ec25f54d448a1777df83f366bc36f81d2cbf13354a0430c5ee7234
+AUX python-ogre-1150.patch 12205 RMD160 5c7adab72d6dc9ca1ae58ebadb5d671df6649cf5 SHA1 5535a1353563d5dc1bb6b615b5457a79801079fd SHA256 2972c2d43c0eb0e3c965a171f01911b0038eaebfde1d0e2f49ce336e2606b5ff
+EBUILD python-ogre-1150.ebuild 1150 RMD160 af4f487f148e68915ee2c405ed75990fee20af1d SHA1 26eb26fdc31611f94f3426f272f4650d7393dea6 SHA256 d81182b3508050a9c0df7e94558c4c984ab150cd47e37811a017eeacf12bf519
+MISC ChangeLog 1280 RMD160 06b9085c7e0407145671514c9d66879f9219cdda SHA1 cbcad60ea75deaa900fce1ead843b138c12309bb SHA256 f28ab772a02153a2c653a04dc79f99be234cd5a3a8e1c3fb44b851b513bb81fd
 MISC metadata.xml 225 RMD160 4c506d7c9b24eec779d50ce5ede69834a7f6178a SHA1 a318096995ed1f48d6657e4b08a13371852b12de SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655
diff --git a/dev-games/python-ogre/files/python-ogre-1056.patch b/dev-games/python-ogre/files/python-ogre-1056.patch
deleted file mode 100644
index 501dc62..0000000
--- a/dev-games/python-ogre/files/python-ogre-1056.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: environment.py
-===================================================================
---- environment.py	(revision 1056)
-+++ environment.py	(working copy)
-@@ -570,6 +570,7 @@
-     else:
-         base = 'boost_1_41_0'
-         versionBase = '1_41' ## the version used on the library name
-+        lib = "boost_python-mt"
- 
-     if isLinux():
-         bjambuildset = 'gcc'
-@@ -680,6 +681,7 @@
-                 import re
-                 gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0].split('.')
-                 lib = "boost_python-gcc%s%s-mt" % (gcc_version[0], gcc_version[1])
-+                lib = "boost_python-mt"
-         else:
-             lib = Config.LIB_Boost
- 
-@@ -1041,7 +1043,7 @@
- 
- class cegui(pymodule):
-     parent = "ogre/gui"
--    version = "0.7.1"
-+    version = "0.6.2"
- 
-     if isWindows():
-         version = "0.7.1"
-@@ -1073,7 +1075,7 @@
-         libs = [boost.lib, 'OgreMain' ]
- 
-     if isLinux() or isMac():
--        base = "CEGUI-0.7.1"
-+        base = "CEGUI-0.6.2"
-         source = [
-             [wget, "http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.7.1.tar.gz?download", downloadPath]
-         ]
-Index: PythonOgreConfig_posix.py
-===================================================================
---- PythonOgreConfig_posix.py	(revision 1056)
-+++ PythonOgreConfig_posix.py	(working copy)
-@@ -9,7 +9,7 @@
- _SVN = False    # if building from Ogre svn

- 

- # the base of the /usr/... dircetory structure that we are using

--ROOT_DIR = os.path.join(BASE_DIR,'root')

-+ROOT_DIR = os.path.join(BASE_DIR,'/')

- LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')

- LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')

- 

-@@ -57,7 +57,8 @@
- PATH_THIRDPARTY =   os.path.join(module_dir, 'ThirdParty' )

- PATH_Ogre =         os.path.join(BASE_DIR,'ogre')

- PATH_OgreAddons =   os.path.join(BASE_DIR, 'ogreaddons')

--PATH_CEGUI =        os.path.join(BASE_DIR, 'CEGUI-0.6.2' )

-+#PATH_CEGUI =        os.path.join(BASE_DIR, 'CEGUI' )

-+PATH_CEGUI =        os.path.join(LOCAL_INCLUDE, 'CEGUI' )

- PATH_OIS =          os.path.join(BASE_DIR, 'ois')

- 

- if SDK:

-@@ -216,7 +217,8 @@
- PATH_INCLUDE_OgreOdeLoader= os.path.join( PATH_OgreOde,'loader/include')

- PATH_INCLUDE_FMOD =  ""

- #PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/include')

--PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_INCLUDE_CEGUI, 'RendererModules', 'Ogre')

-+#PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_INCLUDE_CEGUI, 'RendererModules', 'Ogre')

-+PATH_INCLUDE_Ogre_CEGUIRenderer = "."

- PATH_INCLUDE_quickgui =     PATH_quickgui

- PATH_INCLUDE_NxOgre=        PATH_NxOgre

- PATH_INCLUDE_NxOgre_09=        PATH_NxOgre_09

-Index: code_generators/cegui/generate_code.py
-===================================================================
---- code_generators/cegui/generate_code.py	(revision 1056)
-+++ code_generators/cegui/generate_code.py	(working copy)
-@@ -190,7 +190,10 @@
-         #     '::CEGUI::FileIOException',
-             ]
-         for c in e:
--            global_ns.member_functions(c).exclude()
-+            try:
-+                global_ns.member_functions(c).exclude()
-+	    except:
-+	    	pass
-             

-             

-     

-Index: SConstruct
-===================================================================
---- SConstruct	(revision 1056)
-+++ SConstruct	(working copy)
-@@ -55,7 +55,7 @@
-         CCFLAGS += ' /W3 /wd4675' # warning level  -Zc:wchar_t
-         CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c  /Ob2 /Oi /O2 /Ot /Oy /GS- /GR /Ox '
-     elif environment.isLinux():
--        CCFLAGS = ' `pkg-config --cflags OGRE` '        ## needs to change I think :)
-+        CCFLAGS = ' `pkg-config --cflags OGRE gtk+-2.0` '        ## needs to change I think :)
-         CCFLAGS += ' -I'
-         CCFLAGS += ' -O3 -I./ '
-         CCFLAGS += ' -DBOOST_PYTHON_MAX_ARITY=19 -DBOOST_PYTHON_NO_PY_SIGNATURES '
-Index: demos/plugins.cfg.posix
-===================================================================
---- demos/plugins.cfg.posix	(revision 1056)
-+++ demos/plugins.cfg.posix	(working copy)
-@@ -5,7 +5,7 @@
- 

- ##

- ## NOTE use this for MacOS or Linux

--PluginFolder=/home/andy/development/root/usr/lib/OGRE

-+PluginFolder=/usr/lib/OGRE

- Plugin=RenderSystem_GL

- Plugin=Plugin_ParticleFX

- Plugin=Plugin_BSPSceneManager

-Index: packages_2.6/ogre/gui/CEGUI/__init__.py
-===================================================================
---- packages_2.6/ogre/gui/CEGUI/__init__.py	(revision 1056)
-+++ packages_2.6/ogre/gui/CEGUI/__init__.py	(working copy)
-@@ -9,7 +9,7 @@
- elif sys.platform == "linux2":

-     ## We need to import the library 

-     import ctypes

--    ctypes.CDLL("libCEGUIBase-0.7.1.so", ctypes.RTLD_GLOBAL)

-+    ctypes.CDLL("libCEGUIBase.so", ctypes.RTLD_GLOBAL)

- 

- from _cegui_ import *

- ## Make sure we are using a sane XML parser

diff --git a/dev-games/python-ogre/files/python-ogre-1126.patch b/dev-games/python-ogre/files/python-ogre-1126.patch
deleted file mode 100644
index 7831c56..0000000
--- a/dev-games/python-ogre/files/python-ogre-1126.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: environment.py
-===================================================================
---- environment.py	(Revision 1126)
-+++ environment.py	(Arbeitskopie)
-@@ -550,6 +550,7 @@
-     else:
-         base = 'boost_1_41_0'
-         versionBase = '1_41' ## the version used on the library name
-+        lib = "boost_python-mt"
- 
-     if isLinux():
-         bjambuildset = 'gcc'
-@@ -661,6 +662,7 @@
-                 import re
-                 gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0].split('.')
-                 lib = "boost_python-gcc%s%s-mt" % (gcc_version[0], gcc_version[1])
-+                lib = "boost_python-mt"
-         else:
-             lib = Config.LIB_Boost
-     #lib = "libboost_python"
-@@ -745,7 +747,7 @@
-         LINKFLAGS = ''
- 
-     elif isLinux():
--        version = "1.7.0"
-+        version = "1.7.1"
-         base = "ogre-v1-7-0p1"
-         baseDir = 'ogre'
-         ##https://sourceforge.net/projects/ogre/files/ogre/1.7/ogre-v1-7-0RC1.tar.bz2/download
-@@ -1603,8 +1605,7 @@
-     lib_dirs = [
-         boost.PATH_LIB,
-         Config.PATH_LIB_Bullet,
--    ]
--    include_dirs = [
-+    
-         boost.PATH,
-         Config.PATH_INCLUDE_Bullet
-     ]
-@@ -2021,11 +2022,22 @@
-     descText = "Octree Zone Management - Expose all functions in OctreeZone incase required"
- 
- class ogreoggsound(pymodule):
--    version = "r274"
-+    version = "r348"
-     active = True
-     name = 'ogreoggsound'
-     parent = "ogre/sound"
-     package_name=[ogre.package_name, 'ogreoggsound']
-+
-+    source = [
-+	[ svn, ' co https://ogreoggsound.svn.sourceforge.net/svnroot/ogreoggsound/trunk ogreoggsound', os.getcwd() ]
-+    ]
-+   
-+#    build = [
-+#	    [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
-+#	    [0, "make", baseDir]
-+#    ]
-+
-+
-     include_dirs = [
-         boost.PATH,
-         Config.PATH_INCLUDE_Ogre,
-Index: PythonOgreConfig_posix.py
-===================================================================
---- PythonOgreConfig_posix.py	(Revision 1126)
-+++ PythonOgreConfig_posix.py	(Arbeitskopie)
-@@ -9,7 +9,7 @@
- _SVN = False    # if building from Ogre svn

- 

- # the base of the /usr/... directory structure that we are using

--ROOT_DIR = os.path.join(BASE_DIR,'root')

-+ROOT_DIR = os.path.join(BASE_DIR,'/')

- LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')

- LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')

- 

-@@ -22,7 +22,7 @@
- PATH_LIB_Thread_STATIC = LOCAL_LIB

- PATH_LIB_date_time_STATIC = LOCAL_LIB

- ## and the name of the boost python library

--LIB_Boost = "libboost_python" 

-+LIB_Boost = "libboost_python-mt" 

- 

- # in Linux we need to code in the Relative path for the library

- RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''

-@@ -59,7 +59,8 @@
- PATH_THIRDPARTY =   os.path.join(module_dir, 'ThirdParty' )

- PATH_Ogre =         os.path.join(BASE_DIR,'ogre')

- PATH_OgreAddons =   os.path.join(BASE_DIR, 'ogreaddons')

--PATH_CEGUI =        os.path.join(BASE_DIR, 'CEGUI-0.7.1' )

-+#PATH_CEGUI =        os.path.join(BASE_DIR, 'cegui-0.7.1' )

-+PATH_CEGUI =        os.path.join(LOCAL_LIB, 'cegui-0.7.1' )

- PATH_OIS =          os.path.join(BASE_DIR, 'ois')

- 

- if SDK:

-@@ -92,6 +93,7 @@
- PATH_watermesh=     os.path.join(PATH_THIRDPARTY, 'watermesh')

- PATH_ofusion=       os.path.join(PATH_THIRDPARTY, 'ofusion')

- PATH_ogrevideoffmpeg = os.path.join(PATH_THIRDPARTY,'ffmpeg')

-+PATH_ogrevideo =  os.path.join(BASE_DIR,'ogrevideo','trunk')

- PATH_NxOgre=        os.path.join(PATH_THIRDPARTY, 'nxogre')

- PATH_NxOgre_09=        os.path.join(PATH_THIRDPARTY, 'nxogre_0.9')

- # PATH_NxOgre=        os.path.join(BASE_DIR, 'nxogre/NxOgre')

-@@ -106,7 +108,7 @@
- PATH_ogrepcz = os.path.join(PATH_Ogre, 'PlugIns', 'PCZSceneManager' )

- PATH_hydrax = os.path.join(PATH_THIRDPARTY, 'Hydrax')

- PATH_hikari = os.path.join(PATH_THIRDPARTY, 'Hikari' ) # BASE_DIR, 'hikari', 'hikari')

--PATH_mygui = os.path.join(BASE_DIR, 'MyGUI_2.2.0_RC1_source' )

-+PATH_mygui = os.path.join(BASE_DIR, 'MyGUI2.2.3_source' )

- PATH_canvas = os.path.join(PATH_THIRDPARTY, 'canvas')

- PATH_plsm2 =        os.path.join(PATH_THIRDPARTY, 'plsm2' )

- 

-@@ -176,7 +178,11 @@
- PATH_INCLUDE_Ogre_Dependencies =    PATH_INCLUDE_Ogre #      os.path.join( PATH_Ogre, 'Dependencies/include')

- 

- PATH_INCLUDE_OIS =          os.path.join(LOCAL_INCLUDE,'OIS') #os.path.join(PATH_OIS,'includes')    ## Note the plural include's

--PATH_INCLUDE_CEGUI =        os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')

-+#PATH_INCLUDE_CEGUI =        os.path.join(LOCAL_INCLUDE,'cegui-0.7.1') #os.path.join(PATH_CEGUI, r'include/CEGUI')

-+PATH_INCLUDE_CEGUI =        os.path.join('/usr/include/cegui-0.7.1/CEGUI')

-+#print PATH_INCLUDE_CEGUI

-+#import sys

-+#sys.exit()

- 

- PATH_INCLUDE_ogrepaging =   os.path.join(PATH_Ogre,'Components','Paging', 'include')

- PATH_INCLUDE_ogrertshadersystem =   os.path.join(PATH_Ogre,'Components','RTShaderSystem', 'include')

-@@ -188,7 +194,7 @@
- 

- if SDK :

-     PATH_INCLUDE_OIS =          os.path.join(PATH_OIS,'include','OIS') #os.path.join(PATH_OIS,'includes')    ## Note the plural include's

--    PATH_INCLUDE_CEGUI =        os.path.join(PATH_CEGUI,'include','CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')

-+    PATH_INCLUDE_CEGUI =        os.path.join(PATH_CEGUI,'include','cegui-0.7.1') #os.path.join(PATH_CEGUI, r'include/CEGUI')

-     PATH_INCLUDE_Ogre=          os.path.join(PATH_Ogre,'OgreMain/include')

-     PATH_INCLUDE_Ogre_Dependencies =    os.path.join( PATH_Ogre, 'Dependencies/include')

- 

-@@ -222,6 +228,7 @@
- PATH_INCLUDE_FMOD =  ""

- #PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/include')

- PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_INCLUDE_CEGUI, 'RendererModules', 'Ogre')

-+#PATH_INCLUDE_Ogre_CEGUIRenderer = "."

- PATH_INCLUDE_quickgui =     PATH_quickgui

- PATH_INCLUDE_NxOgre=        PATH_NxOgre

- PATH_INCLUDE_NxOgre_09=        PATH_NxOgre_09

-Index: code_generators/cegui/generate_code.py
-===================================================================
---- code_generators/cegui/generate_code.py	(Revision 1126)
-+++ code_generators/cegui/generate_code.py	(Arbeitskopie)
-@@ -193,8 +193,10 @@
-         #     '::CEGUI::FileIOException',

-             ]

-         for c in e:

--            global_ns.member_functions(c).exclude()

--            

-+            try:
-+                global_ns.member_functions(c).exclude()
-+	    except:
-+	    	pass
-     cls = CEGUI_ns.class_('::CEGUI::RefCounted< CEGUI::BoundSlot >')

-     cls.operator('==').exclude() # not in debug build

- 

-@@ -306,6 +308,8 @@
-     if environment._USE_THREADS:

-         defined_symbols.append('BOOST_HAS_THREADS')

-         defined_symbols.append('BOOST_HAS_WINTHREADS')

-+
-+#    print environment.cegui.include_dirs
- 

-     mb = module_builder.module_builder_t( [ xml_cached_fc ]

-                                           , gccxml_path=environment.gccxml_bin

-Index: SConstruct
-===================================================================
---- SConstruct	(Revision 1126)
-+++ SConstruct	(Arbeitskopie)
-@@ -60,10 +60,11 @@
-         else:
-             CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c  /Ob2 /Oi /O2 /Ot /Oy /GS- /GR /Ox '
-     elif environment.isLinux():
--        CCFLAGS = ' `pkg-config --cflags OGRE` '        ## needs to change I think :)
-+        CCFLAGS = ' `pkg-config --cflags OGRE gtk+-2.0` '        ## needs to change I think :)
-         CCFLAGS += ' -I'
-         CCFLAGS += ' -O3 -I./ '
--        CCFLAGS += ' -DBOOST_PYTHON_MAX_ARITY=19 -DBOOST_PYTHON_NO_PY_SIGNATURES '
-+        CCFLAGS += ' -DBOOST_PYTHON_NO_PY_SIGNATURES '
-+        CCFLAGS += ' -DBOOST_PYTHON_MAX_ARITY=19 '
-         if cls.ModuleName == 'OGRE':
-             ##### -fvisibility=hidden -finline-limit=20 '
-             #CCFLAGS += ' -fvisibility=hidden -fvisibility-inlines-hidden -DOGRE_GCC_VISIBILITY '
-@@ -117,7 +118,7 @@
-             LINKFLAGS = " /MAP /MAPINFO:EXPORTS /NOLOGO /OPT:REF /INCREMENTAL:NO /DLL /OPT:ICF /subsystem:console "
-     if environment.isLinux():
-         if os.sys.platform <> 'darwin':
--            LINKFLAGS = ' `pkg-config --libs OGRE` -lstdc++ '
-+            LINKFLAGS = ' `pkg-config --libs OGRE CEGUI-0.7.1` -lstdc++ '
-     if environment.isMac():
-             LINKFLAGS = ' -arch ' + environment.MAC_ARCH + ' -dynamiclib -dynamic \
-                         -framework Ogre -framework Carbon -framework Python '
-Index: packages_2.6/ogre/gui/CEGUI/__init__.py
-===================================================================
---- packages_2.6/ogre/gui/CEGUI/__init__.py	(Revision 1126)
-+++ packages_2.6/ogre/gui/CEGUI/__init__.py	(Arbeitskopie)
-@@ -9,7 +9,7 @@
- elif sys.platform == "linux2":

-     ## We need to import the library 

-     import ctypes

--    ctypes.CDLL("libCEGUIBase-0.7.1.so", ctypes.RTLD_GLOBAL)

-+    ctypes.CDLL("libCEGUIBase.so", ctypes.RTLD_GLOBAL)

- 

- from _cegui_ import *

- ## Make sure we are using a sane XML parser

diff --git a/dev-games/python-ogre/files/python-ogre-1150.patch b/dev-games/python-ogre/files/python-ogre-1150.patch
new file mode 100644
index 0000000..9da9ff9
--- /dev/null
+++ b/dev-games/python-ogre/files/python-ogre-1150.patch
@@ -0,0 +1,271 @@
+Index: environment.py
+===================================================================
+--- environment.py	(Revision 1150)
++++ environment.py	(Arbeitskopie)
+@@ -10,7 +10,7 @@
+ 
+ PythonOgreMajorVersion = "1"
+ PythonOgreMinorVersion = "7"
+-PythonOgrePatchVersion = "2"
++PythonOgrePatchVersion = "3"
+ 
+ _UserName = getpass.getuser()
+ 
+@@ -573,6 +573,7 @@
+     else:
+         base = 'boost_1_41_0'
+         versionBase = '1_41' ## the version used on the library name
++        lib = "boost_python-mt"
+ 
+     if isLinux():
+         bjambuildset = 'gcc'
+@@ -684,6 +685,7 @@
+                 import re
+                 gcc_version = re.search(r'([0-9]+?\.[0-9]+?\.[0-9]+?)', gccp.communicate()[0]).groups()[0].split('.')
+                 lib = "boost_python-gcc%s%s-mt" % (gcc_version[0], gcc_version[1])
++                lib = "boost_python-mt"
+         else:
+             lib = Config.LIB_Boost
+     #lib = "libboost_python"
+@@ -778,10 +780,10 @@
+         LINKFLAGS = ''
+ 
+     elif isLinux():
+-        version = "1.7.2"
+-        base = "ogre_src_v1-7-2"
++        version = "1.7.3"
++        base = "ogre_src_v1-7-3"
+         baseDir = 'ogre'
+-        #http://sourceforge.net/projects/ogre/files/ogre/1.7/ogre_src_v1-7-2.tar.bz2/download
++        #http://sourceforge.net/projects/ogre/files/ogre/1.7/ogre_src_v1-7-3.tar.bz2/download
+ 
+         source = [
+             [wget, "http://sourceforge.net/projects/ogre/files/ogre/1.7/" + base + ".tar.bz2", downloadPath],
+@@ -799,7 +801,7 @@
+ 
+         buildCmds = [
+             [0, tar + " jxf " + os.path.join(downloadPath, base) + ".tar.bz2 --overwrite", os.getcwd() ],
+-            [0, "mv ogre_src_v1-7-2 " + baseDir, os.getcwd()],
++            [0, "mv ogre_src_v1-7-3 " + baseDir, os.getcwd()],
+             [0, "cmake . -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
+             [0, "make", baseDir],
+             [0, _sudo + " make install", baseDir]
+@@ -2090,6 +2092,14 @@
+     parent = "ogre/sound"
+     package_name=[ogre.package_name, 'ogreoggsound']
+ 
++#    source = [
++#	[ svn, ' co https://ogreoggsound.svn.sourceforge.net/svnroot/ogreoggsound/trunk ogreoggsound', os.getcwd() ]
++#    ]
++#    build = [
++#	    [0, "cmake . -DCMAKE_INSTALL_PREFIX:PATH=%s" % PREFIX, baseDir],
++#	    [0, "make", baseDir]
++#    ]
++
+     source = [
+         [ wget, "http://sourceforge.net/projects/ogreoggsound/files/OgreOggSound-Cthugha/ogreoggsound-v1.21.zip", downloadPath],
+     ] 
+Index: PythonOgreConfig_posix.py
+===================================================================
+--- PythonOgreConfig_posix.py	(Revision 1150)
++++ PythonOgreConfig_posix.py	(Arbeitskopie)
+@@ -9,7 +9,8 @@
+ _SVN = False    # if building from Ogre svn

+ 

+ # the base of the /usr/... directory structure that we are using

+-ROOT_DIR = os.path.join(BASE_DIR,'root')

++#ROOT_DIR = os.path.join(BASE_DIR,'/')

++ROOT_DIR = '/'

+ LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')

+ LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')

+ 

+@@ -22,7 +23,7 @@
+ PATH_LIB_Thread_STATIC = LOCAL_LIB

+ PATH_LIB_date_time_STATIC = LOCAL_LIB

+ ## and the name of the boost python library

+-LIB_Boost = "libboost_python" 

++LIB_Boost = "libboost_python-mt" 

+ 

+ # in Linux we need to code in the Relative path for the library

+ RPATH=os.path.join('\\$$ORIGIN',os.pardir,os.pardir, 'lib') #+ '\''

+@@ -57,10 +58,14 @@
+ 

+ # # ## Parent directories of the libraries

+ PATH_THIRDPARTY =   os.path.join(module_dir, 'ThirdParty' )

+-PATH_Ogre =         os.path.join(BASE_DIR,'ogre')

++#PATH_Ogre =         os.path.join(BASE_DIR,'ogre')

++PATH_Ogre =         os.path.join(LOCAL_INCLUDE,'OGRE')

+ PATH_OgreAddons =   os.path.join(BASE_DIR, 'ogreaddons')

+-PATH_CEGUI =        os.path.join(BASE_DIR, 'CEGUI-0.7.5' )

+-PATH_OIS =          os.path.join(BASE_DIR, 'ois')

++#PATH_CEGUI =        os.path.join(BASE_DIR, 'CEGUI-0.7.1' )

++#PATH_CEGUI =        os.path.join(BASE_DIR, 'CEGUI' )

++PATH_CEGUI =        os.path.join(LOCAL_INCLUDE, 'CEGUI' )

++#PATH_OIS =          os.path.join(BASE_DIR, 'ois')

++PATH_OIS =          os.path.join(LOCAL_INCLUDE, 'ois')

+ 

+ if _SDK:

+     PATH_CEGUI =        os.path.join(BASE_DIR, 'ogre','Dependencies')

+@@ -192,7 +197,8 @@
+ PATH_INCLUDE_ogreoctreezone = os.path.join(PATH_Ogre,'Plugins', 'OctreeZone', 'include' )

+ PATH_INCLUDE_ogreoctreesm = os.path.join(PATH_Ogre,'Plugins', 'OctreeSceneManager', 'include' )

+ PATH_INCLUDE_sdksample = os.path.join(PATH_Ogre, "Samples", "Common", "include"),

+-PATH_INCLUDE_ogreproperty = os.path.join(PATH_Ogre,'Components','Property', 'include')

++#PATH_INCLUDE_ogreproperty = os.path.join(PATH_Ogre,'Components','Property', 'include')

++PATH_INCLUDE_ogreproperty = os.path.join(PATH_Ogre,'Property')

+ 

+ 

+ PATH_ogrevideo =  os.path.join(BASE_DIR,'ogrevideo','trunk')

+Index: code_generators/ogre/python_ogre_include_OGRE.h
+===================================================================
+--- code_generators/ogre/python_ogre_include_OGRE.h	(Revision 1150)
++++ code_generators/ogre/python_ogre_include_OGRE.h	(Arbeitskopie)
+@@ -10,6 +10,7 @@
+ #if (OGRE_COMPILER == OGRE_COMPILER_GNUC ) && OGRE_THREAD_PROVIDER

+ #define OGRE_COMP_VER 420

+ #endif

++#define OGRE_COMP_VER 420

+ 

+ // Solve an issue on MSVC

+ // disable thread support so gccxml can handle atomicwrappers correctly

+@@ -21,4 +22,4 @@
+  #define OGRE_THREAD_SUPPORT _HOLD_STATUS // set back to the original state

+ #endif

+ 

+-#include "Ogre.h"
+\ No newline at end of file
++#include "Ogre.h"

+Index: code_generators/cegui/generate_code.py
+===================================================================
+--- code_generators/cegui/generate_code.py	(Revision 1150)
++++ code_generators/cegui/generate_code.py	(Arbeitskopie)
+@@ -193,8 +193,10 @@
+         #     '::CEGUI::FileIOException',

+             ]

+         for c in e:

+-            global_ns.member_functions(c).exclude()

+-            

++            try:
++                global_ns.member_functions(c).exclude()
++	    except:
++	    	pass
+     cls = CEGUI_ns.class_('::CEGUI::RefCounted< CEGUI::BoundSlot >')

+     cls.operator('==').exclude() # not in debug build

+ 

+@@ -306,6 +308,8 @@
+     if environment._USE_THREADS:

+         defined_symbols.append('BOOST_HAS_THREADS')

+         defined_symbols.append('BOOST_HAS_WINTHREADS')

++
++#    print environment.cegui.include_dirs
+ 

+     mb = module_builder.module_builder_t( [ xml_cached_fc ]

+                                           , gccxml_path=environment.gccxml_bin

+Index: SConstruct
+===================================================================
+--- SConstruct	(Revision 1150)
++++ SConstruct	(Arbeitskopie)
+@@ -60,10 +60,11 @@
+         else:
+             CCFLAGS += ' /TP /MD /Zc:forScope /EHs /c  /Ob2 /Oi /O2 /Ot /Oy /GS- /GR /Ox '
+     elif environment.isLinux():
+-        CCFLAGS = ' `pkg-config --cflags OGRE` '        ## needs to change I think :)
++        CCFLAGS = ' `pkg-config --cflags OGRE gtk+-2.0` '        ## needs to change I think :)
+         CCFLAGS += ' -I'
+         CCFLAGS += ' -O3 -I./ '
+-        CCFLAGS += ' -DBOOST_PYTHON_MAX_ARITY=19 -DBOOST_PYTHON_NO_PY_SIGNATURES '
++        CCFLAGS += ' -DBOOST_PYTHON_NO_PY_SIGNATURES '
++        CCFLAGS += ' -DBOOST_PYTHON_MAX_ARITY=19 '
+         if cls.ModuleName == 'OGRE':
+             ##### -fvisibility=hidden -finline-limit=20 '
+             #CCFLAGS += ' -fvisibility=hidden -fvisibility-inlines-hidden -DOGRE_GCC_VISIBILITY '
+@@ -117,7 +118,7 @@
+             LINKFLAGS = " /MAP /MAPINFO:EXPORTS /NOLOGO /OPT:REF /INCREMENTAL:NO /DLL /OPT:ICF /subsystem:console "
+     if environment.isLinux():
+         if os.sys.platform <> 'darwin':
+-            LINKFLAGS = ' `pkg-config --libs OGRE` -lstdc++ '
++            LINKFLAGS = ' `pkg-config --libs OGRE CEGUI` -lstdc++ '
+     if environment.isMac():
+             LINKFLAGS = ' -arch ' + environment.MAC_ARCH + ' -dynamiclib -dynamic \
+                         -framework Ogre -framework Carbon -framework Python '
+Index: setup.py
+===================================================================
+--- setup.py	(Revision 1150)
++++ setup.py	(Arbeitskopie)
+@@ -45,6 +45,10 @@
+ 

+ PythonVersionString = str(sys.version_info[0]) + '.' + str(sys.version_info[1])

+ 

++# hack until packages_2.7 is provided

++#if sys.version_info[1] == 7:

++#    PythonVersionString = str(sys.version_info[0]) + '.' + str(6)

++

+ def GetFileList ( basepath ):

+     filesout = []

+     for root, dirs, files in os.walk(basepath):

+@@ -59,23 +63,25 @@
+        "packages":    ['ogre', 

+                         'ogre.io', 'ogre.io.OIS', 

+                         'ogre.renderer', 'ogre.renderer.OGRE', 

+-                        'ogre.gui', 'ogre.gui.CEGUI','ogre.gui.QuickGUI', 'ogre.gui.betagui',

+-                        'ogre.sound', 'ogre.sound.OgreAL','ogre.sound.ogreoggsound', 

+-                        'ogre.physics', 'ogre.physics.ODE', 'ogre.physics.OgreRefApp',

+-                        'ogre.physics.OgreOde', 'ogre.physics.Opcode',

+-                        'ogre.physics.OgreNewt', 'ogre.physics.ogrenewt2',

+-                        'ogre.physics.bullet','ogre.physics.PhysX', #'ogre.physics.NxOgre',

+-                        'ogre.physics.OgreBulletC', 'ogre.physics.OgreBulletD',

+-                        'ogre.addons','ogre.addons.ogrevideo',

+-                        'ogre.addons.plib', # 'ogre.gui.navi',

+-                        'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum',

+-                        'ogre.addons.noise', 'ogre.addons.ofusion', #'ogre.addons.watermesh'

+-                        'ogre.addons.particleuniverse', 'ogre.addons.cadunetree',

+-                        'ogre.renderer.ogrepcz', 'ogre.addons.hydrax',

+-                        'ogre.gui.hikari','ogre.gui.mygui','ogre.gui.canvas',

+-                        'ogre.addons.ogrevideoffmpeg',

+-                        'ogre.renderer.plsm2',

+-                        'ogre.addons.raknet',

++                        'ogre.gui', 'ogre.gui.CEGUI',

++			#'ogre.gui.QuickGUI', 'ogre.gui.betagui',

++                        #'ogre.sound', 'ogre.sound.OgreAL','ogre.sound.ogreoggsound', 

++                        #'ogre.physics', 'ogre.physics.ODE', 'ogre.physics.OgreRefApp',

++                        #'ogre.physics.OgreOde', 'ogre.physics.Opcode',

++                        #'ogre.physics.OgreNewt', 'ogre.physics.ogrenewt2',

++                        #'ogre.physics.bullet','ogre.physics.PhysX', #'ogre.physics.NxOgre',

++                        #'ogre.physics.OgreBulletC', 'ogre.physics.OgreBulletD',

++                        #'ogre.addons','ogre.addons.ogrevideo',

++                        #'ogre.addons.plib', # 'ogre.gui.navi',

++                        #'ogre.addons.ogreforests', 'ogre.addons.et', 'ogre.addons.caelum',

++                        'ogre.addons.noise',

++			#'ogre.addons.ofusion', #'ogre.addons.watermesh'

++                        #'ogre.addons.particleuniverse', 'ogre.addons.cadunetree',

++                        #'ogre.renderer.ogrepcz', 'ogre.addons.hydrax',

++                        #'ogre.gui.hikari','ogre.gui.mygui','ogre.gui.canvas',

++                        #'ogre.addons.ogrevideoffmpeg',

++                        #'ogre.renderer.plsm2',

++                        #'ogre.addons.raknet',

+                         ],

+                         

+        "package_dir": {'': 'packages_'+ PythonVersionString },

+@@ -83,14 +89,14 @@
+ 

+ }

+ 

+-if METADATA['version'].startswith ("1.7"):

+-    for x in [ 'ogre.renderer.ogreoctreesm',

+-                'ogre.renderer.ogrepaging',

+-                'ogre.renderer.ogreterrain',

+-                'ogre.renderer.ogresdksample',

+-                'ogre.renderer.ogrertshadersystem',

+-                'ogre.addons.skyx'] :

+-        PACKAGEDATA['packages'].append ( x )

++#if METADATA['version'].startswith ("1.7"):

++#    for x in [ 'ogre.renderer.ogreoctreesm',

++#                'ogre.renderer.ogrepaging',

++#                'ogre.renderer.ogreterrain',

++#                'ogre.renderer.ogresdksample',

++#                'ogre.renderer.ogrertshadersystem',

++#                'ogre.addons.skyx'] :

++#        PACKAGEDATA['packages'].append ( x )

+         

+ 

+ if __name__ == '__main__':

diff --git a/dev-games/python-ogre/python-ogre-1126.ebuild b/dev-games/python-ogre/python-ogre-1126.ebuild
deleted file mode 100644
index 2235e6e..0000000
--- a/dev-games/python-ogre/python-ogre-1126.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-ESVN_REPO_URI="https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre"
-ESVN_REVISION="${PV}"
-
-inherit distutils subversion
-
-DESCRIPTION="python-ogre python interface to several 3D and related libraries"
-HOMEPAGE="http://www.python-ogre.org/"
-
-LICENSE="OpenSoftware"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.5.2
-	=dev-games/ogre-1.7*
-	>=dev-games/ois-1.2.0
-	>=dev-games/cegui-0.6.2
-	=dev-python/pygccxml-9999
-	=dev-python/py++-9999"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-0.97"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_compile() {
-	local PYTHONOGRE_COMPONENTS="ogre ois cegui noise"
-	for component in ${PYTHONOGRE_COMPONENTS} ; do
-		pushd ./code_generators/${component}
-		python generate_code.py > build.out || die "code generation for ${component} failed"
-		popd
-	done
-	for proj in ${PYTHONOGRE_COMPONENTS} ; do
-		scons PROJECTS=$proj install_pypp_txt=1 $MAKEOPTS || die "scons for ${proj} failed"
-	done
-	distutils_src_compile
-}
diff --git a/dev-games/python-ogre/python-ogre-1056.ebuild b/dev-games/python-ogre/python-ogre-1150.ebuild
index 0c290c9..a0dedef 100644
--- a/dev-games/python-ogre/python-ogre-1056.ebuild
+++ b/dev-games/python-ogre/python-ogre-1150.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="3"
+PYTHON_DEPEND="2"
 ESVN_REPO_URI="https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre"
 ESVN_REVISION="${PV}"
 
@@ -16,10 +17,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.5.2
-	=dev-games/ogre-1.6*
-	>=dev-games/ois-1.2.0
-	>=dev-games/cegui-0.6.2
+RDEPEND=">=dev-lang/python-2.7
+	=dev-games/ogre-1.7.3
+	=dev-games/ois-1.2.0
+	>=dev-games/cegui-0.7.5
 	=dev-python/pygccxml-9999
 	=dev-python/py++-9999"
 DEPEND="${RDEPEND}