Marking stable for gcc 4.1.1 and bug #140707.

(Portage version: 2.1.1_pre3-r5)
 (Signed Manifest commit)

3 files changed, 20 insertions, 102 deletions

diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index cb1008ed72ea..85364364f864 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,37 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 966acbdc7f78f6e26958417396ad4674 ChangeLog 2824
-RMD160 e9342ead91cf9230135a7de5270bd0b45c738159 ChangeLog 2824
-SHA256 5987f2c862e4bd7a37ddffe6f14721ad5cc859ca9a546835e1a2f2b1670b13c4 ChangeLog 2824
-MD5 0ad2514a81760732b181856cf7eab90e files/digest-irrlicht-0.12.0 66
-RMD160 dad2b414e94c8489637efe003703ad71d9ac8727 files/digest-irrlicht-0.12.0 66
-SHA256 3894eb33af23438b605afa8df6922ba533179c55bf7e9f9a2746d1031b38a978 files/digest-irrlicht-0.12.0 66
-MD5 06c03be236123be45b2abe90b9783d4c files/digest-irrlicht-0.14.0 244
-RMD160 30dfad5a4db728a958770a71fd77f52d8e7877b1 files/digest-irrlicht-0.14.0 244
-SHA256 18454d48aa533cbe66ea93acbc6adabe86f361ea07263185f6165de48716353a files/digest-irrlicht-0.14.0 244
+AUX irrlicht-0.12.0-64bit.patch 10232 RMD160 2236e1f206d7cfef008e5c8d5ee4e3d735bdd361 SHA1 6d1ad0de96487a545c041223a7f8e48f8e985371 SHA256 e86f20445d6d0cbe191b29f1a57c125d226588e0dba72e6f22a9c19e8a02c66b
 MD5 e03898aad8550858f91a0b78c888c3f8 files/irrlicht-0.12.0-64bit.patch 10232
 RMD160 2236e1f206d7cfef008e5c8d5ee4e3d735bdd361 files/irrlicht-0.12.0-64bit.patch 10232
 SHA256 e86f20445d6d0cbe191b29f1a57c125d226588e0dba72e6f22a9c19e8a02c66b files/irrlicht-0.12.0-64bit.patch 10232
+AUX irrlicht-0.12.0-opengl.patch 655 RMD160 83a06521306cf177581f2e547a4b9b69ef79e20b SHA1 64fc75a2dae80e130a4df57313d408b1f5fb8f9b SHA256 c97b3d5f857e31de24482cd72d92f6d3c9c1b4ddb2a8ff162411d5f684967865
 MD5 482fcd4ab66e17c76273ec131a05920a files/irrlicht-0.12.0-opengl.patch 655
 RMD160 83a06521306cf177581f2e547a4b9b69ef79e20b files/irrlicht-0.12.0-opengl.patch 655
 SHA256 c97b3d5f857e31de24482cd72d92f6d3c9c1b4ddb2a8ff162411d5f684967865 files/irrlicht-0.12.0-opengl.patch 655
+AUX irrlicht-0.14.0-gcc41.patch 1836 RMD160 d637e9f49167e7b7cc79983556b2bec079de49d0 SHA1 eb3fe553f0bbb098a4d97c7f626d890b74eb69ca SHA256 e3005916b06c360d7e5cefcdac14cbaeb0d2021b1da6adbbe010efe5215d1505
 MD5 5182269be1187ffbd25e8461bf8866b1 files/irrlicht-0.14.0-gcc41.patch 1836
 RMD160 d637e9f49167e7b7cc79983556b2bec079de49d0 files/irrlicht-0.14.0-gcc41.patch 1836
 SHA256 e3005916b06c360d7e5cefcdac14cbaeb0d2021b1da6adbbe010efe5215d1505 files/irrlicht-0.14.0-gcc41.patch 1836
-MD5 83bf4ddba17a6c3c25fd5de2b0a55c38 irrlicht-0.12.0.ebuild 2200
-RMD160 e041687675710795299037eb34e8a1eafbe07243 irrlicht-0.12.0.ebuild 2200
-SHA256 f787a2d57c717a73c2edbb86eb3b2810c884a90362f4d81c6987d22b2e89a4c3 irrlicht-0.12.0.ebuild 2200
-MD5 448b84d974a7fe58187c12391e72d02d irrlicht-0.14.0.ebuild 2221
-RMD160 ec554bcab4d0dab02059f8ac8c23968e5479fb21 irrlicht-0.14.0.ebuild 2221
-SHA256 7beec318b11265f45cf3a630fe59621e86872e3c39f194612054b9313e281b42 irrlicht-0.14.0.ebuild 2221
+DIST irrlicht-0.14.0.zip 13925328 RMD160 6c2abb7822a2fdb0b360983a5ad8094f7bd77eb5 SHA256 5b8c2424463cec711298edb77e25f021a11ac09950e085ebaeb8db546421dd97
+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
+SHA256 00974ffd44a6f6d28c5df3914c7ab116446956e7e058b9150e61a330be3d807a irrlicht-0.14.0.ebuild 2220
+MISC ChangeLog 2980 RMD160 d8bfefbb0770f6f579e08916bb676e91f0b890c4 SHA1 c32bd8e1f6eeb46cf46668e70ff2f2df79959d43 SHA256 8cf3142ea890aa879e3323306ba3a71daecd01853514335fbe6992d8aa56f0e0
+MD5 73021535d1430a63832b08cd9210dd30 ChangeLog 2980
+RMD160 d8bfefbb0770f6f579e08916bb676e91f0b890c4 ChangeLog 2980
+SHA256 8cf3142ea890aa879e3323306ba3a71daecd01853514335fbe6992d8aa56f0e0 ChangeLog 2980
+MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
 MD5 ad41838cd74c70f9c72295bda4662786 metadata.xml 790
 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a metadata.xml 790
 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc metadata.xml 790
+MD5 06c03be236123be45b2abe90b9783d4c files/digest-irrlicht-0.14.0 244
+RMD160 30dfad5a4db728a958770a71fd77f52d8e7877b1 files/digest-irrlicht-0.14.0 244
+SHA256 18454d48aa533cbe66ea93acbc6adabe86f361ea07263185f6165de48716353a files/digest-irrlicht-0.14.0 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEMaZ/2CTtIKiFlQIRAs9pAJ9rIOdixVdcPcBdy57cyoXFP6ZqWwCgk5N3
-lwjdhOl5ujaxIPMkcsflm0o=
-=xJ4f
+iD8DBQFEyQW2kT4lNIS36YERAt3jAJwIh96+plS+cuhEAOPPB2yqYzAdowCdHWl2
++AAcZ1UVLV8+0+XLOWINPLA=
+=k8jW
 -----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/digest-irrlicht-0.12.0 b/dev-games/irrlicht/files/digest-irrlicht-0.12.0
deleted file mode 100644
index 68548dc06b30..000000000000
--- a/dev-games/irrlicht/files/digest-irrlicht-0.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6f046fee28630cf08aa391ee69c94c5 irrlicht-0.12.0.zip 14060742
diff --git a/dev-games/irrlicht/irrlicht-0.12.0.ebuild b/dev-games/irrlicht/irrlicht-0.12.0.ebuild
deleted file mode 100644
index b78dd6380183..000000000000
--- a/dev-games/irrlicht/irrlicht-0.12.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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-0.12.0.ebuild,v 1.2 2006/02/10 16:13:28 wolf31o2 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/irrlicht/${P}.zip
-	mirror://sourceforge/irrlicht/${P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="doc"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/opengl
-	|| (
-		(
-			virtual/glu
-			x11-libs/libX11	)
-		 virtual/x11 )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	|| (
-		(
-			x11-proto/xproto
-			x11-proto/xf86vidmodeproto )
-		 virtual/x11 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/source
-	unzip -qo source.zip || die "unpacking source.zip"
-	rm -f source.zip
-	cd Irrlicht
-
-	epatch "${FILESDIR}"/${PN}-0.12.0-64bit.patch
-
-	# stupid nvidia / xorg GL differences
-	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
-	rm -r zlib jpeglib libpng
-	sed -i -e 's:zlib.zlib\.h:zlib.h:' CZipReader.cpp || die "zlib sed"
-	sed -i -e '/include/s:jpeglib/::'  CImageLoaderJPG.h || die "jpeg sed"
-	sed -i -e '/include/s:libpng/::'   CImageLoaderPNG.cpp || die "png sed"
-	sed -i -r \
-		-e '/^CXXFLAGS/s:=:+=:' \
-		-e '/^LINKOBJ/s:(zlib|jpeglib|libpng)/[^.]+\.o::g' \
-		Makefile || die "sed objs"
-	for x in z jpeg png ; do
-		mkdir ${x} && cd ${x} || die
-		$(tc-getAR) x $($(tc-getCC) -print-file-name=lib${x}.a) || die "explode lib${x}.a"
-		cd ..
-	done
-	sed -i \
-		-e '/^LINKOBJ/s:$: $(wildcard z/*.o) $(wildcard jpeg/*.o) $(wildcard png/*.o):' \
-		Makefile || die "sed objs two"
-}
-
-src_compile() {
-	emake -C source/Irrlicht || die "emake failed"
-}
-
-src_install() {
-	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
-		cp -r examples media "${D}"/usr/share/doc/${PF}/ || die "cp failed"
-	fi
-}