Version bump

Package-Manager: portage-2.1.2_rc2-r5

6 files changed, 143 insertions, 8 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index d7a8515d37b4..b8ecd6d19058 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.19 2006/10/14 11:29:13 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.20 2006/12/06 19:41:20 nyhm Exp $
+
+*irrlicht-1.2 (06 Dec 2006)
+
+  06 Dec 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/irrlicht-1.2-config.patch, +files/irrlicht-1.2-demoMake.patch,
+  +irrlicht-1.2.ebuild:
+  Version bump
 
 *irrlicht-1.1-r1 (14 Oct 2006)
 
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index e53537d645ad..2771e8ee5467 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -29,8 +29,17 @@ AUX irrlicht-1.1-jpeg.patch 706 RMD160 574599882d16de0db72b01ad21a495c29e680cf5
 MD5 4e49e2e5b984311f091ad42d1b68ed79 files/irrlicht-1.1-jpeg.patch 706
 RMD160 574599882d16de0db72b01ad21a495c29e680cf5 files/irrlicht-1.1-jpeg.patch 706
 SHA256 a24eb235b390af6db2d893891b383f1d98510f79cbb5e39775e9d2e77599710f files/irrlicht-1.1-jpeg.patch 706
+AUX irrlicht-1.2-config.patch 1357 RMD160 7735711727875a86798bc5aaded4a7446e4d3755 SHA1 69dd8e9324dac86861ba6f2bdfcd4c40668e9aa0 SHA256 cb31c5b0ddbdbcb1807f4d7c4c359d0735a940a2bc47b7e47094ce07997f0001
+MD5 9878aefe6ae59a4a46ce7dce7dea9397 files/irrlicht-1.2-config.patch 1357
+RMD160 7735711727875a86798bc5aaded4a7446e4d3755 files/irrlicht-1.2-config.patch 1357
+SHA256 cb31c5b0ddbdbcb1807f4d7c4c359d0735a940a2bc47b7e47094ce07997f0001 files/irrlicht-1.2-config.patch 1357
+AUX irrlicht-1.2-demoMake.patch 618 RMD160 4a03562b6f5f51fd9abca0b02e1a095586b98263 SHA1 01d9c74bc850ab8a72332e40525a5802273fd805 SHA256 2b9716074de8e076844275b431f1665d3c356636363cf6c8cc082d5ece2895ad
+MD5 a25c8198150e065c6c7ab7f66eceeb49 files/irrlicht-1.2-demoMake.patch 618
+RMD160 4a03562b6f5f51fd9abca0b02e1a095586b98263 files/irrlicht-1.2-demoMake.patch 618
+SHA256 2b9716074de8e076844275b431f1665d3c356636363cf6c8cc082d5ece2895ad files/irrlicht-1.2-demoMake.patch 618
 DIST irrlicht-0.14.0.zip 13925328 RMD160 6c2abb7822a2fdb0b360983a5ad8094f7bd77eb5 SHA1 1d77e5b6e4bfe4edee1e808e9f07f3a414bd3bd9 SHA256 5b8c2424463cec711298edb77e25f021a11ac09950e085ebaeb8db546421dd97
 DIST irrlicht-1.1.zip 15647723 RMD160 1469ade750699b12244e0f38ea07e6a4314e696c SHA1 63190a3cf04e7a52998992adec409531a2fd114a SHA256 6ef74629d33b4f2cb2faa91d81cbd0f591ebce620ebfae8e4fd3fb71f1137f19
+DIST irrlicht-1.2.zip 17278801 RMD160 248f66108d4ff64d17460397131afd80e3729ab4 SHA1 4cf33561f6c65d82302b1af1edba507372593fe4 SHA256 e89184273e35168011c533c1a61cd9a5a6547f76ca7eee08ee677793db55bc9b
 EBUILD irrlicht-0.14.0.ebuild 2220 RMD160 a2256ccfc898644a681fadf3c280cde8bbebc3d7 SHA1 0d36673818552c9cd498e7971612e5bd2dcc663b SHA256 00974ffd44a6f6d28c5df3914c7ab116446956e7e058b9150e61a330be3d807a
 MD5 98ab80734a6b0565651c619e7fdd8c72 irrlicht-0.14.0.ebuild 2220
 RMD160 a2256ccfc898644a681fadf3c280cde8bbebc3d7 irrlicht-0.14.0.ebuild 2220
@@ -43,10 +52,14 @@ EBUILD irrlicht-1.1.ebuild 1621 RMD160 7e9460c668a35831fdd1521045bcf037ff50e4af
 MD5 0a7c63b9d2e717af2099a1f8d1aeb61b irrlicht-1.1.ebuild 1621
 RMD160 7e9460c668a35831fdd1521045bcf037ff50e4af irrlicht-1.1.ebuild 1621
 SHA256 2a2c480d174ce0f5a38575e2c8d7efd8a4d752089a1c19d2a8c0f561189513d2 irrlicht-1.1.ebuild 1621
-MISC ChangeLog 3429 RMD160 0ac6ceaf21a2d22df3fa5074bf1d51e31b4bd38e SHA1 f46bb423de4f3f3853dfca672f95fca474c7b03c SHA256 3cd24e7a1dec5393ce503167737fb0b796657e9fab4368629477261a33e75d66
-MD5 dcd3dc8ff09960ca2797b8d814fc77fa ChangeLog 3429
-RMD160 0ac6ceaf21a2d22df3fa5074bf1d51e31b4bd38e ChangeLog 3429
-SHA256 3cd24e7a1dec5393ce503167737fb0b796657e9fab4368629477261a33e75d66 ChangeLog 3429
+EBUILD irrlicht-1.2.ebuild 1706 RMD160 f4b4a3a6789bfaad43ba579ebb798acb70d12d2a SHA1 0c9bc096ff4c651a3c7f8f7bce7681cae700cb10 SHA256 15f2f7643bb5ee6aeab2ce265ddaceda9c594bb0f1737a9f2edebbb8f14d237a
+MD5 153032e81126fc1d98dcfe7fe7f207fa irrlicht-1.2.ebuild 1706
+RMD160 f4b4a3a6789bfaad43ba579ebb798acb70d12d2a irrlicht-1.2.ebuild 1706
+SHA256 15f2f7643bb5ee6aeab2ce265ddaceda9c594bb0f1737a9f2edebbb8f14d237a irrlicht-1.2.ebuild 1706
+MISC ChangeLog 3616 RMD160 cb1191cdb3999521027ec51fd97a33401bcc3555 SHA1 5d27e27f76980af044011a523a83f9175fb62ced SHA256 59048afb2518072ea789179763bce121bbdc537908c0d4912d675aac7b745f02
+MD5 1b3d5c071afeb53c4c91d1c55b3e3cd8 ChangeLog 3616
+RMD160 cb1191cdb3999521027ec51fd97a33401bcc3555 ChangeLog 3616
+SHA256 59048afb2518072ea789179763bce121bbdc537908c0d4912d675aac7b745f02 ChangeLog 3616
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
 MD5 ad41838cd74c70f9c72295bda4662786 metadata.xml 790
 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a metadata.xml 790
@@ -60,10 +73,13 @@ SHA256 29a07f4de557b88f5f885cad68cfff10025eb61b95b007c1fc8cede6895b475e files/di
 MD5 80763a673fb7e778c220baaa5bc0cf6d files/digest-irrlicht-1.1-r1 235
 RMD160 31441437239c94f40ad85390f945933a5f7016c7 files/digest-irrlicht-1.1-r1 235
 SHA256 29a07f4de557b88f5f885cad68cfff10025eb61b95b007c1fc8cede6895b475e files/digest-irrlicht-1.1-r1 235
+MD5 3b0041d9420302b07d78d59b5c63cce8 files/digest-irrlicht-1.2 235
+RMD160 1f9cb02326b5fd254a6cfe7b5f3e358e1a8e4441 files/digest-irrlicht-1.2 235
+SHA256 1050ed335e1f605e5f3ecab169b6b81a391ca640435382d05e7fc0ac39694631 files/digest-irrlicht-1.2 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFMMoXbfN2jvlVAhwRAhpfAJ4k4e78Z1L0F/0nSWD8BFWdoVwhpQCfXgyD
-wfcw06NBSU7nN0ic+bh/Qxw=
-=4Min
+iD8DBQFFdxzndz7hIScOURERAsykAJ4tfl9C7K0XExfLM3tEN4A5AysqSwCgqYy+
+/9qzWTWQpjMBjG6FHmh1s08=
+=U4Dd
 -----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/digest-irrlicht-1.2 b/dev-games/irrlicht/files/digest-irrlicht-1.2
new file mode 100644
index 000000000000..1fc86f002543
--- /dev/null
+++ b/dev-games/irrlicht/files/digest-irrlicht-1.2
@@ -0,0 +1,3 @@
+MD5 caf1d610d1268ab2f9e53e45c7349bf8 irrlicht-1.2.zip 17278801
+RMD160 248f66108d4ff64d17460397131afd80e3729ab4 irrlicht-1.2.zip 17278801
+SHA256 e89184273e35168011c533c1a61cd9a5a6547f76ca7eee08ee677793db55bc9b irrlicht-1.2.zip 17278801
diff --git a/dev-games/irrlicht/files/irrlicht-1.2-config.patch b/dev-games/irrlicht/files/irrlicht-1.2-config.patch
new file mode 100644
index 000000000000..e6ba8795f0d6
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.2-config.patch
@@ -0,0 +1,26 @@
+--- include/IrrCompileConfig.h.old	2006-09-16 12:42:28.000000000 +0200
++++ include/IrrCompileConfig.h	2006-09-16 12:42:58.000000000 +0200
+@@ -68,7 +68,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.
+@@ -79,7 +78,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.
+@@ -90,7 +88,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.2-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.2-demoMake.patch
new file mode 100644
index 000000000000..56de8ca5c8e8
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.2-demoMake.patch
@@ -0,0 +1,14 @@
+--- ../../examples/Demo/Makefile.old	2006-10-14 13:06:42.000000000 +0200
++++ ../../examples/Demo/Makefile	2006-10-14 13:08:32.000000000 +0200
+@@ -2,9 +2,9 @@
+ # Handwritten by me, made with Kate. So it is far from being perfect. :)
+ 
+ CXX = g++
+-CPPFLAGS = -I"../../include" -I"/usr/X11R6/include"
++CPPFLAGS = -I/usr/include/irrlicht
+ CXXFLAGS = -O3 -ffast-math
+-LDFLAGS = -L"/usr/X11R6/lib" -L"../../lib/Linux" -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11
++LDFLAGS = -lIrrlicht -lGL -lGLU -lXxf86vm -lXext -lX11 -lpng -ljpeg
+ # if you enable sound add the proper library for linking
+ # -laudiere
+ # -lSDL_mixer -lSDL
diff --git a/dev-games/irrlicht/irrlicht-1.2.ebuild b/dev-games/irrlicht/irrlicht-1.2.ebuild
new file mode 100644
index 000000000000..d5693e46e432
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.2.ebuild,v 1.1 2006/12/06 19:41:20 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 "${WORKDIR}"/${P}
+	edos2unix include/IrrCompileConfig.h
+	epatch "${FILESDIR}"/${P}-config.patch
+
+	cd "${S}"
+	edos2unix ../../examples/Demo/Makefile
+	epatch "${FILESDIR}"/${P}-demoMake.patch
+
+	# stupid nvidia / xorg GL differences
+	# still needed - bug #114335
+	if echo -e '#include <GL/glx.h>\nglXGetProcAddress blah;' | \
+	   $(tc-getCC) -E - | \
+	   grep -q glXGetProcAddressARB
+	then
+		epatch "${FILESDIR}"/${PN}-0.12.0-opengl.patch
+	fi
+
+	# use the system zlib/jpeg/png
+	sed -i \
+		-e "/^CXX/s:g++:$(tc-getCXX):" \
+		-e '/^CXXFLAGS/s:=:+=:' \
+		-e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
+		-e '/^ZLIBOBJ/d' \
+		-e '/^JPEGLIBOBJ/d' \
+		-e '/^LIBPNGOBJ/d' \
+		Makefile || die "sed 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
+}