Version bump

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.9 i686

5 files changed, 121 insertions, 5 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 4fe6ee232753..0f8f55461ef7 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.28 2008/10/09 06:25:50 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.29 2008/12/18 09:08:11 nyhm Exp $
+
+*irrlicht-1.5 (18 Dec 2008)
+
+  18 Dec 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/irrlicht-1.5-config.patch, +files/irrlicht-1.5-demoMake.patch,
+  +irrlicht-1.5.ebuild:
+  Version bump
 
 *irrlicht-1.4.2 (09 Oct 2008)
 
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index fbf3d2146d6b..d86ed00d4c99 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -7,18 +7,22 @@ AUX irrlicht-1.4.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57
 AUX irrlicht-1.4.1-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
 AUX irrlicht-1.4.2-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
 AUX irrlicht-1.4.2-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
+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
 DIST irrlicht-1.4.1.zip 17041941 RMD160 2380f527db75b041f60694387976872ce4b5e1b0 SHA1 1fbf3d28eb05772bfe0d7174ce34adc72a2bc745 SHA256 2565fea8e0b5a4e3a3ab73312d9d5d2ea7c936aabd3e94e05008c161883de4b7
 DIST irrlicht-1.4.2.zip 18306598 RMD160 0099fbcf0e46513eee186be347b5f5dad505e7ae SHA1 7ec2960398e9b2ef68285c474aacfada9e4fd6da SHA256 79eab7edfb289d67569ea2061fccd6d5476648b1331f63e51a005931f129af17
 DIST irrlicht-1.4.zip 16892787 RMD160 b035c37fda41f5f68484e3a2988465ce7c019382 SHA1 cc73d0d6ac47e8803b3139e83b00cdc0060527b5 SHA256 870845bb0b987b5b1e3c086d22a77f58300ba9c4a65f4685768e1695696ccd52
+DIST irrlicht-1.5.zip 19483190 RMD160 c314cc31eaf34da2212ba999f57ccd84d0e20a7a SHA1 cabd6618636015dea6b0138339517e025e840e8e SHA256 289598ebb7e4c88e1de8c4324ba59257ddcaed3ed1f7ec50df30a560f1b02bac
 EBUILD irrlicht-1.4.1.ebuild 1365 RMD160 c77ec8ee80e70b18a791de2db350a79c30427289 SHA1 e3f5d1dc60c9db0ab97cde9b9aa220ae99a66f03 SHA256 e285213ee1bcf05a71790c3d6cfe7a56b9cd5778c34840f97e8f27cfbd1918b3
 EBUILD irrlicht-1.4.2.ebuild 1365 RMD160 8826c63323b7f84b5360d68cad95b7e20b381d66 SHA1 8690f0340cb4b0f4dc8f7ddd5056afdfbf7f6678 SHA256 23b8e1d499e5276714bca5145caa749164e117c57e50546f89981028b8d6390b
 EBUILD irrlicht-1.4.ebuild 1360 RMD160 58c7cefc11bdd649fd333af4ea8e6268fd652579 SHA1 e1deef3e701ca26a3289a90f0d90db44ad512fc7 SHA256 af82c554408f457a2ad4d158a431877aff453e7239e1cea4476e8aedacf71dd0
-MISC ChangeLog 4952 RMD160 c97c8370b74b23cee3814178f62103584b863eac SHA1 9a20da23f184bfcf337d296d72d49153038e7dab SHA256 a694d8e399e1f6f59ae074d51613475cb64064528653eab66d712a325926be34
+EBUILD irrlicht-1.5.ebuild 1363 RMD160 89bc25b5afa3660963ec2d340cf46c0b66043ea5 SHA1 4fd1c4c609662b2269506d60612745aa0b6c1a8a SHA256 dcd5ab812cc1d9c1b5cc7d9c78b40bc3132e4bd1f7c75f1caa67f62157eae208
+MISC ChangeLog 5141 RMD160 db886f1a720ba7bf9fcfe2e48201de05ce1af10b SHA1 72eea6ab2500a5d43ce65d2dced29fda2692cfa5 SHA256 c11e564183fdae574bc491e89511f70cec3b4e8adb7c5e85f7cb2903b80e120b
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk6ka8ACgkQdz7hIScOURENVQCfdnXgRNnBspZYFLgK65e9HkbK
-nlIAn0IPhMDCkVHn2jklI6Q+z+T+2wra
-=pcIc
+iEYEARECAAYFAklKEwQACgkQdz7hIScOURG1IQCeOEUbxFcuO0bMVlewzTXd11+4
+gl8AniS5SWlWJpXCKlB5IfcDgUpE+D78
+=D5Vu
 -----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/irrlicht-1.5-config.patch b/dev-games/irrlicht/files/irrlicht-1.5-config.patch
new file mode 100644
index 000000000000..fbb1cab1ac7b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.5-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-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.5-demoMake.patch
new file mode 100644
index 000000000000..ba8a3e2495fb
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.5-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.ebuild b/dev-games/irrlicht/irrlicht-1.5.ebuild
new file mode 100644
index 000000000000..8923ac2210a3
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.5.ebuild,v 1.1 2008/12/18 09:08:11 nyhm Exp $
+
+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_unpack() {
+	unpack ${A}
+	cd ${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
+}