Patch for lua 5.1 support from Devils-Hawk, bug #177670

Package-Manager: portage-2.1.2.7

5 files changed, 205 insertions, 9 deletions

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index f476b8d669a0..5bebff4bfc8f 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/cegui
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.13 2007/05/04 16:51:30 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.14 2007/05/22 17:36:41 nyhm Exp $
+
+*cegui-0.5.0b-r2 (22 May 2007)
+
+  22 May 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/cegui-0.5.0b-lua.patch, +cegui-0.5.0b-r2.ebuild:
+  Patch for lua 5.1 support from Devils-Hawk, bug #177670
 
   04 May 2007; Matti Bickel <mabi@gentoo.org> cegui-0.5.0b-r1.ebuild:
   ~ppc readded (bug #174055)
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index 5f483ab9fd2f..1a313cd28c5f 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -5,6 +5,10 @@ AUX cegui-0.4.1-gcc-41.patch 552 RMD160 953b657342b55168a7ff686cdc82c913a99e94bc
 MD5 c05ac59d048dcb893a5aad9dc8313de5 files/cegui-0.4.1-gcc-41.patch 552
 RMD160 953b657342b55168a7ff686cdc82c913a99e94bc files/cegui-0.4.1-gcc-41.patch 552
 SHA256 4c7b22ffbce2447be29ee8774d34ecdfbbb5a0b72f393401352ccba3eca48953 files/cegui-0.4.1-gcc-41.patch 552
+AUX cegui-0.5.0b-lua.patch 3093 RMD160 0052aa9daeefe0f8b5319ca1fa999555f42cb110 SHA1 2cf7b736b14a31482310ff81074952ff16d60e2d SHA256 892aed2527e4c0b890ea9659dfac218794d8cc1e64231d190ec55aaca50f503d
+MD5 1ee25b0722f177b26813bd25cc4f9f79 files/cegui-0.5.0b-lua.patch 3093
+RMD160 0052aa9daeefe0f8b5319ca1fa999555f42cb110 files/cegui-0.5.0b-lua.patch 3093
+SHA256 892aed2527e4c0b890ea9659dfac218794d8cc1e64231d190ec55aaca50f503d files/cegui-0.5.0b-lua.patch 3093
 DIST CEGUI-0.5.0b.tar.gz 2240192 RMD160 a60f5ee74315dc83db860cfa91f93449ed7b01f9 SHA1 29c3888b1ba9a4ee246a8534244a00280c01bd60 SHA256 50c1036f3adc741478966bf29a1e3104b983af8bfd82e201ed35ad2039e166ff
 DIST cegui_mk2-source-0.4.1.tar.bz2 7393348 RMD160 876ccd2bac74720dd805b9ec0095b97128943e30 SHA1 1c4805b9703c19d49f62d54283bff20a08b84b89 SHA256 a3bdd7f528daa97d2e432994ef249c61b951137aa54aa59dfd04656e3be67d11
 EBUILD cegui-0.4.1.ebuild 1443 RMD160 6801b0ce0e1840c121016fac3986765bf57c7bac SHA1 8592cad9bdd6a37021c9a46e0fb874ee40c2d763 SHA256 f3d282817f1bd29aaf1d2b669dc3f2aad2bf902d385ce86c6ee34d638bcc79e8
@@ -15,14 +19,18 @@ EBUILD cegui-0.5.0b-r1.ebuild 2007 RMD160 537260704e6a54f685c0b3580332fc7d148250
 MD5 3abd3b5dbce58a0eb32f932b27f70652 cegui-0.5.0b-r1.ebuild 2007
 RMD160 537260704e6a54f685c0b3580332fc7d148250bb cegui-0.5.0b-r1.ebuild 2007
 SHA256 a07b7a13a20f344e1e967779aa29b9eadd7fd85dd5badc3581e61f63e6cb9254 cegui-0.5.0b-r1.ebuild 2007
+EBUILD cegui-0.5.0b-r2.ebuild 2066 RMD160 37edb670f44fb8f19d133e83cf53a8df367aee4c SHA1 4ac244dcc87075c5b30d8f786901ae4cecca7c91 SHA256 43b08efcf5a74f0b9aeee0bf9192d035b207ac65d30aefa39ab8af210bf4ed84
+MD5 75e7c8f350eea1217f52efe7863a824c cegui-0.5.0b-r2.ebuild 2066
+RMD160 37edb670f44fb8f19d133e83cf53a8df367aee4c cegui-0.5.0b-r2.ebuild 2066
+SHA256 43b08efcf5a74f0b9aeee0bf9192d035b207ac65d30aefa39ab8af210bf4ed84 cegui-0.5.0b-r2.ebuild 2066
 EBUILD cegui-0.5.0b.ebuild 1958 RMD160 60292e56425937740345530defadc29482f2986b SHA1 aece43393d25af0a4c25c640314d41a200cd2396 SHA256 98171f09075881ab1293767bdde73d7296f6d1d84c6ebe1a2c1526d00b29a682
 MD5 1b260502c278d3e79ec3945e152f9642 cegui-0.5.0b.ebuild 1958
 RMD160 60292e56425937740345530defadc29482f2986b cegui-0.5.0b.ebuild 1958
 SHA256 98171f09075881ab1293767bdde73d7296f6d1d84c6ebe1a2c1526d00b29a682 cegui-0.5.0b.ebuild 1958
-MISC ChangeLog 1799 RMD160 33562163d6591af50068fa49ddb84d3a9806c2bf SHA1 79a7077058eafc67eaf4a279ac44464c9a64f575 SHA256 d028709114015e216aec2f2ca8c5d1d7f5869242445f4b8ba716f8eea6d8d221
-MD5 318ffa478ab3314912cac7254eba9e70 ChangeLog 1799
-RMD160 33562163d6591af50068fa49ddb84d3a9806c2bf ChangeLog 1799
-SHA256 d028709114015e216aec2f2ca8c5d1d7f5869242445f4b8ba716f8eea6d8d221 ChangeLog 1799
+MISC ChangeLog 1996 RMD160 c9341dd4443e2bc579a68caea31415d45fbf42f4 SHA1 07c79c89a2491ee8a6977a40203775eab4835c0c SHA256 6a12be0119d359fa356b8a31678a12aae6e06994689b74b84cadae0664652551
+MD5 5a83f9f2b1ace8dc525ebe023413c2b7 ChangeLog 1996
+RMD160 c9341dd4443e2bc579a68caea31415d45fbf42f4 ChangeLog 1996
+SHA256 6a12be0119d359fa356b8a31678a12aae6e06994689b74b84cadae0664652551 ChangeLog 1996
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -36,10 +44,13 @@ SHA256 7a6c7e32c626f6469e1c50a9b105de7d2886544f72605e4e25f17560e57f8733 files/di
 MD5 e35f06970efc8099080ba7b6a6da324d files/digest-cegui-0.5.0b-r1 241
 RMD160 36e899b294994c43cba365d69793b2fcdd61ed67 files/digest-cegui-0.5.0b-r1 241
 SHA256 7a6c7e32c626f6469e1c50a9b105de7d2886544f72605e4e25f17560e57f8733 files/digest-cegui-0.5.0b-r1 241
+MD5 e35f06970efc8099080ba7b6a6da324d files/digest-cegui-0.5.0b-r2 241
+RMD160 36e899b294994c43cba365d69793b2fcdd61ed67 files/digest-cegui-0.5.0b-r2 241
+SHA256 7a6c7e32c626f6469e1c50a9b105de7d2886544f72605e4e25f17560e57f8733 files/digest-cegui-0.5.0b-r2 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGO2QYfNMcoUhJ7GwRAskLAKCHPytZFpSvXgKnyekHeMdhSPXhFACfVP8H
-49CpDr/s5w/EAvnsyvVke8Q=
-=sgrZ
+iD8DBQFGUyovdz7hIScOURERAuvLAKCGixl9Y/bHT5Svb+qbSZ/x5a2hggCeK7WV
+AvGa2YRasoeKGFTDawMDOL8=
+=SK/V
 -----END PGP SIGNATURE-----
diff --git a/dev-games/cegui/cegui-0.5.0b-r2.ebuild b/dev-games/cegui/cegui-0.5.0b-r2.ebuild
new file mode 100644
index 000000000000..a45bf0df8196
--- /dev/null
+++ b/dev-games/cegui/cegui-0.5.0b-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.5.0b-r2.ebuild,v 1.1 2007/05/22 17:36:41 nyhm Exp $
+
+inherit autotools eutils
+
+MY_P=CEGUI-${PV}
+DESCRIPTION="Crazy Eddie's GUI System"
+HOMEPAGE="http://www.cegui.org.uk/"
+SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="devil doc examples expat freeimage lua opengl xerces-c xml"
+
+RDEPEND="dev-libs/libpcre
+	=media-libs/freetype-2*
+	devil? ( media-libs/devil )
+	expat? ( dev-libs/expat )
+	freeimage? ( media-libs/freeimage )
+	lua? ( dev-lang/lua )
+	opengl? ( virtual/opengl
+		virtual/glu
+		virtual/glut )
+	xerces-c? ( dev-libs/xerces-c )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P/b}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	if use examples ; then
+		cp -r Samples Samples.clean
+		rm -f $(find Samples.clean -name 'Makefile*')
+		rm -rf Samples.clean/bin
+	fi
+	epatch "${FILESDIR}"/${P}-lua.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable devil) \
+		$(use_enable examples samples) \
+		$(use_enable expat) \
+		$(use_enable freeimage) \
+		$(use_enable lua lua-module) \
+		$(use_enable lua toluacegui) \
+		$(use_enable opengl opengl-renderer) \
+		$(use_enable xerces-c) \
+		$(use_enable xml libxml) \
+		--enable-static \
+		--enable-tga \
+		--enable-tinyxml \
+		--disable-corona \
+		--disable-dependency-tracking \
+		--disable-irrlicht-renderer \
+		--disable-samples \
+		--disable-silly \
+		--without-gtk2 \
+		--without-ogre-renderer \
+		|| die
+	emake || die "emake failed"
+	if use doc ; then
+		mkdir -p documentation/api_reference
+		doxygen || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO
+	use doc && dohtml -r documentation/api_reference
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/Samples
+		doins -r Samples.clean/* || die "doins failed"
+	fi
+}
diff --git a/dev-games/cegui/files/cegui-0.5.0b-lua.patch b/dev-games/cegui/files/cegui-0.5.0b-lua.patch
new file mode 100644
index 000000000000..f94a50335d29
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.5.0b-lua.patch
@@ -0,0 +1,93 @@
+--- acinclude.m4
++++ acinclude.m4
+@@ -539,6 +539,17 @@
+ AC_DEFUN([CEGUI_CHECK_LUA],[
+     PKG_CHECK_MODULES(Lua, lua >= 5.0 lua < 5.1, [cegui_found_lua=yes], [cegui_found_lua=no])
+ 
++    LUA_VERSION_FLAGS="";
++    if test x$cegui_found_lua = xno; then
++       PKG_CHECK_MODULES(Lua, lua >= 5.1, [cegui_found_lua=yes], [cegui_found_lua=no])
++       
++       if test x$cegui_found_lua = xyes; then
++	  LUA_VERSION_FLAGS="$LUA_VERSION_FLAGS -DLUA51"
++  	  AC_MSG_NOTICE([Lua version >=5.1])
++       fi
++    fi
++    AC_SUBST(LUA_VERSION_FLAGS)
++
+     AC_ARG_ENABLE([lua-module], AC_HELP_STRING([--disable-lua-module], [Disables building of the Lua scripting module.]),
+                 [cegui_with_lua=$enableval], [cegui_with_lua=yes])
+     AC_ARG_ENABLE([toluacegui], AC_HELP_STRING([--enable-toluacegui], [Enables building of our custom tolua++ based binding generator tool, tolua++cegui.]),
+--- ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp
++++ ScriptingModules/CEGUILua/LuaScriptModule/src/CEGUILua.cpp
+@@ -35,12 +35,10 @@
+ 
+ // include Lua libs and tolua++
+ extern "C" {
+-#include "lua.h"
++#include "tolua++.h"
+ #include "lualib.h"
+-#include "lauxlib.h"
+ }
+ 
+-#include "tolua++.h"
+ 
+ // prototype for bindings initialisation function
+ int tolua_CEGUI_open(lua_State* tolua_S);
+@@ -55,11 +53,36 @@
+ *************************************************************************/
+ LuaScriptModule::LuaScriptModule()
+ {
++#ifdef LUA51
++       static const luaL_Reg lualibs[] = { 
++          {"", luaopen_base}, 
++          {LUA_LOADLIBNAME, luaopen_package}, 
++          {LUA_TABLIBNAME, luaopen_table}, 
++          {LUA_IOLIBNAME, luaopen_io}, 
++          {LUA_OSLIBNAME, luaopen_os}, 
++          {LUA_STRLIBNAME, luaopen_string}, 
++          {LUA_MATHLIBNAME, luaopen_math}, 
++#if defined(DEBUG) || defined (_DEBUG) 
++          {LUA_DBLIBNAME, luaopen_debug}, 
++#endif 
++          {NULL, NULL} 
++        };
++#endif /* LUA51 */
++
+ 	// create a lua state
+ 	d_ownsState = true;
+ 	d_state = lua_open();
+ 
+ 	// init all standard libraries
++#ifdef LUA51
++        const luaL_Reg *lib = lualibs; 
++        for (; lib->func; lib++) 
++        { 
++           lua_pushcfunction(d_state, lib->func); 
++           lua_pushstring(d_state, lib->name); 
++           lua_call(d_state, 1, 0); 
++        }	
++#else /* LUA51 */
+ 	luaopen_base(d_state);
+ 	luaopen_io(d_state);
+ 	luaopen_string(d_state);
+@@ -68,7 +91,7 @@
+ #if defined(DEBUG) || defined (_DEBUG)
+ 	luaopen_debug(d_state);
+ #endif
+-
++#endif /* LUA51 */
+ 	setModuleIdentifierString();
+ }
+ 
+--- ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
++++ ScriptingModules/CEGUILua/LuaScriptModule/src/Makefile.am
+@@ -1,6 +1,7 @@
+ INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/ScriptingModules/CEGUILua/tolua++ \
+-           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include
++           -I$(top_srcdir)/ScriptingModules/CEGUILua/LuaScriptModule/include \
++           ${LUA_VERSION_FLAGS}
+ lib_LTLIBRARIES = libCEGUILuaScriptModule.la
+ 
+ libCEGUILuaScriptModule_la_LDFLAGS = -version-info @CEGUI_VERSION_INFO@
diff --git a/dev-games/cegui/files/digest-cegui-0.5.0b-r2 b/dev-games/cegui/files/digest-cegui-0.5.0b-r2
new file mode 100644
index 000000000000..12103a3d99b2
--- /dev/null
+++ b/dev-games/cegui/files/digest-cegui-0.5.0b-r2
@@ -0,0 +1,3 @@
+MD5 b42322a33c6a06eede76b15f75694a17 CEGUI-0.5.0b.tar.gz 2240192
+RMD160 a60f5ee74315dc83db860cfa91f93449ed7b01f9 CEGUI-0.5.0b.tar.gz 2240192
+SHA256 50c1036f3adc741478966bf29a1e3104b983af8bfd82e201ed35ad2039e166ff CEGUI-0.5.0b.tar.gz 2240192