version bump (bug #417737)

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 687 insertions, 0 deletions

diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch
new file mode 100644
index 000000000000..da553ed8ab58
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-config.patch
@@ -0,0 +1,29 @@
+--- include/IrrCompileConfig.h.old
++++ include/IrrCompileConfig.h
+@@ -176,7 +176,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ 
+ 
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+@@ -187,7 +187,7 @@
+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+ 
+ 
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
+@@ -348,7 +348,7 @@
+ /** If this is commented out, Irrlicht will try to compile using the zlib
+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
+ defined. */
+-#define _IRR_USE_NON_SYSTEM_ZLIB_
++//#define _IRR_USE_NON_SYSTEM_ZLIB_
+ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
+ #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ //! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch
new file mode 100644
index 000000000000..a8f4aace8d0a
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-demoMake.patch
@@ -0,0 +1,572 @@
+--- examples/Demo/Makefile
++++ examples/Demo/Makefile
+@@ -2,7 +2,7 @@
+ Target = Demo

+ Sources = CDemo.cpp CMainMenu.cpp main.cpp

+ 

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -Wall -O3 -ffast-math

+ 

+ ifeq ($(HOSTTYPE), x86_64)

+@@ -13,7 +13,7 @@
+ 

+ # target specific settings

+ all_linux: SYSTEM=Linux

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg

+ 

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lglu32 -lm

+--- examples/14.Win32Window/Makefile
++++ examples/14.Win32Window/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/12.TerrainRendering/Makefile
++++ examples/12.TerrainRendering/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/11.PerPixelLighting/Makefile
++++ examples/11.PerPixelLighting/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/08.SpecialFX/Makefile
++++ examples/08.SpecialFX/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/06.2DGraphics/Makefile
++++ examples/06.2DGraphics/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/04.Movement/Makefile
++++ examples/04.Movement/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,14 +17,14 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/16.Quake3MapShader/Makefile
++++ examples/16.Quake3MapShader/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/15.LoadIrrFile/Makefile
++++ examples/15.LoadIrrFile/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/02.Quake3Map/Makefile
++++ examples/02.Quake3Map/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,7 +17,7 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht

+ static_win32: LDFLAGS += -lgdi32 -lopengl32 -ld3dx9d -lwinmm -lm

+@@ -25,7 +25,7 @@
+ static_win32 all_win32 clean_win32: SYSTEM=Win32-gcc

+ static_win32 all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32 static_win32:

+ 	$(warning Building...)

+--- examples/19.MouseAndJoystick/Makefile
++++ examples/19.MouseAndJoystick/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ #CXXFLAGS = -O3 -ffast-math

+ CXXFLAGS = -g -Wall

+ 

+@@ -17,14 +17,14 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/13.RenderToTexture/Makefile
++++ examples/13.RenderToTexture/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/10.Shaders/Makefile
++++ examples/10.Shaders/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/09.Meshviewer/Makefile
++++ examples/09.Meshviewer/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/21.Quake3Explorer/Makefile
++++ examples/21.Quake3Explorer/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp sound.cpp q3factory.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ #CXXFLAGS = -O3 -ffast-math

+ CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/03.CustomSceneNode/Makefile
++++ examples/03.CustomSceneNode/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/20.ManagedLights/Makefile
++++ examples/20.ManagedLights/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ #CXXFLAGS = -O3 -ffast-math

+ CXXFLAGS = -g -Wall

+ 

+@@ -17,14 +17,14 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32: CPPFLAGS += -D__GNUWIN32__ -D_WIN32 -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/05.UserInterface/Makefile
++++ examples/05.UserInterface/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/01.HelloWorld/Makefile
++++ examples/01.HelloWorld/Makefile
+@@ -7,9 +7,9 @@
+ # List of source files, separated by spaces

+ Sources := main.cpp

+ # Path to Irrlicht directory, should contain include/ and lib/

+-IrrlichtHome := ../..

++IrrlichtHome := /usr

+ # Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems

+-BinPath = ../../bin/$(SYSTEM)

++BinPath = ../../bin

+ 

+ # general compiler settings (might need to be set when compiling the lib, too)

+ # preprocessor flags, e.g. defines and include paths

+@@ -24,7 +24,7 @@
+ #no changes necessary below this line

+ ####

+ 

+-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)

++CPPFLAGS = -I/usr/include/irrlicht $(USERCPPFLAGS)

+ CXXFLAGS = $(USERCXXFLAGS)

+ LDFLAGS = $(USERLDFLAGS)

+ 

+@@ -32,8 +32,8 @@
+ all: all_linux

+ 

+ # target specific settings

+-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht

+-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11

++all_linux all_win32 static_win32: LDFLAGS += -lIrrlicht

++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lpng -ljpeg

+ all_linux clean_linux: SYSTEM=Linux

+ all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32 static_win32: SUF=.exe

+--- examples/18.SplitScreen/Makefile
++++ examples/18.SplitScreen/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

+--- examples/07.Collision/Makefile
++++ examples/07.Collision/Makefile
+@@ -5,7 +5,7 @@
+ Sources = main.cpp

+ 

+ # general compiler settings

+-CPPFLAGS = -I../../include -I/usr/X11R6/include

++CPPFLAGS = -I/usr/include/irrlicht

+ CXXFLAGS = -O3 -ffast-math

+ #CXXFLAGS = -g -Wall

+ 

+@@ -17,13 +17,13 @@
+ endif

+ 

+ # target specific settings

+-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/Linux -lIrrlicht -lGL -lXxf86vm -lXext -lX11

++all_linux: LDFLAGS = -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -ljpeg -lpng
+ all_linux clean_linux: SYSTEM=Linux

+ all_win32: LDFLAGS = -L../../lib/Win32-gcc -lIrrlicht -lopengl32 -lm

+ all_win32 clean_win32: SYSTEM=Win32-gcc

+ all_win32 clean_win32: SUF=.exe

+ # name of the binary - only valid for targets which set SYSTEM

+-DESTPATH = ../../bin/$(SYSTEM)/$(Target)$(SUF)

++DESTPATH = ../../bin/$(Target)$(SUF)
+ 

+ all_linux all_win32:

+ 	$(warning Building...)

diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch
new file mode 100644
index 000000000000..e23c98f243ae
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-gentoo.patch
@@ -0,0 +1,46 @@
+--- irrlicht-1.7.2.orig/source/Irrlicht/CImageLoaderPNG.cpp
++++ irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp
+@@ -162,7 +162,7 @@
+ 	if (BitDepth < 8)

+ 	{

+ 		if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA)

+-			png_set_gray_1_2_4_to_8(png_ptr);

++			png_set_expand_gray_1_2_4_to_8(png_ptr);

+ 		else

+ 			png_set_packing(png_ptr);

+ 	}

+--- irrlicht-1.7.2.orig/source/Irrlicht/Makefile
++++ irrlicht-1.7.2/source/Irrlicht/Makefile
+@@ -39,11 +39,7 @@
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o

+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o

+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o

+-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o

+-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o

+-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o

+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o

+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o

+ 

+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions

+ EXTRAOBJ =

+@@ -54,18 +50,16 @@
+ 

+ ###############

+ #Compiler flags

+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng

++CXXINCS = -I../../include

+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1

+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing

+ ifndef NDEBUG

+ CXXFLAGS += -g -D_DEBUG

+-else

+-CXXFLAGS += -fexpensive-optimizations -O3

+ endif

+ ifdef PROFILE

+ CXXFLAGS += -pg

+ endif

+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

+ 

+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC

+ sharedlib sharedlib_osx: CFLAGS += -fPIC

diff --git a/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch b/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch
new file mode 100644
index 000000000000..a1426bf2907b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.3-libpng15.patch
@@ -0,0 +1,40 @@
+--- source/Irrlicht/CImageLoaderPNG.cpp
++++ source/Irrlicht/CImageLoaderPNG.cpp
+@@ -28,7 +28,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)

+ {

+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);

+-	longjmp(png_ptr->jmpbuf, 1);

++	longjmp(png_jmpbuf(png_ptr), 1);

+ }

+ 

+ // PNG function for file reading

+@@ -37,7 +37,7 @@
+ 	png_size_t check;

+ 

+ 	// changed by zola {

+-	io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;

++	io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);

+ 	check=(png_size_t) file->read((void*)data,(u32)length);

+ 	// }

+ 

+--- source/Irrlicht/CImageWriterPNG.cpp
++++ source/Irrlicht/CImageWriterPNG.cpp
+@@ -35,7 +35,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)

+ {

+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);

+-	longjmp(png_ptr->jmpbuf, 1);

++	longjmp(png_jmpbuf(png_ptr), 1);

+ }

+ 

+ // PNG function for file writing

+@@ -43,7 +43,7 @@
+ {

+ 	png_size_t check;

+ 

+-	io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;

++	io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);

+ 	check=(png_size_t) file->write((const void*)data,(u32)length);

+ 

+ 	if (check != length)