Version bump #122920 by Patrick Zimmermann

(Portage version: 2.1_pre6-r4)

6 files changed, 197 insertions, 14 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 45b5accbd559..3bc2189dffab 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.24 2006/03/11 01:13:04 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.25 2006/03/20 22:25:47 tupone Exp $
+
+*ogre-1.0.7 (20 Mar 2006)
+
+  20 Mar 2006; <Tupone@gentoo.org> +files/ogre-1.0.7-gcc34.patch,
+  +files/ogre-1.0.7-gcc41.patch, +ogre-1.0.7.ebuild:
+  Version bump #122920 by Patrick Zimmerman.
 
   11 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
   +files/ogre-1.0.6-gcc41.patch, ogre-1.0.6.ebuild:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 200fbf03be1c..3640ee567457 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0624b15e7f287337bfac57092bbaeb5c ChangeLog 3272
-RMD160 8fc0e296aec5e19b2b50454e6bbac9409e3d2682 ChangeLog 3272
-SHA256 bb585c5a0bd4e5129ebcdda2b156bd9b483c48025297ae347cf32cb8c5caa350 ChangeLog 3272
+MD5 200b2a8e80212f2adac0ddb2d1abbd14 ChangeLog 3464
+RMD160 2bd8956bc2ac77c03147aa23e736716555b9f44f ChangeLog 3464
+SHA256 b2f98940a4516819527a96034707a585b90b107dec4f6ea81e32088c3280d082 ChangeLog 3464
 MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.15.1-nocg.patch 1535
 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e files/0.15.1-nocg.patch 1535
 SHA256 7b931bde184602cf09704685f7967827f24e32926ec8dc0a5411f8f24960279e files/0.15.1-nocg.patch 1535
@@ -28,6 +25,9 @@ SHA256 4e0ff1c466fd0aad46b75f81fd2819d8dac56b3021b30f5958e838bb27d3a84e files/di
 MD5 407aa30fcdb085369e6d75dc884d5838 files/digest-ogre-1.0.6 274
 RMD160 1245c68b48814b269c22f8b19dba5cb88ab1f547 files/digest-ogre-1.0.6 274
 SHA256 83b1b88475bcd86f981654840875f1375aed8c4a3b2c93d65fca824a630fd032 files/digest-ogre-1.0.6 274
+MD5 502d91003b6e329ee506e736582afa42 files/digest-ogre-1.0.7 274
+RMD160 79a48d39502d13a1777fb022c10f038fcbf70198 files/digest-ogre-1.0.7 274
+SHA256 b1133887793593bdd8e676f1cc1724d0eea962d3f28ca44d428f1fc9a501740a files/digest-ogre-1.0.7 274
 MD5 00b83fe5730136f01f243b1f16fd478f files/ogre-1.0.1-autotools.patch 3482
 RMD160 601c6533ab832176d8cf37668557d4338831dc59 files/ogre-1.0.1-autotools.patch 3482
 SHA256 43982939136c12a24743b6ab661b08fb39356ed41e7cbe3631252f163c80b4b5 files/ogre-1.0.1-autotools.patch 3482
@@ -37,6 +37,12 @@ SHA256 38d3d7ec2682c14cd617057bb09bdd1bb476e3d46af494b4055c196c730259b3 files/og
 MD5 6346d883e358b13caee4ac980927f835 files/ogre-1.0.6-gcc41.patch 2964
 RMD160 53f750cdd7113d1642a15bbbcee5bcc5470bc4ea files/ogre-1.0.6-gcc41.patch 2964
 SHA256 4ee1c89b97ecbb9e0735bef2a0232d63c2116eaa4e09dba6e7c8bfe64562a65a files/ogre-1.0.6-gcc41.patch 2964
+MD5 9cc328294f149f199ee3547fcb2b3f29 files/ogre-1.0.7-gcc34.patch 374
+RMD160 e7d7a0065d7c2adbd368d02e32169bb1ef0e665d files/ogre-1.0.7-gcc34.patch 374
+SHA256 86e701c1aa4e06999fdfe1b4a1492abd5a1e576a8176b50ec8bde36383b30566 files/ogre-1.0.7-gcc34.patch 374
+MD5 6346d883e358b13caee4ac980927f835 files/ogre-1.0.7-gcc41.patch 2964
+RMD160 53f750cdd7113d1642a15bbbcee5bcc5470bc4ea files/ogre-1.0.7-gcc41.patch 2964
+SHA256 4ee1c89b97ecbb9e0735bef2a0232d63c2116eaa4e09dba6e7c8bfe64562a65a files/ogre-1.0.7-gcc41.patch 2964
 MD5 b11c4d3064c807f259eae5a15f61232a metadata.xml 4326
 RMD160 dc14cc3b5869cbfddc4791048dcbb92bc59553de metadata.xml 4326
 SHA256 18f503fee6e9acb25ea9f9d7efafb0c6c454bfb1519a13b811f2aed18f1b7927 metadata.xml 4326
@@ -61,10 +67,6 @@ SHA256 1e82e8bdba7c153ebdf50cdb27587733a0808eb9145ed02684771d5691d8416c ogre-1.0
 MD5 a0c1128d9ae0ae074fbbd14254b3a040 ogre-1.0.6.ebuild 2578
 RMD160 6c64b02f453dec273f90aa73a5b8c744951196e3 ogre-1.0.6.ebuild 2578
 SHA256 687e75d433cc78a4f6e6ee9e3874db423a86692d937b352907e0acdfe8f63c66 ogre-1.0.6.ebuild 2578
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEEiQzCRZPokWLroQRAhIWAJwNLQVHGNs7+J1UzVMLA0YFH+jpZgCeN9CN
-5cVm2yjxRazhthwWmHEwwiA=
-=V7Bq
------END PGP SIGNATURE-----
+MD5 0c7bc628195ce75967bf46c94b89aa5e ogre-1.0.7.ebuild 2393
+RMD160 5402ae0922fc5eec12061aed738a5ee0dcdff79f ogre-1.0.7.ebuild 2393
+SHA256 16f7146e73c46ef594fd125e7fc82d77a68a3afb0ec82d90b9a554d2a4a3e795 ogre-1.0.7.ebuild 2393
diff --git a/dev-games/ogre/files/digest-ogre-1.0.7 b/dev-games/ogre/files/digest-ogre-1.0.7
new file mode 100644
index 000000000000..235dd61ab8ae
--- /dev/null
+++ b/dev-games/ogre/files/digest-ogre-1.0.7
@@ -0,0 +1,3 @@
+MD5 9120af9f10efddeb8c79bb9f46d9706c ogre-linux_osx-v1-0-7.tar.bz2 18786151
+RMD160 25da89e5f1375b8acdda377a3734914f6f87bb37 ogre-linux_osx-v1-0-7.tar.bz2 18786151
+SHA256 e4dbd75feb877173f3cc9c83f10e4f5326affebc5833c4c0f49c349bfbda84af ogre-linux_osx-v1-0-7.tar.bz2 18786151
diff --git a/dev-games/ogre/files/ogre-1.0.7-gcc34.patch b/dev-games/ogre/files/ogre-1.0.7-gcc34.patch
new file mode 100644
index 000000000000..0503d5a2fafe
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.0.7-gcc34.patch
@@ -0,0 +1,10 @@
+--- PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp.original	2006-03-20 22:08:17.000000000 +0100
++++ PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp	2006-03-20 22:06:59.000000000 +0100
+@@ -22,6 +22,7 @@
+ -----------------------------------------------------------------------------
+ */
+ 
++#include "OgreLogManager.h"
+ #include "OgreSDLConfig.h"
+ 
+ #include <libglademm/xml.h>
diff --git a/dev-games/ogre/files/ogre-1.0.7-gcc41.patch b/dev-games/ogre/files/ogre-1.0.7-gcc41.patch
new file mode 100644
index 000000000000..91a0357848be
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.0.7-gcc41.patch
@@ -0,0 +1,61 @@
+--- ./ogrenew/OgreMain/include/OgreEntity.h.old	2005-11-16 21:39:05.000000000 +0100
++++ ./ogrenew/OgreMain/include/OgreEntity.h	2006-01-28 15:10:57.000000000 +0100
+@@ -568,7 +568,7 @@
+ 	
+         /** Stops sharing the SkeletonInstance with other entities.
+         */
+-        void Entity::stopSharingSkeletonInstance();
++        void stopSharingSkeletonInstance();
+ 
+ 
+         /**
+
+--- ./ogrenew/OgreMain/include/OgreHardwareOcclusionQuery.h.old	2005-08-20 01:47:32.000000000 +0200
++++ ./ogrenew/OgreMain/include/OgreHardwareOcclusionQuery.h	2006-01-28 15:18:38.000000000 +0100
+@@ -113,7 +113,7 @@
+ 	  * Lets you know when query is done, or still be processed by the Hardware
+ 	  * @return true if query isn't finished.
+ 	  */
+-	 virtual bool HardwareOcclusionQuery::isStillOutstanding(void) = 0; 
++	 virtual bool isStillOutstanding(void) = 0; 
+ 	/**
+ 	  *   
+ 	  * @Remarks This function allows you to set how often the hardware occlusion really are sent to the driver
+
+--- ./ogrenew/OgreMain/include/OgreImage.h.old	2005-04-06 15:30:43.000000000 +0200
++++ ./ogrenew/OgreMain/include/OgreImage.h	2006-01-28 14:56:54.000000000 +0100
+@@ -136,7 +136,7 @@
+ 			@remarks 
+ 				The size of the buffer must be numFaces*PixelUtil::getMemorySize(width, height, depth, format)
+          */
+-		Image& Image::loadDynamicImage( uchar* pData, size_t uWidth, size_t uHeight, 
++		Image& loadDynamicImage( uchar* pData, size_t uWidth, size_t uHeight, 
+ 							size_t depth,
+ 							 PixelFormat eFormat, bool autoDelete = false, 
+ 							 size_t numFaces = 1, size_t numMipMaps = 0);
+
+--- ./ogrenew/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h.old	2005-02-04 18:51:24.000000000 +0100
++++ ./ogrenew/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h	2006-01-28 15:30:05.000000000 +0100
+@@ -193,8 +193,8 @@
+     /** Overridden from SceneManager */
+     void clearScene(void);
+ 
+-    AxisAlignedBoxSceneQuery* OctreeSceneManager::createAABBQuery(const AxisAlignedBox& box, unsigned long mask);
+-    SphereSceneQuery* OctreeSceneManager::createSphereQuery(const Sphere& sphere, unsigned long mask);
++    AxisAlignedBoxSceneQuery* createAABBQuery(const AxisAlignedBox& box, unsigned long mask);
++    SphereSceneQuery* createSphereQuery(const Sphere& sphere, unsigned long mask);
+     PlaneBoundedVolumeListSceneQuery* createPlaneBoundedVolumeQuery(const PlaneBoundedVolumeList& volumes, unsigned long mask);
+     RaySceneQuery* createRayQuery(const Ray& ray, unsigned long mask);
+     IntersectionSceneQuery* createIntersectionQuery(unsigned long mask);
+
+--- ./ogrenew/Tools/XMLConverter/include/tinyxml.h.old	2003-09-11 00:48:29.000000000 +0200
++++ ./ogrenew/Tools/XMLConverter/include/tinyxml.h	2006-01-28 15:42:29.000000000 +0100
+@@ -790,7 +790,7 @@
+ #endif
+ 
+ 	/// Construct.
+-	TiXmlDeclaration::TiXmlDeclaration( const char * _version,
++	TiXmlDeclaration( const char * _version,
+ 										const char * _encoding,
+ 										const char * _standalone );
+ 
diff --git a/dev-games/ogre/ogre-1.0.7.ebuild b/dev-games/ogre/ogre-1.0.7.ebuild
new file mode 100644
index 000000000000..b6177f5684e8
--- /dev/null
+++ b/dev-games/ogre/ogre-1.0.7.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.0.7.ebuild,v 1.1 2006/03/20 22:25:47 tupone Exp $
+
+inherit eutils
+
+MY_PV=${PV//./-}
+MY_PV=${MY_PV/_/}
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/ogre/${PN}-linux_osx-v${MY_PV}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="cegui cg devil double-precision doc gtk opengl openexr sdl threads"
+
+RDEPEND=">=dev-libs/zziplib-0.13.36
+	=media-libs/freetype-2*
+	threads? ( >=dev-libs/boost-1.33.0 )
+	cegui? ( >=dev-games/cegui-0.3.0 )
+	devil? ( >=media-libs/devil-1.5 )
+	openexr? ( >=media-libs/openexr-1.2 )
+	sdl? ( >=media-libs/libsdl-1.2.6 )
+	!sdl? ( !opengl? (
+		=dev-cpp/gtkglextmm-1.0*
+		=dev-cpp/libglademm-2.2*
+	) )
+	gtk? (
+		=dev-cpp/libglademm-2.2*
+		=dev-cpp/gtkmm-2.2*
+	)
+	virtual/opengl
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	cg? ( >=media-gfx/nvidia-cg-toolkit-1.2 )"
+
+S=${WORKDIR}/ogrenew
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc{41,34}.patch
+
+	# bundled libtool goes boom, so force newer ... note, don't
+	./bootstrap || die "bootstrap failed"
+
+	# Fails to build on amd64 w/gcc-3.4.4 so remove the flag ...
+	sed -i \
+		-e 's:-fno-rtti::g' \
+		configure || die "sed CFLAGS"
+}
+
+src_compile() {
+	# For the config toolkit:
+	#  USE="gtk" -> gtk
+	#  USE="-gtk" -> cli
+	local mycfgtk="cli"
+	use gtk && mycfgtk="gtk"
+
+	# For the renderer/platform manager:
+	#  USE="sdl" -> SDL
+	#  USE="-sdl opengl" -> GLX
+	#  USE="-sdl -opengl" -> gtk
+	local myplat=""
+	if use sdl ; then
+		myplat="SDL"
+	elif use opengl ; then
+		myplat="GLX"
+	else
+		myplat="gtk"
+	fi
+
+#		--with-gl-support=${myplat} 
+	econf \
+		--with-cfgtk=${mycfgtk} \
+		--with-platform=${myplat} \
+		$(use_enable devil) \
+		$(use_enable cg) \
+		$(use_enable openexr) \
+		$(use_enable threads threading) \
+		$(use_enable double-precision double) \
+		$(use_enable sdl sdltest) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	insinto /usr/share/OGRE/Media
+	doins Samples/Media/*
+	if use doc ; then
+		dohtml -r Docs/* Docs/Tutorials/*
+		insinto /usr/share/doc/${PF}/Samples
+		doins -r Samples/*
+	fi
+	dodoc AUTHORS BUGS LINUX.DEV README Docs/README.linux
+	dohtml Docs/*.html
+}