old

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

8 files changed, 11 insertions, 762 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index f56ae1cff79c..55702ec19ec5 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/irrlicht
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.56 2012/12/07 23:43:22 hasufell Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.57 2013/01/22 18:17:13 mr_bones_ Exp $
+
+  22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/irrlicht-1.7.2-config.patch, -files/irrlicht-1.7.2-demoMake.patch,
+  -files/irrlicht-1.7.2-gcc46.patch, -files/irrlicht-1.7.2-gentoo.patch,
+  -files/irrlicht-1.7.2-libpng15.patch, -irrlicht-1.7.2.ebuild,
+  irrlicht-1.8.ebuild:
+  old
 
 *irrlicht-1.8 (07 Dec 2012)
 
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-config.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-config.patch
deleted file mode 100644
index da553ed8ab58..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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.2-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-demoMake.patch
deleted file mode 100644
index a8f4aace8d0a..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-demoMake.patch
+++ /dev/null
@@ -1,572 +0,0 @@
---- 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.2-gcc46.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch
deleted file mode 100644
index 39231ba062aa..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./source/Irrlicht/Makefile.orig
-+++ ./source/Irrlicht/Makefile
-@@ -75,7 +75,6 @@
- LIB_PATH = ../../lib/$(SYSTEM)

- INSTALL_DIR = /usr/local/lib

- sharedlib install: SHARED_LIB = libIrrlicht.so

--staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias

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

- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include

- 

diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-gentoo.patch
deleted file mode 100644
index e23c98f243ae..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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.2-libpng15.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch
deleted file mode 100644
index a1426bf2907b..000000000000
--- a/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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)

diff --git a/dev-games/irrlicht/irrlicht-1.7.2.ebuild b/dev-games/irrlicht/irrlicht-1.7.2.ebuild
deleted file mode 100644
index 31c93b98a8c9..000000000000
--- a/dev-games/irrlicht/irrlicht-1.7.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.6 2011/09/15 03:18:02 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="http://irrlicht.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-RDEPEND="virtual/jpeg
-	media-libs/libpng
-	app-arch/bzip2
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	x11-proto/xproto
-	x11-proto/xf86vidmodeproto"
-
-S=${WORKDIR}/${P}/source/Irrlicht
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	cd ../..
-	edos2unix include/IrrCompileConfig.h
-	epatch \
-		"${FILESDIR}"/${P}-config.patch \
-		"${FILESDIR}"/${P}-demoMake.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	sed -i \
-		-e 's:\.\./\.\./media:../media:g' \
-		$(grep -rl '\.\./\.\./media' examples) \
-		|| die 'sed failed'
-}
-
-src_compile() {
-	tc-export CXX CC AR
-	emake sharedlib staticlib || die "emake failed"
-}
-
-src_install() {
-	cd ../..
-	dolib.a lib/Linux/libIrrlicht.a || die
-	dolib.so lib/Linux/libIrrlicht.so* || die
-	insinto /usr/include/${PN}
-	doins include/* || die
-	dodoc changes.txt readme.txt
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples media || die
-	fi
-}
diff --git a/dev-games/irrlicht/irrlicht-1.8.ebuild b/dev-games/irrlicht/irrlicht-1.8.ebuild
index 8419bd84adb5..2f6bb091be66 100644
--- a/dev-games/irrlicht/irrlicht-1.8.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.ebuild,v 1.1 2012/12/07 23:43:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.8.ebuild,v 1.2 2013/01/22 18:17:13 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs