Version bump

Package-Manager: portage-2.2_pre7/cvs/Linux 2.6.25.4 Intel(R) Core(TM)2 Duo CPU E6750 @ 2.66GHz

5 files changed, 142 insertions, 2 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index ac1853214ce8..ed839ad29fc5 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.48 2008/04/09 21:34:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.49 2008/06/01 14:20:35 nyhm Exp $
+
+*ogre-1.4.8 (01 Jun 2008)
+
+  01 Jun 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/ogre-1.4.8-as-needed.patch, +files/ogre-1.4.8-cegui.patch,
+  +ogre-1.4.8.ebuild:
+  Version bump
 
   09 Apr 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/ogre-1.4.7-as-needed.patch, ogre-1.4.7.ebuild:
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 41c48b1f6d26..2fb89a4673a6 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.15.1-nocg.patch 1535 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e SHA1 07c4a8cac2a51aa369a2aef92ad484c4221ea339 SHA256 7b931bde184602cf09704685f7967827f24e32926ec8dc0a5411f8f24960279e
 AUX ogre-1.4.7-as-needed.patch 428 RMD160 30dcb1754fc9eaf83352a2890d69217c27b8e71b SHA1 89e9b5954e4f5321bdd100af09b5f5425f52d5f9 SHA256 c8e5d95ae9da0619bcca241c900489e14cf658b858ff7be6d8842067696f0e6a
 AUX ogre-1.4.7-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
+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
 DIST ogre-linux_osx-v0-15-1.tar.bz2 24570136 RMD160 19709f610e581c8cbfcfbbe8e4feed1e4bbb2e27 SHA1 c075e585dadd29a5c0271ccb97eb56e473c3271a SHA256 a55f724059feddc6fd51a588be8e2a839341a7c8b97bb2ee5774f4200b383915
 DIST ogre-linux_osx-v1-4-7.tar.bz2 28804286 RMD160 4882a18ca8a4f6037fd0c3eef6c9b0fb026436fb SHA1 d40c6c6500742aef8bb201265362d381ba2b7001 SHA256 bf23a33ae53715ddb77cb06148c9c7a681c685c90227163aa8ce9af1c993b0cf
+DIST ogre-v1-4-8.tar.bz2 29700614 RMD160 9764532aab9db2bfc655c9eaec88481eb6302b44 SHA1 afa3d98c5f553023da1d3698cbf2713836d8e216 SHA256 396eac8accbee9b3652ed6b94e2bc2c7a129e96c661fe1a6d5855c78657d19c1
 EBUILD ogre-0.15.1.ebuild 1436 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 SHA1 9b4bfa5a7d8f389e6cf4b4f01d25e4a946de3dc3 SHA256 f5705dcac9ff289e48f02ce9b402f33eeb93964cf9702d93fd8ff656ab1030b4
 EBUILD ogre-1.4.7.ebuild 2290 RMD160 a20b74c1e86ed9bf3cd1bcb50cdde3bac0661bf2 SHA1 8c1e0c45557a530b7d47fe283891ade6c1c2905f SHA256 313450da101a7cfdeee5a3372eb888b5b3ba54b6e64816ebd7e7d09f9801c77b
-MISC ChangeLog 6948 RMD160 5ebe3aa413e66aead9735f6cb3077d6d65d43536 SHA1 b95d8c1cc4edb632caeb13a99ba0c6ba056419a4 SHA256 fd0a94a919a85774eb442d9417e74ac24eebc62d0f327a4c19c8d301c7fb18a9
+EBUILD ogre-1.4.8.ebuild 2260 RMD160 83095b116d6b6e7c740c34ad964ca3a8135f124b SHA1 678fdc095ed91678d3b0a0c88e1ef00dc8e4f6ab SHA256 58c077a255535e65af9bc1cc1e1cbb8a22616a4f2b3116d673ab515a4ec62e10
+MISC ChangeLog 7124 RMD160 713142283af2e5c3f3139a0e812e950165cf984f SHA1 6008747419a62350107591587e7c6a1bf8f7bf2c SHA256 b05156db7a85d5e0792e4a4327457fe81da7b1e919a6cc84b105b29bd1e63891
 MISC metadata.xml 4236 RMD160 5d2bac49f866b24ea847eab24df427f1f84db1cf SHA1 de49ea9fb17aa117ce25f685ae76062bea60b91f SHA256 3d5b0d15c24a55959278cf092bb62bfd109da2db4fcc8a07a7c6ccf449624981
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhCsDoACgkQdz7hIScOURFyvwCgyj6VWtD0e5IiD1SwQ0Z3TOhg
+KFEAoMUNJtxA0nnhJ7DJ1OZuTXDx9Hn6
+=6HWp
+-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.4.8-as-needed.patch b/dev-games/ogre/files/ogre-1.4.8-as-needed.patch
new file mode 100644
index 000000000000..ce218097f770
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.4.8-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.8-cegui.patch b/dev-games/ogre/files/ogre-1.4.8-cegui.patch
new file mode 100644
index 000000000000..c089164af219
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.4.8-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.8.ebuild b/dev-games/ogre/ogre-1.4.8.ebuild
new file mode 100644
index 000000000000..bfa816906467
--- /dev/null
+++ b/dev-games/ogre/ogre-1.4.8.ebuild
@@ -0,0 +1,89 @@
+# 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.8.ebuild,v 1.1 2008/06/01 14:20:35 nyhm Exp $
+
+inherit eutils autotools
+
+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() {
+	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
+}