version bump

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 102 insertions, 2 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index ebbc4fc812dd..2d7de586316b 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.59 2009/11/18 14:15:44 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.60 2009/12/03 01:41:58 mr_bones_ Exp $
+
+*ogre-1.6.4 (03 Dec 2009)
+
+  03 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> +ogre-1.6.4.ebuild,
+  +files/ogre-1.6.4-boost.patch:
+  version bump
 
   18 Nov 2009; Alfredo Tupone <tupone@gentoo.org> ogre-1.6.3.ebuild,
   +files/ogre-1.6.3-boost.patch:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 8d0596c2811d..2b0fa9d93cb6 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,9 +1,12 @@
 AUX ogre-1.4.9-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a
 AUX ogre-1.4.9-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
 AUX ogre-1.6.3-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
+AUX ogre-1.6.4-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
 DIST ogre-v1-4-9.tar.bz2 29555312 RMD160 c95536520d222b410e30f7bbee15c55360ee9c8d SHA1 3b8fb296a16cac77cdba6370bd9c752bfcccf18a SHA256 38b17826b6b34e70bf1bab17d4791ab1d485409c938cf71e1e5f866f3391c35b
 DIST ogre-v1-6-3.tar.bz2 41790055 RMD160 e1e16c152d5cb3141e306e4886092b5675695e9a SHA1 0bde8f8d982151c561e9e6c9ccb51e0d19b5eab6 SHA256 cd5897b49d9a9fd12e5a67d0b804ef9302cfff62fa8bfde4941cb488b677a2ef
+DIST ogre-v1-6-4.tar.bz2 41792925 RMD160 1c7e5f83df812671bcdc6bcf5dfa6a38fc69c93f SHA1 8d0c3edd2c8e289675555d10692407203e9e8a4a SHA256 af348dc278ff53f5eec966073d1eb8a87ad5c29215339713ce91eda1501bf12e
 EBUILD ogre-1.4.9.ebuild 2474 RMD160 fde3e4726d13e7e33e09ef504113eb6a20754c9c SHA1 9e4c7432007c6fe97b7407db03c18d1c726fddfd SHA256 64c1648585f07452afbac82a81f2a9fef3d65a176b553857f90c91c0c5a0ebfa
 EBUILD ogre-1.6.3.ebuild 2196 RMD160 84623534fe35488baf4490e9dc2690de4c98d1cb SHA1 87c9421a0c731aa33847c5207511c765c0034f0b SHA256 b9208d9237263723bf53eb142796b4e3d8fabc65e4c1bedd8a36f7e853c2efce
-MISC ChangeLog 8509 RMD160 b505f8250d90341bd1fbc3aa20f5e2bd7c964aa5 SHA1 7cabd2f216cd5962ef4340f11f147db7e998c770 SHA256 ab482fb2a831cbfc1de899e3df5b073dbccbfe6dac26d4d0e2d720b8f55296b3
+EBUILD ogre-1.6.4.ebuild 2199 RMD160 bd151f5cf60ebb7990594671b5af4a152d38fa1d SHA1 e3044f614f8f39d083f9af8c55571de032cb702f SHA256 49ab2927af820c3a5aba3411e733d0cce2ee3358d4fd80c206cff875f9f02cb7
+MISC ChangeLog 8663 RMD160 6d715669b6c3b132ff0a4db1a69412a2563e7387 SHA1 ab60f67ec15f598851caddb581587d476dc4c8fb SHA256 85be6a772f4877a5fad27c239ace80453e52e612c3fb4f6689fc60559c615cdb
 MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
diff --git a/dev-games/ogre/files/ogre-1.6.4-boost.patch b/dev-games/ogre/files/ogre-1.6.4-boost.patch
new file mode 100644
index 000000000000..9f1784c558cd
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.4-boost.patch
@@ -0,0 +1,10 @@
+--- OgreMain/include/OgreStdHeaders.h.old	2009-11-18 14:08:48.000000000 +0100
++++ OgreMain/include/OgreStdHeaders.h	2009-11-18 14:09:59.000000000 +0100
+@@ -110,6 +110,7 @@
+ #	include <boost/thread/recursive_mutex.hpp>
+ #	include <boost/thread/condition.hpp>
+ #	include <boost/thread/thread.hpp>
++#	include <boost/function.hpp>
+ #endif
+ 
+ #if defined ( OGRE_GCC_VISIBILITY )
diff --git a/dev-games/ogre/ogre-1.6.4.ebuild b/dev-games/ogre/ogre-1.6.4.ebuild
new file mode 100644
index 000000000000..cb6c281c8439
--- /dev/null
+++ b/dev-games/ogre/ogre-1.6.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.1 2009/12/03 01:41:58 mr_bones_ Exp $
+
+EAPI=2
+inherit multilib eutils autotools flag-o-matic
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/ogre/ogre-v${PV//./-}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc cg devil double-precision examples gtk threads"
+RESTRICT="test" #139905
+
+RDEPEND="dev-libs/zziplib
+	media-libs/freetype:2
+	virtual/opengl
+	virtual/glu
+	x11-libs/libXt
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libX11
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	devil? ( media-libs/devil )
+	gtk? ( x11-libs/gtk+:2 )
+	threads? ( || ( >=dev-libs/boost-1.34.1 dev-libs/boost[threads] ) )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	ecvs_clean
+	if use examples ; then
+		cp -r Samples install-examples || die
+		find install-examples \
+			'(' -name .keepme -o -name '*.cbp' -o -name '*.vcproj*' ')' \
+			-print0 | xargs -0 rm -rf
+		find install-examples -type d -print0 | xargs -0 rmdir 2> /dev/null
+		sed -i \
+			-e "s:/usr/local/lib/OGRE:/usr/$(get_libdir)/OGRE:" \
+			$(grep -rl /usr/local/lib/OGRE install-examples) \
+			|| die "sed failed"
+	fi
+	sed -i -e '/CPPUNIT/d' configure.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-boost.patch
+	eautoreconf
+}
+
+src_configure() {
+	strip-flags
+		econf \
+		--disable-dependency-tracking \
+		--disable-freeimage \
+		--disable-openexr \
+		--disable-ogre-demos \
+		--enable-static \
+		--with-platform=GLX \
+		--with-gui=$(usev gtk || echo Xt) \
+		$(use_enable cg) \
+		$(use_enable devil) \
+		$(use_enable double-precision double) \
+		$(use_enable threads threading)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html
+		doins -r Docs/* || die "doins Docs failed"
+	fi
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/Samples
+		doins -r install-examples/* || die "doins Samples failed"
+	fi
+	dodoc AUTHORS BUGS LINUX.DEV README
+}