version bump

Package-Manager: portage-2.1.4.4

5 files changed, 133 insertions, 2 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 7c1414cadd49..0565da07ded0 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.50 2008/06/02 01:59:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.51 2008/06/20 17:11:15 mr_bones_ Exp $
+
+*ogre-1.4.9 (20 Jun 2008)
+
+  20 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ogre-1.4.9-as-needed.patch, +files/ogre-1.4.9-cegui.patch,
+  +ogre-1.4.9.ebuild:
+  version bump
 
   02 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.4.8.ebuild:
   strip-flags for bugs like #186734
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index a43c9b964485..df8699d6cd0c 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,9 +1,13 @@
 AUX 0.15.1-nocg.patch 1535 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e SHA1 07c4a8cac2a51aa369a2aef92ad484c4221ea339 SHA256 7b931bde184602cf09704685f7967827f24e32926ec8dc0a5411f8f24960279e
 AUX ogre-1.4.8-as-needed.patch 428 RMD160 30dcb1754fc9eaf83352a2890d69217c27b8e71b SHA1 89e9b5954e4f5321bdd100af09b5f5425f52d5f9 SHA256 c8e5d95ae9da0619bcca241c900489e14cf658b858ff7be6d8842067696f0e6a
 AUX ogre-1.4.8-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
+AUX ogre-1.4.9-as-needed.patch 428 RMD160 30dcb1754fc9eaf83352a2890d69217c27b8e71b SHA1 89e9b5954e4f5321bdd100af09b5f5425f52d5f9 SHA256 c8e5d95ae9da0619bcca241c900489e14cf658b858ff7be6d8842067696f0e6a
+AUX ogre-1.4.9-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
 DIST ogre-linux_osx-v0-15-1.tar.bz2 24570136 RMD160 19709f610e581c8cbfcfbbe8e4feed1e4bbb2e27 SHA1 c075e585dadd29a5c0271ccb97eb56e473c3271a SHA256 a55f724059feddc6fd51a588be8e2a839341a7c8b97bb2ee5774f4200b383915
 DIST ogre-v1-4-8.tar.bz2 29700614 RMD160 9764532aab9db2bfc655c9eaec88481eb6302b44 SHA1 afa3d98c5f553023da1d3698cbf2713836d8e216 SHA256 396eac8accbee9b3652ed6b94e2bc2c7a129e96c661fe1a6d5855c78657d19c1
+DIST ogre-v1-4-9.tar.bz2 29555312 RMD160 c95536520d222b410e30f7bbee15c55360ee9c8d SHA1 3b8fb296a16cac77cdba6370bd9c752bfcccf18a SHA256 38b17826b6b34e70bf1bab17d4791ab1d485409c938cf71e1e5f866f3391c35b
 EBUILD ogre-0.15.1.ebuild 1436 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 SHA1 9b4bfa5a7d8f389e6cf4b4f01d25e4a946de3dc3 SHA256 f5705dcac9ff289e48f02ce9b402f33eeb93964cf9702d93fd8ff656ab1030b4
 EBUILD ogre-1.4.8.ebuild 2291 RMD160 424165c52ff80c399b32dff2d2e5459f0ac52616 SHA1 6afda5789bfeab6e83bc18e112d53150d538ea05 SHA256 c871c34335ef67262730289d6e0c599d5954d5402c60328f240420fbe9147082
-MISC ChangeLog 7240 RMD160 69c18050567e3c771f7660aa8429de2b90b3f074 SHA1 36a15d9ff1c16ac03f1925585373f870f685a645 SHA256 2d8cc50189152db022a25fc573f6c49156c26324f92b5b182d9b84b2bab1b712
+EBUILD ogre-1.4.9.ebuild 2291 RMD160 31273eff5f86343519c9ede48a55754604065e38 SHA1 96546f28ba680d1fccb924338f588fa3be7ce2b1 SHA256 0817b66145effca3b4ba55fd577a07f65a88755c1b873a4f7b2e9cf0f106974f
+MISC ChangeLog 7428 RMD160 23c4f007b5300cc5e95660ebdd6cba2e48e4c416 SHA1 f4b61a0a8972756e296ccf0ba8eb3b18a86ae040 SHA256 46232497cedf618f66e2f46dfcbe887ac6f3459925faeb05eecf2f33e01cbb2e
 MISC metadata.xml 4236 RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf SHA1 de49ea9fb17aa117ce25f685ae76062bea60b91f SHA256 3d5b0d15c24a55959278cf092bb62bfd109da2db4fcc8a07a7c6ccf449624981
diff --git a/dev-games/ogre/files/ogre-1.4.9-as-needed.patch b/dev-games/ogre/files/ogre-1.4.9-as-needed.patch
new file mode 100644
index 000000000000..ce218097f770
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.4.9-as-needed.patch
@@ -0,0 +1,11 @@
+--- acinclude.m4.orig	2008-04-09 17:49:30.848987000 +0100
++++ acinclude.m4	2008-04-09 17:53:25.652068359 +0100
+@@ -340,7 +340,7 @@
+ 	* --disable-cg to this configure script but this is highly     *
+ 	* discouraged as this breaks many of the examples.             *
+ 	****************************************************************])
+-	)
++	,-Xlinker --no-as-needed)
+ fi
+ 
+ AM_CONDITIONAL(BUILD_CGPLUGIN, test x$build_cg = xyes)
diff --git a/dev-games/ogre/files/ogre-1.4.9-cegui.patch b/dev-games/ogre/files/ogre-1.4.9-cegui.patch
new file mode 100644
index 000000000000..c089164af219
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.4.9-cegui.patch
@@ -0,0 +1,19 @@
+--- acinclude.m4
++++ acinclude.m4
+@@ -411,6 +411,8 @@
+ ])
+ 
+ AC_DEFUN([OGRE_CHECK_CEGUI], [
++    AC_ARG_ENABLE(cegui)
++    if test x$enable_cegui != xno; then
+     PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.5.0, 
+             [build_cegui_sample=true], [build_cegui_sample=false])
+     if test x$build_cegui_sample = xtrue; then
+@@ -426,6 +428,7 @@
+     else
+         AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built])
+     fi
++    fi
+     AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
+ ])
+ 
diff --git a/dev-games/ogre/ogre-1.4.9.ebuild b/dev-games/ogre/ogre-1.4.9.ebuild
new file mode 100644
index 000000000000..339f6a23bbbf
--- /dev/null
+++ b/dev-games/ogre/ogre-1.4.9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.9.ebuild,v 1.1 2008/06/20 17:11:15 mr_bones_ Exp $
+
+inherit 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 cegui cg devil double-precision examples gtk openexr 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
+	cegui? ( >=dev-games/cegui-0.5 )
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	devil? ( media-libs/devil )
+	gtk? ( >=x11-libs/gtk+-2 )
+	openexr? ( media-libs/openexr )
+	threads? ( dev-libs/boost )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	if use threads && ! built_with_use --missing true dev-libs/boost threads
+	then
+		die "Please emerge dev-libs/boost with USE=threads"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	ecvs_clean
+	if use examples ; then
+		cp -r Samples install-examples || die
+		find install-examples \
+			'(' -name 'Makefile*' -o -name obj -o \
+			    -name bin -o -name '*.cbp' -o -name '*.vcproj*' ')' \
+			-print0 | xargs -0 rm -rf
+	fi
+	sed -i -e '/CPPUNIT/d' configure.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-*.patch
+	eautoreconf
+}
+
+src_compile() {
+	strip-flags
+	econf \
+		--disable-dependency-tracking \
+		--disable-freeimage \
+		--disable-ogre-demos \
+		--enable-static \
+		--with-platform=GLX \
+		--with-gui=$(usev gtk || echo Xt) \
+		$(use_enable cegui) \
+		$(use_enable cg) \
+		$(use_enable devil) \
+		$(use_enable double-precision double) \
+		$(use_enable openexr) \
+		$(use_enable threads threading) \
+		|| die
+	emake || die "emake failed"
+}
+
+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
+}