Version bump #95396 by Giacomo Graziosi.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 131 insertions, 2 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index e67a0b343482..706f32802c0a 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.18 2005/05/04 04:08:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.19 2005/06/08 02:49:06 vapier Exp $
+
+*ogre-1.0.2 (08 Jun 2005)
+
+  08 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ogre-1.0.2-autotools.patch, +ogre-1.0.2.ebuild:
+  Version bump #95396 by Giacomo Graziosi.
 
   04 May 2005; Sven Wegener <swegener@gentoo.org> ogre-1.0.1.ebuild:
   Fixed !use? in *DEPEND.
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index eda5636c9472..820c7d0a8ca0 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,8 +1,11 @@
-MD5 9ad43c39d57b57c9e3498e7475099f12 ChangeLog 2321
+MD5 eadbdb13103d3361b7d07d404ebe49f6 ChangeLog 2497
 MD5 b11c4d3064c807f259eae5a15f61232a metadata.xml 4326
+MD5 fcf412acd8bd58918ffa8c5e6639151a ogre-1.0.2.ebuild 2384
 MD5 24a70171384ad7a8b14c8a5e4e891521 ogre-1.0.1.ebuild 2217
 MD5 0b1ac52dc3bcf567017d7f496464eb81 ogre-0.15.1.ebuild 1436
 MD5 77b04d7b9bd7c05800bc038e8e7e5536 files/digest-ogre-1.0.1 76
+MD5 f8f854062e8f3ade51a25fa86c2c4d4d files/digest-ogre-1.0.2 76
 MD5 00b83fe5730136f01f243b1f16fd478f files/ogre-1.0.1-autotools.patch 3482
+MD5 a71b8412cf3e1e75c6d8cf54120adc2e files/ogre-1.0.2-autotools.patch 672
 MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.15.1-nocg.patch 1535
 MD5 1a623c9495c1a9f63d402d570d74e79d files/digest-ogre-0.15.1 77
diff --git a/dev-games/ogre/files/digest-ogre-1.0.2 b/dev-games/ogre/files/digest-ogre-1.0.2
new file mode 100644
index 000000000000..8fc21907290c
--- /dev/null
+++ b/dev-games/ogre/files/digest-ogre-1.0.2
@@ -0,0 +1 @@
+MD5 6234847ec4f3de1c7f7aeec1971c950e ogre-linux_osx-v1-0-2.tar.bz2 19799226
diff --git a/dev-games/ogre/files/ogre-1.0.2-autotools.patch b/dev-games/ogre/files/ogre-1.0.2-autotools.patch
new file mode 100644
index 000000000000..07324d525dab
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.0.2-autotools.patch
@@ -0,0 +1,20 @@
+The build exr logic is inverted, so un-invert it.
+
+http://bugs.gentoo.org/95396
+https://sourceforge.net/tracker/index.php?func=detail&aid=1216798&group_id=2997&atid=302997
+
+--- acinclude.m4
++++ acinclude.m4
+@@ -325,10 +325,10 @@
+               [build_exr=$enableval],
+               [build_exr=no])
+ 
+-if test "x$build_exr" = "xno" ; then
++if test "x$build_exr" = "xyes" ; then
+ 	PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=yes], [build_exr=no])
+ 
+-	if test "x$build_exr" = "xno" ; then
++	if test "x$build_exr" = "xyes" ; then
+ 	   	AC_CONFIG_FILES([ PlugIns/EXRCodec/Makefile \
+     					 PlugIns/EXRCodec/src/Makefile \
+     					 PlugIns/EXRCodec/include/Makefile])
diff --git a/dev-games/ogre/ogre-1.0.2.ebuild b/dev-games/ogre/ogre-1.0.2.ebuild
new file mode 100644
index 000000000000..14f54a8c79ab
--- /dev/null
+++ b/dev-games/ogre/ogre-1.0.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.0.2.ebuild,v 1.1 2005/06/08 02:49:06 vapier 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"
+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 )
+	cegui? ( >=dev-games/cegui-0.2.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}-autotools.patch
+
+	# bundled libtool goes boom, so force newer
+	sed -i 's:libtoolize:libtoolize --copy:' bootstrap
+	./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
+}