version bump

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 118 insertions, 2 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index f5dc0536f809..f462793a7857 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.31 2009/01/17 14:36:56 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.32 2009/08/05 16:51:36 mr_bones_ Exp $
+
+*irrlicht-1.5.1 (05 Aug 2009)
+
+  05 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +irrlicht-1.5.1.ebuild, +files/irrlicht-1.5.1-config.patch,
+  +files/irrlicht-1.5.1-demoMake.patch:
+  version bump
 
   17 Jan 2009; nixnut <nixnut@gentoo.org> irrlicht-1.5.ebuild:
   ppc stable #253659
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index a167415f9fe9..ab5dbafb135f 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,6 +1,10 @@
 AUX irrlicht-1.5-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
 AUX irrlicht-1.5-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
+AUX irrlicht-1.5.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
+AUX irrlicht-1.5.1-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
+DIST irrlicht-1.5.1.zip 22514017 RMD160 2296568336dc9d506b59c1204c137526391fe3e5 SHA1 6110f398f4ed3850e0c5237629aa48050fb95fec SHA256 b5518bdb3fa8098ca92795a4bb03d19596b81103797fbaca199fc546d3c07070
 DIST irrlicht-1.5.zip 19483190 RMD160 c314cc31eaf34da2212ba999f57ccd84d0e20a7a SHA1 cabd6618636015dea6b0138339517e025e840e8e SHA256 289598ebb7e4c88e1de8c4324ba59257ddcaed3ed1f7ec50df30a560f1b02bac
+EBUILD irrlicht-1.5.1.ebuild 1378 RMD160 049027a68855893528a5d6bf0337828adc5d1026 SHA1 4ef11797bb829d26677085f2cb788dcfa0f0557b SHA256 ff08d91d3fad120eb437361ae9ff2b8fb3a9e33d9336e3e0d0c05657309e1160
 EBUILD irrlicht-1.5.ebuild 1362 RMD160 501d9707e2ee2d49fa0c8d5513fc772e9d39cc67 SHA1 6ca9ea9bf9e7221a1cd932eed257e58c553e149f SHA256 ca9a57a6a18cdba84e94dbad7cf6e6965047a4dc17a4d007fb7161af3c4b862e
-MISC ChangeLog 5330 RMD160 349c125763171af2f2b46dd491275b458271db20 SHA1 e70931e9e19eb2fabc168bc5ebbc0f14c607cad9 SHA256 7a95b536a85912f0b160d3d1496f258b0e23fb3ab9206270eeef9a183519f527
+MISC ChangeLog 5537 RMD160 0a162426c63d27e3886a6c9464626a589ad98e6b SHA1 bb207b6e4427a7409054e63d8665a252f545d8e0 SHA256 d3ad6137caab5700e4340c7a6eac09cd3d3ee4d042be4d922b75d4b07b957515
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
diff --git a/dev-games/irrlicht/files/irrlicht-1.5.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.5.1-config.patch
new file mode 100644
index 000000000000..fbb1cab1ac7b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.5.1-config.patch
@@ -0,0 +1,26 @@
+--- include/IrrCompileConfig.h
++++ include/IrrCompileConfig.h
+@@ -113,7 +113,6 @@
+ //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.

+ /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.

+ 	This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */

+-#define _IRR_USE_NON_SYSTEM_ZLIB_

+ 

+ 

+ //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.

+@@ -124,7 +123,6 @@
+ //! 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_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.

+@@ -135,7 +133,6 @@
+ //! 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_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9

diff --git a/dev-games/irrlicht/files/irrlicht-1.5.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.5.1-demoMake.patch
new file mode 100644
index 000000000000..ba8a3e2495fb
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.5.1-demoMake.patch
@@ -0,0 +1,20 @@
+--- 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

diff --git a/dev-games/irrlicht/irrlicht-1.5.1.ebuild b/dev-games/irrlicht/irrlicht-1.5.1.ebuild
new file mode 100644
index 000000000000..8face128db4d
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.5.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.5.1.ebuild,v 1.1 2009/08/05 16:51:36 mr_bones_ 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="media-libs/jpeg
+	media-libs/libpng
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-proto/xproto
+	x11-proto/xf86vidmodeproto"
+
+S=${WORKDIR}/${P}/source/Irrlicht
+
+src_prepare() {
+	cd "${WORKDIR}"/${P}
+	epatch \
+		"${FILESDIR}"/${P}-config.patch \
+		"${FILESDIR}"/${P}-demoMake.patch
+
+	cd "${S}"
+	sed -i \
+		-e '/^CXXFLAGS/s:=:+=:' \
+		-e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
+		-e '/^ZLIBOBJ/d' \
+		-e '/^JPEGLIBOBJ/d' \
+		-e '/^LIBPNGOBJ/d' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	cd ../..
+	dolib.a lib/Linux/libIrrlicht.a || die "dolib.a failed"
+	insinto /usr/include/${PN}
+	doins include/* || die "doins failed"
+	dodoc changes.txt readme.txt
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples media || die "doins failed"
+	fi
+}