Version bump

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25.4 Intel(R) Core(TM)2 Duo CPU E6750 @ 2.66GHz

5 files changed, 121 insertions, 5 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index ffda5fda6033..e2d601909d17 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.26 2008/05/11 16:19:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.27 2008/06/04 08:26:15 nyhm Exp $
+
+*irrlicht-1.4.1 (04 Jun 2008)
+
+  04 Jun 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/irrlicht-1.4.1-config.patch, +files/irrlicht-1.4.1-demoMake.patch,
+  +irrlicht-1.4.1.ebuild:
+  Version bump
 
   11 May 2008; Markus Meier <maekke@gentoo.org> irrlicht-1.4.ebuild:
   amd64 stable, bug 221167
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index f76f6c14e526..e4dc38353717 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -11,18 +11,22 @@ AUX irrlicht-1.3.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57
 AUX irrlicht-1.3.1-demoMake.patch 682 RMD160 ff5673563dacff62ffd9acf9f1a172ee121894d9 SHA1 938e9d13705e963a9f23148e3af51f6177b396cb SHA256 15ac94dc4a3ff5203cccbc3bb396751a7f62c351511caf2755c13b94832889b6
 AUX irrlicht-1.4-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
 AUX irrlicht-1.4-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
+AUX irrlicht-1.4.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57e50e SHA1 e7e0ad99523576c4667c0fb438d12c8b7d2454b9 SHA256 3e455791e5be5a21ea9e61380389d4b8d18de6d2c1e3e0c1fd2a106206ad3fa9
+AUX irrlicht-1.4.1-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
 DIST irrlicht-1.2.zip 17278801 RMD160 248f66108d4ff64d17460397131afd80e3729ab4 SHA1 4cf33561f6c65d82302b1af1edba507372593fe4 SHA256 e89184273e35168011c533c1a61cd9a5a6547f76ca7eee08ee677793db55bc9b
 DIST irrlicht-1.3.1.zip 16325880 RMD160 771d3e843483b6cb9d8e0e0664beeedb63d56773 SHA1 374e25a95de399ce6f7683d651a65827cf64a5ce SHA256 91f080776fbad55331ca793b25647def2ef66363eac0cf5fef619f3690044beb
+DIST irrlicht-1.4.1.zip 17041941 RMD160 2380f527db75b041f60694387976872ce4b5e1b0 SHA1 1fbf3d28eb05772bfe0d7174ce34adc72a2bc745 SHA256 2565fea8e0b5a4e3a3ab73312d9d5d2ea7c936aabd3e94e05008c161883de4b7
 DIST irrlicht-1.4.zip 16892787 RMD160 b035c37fda41f5f68484e3a2988465ce7c019382 SHA1 cc73d0d6ac47e8803b3139e83b00cdc0060527b5 SHA256 870845bb0b987b5b1e3c086d22a77f58300ba9c4a65f4685768e1695696ccd52
 EBUILD irrlicht-1.2.ebuild 1695 RMD160 c196072b617dae1b74216dd7c09010c5904154b0 SHA1 94d9aefb0458594ad34072d9a9f59610b38c65ee SHA256 374d0a8b3d7a9b1273e5c5a794b6eab065a93e6037eb0c037111cf4642d51018
 EBUILD irrlicht-1.3.1.ebuild 1349 RMD160 97bb61d0ee7a6a1bbf91e8c9420d54c0b769abef SHA1 a43bf48cd7520c9fda83411875949861b6d51b07 SHA256 cb3ebd9c934a88467a076b4e76a9006d58da7751d51b6d309e8eebf28d23ad73
+EBUILD irrlicht-1.4.1.ebuild 1349 RMD160 a2aaa421e36f3561fb8b2f92f21e0bc8ce3a72ea SHA1 34f5bc9d98ecc8d06d37b8ad1c66e5da1a0b6a5e SHA256 f8aabb8eb99ab135562395cad47273f1f45588b435181f7409badb81141675ef
 EBUILD irrlicht-1.4.ebuild 1346 RMD160 9b7bb7c27b10d1ab25d397401cf01ca8d6ff7f6f SHA1 05becca2e34eeb40825b50abfeb9bf6a91984891 SHA256 42ebde38787e7608673b9c8eb698757df02ebfdd86e6547c6a7c002907573f37
-MISC ChangeLog 4547 RMD160 dc2346b5a3ae87a5ee1c83d95dbfba871f229316 SHA1 ac229224bfb9ec86a6f0078fe8b127073eaf9976 SHA256 c97f5e77246d585037b925dbbd419c4deb134be35ec8cb47a4c28b9a0fd6c1dc
+MISC ChangeLog 4742 RMD160 262cc3a6cb7ddfd1488732efe21f900051886670 SHA1 86bb58356021ca3d1fe944d7ca15ad4b70489390 SHA256 fa45413a9e785c17c71452e4bbedadab9df2f41817643e10ed26fdf601641b7a
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgnHM4ACgkQkKaRLQcq0GIWPgCgly99itnSZVEj8ZFrb7z2Zacw
-GzwAoKryjGiyZIf1A36MuiNOlia3kvrH
-=aoMC
+iEYEARECAAYFAkhGUa0ACgkQdz7hIScOUREI+QCghQ8gy+W4h2qRNoXYfcuQuM5O
+U/oAn0S6l2krW3bdqiXuKiIPCqdPYrQq
+=zxTc
 -----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/irrlicht-1.4.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.4.1-config.patch
new file mode 100644
index 000000000000..fbb1cab1ac7b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.4.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.4.1-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.4.1-demoMake.patch
new file mode 100644
index 000000000000..ba8a3e2495fb
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.4.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.4.1.ebuild b/dev-games/irrlicht/irrlicht-1.4.1.ebuild
new file mode 100644
index 000000000000..0a4ae043a912
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.4.1.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.4.1.ebuild,v 1.1 2008/06/04 08:26:15 nyhm Exp $
+
+inherit eutils
+
+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
+}