version bump

5 files changed, 107 insertions, 2 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index af1150a01bc0..901f4e4c4e08 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/ogre
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.14 2004/06/25 02:23:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.15 2004/12/10 11:39:36 mr_bones_ Exp $
+
+*ogre-0.15.1 (10 Dec 2004)
+
+  10 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.15.1-nocg.patch, +ogre-0.15.1.ebuild:
+  version bump
 
 *ogre-0.14.0 (24 Jun 2004)
 
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 4e027152096d..ace96e7fcf44 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -3,8 +3,10 @@ MD5 b11c4d3064c807f259eae5a15f61232a metadata.xml 4326
 MD5 a6549b2ac2b9bdf86dd9c641cf62353e ogre-0.13.1.ebuild 1518
 MD5 148961a1c1a99491973b2018a54497f6 ogre-0.14.0.ebuild 1418
 MD5 19d8aa6f20f8a89c02eea48fd36c10f5 ogre-0.14.0-r1.ebuild 1450
+MD5 75bc07d3fc918b88f77a6b2526628f45 ogre-0.15.1.ebuild 1449
 MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.13.1-nocg.patch 1535
-MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.14.0-nocg.patch 1535
 MD5 06fffa8ed37ab32945ac506d70dfa80e files/digest-ogre-0.13.1 77
 MD5 a6eec2ad2bd89196e3b0493eaf9a1550 files/digest-ogre-0.14.0 77
+MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.14.0-nocg.patch 1535
 MD5 a6eec2ad2bd89196e3b0493eaf9a1550 files/digest-ogre-0.14.0-r1 77
+MD5 1a623c9495c1a9f63d402d570d74e79d files/digest-ogre-0.15.1 77
diff --git a/dev-games/ogre/files/0.15.1-nocg.patch b/dev-games/ogre/files/0.15.1-nocg.patch
new file mode 100644
index 000000000000..463dce704339
--- /dev/null
+++ b/dev-games/ogre/files/0.15.1-nocg.patch
@@ -0,0 +1,30 @@
+--- configure.in.orig	2004-04-14 12:04:49.000000000 +0200
++++ configure.in	2004-04-14 12:05:43.000000000 +0200
+@@ -44,12 +44,6 @@
+ ****************************************************************]))
+ AC_CHECK_LIB(ILU, iluFlipImage)
+ AC_CHECK_LIB(pthread, pthread_create)
+-AC_CHECK_LIB(Cg, cgCreateProgram,,AC_MSG_ERROR([
+-****************************************************************
+-* You do not have the nVidia Cg libraries installed.           *
+-* Go to http://developer.nvidia.com/object/cg_toolkit.html     *
+-* (Click on Cg_Linux.tar.gz).                                  *
+-****************************************************************]))
+ AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,,snprintf))
+ AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF,,vsnprintf))
+ 
+@@ -94,9 +88,6 @@
+     PlugIns/BSPSceneManager/Makefile \
+     PlugIns/BSPSceneManager/src/Makefile \
+     PlugIns/BSPSceneManager/include/Makefile \
+-    PlugIns/CgProgramManager/Makefile \
+-    PlugIns/CgProgramManager/src/Makefile \
+-    PlugIns/CgProgramManager/include/Makefile \
+     PlugIns/FileSystem/Makefile \
+     PlugIns/FileSystem/src/Makefile \
+     PlugIns/FileSystem/include/Makefile \
+--- PlugIns/Makefile.am.orig	2004-04-14 12:05:54.000000000 +0200
++++ PlugIns/Makefile.am	2004-04-14 12:06:03.000000000 +0200
+@@ -1 +1 @@
+-SUBDIRS = BSPSceneManager CgProgramManager FileSystem ParticleFX OctreeSceneManager GuiElements NatureSceneManager
++SUBDIRS = BSPSceneManager FileSystem ParticleFX OctreeSceneManager GuiElements NatureSceneManager
diff --git a/dev-games/ogre/files/digest-ogre-0.15.1 b/dev-games/ogre/files/digest-ogre-0.15.1
new file mode 100644
index 000000000000..d19fc12f97df
--- /dev/null
+++ b/dev-games/ogre/files/digest-ogre-0.15.1
@@ -0,0 +1 @@
+MD5 b6f32f431727a000b739abde8784700b ogre-linux_osx-v0-15-1.tar.bz2 24570136
diff --git a/dev-games/ogre/ogre-0.15.1.ebuild b/dev-games/ogre/ogre-0.15.1.ebuild
new file mode 100644
index 000000000000..07ef97614c34
--- /dev/null
+++ b/dev-games/ogre/ogre-0.15.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-0.15.1.ebuild,v 1.1 2004/12/10 11:39:36 mr_bones_ Exp $
+
+inherit eutils
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/ogre/${PN}-linux_osx-v${PV//./-}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc gtk"
+
+RDEPEND="virtual/opengl
+	media-libs/libsdl
+	=media-libs/freetype-2*
+	>=media-libs/devil-1.5
+	gtk? (
+		=dev-cpp/libglademm-2.0*
+		=dev-cpp/gtkmm-2* )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	x86? ( >=media-gfx/nvidia-cg-toolkit-1.2 )
+	amd64? ( >=media-gfx/nvidia-cg-toolkit-1.2 )
+	|| (
+		dev-libs/STLport
+		>=sys-devel/gcc-3.0 )"
+
+S="${WORKDIR}/ogrenew"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	case "${ARCH}" in
+	x86 | amd64)
+		;;
+	*)
+		einfo "Removing nVidia Cg dependency on this arch"
+		epatch "${FILESDIR}/${PV}-nocg.patch"
+		rm -rf "${S}/autom4te.cache"
+		./bootstrap
+		;;
+	esac
+}
+
+src_compile() {
+	local myconf="cli"
+
+	use gtk && myconf="gtk"
+
+	econf --with-cfgtk=${myconf} || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	if use doc ; then
+		dohtml -r Docs/* Docs/Tutorials/*
+	fi
+	insinto /usr/share/OGRE/Media
+	doins Samples/Media/*
+	dodoc AUTHORS BUGS LINUX.DEV README Docs/README.linux
+	dohtml Docs/*.html
+}