Version bump

Package-Manager: portage-2.1.4

5 files changed, 146 insertions, 6 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 5bf3104c1fb3..a0b026b0169c 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/ogre
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.44 2007/11/17 16:05:06 drac Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.45 2008/01/16 11:39:13 nyhm Exp $
+
+*ogre-1.4.6 (16 Jan 2008)
+
+  16 Jan 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/ogre-1.4.6-cegui.patch, +ogre-1.4.6.ebuild:
+  Version bump
 
   17 Nov 2007; Samuli Suominen <drac@gentoo.org> ogre-1.4.5.ebuild:
   Keyword ~amd64 wrt #138093.
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 49b8546e245c..93796cf68b6c 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.15.1-nocg.patch 1535 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e SHA1 07c4a8cac2a51aa369a2aef92ad484c4221ea339 SHA256 7b931bde184602cf09704685f7967827f24e32926ec8dc0a5411f8f24960279e
 MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.15.1-nocg.patch 1535
 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e files/0.15.1-nocg.patch 1535
@@ -6,8 +9,13 @@ AUX ogre-1.4.5-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 S
 MD5 fdfb5745056c923cf983f726414044e9 files/ogre-1.4.5-cegui.patch 542
 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 files/ogre-1.4.5-cegui.patch 542
 SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96 files/ogre-1.4.5-cegui.patch 542
+AUX ogre-1.4.6-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
+MD5 fdfb5745056c923cf983f726414044e9 files/ogre-1.4.6-cegui.patch 542
+RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 files/ogre-1.4.6-cegui.patch 542
+SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96 files/ogre-1.4.6-cegui.patch 542
 DIST ogre-linux_osx-v0-15-1.tar.bz2 24570136 RMD160 19709f610e581c8cbfcfbbe8e4feed1e4bbb2e27 SHA1 c075e585dadd29a5c0271ccb97eb56e473c3271a SHA256 a55f724059feddc6fd51a588be8e2a839341a7c8b97bb2ee5774f4200b383915
 DIST ogre-linux_osx-v1-4-5.tar.bz2 29261246 RMD160 0af58093684092ca61d7b8429ee986c2e5fc3de2 SHA1 61c41393240f775aa02b40bf740b4c224ddd817d SHA256 744b10738305366fddb580a8244723e4db74c48979112010557065d11f01211b
+DIST ogre-linux_osx-v1-4-6.tar.bz2 29142327 RMD160 df29b98b4c4efa1befb496d303f20d71ff04c702 SHA1 4221ccbb2121e6972c105bfa1ed1faebfc419b33 SHA256 4da478ab66e7dcbd797cfc38fa60575107a7478026b4a89a227f1363b5f963f2
 EBUILD ogre-0.15.1.ebuild 1436 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 SHA1 9b4bfa5a7d8f389e6cf4b4f01d25e4a946de3dc3 SHA256 f5705dcac9ff289e48f02ce9b402f33eeb93964cf9702d93fd8ff656ab1030b4
 MD5 0b1ac52dc3bcf567017d7f496464eb81 ogre-0.15.1.ebuild 1436
 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 ogre-0.15.1.ebuild 1436
@@ -16,10 +24,14 @@ EBUILD ogre-1.4.5.ebuild 2341 RMD160 10d5110bd20e22bd177c18ca9b096652848cc3fb SH
 MD5 80301e7a8274319aa3a0b743042c8f93 ogre-1.4.5.ebuild 2341
 RMD160 10d5110bd20e22bd177c18ca9b096652848cc3fb ogre-1.4.5.ebuild 2341
 SHA256 7a0a37d33c58f44cee886aa511eb609424668438bfb9f9bf33a6af1b069c91dd ogre-1.4.5.ebuild 2341
-MISC ChangeLog 6340 RMD160 10d0f81b194fec36232ba86917aafd862298c1c1 SHA1 e42b4945a91b20be771a167e67ac2c4bd8c3b990 SHA256 d6c40b240fe2b3c5a5311c665ca08aa29a6ba0ce582129d55d711bd42b41215a
-MD5 de6cc51aba1fbd99e22b585bd3f58e75 ChangeLog 6340
-RMD160 10d0f81b194fec36232ba86917aafd862298c1c1 ChangeLog 6340
-SHA256 d6c40b240fe2b3c5a5311c665ca08aa29a6ba0ce582129d55d711bd42b41215a ChangeLog 6340
+EBUILD ogre-1.4.6.ebuild 2341 RMD160 037a7addad9b4ab9465e8c68d96f40a693467f98 SHA1 2e675e8991c13becfb36771d5a5549ada526ba31 SHA256 f67f870957f642f6650af79101f1a0313f6575b681054ba8f6106c0ede4b9711
+MD5 b7f50732cf2894bd2f0067427a67d0f6 ogre-1.4.6.ebuild 2341
+RMD160 037a7addad9b4ab9465e8c68d96f40a693467f98 ogre-1.4.6.ebuild 2341
+SHA256 f67f870957f642f6650af79101f1a0313f6575b681054ba8f6106c0ede4b9711 ogre-1.4.6.ebuild 2341
+MISC ChangeLog 6484 RMD160 f5e14a488c01331f00b5e163b89cbd1ca3061089 SHA1 2230d799f4cdda793651aa2cdd9932129a83bcbe SHA256 ccd08c5775f963b8e82cfa2f48a0c414873ff09c1183ed79fff516ae0b202d33
+MD5 5077d0ea9c14dda91df9a77788abd8f7 ChangeLog 6484
+RMD160 f5e14a488c01331f00b5e163b89cbd1ca3061089 ChangeLog 6484
+SHA256 ccd08c5775f963b8e82cfa2f48a0c414873ff09c1183ed79fff516ae0b202d33 ChangeLog 6484
 MISC metadata.xml 4236 RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf SHA1 de49ea9fb17aa117ce25f685ae76062bea60b91f SHA256 3d5b0d15c24a55959278cf092bb62bfd109da2db4fcc8a07a7c6ccf449624981
 MD5 e7475f1eeda170514de47a940cb77420 metadata.xml 4236
 RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf metadata.xml 4236
@@ -30,3 +42,13 @@ SHA256 1576201669beb416fcceef86a919d6e5e75c27e0793d9b858ddd4ea6b23a6f7c files/di
 MD5 8074fe89612e52f48ee59c3417f45207 files/digest-ogre-1.4.5 274
 RMD160 82e23b0b89828f7672a08696c30db7e71d486408 files/digest-ogre-1.4.5 274
 SHA256 06a52e2eb420255cdeb6784fad141402c443c3ec365b7968c534696f674f712b files/digest-ogre-1.4.5 274
+MD5 5c72b565a795b193b287975470f7a06d files/digest-ogre-1.4.6 274
+RMD160 888bb4f3001047adf1e1c25a226c1cf42a4d37f3 files/digest-ogre-1.4.6 274
+SHA256 c5dc797136dc3d281065648c1845360be54dc3e27af1f5f12c8ce28d3c28286b files/digest-ogre-1.4.6 274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHjezndz7hIScOURERAmfuAJwKkm9FBPJrEcReh2ym6DOAlWO6mgCg6OiN
+ykEUXu/hoAXwx6q5SI4yEBQ=
+=6dCE
+-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/digest-ogre-1.4.6 b/dev-games/ogre/files/digest-ogre-1.4.6
new file mode 100644
index 000000000000..8917d10b6910
--- /dev/null
+++ b/dev-games/ogre/files/digest-ogre-1.4.6
@@ -0,0 +1,3 @@
+MD5 ef1cf73106e0387624bfdd539cdf9de6 ogre-linux_osx-v1-4-6.tar.bz2 29142327
+RMD160 df29b98b4c4efa1befb496d303f20d71ff04c702 ogre-linux_osx-v1-4-6.tar.bz2 29142327
+SHA256 4da478ab66e7dcbd797cfc38fa60575107a7478026b4a89a227f1363b5f963f2 ogre-linux_osx-v1-4-6.tar.bz2 29142327
diff --git a/dev-games/ogre/files/ogre-1.4.6-cegui.patch b/dev-games/ogre/files/ogre-1.4.6-cegui.patch
new file mode 100644
index 000000000000..c089164af219
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.4.6-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.6.ebuild b/dev-games/ogre/ogre-1.4.6.ebuild
new file mode 100644
index 000000000000..c187c598b254
--- /dev/null
+++ b/dev-games/ogre/ogre-1.4.6.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.6.ebuild,v 1.1 2008/01/16 11:39:13 nyhm Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/ogre/ogre-linux_osx-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.1.10
+	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-1.2 )
+	threads? ( dev-libs/boost )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/ogrenew
+
+pkg_setup() {
+	if use threads && has_version "<dev-libs/boost-1.34" && \
+		! built_with_use dev-libs/boost threads
+	then
+		die "Please emerge dev-libs/boost with USE=threads"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	find -name CVS -print0 | xargs -0 rm -rf
+	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 '/CPPUNIT/d' configure.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-cegui.patch
+	eautoreconf
+}
+
+src_compile() {
+	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
+}