add USE flag for cegui support with patch from Adam Van Ymeren via bug #298736

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 41 insertions, 7 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index b6578eaa8d83..9cc9539f0fca 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.63 2010/01/11 18:38:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.64 2010/03/26 02:06:09 mr_bones_ Exp $
+
+  26 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.5.ebuild,
+  +files/ogre-1.6.5-cegui.patch:
+  add USE flag for cegui support with patch from Adam Van Ymeren via bug
+  #298736
 
 *ogre-1.6.5 (11 Jan 2010)
 
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 0fca391fa21e..60e98678dc7d 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -2,9 +2,10 @@ AUX ogre-1.4.9-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a
 AUX ogre-1.4.9-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
 AUX ogre-1.6.5-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f
 AUX ogre-1.6.5-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
+AUX ogre-1.6.5-cegui.patch 885 RMD160 0b2252ced3f1f7d3e1f3d429ff75a494d59f1793 SHA1 f94eaf64966efad0592cbb6aa90c1700deadbfc7 SHA256 364739dbc04d99eb4a1fd1faad37079dd9acc60b8181f96a399861d700940d6b
 DIST ogre-v1-4-9.tar.bz2 29555312 RMD160 c95536520d222b410e30f7bbee15c55360ee9c8d SHA1 3b8fb296a16cac77cdba6370bd9c752bfcccf18a SHA256 38b17826b6b34e70bf1bab17d4791ab1d485409c938cf71e1e5f866f3391c35b
 DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
 EBUILD ogre-1.4.9.ebuild 2471 RMD160 e4d5799c3181b5e018cf388e6f61af6ed105400d SHA1 cf23cea542cbf09cea5a5863a7e8e058f3122b16 SHA256 4a5e333060987d058edc37fd4af50a40fd8681ebb79c222900a4767a968b04c6
-EBUILD ogre-1.6.5.ebuild 2332 RMD160 575573a001e999476649138bcb1be97777d43606 SHA1 db8b911563a09580b8d65f0cdeab483d21f5bd4a SHA256 5955b96153e8e6f6e28ef6aff9fd184202b64b1da193fb1187b7635636e1d627
-MISC ChangeLog 9139 RMD160 09791a85d4d5963eb72ee8af52149180b17381c9 SHA1 35f7b04d9f4b762c2099c6980bd3414fe2821bf3 SHA256 38a5b5b7947de33e27c5b122e9502b94e540d5b08ffef0f50387aeeec8a50195
+EBUILD ogre-1.6.5.ebuild 2431 RMD160 bda184710d50c2ad328d1f2cca1e91f7ce07a86b SHA1 9d0967b1f2130dca35e8c3fdd2addacd927cd684 SHA256 bacf1c14e6215d247ad1545ab857b023a843da652d830066d4ca7523c7efe43e
+MISC ChangeLog 9330 RMD160 e8f8479669fba9c960dfcfddfc0685738e5baffc SHA1 31ee1d4588122173c86b55ff514b23b9445115fc SHA256 354e6388f9f42f90eef22f10228bd0ed2117af9e6e9a5e2ce35a6da859d455f0
 MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
diff --git a/dev-games/ogre/files/ogre-1.6.5-cegui.patch b/dev-games/ogre/files/ogre-1.6.5-cegui.patch
new file mode 100644
index 000000000000..7b2b66515e54
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.5-cegui.patch
@@ -0,0 +1,25 @@
+--- b/acinclude.m4	2008-12-30 12:00:47.000000000 -0500
++++ a/acinclude.m4	2010-03-23 00:51:13.000000000 -0400
+@@ -444,6 +439,14 @@
+ ])
+ 
+ AC_DEFUN([OGRE_CHECK_CEGUI], [
++AC_ARG_ENABLE(cegui,
++               AC_HELP_STRING([--disable-cegui],
++	                      [Don't build CEGUIRenderer, even if CEGUI is installed.]),
++	       [if test x$enableval = xyes; then
++	          build_cegui_sample=true
++	        fi],
++	       [build_cegui_sample=true])
++    if test x$build_cegui_sample = xtrue; 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
+@@ -459,6 +462,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.6.5.ebuild b/dev-games/ogre/ogre-1.6.5.ebuild
index 4deaaffb4a18..a5ec1f8d3784 100644
--- a/dev-games/ogre/ogre-1.6.5.ebuild
+++ b/dev-games/ogre/ogre-1.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.1 2010/01/11 18:38:13 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.5.ebuild,v 1.2 2010/03/26 02:06:09 mr_bones_ Exp $
 
 EAPI=2
 inherit multilib eutils autotools flag-o-matic
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/ogre/ogre-v${PV//./-}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc cg devil double-precision examples gtk threads"
+IUSE="cegui cg devil doc double-precision examples gtk threads"
 RESTRICT="test" #139905
 
 RDEPEND="dev-libs/zziplib
@@ -26,6 +26,7 @@ RDEPEND="dev-libs/zziplib
 	cg? ( media-gfx/nvidia-cg-toolkit )
 	devil? ( media-libs/devil )
 	gtk? ( x11-libs/gtk+:2 )
+	cegui? ( >=dev-games/cegui-0.5 )
 	threads? ( || ( >=dev-libs/boost-1.34.1 dev-libs/boost[threads] ) )"
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
@@ -48,7 +49,8 @@ src_prepare() {
 	fi
 	sed -i -e '/CPPUNIT/d' configure.in || die "sed failed"
 	epatch "${FILESDIR}"/${P}-boost.patch \
-		"${FILESDIR}"/${P}-automake.patch
+		"${FILESDIR}"/${P}-automake.patch \
+		"${FILESDIR}"/${P}-cegui.patch
 	eautoreconf
 }
 
@@ -68,7 +70,8 @@ src_configure() {
 		$(use_enable cg) \
 		$(use_enable devil) \
 		$(use_enable double-precision double) \
-		$(use_enable threads threading)
+		$(use_enable threads threading) \
+		$(use_enable cegui)
 }
 
 src_install() {