version bump

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

5 files changed, 117 insertions, 3 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 5ccad1524752..b6578eaa8d83 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.62 2009/12/21 20:44:22 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.63 2010/01/11 18:38:13 mr_bones_ Exp $
+
+*ogre-1.6.5 (11 Jan 2010)
+
+  11 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org> +ogre-1.6.5.ebuild,
+  +files/ogre-1.6.5-automake.patch, +files/ogre-1.6.5-boost.patch:
+  version bump
 
   21 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.4.ebuild:
   look in /opt for nvidia-cg-toolkit (bug #259169)
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 2a07cb2e1dff..9c6f6056c205 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -2,9 +2,13 @@ AUX ogre-1.4.9-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a
 AUX ogre-1.4.9-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
 AUX ogre-1.6.4-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f
 AUX ogre-1.6.4-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
+AUX ogre-1.6.5-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f
+AUX ogre-1.6.5-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-4.tar.bz2 41792925 RMD160 1c7e5f83df812671bcdc6bcf5dfa6a38fc69c93f SHA1 8d0c3edd2c8e289675555d10692407203e9e8a4a SHA256 af348dc278ff53f5eec966073d1eb8a87ad5c29215339713ce91eda1501bf12e
+DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
 EBUILD ogre-1.4.9.ebuild 2471 RMD160 e4d5799c3181b5e018cf388e6f61af6ed105400d SHA1 cf23cea542cbf09cea5a5863a7e8e058f3122b16 SHA256 4a5e333060987d058edc37fd4af50a40fd8681ebb79c222900a4767a968b04c6
 EBUILD ogre-1.6.4.ebuild 2332 RMD160 f780edad2b87c7ed3a0b2f74a8ffe16889d1c053 SHA1 37729a60a03f4aeb5a71a13261d1a2c9e7b2df35 SHA256 1ff6be29cd5362831db738beecea1e2b8020a138119941e93d4aee8abb5d01dc
-MISC ChangeLog 8954 RMD160 b7dc5ef12a93a30faeffc5ef6d8a19968988b515 SHA1 85441baae8d62336714f6da65f152c1c03429713 SHA256 d2258d76d7dedb8503ff9d43409a2ef2ccba17554124ff80839c3aa80bb55beb
+EBUILD ogre-1.6.5.ebuild 2332 RMD160 575573a001e999476649138bcb1be97777d43606 SHA1 db8b911563a09580b8d65f0cdeab483d21f5bd4a SHA256 5955b96153e8e6f6e28ef6aff9fd184202b64b1da193fb1187b7635636e1d627
+MISC ChangeLog 9139 RMD160 09791a85d4d5963eb72ee8af52149180b17381c9 SHA1 35f7b04d9f4b762c2099c6980bd3414fe2821bf3 SHA256 38a5b5b7947de33e27c5b122e9502b94e540d5b08ffef0f50387aeeec8a50195
 MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
diff --git a/dev-games/ogre/files/ogre-1.6.5-automake.patch b/dev-games/ogre/files/ogre-1.6.5-automake.patch
new file mode 100644
index 000000000000..bfb473a2381c
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.5-automake.patch
@@ -0,0 +1,9 @@
+--- RenderSystems/GL/src/Makefile.am.old	2009-12-16 12:12:56.000000000 +0100
++++ RenderSystems/GL/src/Makefile.am	2009-12-16 12:14:43.000000000 +0100
+@@ -42,4 +42,5 @@
+     $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \
+     $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \
+     $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \
+-    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS)
++    $(top_builddir)/OgreMain/src/libOgreMain.la \
++    $(GL_LIBS) $(GLSUPPORT_LIBS) $(OGRE_THREAD_LIBS)
diff --git a/dev-games/ogre/files/ogre-1.6.5-boost.patch b/dev-games/ogre/files/ogre-1.6.5-boost.patch
new file mode 100644
index 000000000000..9f1784c558cd
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.5-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.5.ebuild b/dev-games/ogre/ogre-1.6.5.ebuild
new file mode 100644
index 000000000000..4deaaffb4a18
--- /dev/null
+++ b/dev-games/ogre/ogre-1.6.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.1 2010/01/11 18:38:13 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 \
+		"${FILESDIR}"/${P}-automake.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/opt/nvidia-cg-toolkit/lib
+	append-cppflags -I/opt/nvidia-cg-toolkit/include
+	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
+}