Version bump, bug #160213

(Portage version: 2.1.2.2)

5 files changed, 54 insertions, 214 deletions

diff --git a/games-action/formido/ChangeLog b/games-action/formido/ChangeLog
index 9ce8dfe5e796..835230b0181f 100644
--- a/games-action/formido/ChangeLog
+++ b/games-action/formido/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/formido
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/formido/ChangeLog,v 1.7 2006/12/05 18:12:34 wolf31o2 Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/formido/ChangeLog,v 1.8 2007/03/13 18:38:18 nyhm Exp $
+
+*formido-1.0.1 (13 Mar 2007)
+
+  13 Mar 2007; Tristan Heaven <nyhm@gentoo.org> +formido-1.0.1.ebuild:
+  Version bump, bug #160213
 
   05 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> formido-1.0.ebuild:
   Removed sed-4 from *DEPEND.
diff --git a/games-action/formido/files/digest-formido-1.0 b/games-action/formido/files/digest-formido-1.0.1
index 5fa728b14773..cd752718bad9 100644
--- a/games-action/formido/files/digest-formido-1.0
+++ b/games-action/formido/files/digest-formido-1.0.1
@@ -1,6 +1,6 @@
-MD5 4019842f46a2bec5c642a2717486ac0a formido-1.0.tar.bz2 2965419
-RMD160 036af897df6e75cd99c8207e60626bf96e031263 formido-1.0.tar.bz2 2965419
-SHA256 fe1b8d5878dae1193d6cbd6dc4c99347699d35c2c4f9f9ba51a28c864de51541 formido-1.0.tar.bz2 2965419
+MD5 f1556282eddc2edcbfc4fdc62d7b2ba4 formido-1.0.1.tar.gz 3117496
+RMD160 0f5c8717b1d7fb53bcb70bb8f822fff40ba9da9b formido-1.0.1.tar.gz 3117496
+SHA256 bfea3f9d66fe657551ae8f060de939465634d6eac552849215f33769a9cf4f86 formido-1.0.1.tar.gz 3117496
 MD5 8d344651a3bcfd1d809dab1bcec2b7ee formido-music.tar.bz2 6159005
 RMD160 d82936aed84343d6ccba3e2f9ea155c005b4934b formido-music.tar.bz2 6159005
 SHA256 3e9d076139f80e257ba2586c474e18361db5197a555956ebf4dc3053b2a2ce6e formido-music.tar.bz2 6159005
diff --git a/games-action/formido/files/homedir.patch b/games-action/formido/files/homedir.patch
deleted file mode 100644
index f27598a3f980..000000000000
--- a/games-action/formido/files/homedir.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -ru formido-1.0.orig/src/blend.cpp formido-1.0/src/blend.cpp
---- formido-1.0.orig/src/blend.cpp	2003-11-07 10:59:01.000000000 -0800
-+++ formido-1.0/src/blend.cpp	2004-01-30 02:22:04.000000000 -0800
-@@ -218,7 +218,7 @@
- 	// 8-bit tables
- 	else {
- 		// First, try to load tables from 'data/alpha8.tab'
--		FILE *fin = fopen("data/alpha8.tab", "rb");
-+		FILE *fin = fopen("./alpha8.tab", "rb");
- 		if(fin) {
- 			// Load the tables
- 			fread(a_table8, sizeof(a_table8), 1, fin);
-@@ -251,7 +251,7 @@
- 			}
- 
- 			// Save the table to disk
--			FILE *fout = fopen("data/alpha8.tab", "wb");
-+			FILE *fout = fopen("./alpha8.tab", "wb");
- 			if(fout) {
- 				fwrite(a_table8, sizeof(a_table8), 1, fout);
- 				fclose(fout);
-diff -ru formido-1.0.orig/src/config.cpp formido-1.0/src/config.cpp
---- formido-1.0.orig/src/config.cpp	2003-11-07 10:59:01.000000000 -0800
-+++ formido-1.0/src/config.cpp	2004-01-30 00:26:31.000000000 -0800
-@@ -30,8 +30,10 @@
- void load_config(char *file, CONFIG *conf) {

- 

- 	FILE *f = fopen(file, "rt");

--	if(!f)

--		error_msg("Unable to load config file: %s!", file);

-+	if(!f) {

-+		if (!(f = fopen(CONFIG(file), "rt")))

-+			error_msg("Unable to load config file: %s!", file);

-+	}

- 

- 	fscanf(f, "video_mode_color_depth = %d\n", &(conf->vid_color_depth));

- 	fscanf(f, "video_mode_fullscreen = %d\n", &(conf->fullscreen));

-diff -ru formido-1.0.orig/src/game.cpp formido-1.0/src/game.cpp
---- formido-1.0.orig/src/game.cpp	2003-11-07 10:59:01.000000000 -0800
-+++ formido-1.0/src/game.cpp	2004-01-30 00:31:12.000000000 -0800
-@@ -173,15 +173,15 @@
- 
- 	char file[100] = "";
- 	int num = 0;
--	sprintf(file, "shot%03d.bmp", num);
-+	sprintf(file, "./shot%03d.bmp", num);
- 
- 	game_paused = true;
- 
- 	// Check if exists
--	FILE *f = fopen(CONFIG(file), "r");
-+	FILE *f = fopen(file, "r");
- 	if(!f) {
- 		// Doesn't exist, save it.
--		SDL_SaveBMP(screen, CONFIG(file));
-+		SDL_SaveBMP(screen, file);
- 	}
- 	else {
- 		fclose(f);
-@@ -189,14 +189,14 @@
- 		// Exists, choose another name
- 		while(num < 1000) {
- 			num++;
--			sprintf(file, "shot%03d.bmp", num);
-+			sprintf(file, "./shot%03d.bmp", num);
- 			
- 
- 			// Check if exists
--			f = fopen(CONFIG(file), "r");
-+			f = fopen(file, "r");
- 			if(!f) {
- 				// Doesn't exist, save it.
--				SDL_SaveBMP(screen, CONFIG(file));
-+				SDL_SaveBMP(screen, file);
- 				break;
- 			}
- 			else
-diff -ru formido-1.0.orig/src/init.cpp formido-1.0/src/init.cpp
---- formido-1.0.orig/src/init.cpp	2003-11-07 10:59:01.000000000 -0800
-+++ formido-1.0/src/init.cpp	2004-01-30 00:23:08.000000000 -0800
-@@ -80,8 +80,7 @@
- void init_sdl() {
- 
- 	// Load the config
--	//load_config("formido.cfg", &config);
--	load_config(CONFIG("formido.cfg"), &config);
-+	load_config("formido.cfg", &config);
- 
- 	// Initialize SDL with video and audio support
- 	if(config.sound) {
-diff -ru formido-1.0.orig/src/main.cpp formido-1.0/src/main.cpp
---- formido-1.0.orig/src/main.cpp	2003-11-07 10:59:01.000000000 -0800
-+++ formido-1.0/src/main.cpp	2004-01-30 00:29:09.000000000 -0800
-@@ -23,6 +23,9 @@
- */

- 

- #include <stdlib.h>

-+#include <sys/stat.h>

-+#include <sys/types.h>

-+#include <unistd.h>

- #include "SDL.h"

- #include "SDL_image.h"

- #include "SDL_mixer.h"

-@@ -272,6 +275,15 @@
- 

- // The good old main()

- int main(int argc, char *argv[]) {

-+	if (!getenv("HOME")) {

-+		    error_msg("Environment variable HOME not set.  Exiting.");

-+	}

-+	chdir(getenv("HOME"));

-+	 /* Don't check the return here because it may already exist. */

-+	mkdir(".formido", 0744);

-+	if (chdir(".formido") != 0) {

-+	    error_msg("Failed to change directories to ~/.formido");

-+	}

- 

- 	// Initialize SDL

- 	init_sdl();

-@@ -359,8 +371,7 @@
- 

- 

- 	// Save the config

--	//save_config("formido.cfg", &config);

--	save_config(CONFIG("formido.cfg"), &config);

-+	save_config("./formido.cfg", &config);

- 

- 	return 0;

- }

-diff -ru formido-1.0.orig/src/menu.cpp formido-1.0/src/menu.cpp
---- formido-1.0.orig/src/menu.cpp	2003-11-07 10:59:01.000000000 -0800
-+++ formido-1.0/src/menu.cpp	2004-01-30 00:23:22.000000000 -0800
-@@ -262,7 +262,7 @@
- 					menu_id = MENU_ID_MAIN;
- 					menu_item = MENU_GAME_SETTINGS;
- 					// Load back the initial settings from config
--					load_config(CONFIG("formido.cfg"), &config);
-+					load_config("formido.cfg", &config);
- 					Mix_VolumeMusic(config.music_vol);
- 				}
- 				else if(menu_id == MENU_ID_HALL_OF_FAME) {
-@@ -305,7 +305,7 @@
- 						menu_item = MENU_GAME_SETTINGS;
- 						menu_id = MENU_ID_MAIN;
- 						// Save config
--						save_config(CONFIG("formido.cfg"), &config);
-+						save_config("./formido.cfg", &config);
- 						break;
- 
- 					// Keys
diff --git a/games-action/formido/formido-1.0.1.ebuild b/games-action/formido/formido-1.0.1.ebuild
new file mode 100644
index 000000000000..02003f2f5314
--- /dev/null
+++ b/games-action/formido/formido-1.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/formido/formido-1.0.1.ebuild,v 1.1 2007/03/13 18:38:18 nyhm Exp $
+
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="A shooting game in the spirit of Phobia games"
+HOMEPAGE="http://www.mhgames.cjb.net/"
+SRC_URI="http://noe.falzon.free.fr/prog/${P}.tar.gz
+	http://koti.mbnet.fi/lsoft/formido/formido-music.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	sed -i \
+		-e "s:g++:$(tc-getCXX):" \
+		-e "/^FLAGS=/s:$: ${CXXFLAGS}:" \
+		-e "/^LINKFLAGS=/s:=.*:=${LDFLAGS}:" \
+		-e "s:\${DATDIR}:${GAMES_DATADIR}/${PN}/data:" \
+		-e "s:\${DEFCONFIGDIR}:${GAMES_DATADIR}/${PN}:" \
+		Makefile \
+		|| die "sed failed"
+	cd data
+	unpack ${PN}-music.tar.bz2
+}
+
+src_install() {
+	dogamesbin ${PN} || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r ${PN}.cfg data || die "doins failed"
+	newicon data/icon.dat ${PN}.bmp
+	make_desktop_entry ${PN} Formido /usr/share/pixmaps/${PN}.bmp
+	dodoc README README-1.0.1
+	prepgamesdirs
+}
diff --git a/games-action/formido/formido-1.0.ebuild b/games-action/formido/formido-1.0.ebuild
deleted file mode 100644
index 565471394fa3..000000000000
--- a/games-action/formido/formido-1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/formido/formido-1.0.ebuild,v 1.7 2006/12/05 18:12:34 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="A shooting game in the spirit of Phobia games"
-HOMEPAGE="http://www.mhgames.cjb.net/"
-SRC_URI="http://koti.mbnet.fi/lsoft/formido/${P}.tar.bz2
-	http://koti.mbnet.fi/lsoft/formido/formido-music.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT=0
-IUSE=""
-
-RDEPEND=">=media-libs/libsdl-1.2.5
-	>=media-libs/sdl-image-1.2.2
-	>=media-libs/sdl-mixer-1.2.4"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-
-	cd ${S}
-	epatch "${FILESDIR}/homedir.patch"
-
-	sed -i \
-		-e "/^FLAGS/ s:$: ${CXXFLAGS}:" Makefile || \
-			die "sed Makefile failed"
-
-	cd ${S}/data
-	unpack ${PN}-music.tar.bz2
-}
-
-src_compile() {
-	emake \
-		CONFIGDIR="${GAMES_DATADIR}/${PN}" \
-		DATDIR="${GAMES_DATADIR}/${PN}/data" \
-		HISCOREDIR="${GAMES_STATEDIR}/${PN}" || die "emake failed"
-}
-
-src_install() {
-	dogamesbin formido     || die "dogamesbin failed"
-	dodoc README           || die "dodoc failed"
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins "${PN}.cfg"      || die "doins failed (cfg)"
-
-	insinto "${GAMES_DATADIR}/${PN}/data"
-	doins data/*           || die "doins failed (data)"
-	# no need to install this twice.
-	rm -f "${D}${GAMES_DATADIR}/${PN}/data/hiscore.dat"
-
-	insinto "${GAMES_STATEDIR}/${PN}"
-	insopts -m 664
-	doins data/hiscore.dat || die "doins failed (hiscore)"
-
-	prepgamesdirs
-}