version bump (bug #346945)

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

4 files changed, 165 insertions, 2 deletions

diff --git a/games-rpg/freedroidrpg/ChangeLog b/games-rpg/freedroidrpg/ChangeLog
index 489c4c3c0519..c468cc42ba43 100644
--- a/games-rpg/freedroidrpg/ChangeLog
+++ b/games-rpg/freedroidrpg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/freedroidrpg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.27 2010/07/12 21:40:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.28 2010/11/28 09:56:19 mr_bones_ Exp $
+
+*freedroidrpg-0.14.1 (28 Nov 2010)
+
+  28 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +freedroidrpg-0.14.1.ebuild, +files/freedroidrpg-0.14.1-syslibs.patch:
+  version bump (bug #346945)
 
   12 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
   freedroidrpg-0.13.ebuild, +files/freedroidrpg-0.13-sdl-gfx.patch,
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 28423e29f367..a7f4173afb74 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,6 +1,9 @@
 AUX freedroidrpg-0.13-sdl-gfx.patch 514 RMD160 4650aaa0e99762441734ca574ab1465a3639dbc2 SHA1 77cc40c6c16b98201acb22801ea6f52e58956526 SHA256 8dc6ec61f0501f1f799b7f5837da88637e146928bfa4de8edcde6974a7e62c0e
 AUX freedroidrpg-0.13-syslibs.patch 2965 RMD160 b1a3cba9e52e3493f5cc292bd524595fe4e7d3a4 SHA1 8f442500b67c7ae0c012a86322e5b6600117dc0f SHA256 e19e7804a2ef3abfab2ec1207c7cc467a4d77accca52884c872dc0e457ecba76
+AUX freedroidrpg-0.14.1-syslibs.patch 3464 RMD160 2be0d73a254425c5f9294eef07e3ca825437bbe6 SHA1 a8e4ee8330dc293d829531f0ebedb94c87d4b25b SHA256 01c7097f6bb4927261b9c95912aabba9b499d331ced3869852c01d4b3c7ba5c6
 DIST freedroidrpg-0.13.tar.bz2 137389662 RMD160 dfd5d60fb173ba6a9107894b2ba4a6f0d5868116 SHA1 6c58cc88c503a3050ef940158f5e338f70899533 SHA256 e4ed0ba187c0c74ec353345825bbf520bdc6d4d173a66ed6dba6e8e1683ffb8a
+DIST freedroidrpg-0.14.1.tar.gz 161715770 RMD160 fc85e688097d1700014f62f6f16629f0418095f0 SHA1 8e254098584d394d474ed81dd48bf3c028b9c56b SHA256 f5a862dda68147e5d3899a781a144e8adb1bd604f40f0edb8ba2f4602bd77ae0
 EBUILD freedroidrpg-0.13.ebuild 1609 RMD160 2532c5917c294a7f38078eb4c0579b9fd24011e9 SHA1 fd74557a95de11c163593a30ca4e80cb5e554b25 SHA256 103fddeb544709dac1fb8a1c6cd5d59168fe3489c47aed1d3363b1753cc7d5ec
-MISC ChangeLog 3784 RMD160 48918290e5d0827306bef0d106dbfc58cda67b00 SHA1 8b2ae1b65890f9fe77ec9ba6f4b04a969ef5b648 SHA256 82e642f482f224b036eac54cee2bfa4aad7248b54c283175375cafca41d1d013
+EBUILD freedroidrpg-0.14.1.ebuild 1544 RMD160 93dea82dabd4428d2f01ba9da6f8f949f21f9d2b SHA1 e0a26e3b04dcca8ee063d3d14e704fb606e73fcd SHA256 3ff19e0f0f95dffc928292142a12b613c0635ca0a1038a7cd167668f29e8fe37
+MISC ChangeLog 3978 RMD160 3027a6ca89562bea344fb818ff6fc43792e9fca6 SHA1 bd0197edb722084e4f6fca7f04a5722bc42f3d45 SHA256 72e37aca9b464b1d7fa2f2692cb761f363aadbfaa002f1b8e4c2cb80b1a7ac0e
 MISC metadata.xml 2102 RMD160 b4460164b2f9e4bc4cc206fcb7a688afa6f127b7 SHA1 aaa79dbac1d09bda7e33de3cdaaf749ce2c1f0ad SHA256 d06c8ed4ae0f0763859351dfebfad1b41e3d054261fa555ba26e67be0f7b60f1
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-syslibs.patch b/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-syslibs.patch
new file mode 100644
index 000000000000..c55531fd7b9c
--- /dev/null
+++ b/games-rpg/freedroidrpg/files/freedroidrpg-0.14.1-syslibs.patch
@@ -0,0 +1,91 @@
+diff -ru freedroidrpg-0.14.1.orig/configure.ac freedroidrpg-0.14.1/configure.ac
+--- freedroidrpg-0.14.1.orig/configure.ac	2010-11-26 17:47:26.000000000 -0500
++++ freedroidrpg-0.14.1/configure.ac	2010-11-28 04:40:12.524987716 -0500
+@@ -110,6 +110,14 @@
+ 	AC_MSG_ERROR([SDL_image library needed for FreedroidRPG!
+ see http://www.libsdl.org/]))
+ 
++AC_CHECK_LIB([SDL_gfx], [rotozoomSurface],,
++       AC_MSG_ERROR([SDL_gfx library needed to run FreedroidRPG
++see http://www.ferzkopp.net/Software/SDL_gfx-2.0/]))
++
++AC_CHECK_LIB([lua], [luaL_openlibs],,
++       AC_MSG_ERROR([lua library needed to run FreedroidRPG
++see http://www.lua.org/]))
++
+ AC_MSG_NOTICE([[Checking for optional SDL libraries:]])
+ AC_CHECK_LIB([SDL_mixer], [Mix_ChannelFinished],, AC_MSG_WARN([
+ --------------------------------------------------
+diff -ru freedroidrpg-0.14.1.orig/src/Makefile.am freedroidrpg-0.14.1/src/Makefile.am
+--- freedroidrpg-0.14.1.orig/src/Makefile.am	2010-11-26 17:41:13.000000000 -0500
++++ freedroidrpg-0.14.1/src/Makefile.am	2010-11-28 04:40:12.524987716 -0500
+@@ -1,9 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-freedroidRPG_LDADD = ../lua/liblua.a
+-
+ if WIN32
+-freedroidRPG_LDADD += ../win32/freedroidRPG.coff
++freedroidRPG_LDADD = ../win32/freedroidRPG.coff
+ endif
+ 
+ bin_PROGRAMS = freedroidRPG
+@@ -22,7 +20,7 @@
+ 	enemy.c input.c keyboard.c main.c hud.c view.c automap.c BFont.c \
+ 	defs.h map.h vars.h takeover.h global.h \
+ 	proto.h struct.h system.h BFont.h \
+-	SDL_rotozoom.c SDL_rotozoom.h open_gl.c open_gl_atlas.c mission.c chat.c light.c \
++	open_gl.c open_gl_atlas.c mission.c chat.c light.c \
+ 	getopt.c getopt1.c getopt.h scandir.c scandir.h sound.h sound_effects.c \
+ 	lang.h lists.c lists.h gen_savestruct.py savestruct.c savestruct.h string.c pathfinder.c \
+ 	benchmark.c \
+@@ -56,8 +54,3 @@
+ savestruct.c savestruct.h: struct.h gen_savestruct.py
+ 	python gen_savestruct.py struct.h savestruct
+ 
+-clean-local:
+-	cd ../lua; make clean
+-
+-../lua/liblua.a: 
+-	cd ../lua; make CC=${CC} AR="${AR} rcu" RANLIB="${RANLIB}" liblua.a
+diff -ru freedroidrpg-0.14.1.orig/src/lua.c freedroidrpg-0.14.1/src/lua.c
+--- freedroidrpg-0.14.1.orig/src/lua.c	2010-11-26 17:41:13.000000000 -0500
++++ freedroidrpg-0.14.1/src/lua.c	2010-11-28 04:40:12.525987480 -0500
+@@ -37,9 +37,9 @@
+ #include "lvledit/lvledit_actions.h"
+ #include "lvledit/lvledit_map.h"
+ 
+-#include "../lua/lua.h"
+-#include "../lua/lauxlib.h"
+-#include "../lua/lualib.h"
++#include <lua.h>
++#include <lauxlib.h>
++#include <lualib.h>
+ 
+ /* Our Lua state for event execution */
+ lua_State *global_lua_state;
+diff -ru freedroidrpg-0.14.1.orig/src/luaconfig.c freedroidrpg-0.14.1/src/luaconfig.c
+--- freedroidrpg-0.14.1.orig/src/luaconfig.c	2010-11-26 17:41:13.000000000 -0500
++++ freedroidrpg-0.14.1/src/luaconfig.c	2010-11-28 04:40:32.263348025 -0500
+@@ -33,8 +33,8 @@
+ #include "global.h"
+ #include "proto.h"
+ 
+-#include "../lua/lua.h"
+-#include "../lua/lauxlib.h"
++#include <lua.h>
++#include <lauxlib.h>
+ 
+ /* Our Lua state for event execution (defined in lua.c) */
+ extern lua_State *global_lua_state;
+diff -ru freedroidrpg-0.14.1.orig/src/system.h freedroidrpg-0.14.1/src/system.h
+--- freedroidrpg-0.14.1.orig/src/system.h	2010-11-26 17:41:13.000000000 -0500
++++ freedroidrpg-0.14.1/src/system.h	2010-11-28 04:40:12.525987480 -0500
+@@ -111,6 +111,7 @@
+ 
+ #include "SDL.h"
+ #include "SDL_image.h"
++#include "SDL_rotozoom.h"
+ 
+ #ifdef HAVE_LIBSDL_MIXER
+ #include "SDL_mixer.h"
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild
new file mode 100644
index 000000000000..4990303c7fba
--- /dev/null
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.14.1.ebuild,v 1.1 2010/11/28 09:56:19 mr_bones_ Exp $
+
+EAPI=2
+PYTHON_DEPEND="2"
+inherit autotools eutils python games
+
+DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
+HOMEPAGE="http://freedroid.sourceforge.net/"
+SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="opengl"
+
+RDEPEND="media-libs/libsdl[opengl?,video]
+	dev-lang/lua
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-net
+	media-libs/sdl-mixer[vorbis]
+	>=media-libs/sdl-gfx-2.0.21
+	media-libs/libogg
+	media-libs/libvorbis
+	x11-libs/libX11
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	dev-lang/python"
+
+pkg_setup() {
+	python_set_active_version 2
+	games_pkg_setup
+}
+
+src_prepare() {
+	rm -rf lua src/SDL_rotozoom*
+	epatch "${FILESDIR}"/${P}-syslibs.patch
+
+	python_convert_shebangs -r 2 .
+
+	# No need for executable game resources
+	find sound graphics -type f -exec chmod -c a-x '{}' +
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--disable-dependency-tracking \
+		--disable-fastmath \
+		$(use_enable opengl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -f "${D}/${GAMES_BINDIR}/"{croppy,pngtoico,gluem,ungluem}
+	newicon win32/w32icon2_64x64.png ${PN}.png
+	make_desktop_entry freedroidRPG "Freedroid RPG"
+	prepgamesdirs
+}