# 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.
-AUX homedir.patch 4606 RMD160 dde77aefb5da107bb723732a726d157e2414e697 SHA1 70b4ca3cbe014fef8dae01157806128f0b0f1172 SHA256 1894faf8ae250f22209a98ab84c9e9938ce649ba92ec3e445c366073dc59a498
-MD5 aaf2970c6efd0a241e14e1113a2ef80e files/homedir.patch 4606
-RMD160 dde77aefb5da107bb723732a726d157e2414e697 files/homedir.patch 4606
-SHA256 1894faf8ae250f22209a98ab84c9e9938ce649ba92ec3e445c366073dc59a498 files/homedir.patch 4606
-DIST formido-1.0.tar.bz2 2965419 RMD160 036af897df6e75cd99c8207e60626bf96e031263 SHA1 b4f65fb6b2ae97dc5a6f8807bc7a50b56fa4fdac SHA256 fe1b8d5878dae1193d6cbd6dc4c99347699d35c2c4f9f9ba51a28c864de51541
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST formido-1.0.1.tar.gz 3117496 RMD160 0f5c8717b1d7fb53bcb70bb8f822fff40ba9da9b SHA1 6025edda9cfceab2cd2491808a7de4ae6383e7e0 SHA256 bfea3f9d66fe657551ae8f060de939465634d6eac552849215f33769a9cf4f86
DIST formido-music.tar.bz2 6159005 RMD160 d82936aed84343d6ccba3e2f9ea155c005b4934b SHA1 949f11945c26bedf0ed9234bb4dfbbcaa3642c35 SHA256 3e9d076139f80e257ba2586c474e18361db5197a555956ebf4dc3053b2a2ce6e
-EBUILD formido-1.0.ebuild 1507 RMD160 08efceef12c104040892489a5052c8308ffd67ce SHA1 29ec3e8a805c46c84dfd35e1ae4794ed3ef080c7 SHA256 3eca11449c364e64600c111e86f1be667848107f1915ca4991b8de6c4228e6e8
-MD5 be6807aff3d0d4e5b91b3814bf0a0994 formido-1.0.ebuild 1507
-RMD160 08efceef12c104040892489a5052c8308ffd67ce formido-1.0.ebuild 1507
-SHA256 3eca11449c364e64600c111e86f1be667848107f1915ca4991b8de6c4228e6e8 formido-1.0.ebuild 1507
-MISC ChangeLog 836 RMD160 abcf9706ce1aa2934fb1c30f934c1c0206e27a86 SHA1 ab0bdf22c1d8396f84bbed062f443e94e64fd4d8 SHA256 31025ba7b9408e28d6c831780cfffe97f7750b9411c8214270675e559b5917b4
-MD5 0ea69f6b2d42ab9e34d87a822dd4ddf1 ChangeLog 836
-RMD160 abcf9706ce1aa2934fb1c30f934c1c0206e27a86 ChangeLog 836
-SHA256 31025ba7b9408e28d6c831780cfffe97f7750b9411c8214270675e559b5917b4 ChangeLog 836
+EBUILD formido-1.0.1.ebuild 1222 RMD160 36c6888316991da76da3856238f0b89eed7c9137 SHA1 0e99b9728a498d074f9b71ff554d7b8bb42f108b SHA256 b866ebbe099186ee135f790f434797306d2d99d06fcdd4395ec25c430e178592
+MD5 e8b3f27c984150bb676fc0fa52ef818c formido-1.0.1.ebuild 1222
+RMD160 36c6888316991da76da3856238f0b89eed7c9137 formido-1.0.1.ebuild 1222
+SHA256 b866ebbe099186ee135f790f434797306d2d99d06fcdd4395ec25c430e178592 formido-1.0.1.ebuild 1222
+MISC ChangeLog 962 RMD160 44c20d27cb3f586f13a869e7cc84b4e985f43b48 SHA1 b8224b79d755f794939b9b412571b7827c85ef88 SHA256 2b08ba0007f62b030255db662604d792fa5ff226cb0a537453bf86a4c4f8cb14
+MD5 96fffc31fbae92b388783ab97d67f7a3 ChangeLog 962
+RMD160 44c20d27cb3f586f13a869e7cc84b4e985f43b48 ChangeLog 962
+SHA256 2b08ba0007f62b030255db662604d792fa5ff226cb0a537453bf86a4c4f8cb14 ChangeLog 962
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 cca65aeb1e17b69b17109257b215e277 files/digest-formido-1.0 488
-RMD160 7962dc2b4a35b726e2009d1b5edabcb95fae6ea7 files/digest-formido-1.0 488
-SHA256 6306e57d5438841175f370c1011847d1e4ebd7bc5c10819532117c82c07fe68c files/digest-formido-1.0 488
+MD5 507dc47f0811483c9299ae7e787fc3ec files/digest-formido-1.0.1 491
+RMD160 ee0e23bedd26fa91dd016ea624a59811a54823df files/digest-formido-1.0.1 491
+SHA256 c7ebe09bbeaaea222c449492fd7609a393ccae4324a4dedf018654907821b409 files/digest-formido-1.0.1 491
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF9u+hdz7hIScOURERArw1AJ9JAWTTvGgrI0kOWEllAJKHeenz2QCfX96y
+vrVswJV07veCbIxDGKFuWHY=
+=85TW
+-----END PGP SIGNATURE-----
-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
+++ /dev/null
-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) {\r
- \r
- FILE *f = fopen(file, "rt");\r
-- if(!f)\r
-- error_msg("Unable to load config file: %s!", file);\r
-+ if(!f) {\r
-+ if (!(f = fopen(CONFIG(file), "rt")))\r
-+ error_msg("Unable to load config file: %s!", file);\r
-+ }\r
- \r
- fscanf(f, "video_mode_color_depth = %d\n", &(conf->vid_color_depth));\r
- fscanf(f, "video_mode_fullscreen = %d\n", &(conf->fullscreen));\r
-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 @@
- */\r
- \r
- #include <stdlib.h>\r
-+#include <sys/stat.h>\r
-+#include <sys/types.h>\r
-+#include <unistd.h>\r
- #include "SDL.h"\r
- #include "SDL_image.h"\r
- #include "SDL_mixer.h"\r
-@@ -272,6 +275,15 @@
- \r
- // The good old main()\r
- int main(int argc, char *argv[]) {\r
-+ if (!getenv("HOME")) {\r
-+ error_msg("Environment variable HOME not set. Exiting.");\r
-+ }\r
-+ chdir(getenv("HOME"));\r
-+ /* Don't check the return here because it may already exist. */\r
-+ mkdir(".formido", 0744);\r
-+ if (chdir(".formido") != 0) {\r
-+ error_msg("Failed to change directories to ~/.formido");\r
-+ }\r
- \r
- // Initialize SDL\r
- init_sdl();\r
-@@ -359,8 +371,7 @@
- \r
- \r
- // Save the config\r
-- //save_config("formido.cfg", &config);\r
-- save_config(CONFIG("formido.cfg"), &config);\r
-+ save_config("./formido.cfg", &config);\r
- \r
- return 0;\r
- }\r
-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
--- /dev/null
+# 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
+}
+++ /dev/null
-# 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
-}
projects / gentoo.git / commitdiff