version bump; clean old versions

(Portage version: 2.1.2-r9)

8 files changed, 13 insertions, 254 deletions

diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog
index f9cc59aa7535..37c67a406cbe 100644
--- a/games-engines/stratagus/ChangeLog
+++ b/games-engines/stratagus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-engines/stratagus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.13 2007/02/28 16:12:55 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.14 2007/03/05 05:51:40 mr_bones_ Exp $
+
+*stratagus-2.2.3 (05 Mar 2007)
+
+  05 Mar 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/flac-1.1.3.patch, -files/stratagus-2.2.2-lua.patch,
+  -stratagus-2.1.ebuild, -stratagus-2.2.2.ebuild, +stratagus-2.2.3.ebuild:
+  version bump; clean old versions
 
   28 Feb 2007; Tristan Heaven <nyhm@gentoo.org>
   +files/stratagus-2.2.2-lua.patch, stratagus-2.2.2.ebuild:
diff --git a/games-engines/stratagus/files/digest-stratagus-2.1 b/games-engines/stratagus/files/digest-stratagus-2.1
deleted file mode 100644
index f9187ae6faeb..000000000000
--- a/games-engines/stratagus/files/digest-stratagus-2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff6b2070b66e8847eeed6bedc24ad8bb stratagus-2.1-src.tar.gz 995686
-RMD160 f5f97854cad9f17104de34613012fd3aa2efbb9b stratagus-2.1-src.tar.gz 995686
-SHA256 1a5fb943ebc9422a18d165ba57deeae406d3d5e2cba171dfe15608732a22326b stratagus-2.1-src.tar.gz 995686
diff --git a/games-engines/stratagus/files/digest-stratagus-2.2.2 b/games-engines/stratagus/files/digest-stratagus-2.2.2
deleted file mode 100644
index 320c19ce7145..000000000000
--- a/games-engines/stratagus/files/digest-stratagus-2.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0e116a9d4080dbca6dad78b7d34fec8f stratagus-2.2.2-src.tar.gz 931693
-RMD160 75bf6c4e2d7e3082172658087266f7730ff07420 stratagus-2.2.2-src.tar.gz 931693
-SHA256 b01417a32358a4f234d2d093fff932e3dd526c1bdba1bf0b95fb6aed52e1c9be stratagus-2.2.2-src.tar.gz 931693
diff --git a/games-engines/stratagus/files/digest-stratagus-2.2.3 b/games-engines/stratagus/files/digest-stratagus-2.2.3
new file mode 100644
index 000000000000..db69ecfae7c5
--- /dev/null
+++ b/games-engines/stratagus/files/digest-stratagus-2.2.3
@@ -0,0 +1,3 @@
+MD5 8c3381470cb04800f6af5f1685ce2958 stratagus-2.2.3-src.tar.gz 933530
+RMD160 a3e7ef3f0fa5c0afaca853227458758d603419a7 stratagus-2.2.3-src.tar.gz 933530
+SHA256 f0f7b24738ae99d8c3c76ade6468f9f2b13e8386b06a042639f97c7ec558680c stratagus-2.2.3-src.tar.gz 933530
diff --git a/games-engines/stratagus/files/flac-1.1.3.patch b/games-engines/stratagus/files/flac-1.1.3.patch
deleted file mode 100644
index acb89fca1332..000000000000
--- a/games-engines/stratagus/files/flac-1.1.3.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ru stratagus-040702/configure.in stratagus-040702-b2/configure.in
---- stratagus-040702/configure.in	2004-06-12 04:55:49.000000000 -0700
-+++ stratagus-040702-b2/configure.in	2006-10-25 17:07:48.000000000 -0700
-@@ -213,8 +213,9 @@
-     FLAC_CFLAGS=
-     FLAC_LIBS=
- else
--    FLAC_CFLAGS="-DUSE_FLAC"
--    FLAC_LIBS="-lFLAC"
-+	# starting with FLAC-1.1.3 libFLAC requires libogg
-+    FLAC_CFLAGS="-DUSE_FLAC $OGG_CFLAGS"
-+    FLAC_LIBS="-lFLAC $OGG_LIBS"
- fi
- AC_SUBST(FLAC_CFLAGS)
- AC_SUBST(FLAC_LIBS)
-diff -ru stratagus-040702/src/sound/flac.c stratagus-040702-b2/src/sound/flac.c
---- stratagus-040702/src/sound/flac.c	2004-06-25 16:22:33.000000000 -0700
-+++ stratagus-040702-b2/src/sound/flac.c	2006-10-25 17:19:41.000000000 -0700
-@@ -47,6 +47,13 @@
- #include "iolib.h"
- #include "sound_server.h"
- 
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- /*----------------------------------------------------------------------------
- --  Declaration
- ----------------------------------------------------------------------------*/
-@@ -88,7 +95,12 @@
- */
- static FLAC__StreamDecoderReadStatus FLAC_read_callback(
- 	const FLAC__StreamDecoder* stream, FLAC__byte buffer[],
--	unsigned int* bytes, void* user)
-+#ifdef LEGACY_FLAC
-+	unsigned int* bytes,
-+#else
-+	size_t* bytes,
-+#endif
-+	void* user)
- {
- 	Sample* sample;
- 	FlacData* data;
-@@ -339,12 +351,21 @@
- 	sample->Pos = 0;
- 	sample->User = data;
- 
-+#ifdef LEGACY_FLAC
- 	FLAC__stream_decoder_set_read_callback(stream, FLAC_read_callback);
- 	FLAC__stream_decoder_set_write_callback(stream, FLAC_write_callback);
- 	FLAC__stream_decoder_set_metadata_callback(stream, FLAC_metadata_callback);
- 	FLAC__stream_decoder_set_error_callback(stream, FLAC_error_callback);
- 	FLAC__stream_decoder_set_client_data(stream, sample);
- 	FLAC__stream_decoder_init(stream);
-+#else
-+	if(FLAC__stream_decoder_init_stream(stream, FLAC_read_callback, NULL, NULL, NULL, NULL, FLAC_write_callback, FLAC_metadata_callback, FLAC_error_callback, sample) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+		FLAC__stream_decoder_delete(stream);
-+		free(data);
-+		free(sample);
-+		return NULL;
-+	}
-+#endif
- 
- 	if (flags & PlayAudioStream) {
- 		sample->Buffer = malloc(SOUND_BUFFER_SIZE);
diff --git a/games-engines/stratagus/files/stratagus-2.2.2-lua.patch b/games-engines/stratagus/files/stratagus-2.2.2-lua.patch
deleted file mode 100644
index 5bcb2a05c5c3..000000000000
--- a/games-engines/stratagus/files/stratagus-2.2.2-lua.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- src/tolua/tolua.cpp
-+++ src/tolua/tolua.cpp
-@@ -16179,7 +16179,12 @@
-    10,115,101,116,109,101,116, 97,116, 97, 98,108,101, 40, 85,
-   110,105,116, 84,121,112,101,115, 44, 32,109,116, 41,32
-   };
-+#if LUA_VERSION_NUM >= 501
-+  luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+  lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
-   lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 1");
-+#endif
-   lua_settop(tolua_S, top);
-  } /* end of embedded lua code */
- 
-@@ -16242,7 +16247,12 @@
-   111,110, 76,105,115,116,101,110,101,114, 58,110,101,119, 40,
-   102, 41, 10,101,110,100,32
-   };
-+#if LUA_VERSION_NUM >= 501
-+  luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+  lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
-   lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 2");
-+#endif
-   lua_settop(tolua_S, top);
-  } /* end of embedded lua code */
- 
-@@ -16490,7 +16500,12 @@
-   105,115,116,101,110,101,114, 40,119, 46, 95, 97, 99,116,105,
-   111,110, 99, 98, 41, 10,101,110,100,32
-   };
-+#if LUA_VERSION_NUM >= 501
-+  luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+  lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
-   lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 3");
-+#endif
-   lua_settop(tolua_S, top);
-  } /* end of embedded lua code */
- 
-@@ -16886,7 +16901,12 @@
-   110,100, 10,114,101,116,117,114,110, 32,109,101,110,117, 10,
-   101,110,100,32
-   };
-+#if LUA_VERSION_NUM >= 501
-+  luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 1");
-+  lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
-   lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 4");
-+#endif
-   lua_settop(tolua_S, top);
-  } /* end of embedded lua code */
- 
-@@ -17086,7 +17106,12 @@
-   101,110,101,114, 58,110,101,119, 40, 99, 97,108,108, 98, 97,
-    99,107, 41, 41, 10,101,110,100,32
-   };
-+#if LUA_VERSION_NUM >= 501
-+  luaL_loadbuffer(tolua_S, (char *)B,sizeof(B),"tolua: embedded Lua code 5");
-+  lua_pcall(tolua_S, 0, 0, lua_gettop(tolua_S));
-+#else
-   lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code 5");
-+#endif
-   lua_settop(tolua_S, top);
-  } /* end of embedded lua code */
- 
---- src/tolua/tolua_map.cpp
-+++ src/tolua/tolua_map.cpp
-@@ -152,7 +152,11 @@
- 		{
- 			lua_pop(L,1);             /* clear metatable off stack */
- 			/* force garbage collection to avoid C to reuse a to-be-collected address */
-+		#if LUA_VERSION_NUM >= 501
-+			lua_gc(L, LUA_GCCOLLECT, 0);
-+		#else
- 			lua_setgcthreshold(L,0);
-+		#endif
- 			success = tolua_register_gc(L,1);
- 		}
- 	}
-@@ -169,7 +173,11 @@
- 	{
- 		void* u = *((void**)lua_touserdata(L,1));
- 		/* force garbage collection to avoid releasing a to-be-collected address */
-+	#if LUA_VERSION_NUM >= 501
-+		lua_gc(L, LUA_GCCOLLECT, 0);
-+	#else
- 		lua_setgcthreshold(L,0);
-+	#endif
- 		lua_pushstring(L,"tolua_gc");
- 		lua_rawget(L,LUA_REGISTRYINDEX);
- 		lua_pushlightuserdata(L,u);
---- src/tolua/tolua_to.cpp
-+++ src/tolua/tolua_to.cpp
-@@ -95,7 +95,11 @@
-  void* v;
-  lua_pushnumber(L,index);
-  lua_gettable(L,lo);
-- v = lua_isnil(L,-1) ? def : lua_unboxpointer(L,-1);
-+#if LUA_VERSION_NUM >= 501
-+ v = lua_isnil(L,-1) ? def : lua_touserdata(L,-1);
-+#else
-+ v = lua_isnil(L,-1) ? def : lua_touserdata(L,-1);
-+#endif
-  lua_pop(L,1);
-  return v;
- }
diff --git a/games-engines/stratagus/stratagus-2.1.ebuild b/games-engines/stratagus/stratagus-2.1.ebuild
deleted file mode 100644
index 09f8fb5640f8..000000000000
--- a/games-engines/stratagus/stratagus-2.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.1.ebuild,v 1.16 2006/12/21 06:24:24 mr_bones_ Exp $
-
-inherit eutils games
-
-MY_PV=040702
-DESCRIPTION="A realtime strategy game engine"
-HOMEPAGE="http://www.stratagus.org/"
-SRC_URI="mirror://sourceforge/stratagus/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc flac mp3 mikmod ogg opengl vorbis"
-
-RDEPEND="app-arch/bzip2
-	>=dev-lang/lua-5
-	media-libs/libpng
-	media-libs/libsdl
-	sys-libs/zlib
-	flac? ( media-libs/flac )
-	mp3? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	ogg? ( vorbis? ( media-libs/libogg media-libs/libvorbis ) )"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/stratagus-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/flac-1.1.3.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use ogg && use vorbis ; then
-		myconf="--enable-ogg" \
-	else
-		myconf="--disable-ogg"
-	fi
-	econf \
-		$(use_enable debug) \
-		$(use_with mikmod) \
-		$(use_with flac) \
-		$(use_with mp3 mad) \
-		$(use_with opengl) \
-		${myconf} \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if use doc ; then
-		emake doc || die "making source documentation failed"
-	fi
-}
-
-src_install() {
-	dogamesbin stratagus || die "dogamesbin failed"
-	dodoc README
-	dohtml -r doc/*
-	use doc && dohtml -r srcdoc/html/*
-	prepgamesdirs
-}
diff --git a/games-engines/stratagus/stratagus-2.2.2.ebuild b/games-engines/stratagus/stratagus-2.2.3.ebuild
index 3df08f379ac0..d340280a71a4 100644
--- a/games-engines/stratagus/stratagus-2.2.2.ebuild
+++ b/games-engines/stratagus/stratagus-2.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.2.ebuild,v 1.2 2007/02/28 16:12:55 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.2.3.ebuild,v 1.1 2007/03/05 05:51:40 mr_bones_ Exp $
 
-inherit eutils games
+inherit games
 
 DESCRIPTION="A realtime strategy game engine"
 HOMEPAGE="http://www.stratagus.org/"
@@ -33,7 +33,6 @@ src_unpack() {
 		-e 's/-O.*\(-fsigned-char\).*/\1"/' \
 		configure \
 		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-lua.patch
 }
 
 src_compile() {