version bump - patches and ebuild from Bernard Cafarelli via bug #100608

(Portage version: 2.0.51.22-r2)

6 files changed, 223 insertions, 8 deletions

diff --git a/games-arcade/smclone/ChangeLog b/games-arcade/smclone/ChangeLog
index 56abec030263..38b9d9208763 100644
--- a/games-arcade/smclone/ChangeLog
+++ b/games-arcade/smclone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-arcade/smclone
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/smclone/ChangeLog,v 1.7 2005/06/08 13:41:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/smclone/ChangeLog,v 1.8 2005/08/24 06:40:08 mr_bones_ Exp $
+
+*smclone-0.97 (24 Aug 2005)
+
+  24 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/smclone-0.97-gentoo-paths.patch,
+  +files/smclone-0.97-use-HOME.patch, +smclone-0.97.ebuild:
+  version bump - patches and ebuild from Bernard Cafarelli via bug #100608
 
   08 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> smclone-0.94.1.ebuild,
   smclone-0.95.ebuild, smclone-0.96.ebuild:
diff --git a/games-arcade/smclone/Manifest b/games-arcade/smclone/Manifest
index 277d20da3e94..0a8b815b452d 100644
--- a/games-arcade/smclone/Manifest
+++ b/games-arcade/smclone/Manifest
@@ -1,12 +1,16 @@
-MD5 5f4fa74eef369bd7844eb5a9dec632b4 smclone-0.95.ebuild 1448
-MD5 3138ce341896a650c4fcf340f10ceefe smclone-0.94.1.ebuild 1497
+MD5 c1deb3b4d30d20303555f901fe97cd5f smclone-0.97.ebuild 1722
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 b2422c7a6e82c311d38820006993eac9 smclone-0.96.ebuild 1559
+MD5 3138ce341896a650c4fcf340f10ceefe smclone-0.94.1.ebuild 1497
+MD5 5f4fa74eef369bd7844eb5a9dec632b4 smclone-0.95.ebuild 1448
 MD5 38fbd70607eefb48df56b9ed2c59794f ChangeLog 1219
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 008cc27fba8111df05177f5862887eeb files/0.94.1-use-HOME.patch 3674
-MD5 311ff08217967d547f411c0bf71c49e0 files/smclone-0.95-gentoo-paths.patch 1008
+MD5 b1ce3220effa0078776f210e66a77c3b files/smclone-0.95-use-HOME.patch 1467
 MD5 205394882ba01abdc762889074a39ce0 files/digest-smclone-0.95 123
-MD5 49d266436c6dd3045c434936a340da6e files/digest-smclone-0.96 192
+MD5 b6a6d58c54c9b3795df75cc1995bb51f files/smclone-0.97-gentoo-paths.patch 1877
 MD5 73e6ede9566959233f03faa1caf91657 files/digest-smclone-0.94.1 202
-MD5 b1ce3220effa0078776f210e66a77c3b files/smclone-0.95-use-HOME.patch 1467
+MD5 008cc27fba8111df05177f5862887eeb files/0.94.1-use-HOME.patch 3674
+MD5 7bcdde4dd7960b5f497476d2509a324c files/smclone-0.97-use-HOME.patch 2606
+MD5 6a6c50e9f4bbccabd4b487227fa297a7 files/digest-smclone-0.97 192
+MD5 311ff08217967d547f411c0bf71c49e0 files/smclone-0.95-gentoo-paths.patch 1008
 MD5 349d7f721e40c9520d0951c7de1aacb6 files/0.94.1-gentoo-paths.patch 1148
+MD5 49d266436c6dd3045c434936a340da6e files/digest-smclone-0.96 192
diff --git a/games-arcade/smclone/files/digest-smclone-0.97 b/games-arcade/smclone/files/digest-smclone-0.97
new file mode 100644
index 000000000000..5adc0061c33d
--- /dev/null
+++ b/games-arcade/smclone/files/digest-smclone-0.97
@@ -0,0 +1,3 @@
+MD5 04541c935a3aeb9f90dcdd3c1940d0ca SMC_0.97_source.zip 233670
+MD5 8c989056502de67c5cdaad797ba9722c SMC_0.97_game.zip 5313784
+MD5 eb4f325dedb9da34049fd727bbf2a1e2 music_2.0_RC_1.zip 17954786
diff --git a/games-arcade/smclone/files/smclone-0.97-gentoo-paths.patch b/games-arcade/smclone/files/smclone-0.97-gentoo-paths.patch
new file mode 100644
index 000000000000..245dd3966842
--- /dev/null
+++ b/games-arcade/smclone/files/smclone-0.97-gentoo-paths.patch
@@ -0,0 +1,41 @@
+--- configure.ac.orig	2005-08-19 00:03:15.000000000 +0200
++++ configure.ac	2005-08-19 00:05:27.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ AC_INIT(src/main.cpp)
+ 
+-PACKAGE=smc
++PACKAGE=smclone
+ VERSION=0.96
+ 
+ AC_PREREQ(2.50)
+@@ -83,12 +83,12 @@
+ packagedocdir=doc/${PACKAGE}
+ 
+ AC_DEFINE_UNQUOTED(SAVE_DIR, "savegames", [Directory for savegames])
+-AC_DEFINE_UNQUOTED(LEVEL_DIR, "${packageprefix}/${packagedatadir}/levels/", [Directory for level files])
+-AC_DEFINE_UNQUOTED(OVERWORLD_DIR, "${packageprefix}/${packagedatadir}/world", [Directory for word data])
+-AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${packageprefix}/${packagedatadir}/pixmaps", [Directory for pixmap data])
+-AC_DEFINE_UNQUOTED(SOUNDS_DIR, "${packageprefix}/${packagedatadir}/sounds", [Directory for sound data])
+-AC_DEFINE_UNQUOTED(MUSIC_DIR, "${packageprefix}/${packagedatadir}/music", [Directory for music data])
+-AC_DEFINE_UNQUOTED(FONT_DIR, "${packageprefix}/${packagedatadir}/font", [Directory for font data])
++AC_DEFINE_UNQUOTED(LEVEL_DIR, "@GENTOO_DATADIR@/levels", [Directory for level files])
++AC_DEFINE_UNQUOTED(OVERWORLD_DIR, "@GENTOO_DATADIR@/world", [Directory for word data])
++AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "@GENTOO_DATADIR@/pixmaps", [Directory for pixmap data])
++AC_DEFINE_UNQUOTED(SOUNDS_DIR, "@GENTOO_DATADIR@/sounds", [Directory for sound data])
++AC_DEFINE_UNQUOTED(MUSIC_DIR, "@GENTOO_DATADIR@/music", [Directory for music data])
++AC_DEFINE_UNQUOTED(FONT_DIR, "@GENTOO_DATADIR@/font", [Directory for font data])
+ 
+ 
+ AC_OUTPUT([Makefile src/Makefile data/Makefile docs/Makefile])
+--- src/preferences.cpp.orig	2005-08-19 07:38:52.000000000 +0200
++++ src/preferences.cpp	2005-08-19 07:39:19.000000000 +0200
+@@ -208,7 +208,7 @@
+ 	Lvleditor_automousehide = 0;
+ 	Backgroundimages_disabled = 0;
+ 
+-	level_dir = "data/levels";
++	level_dir = "@GENTOO_DATADIR@/levels";
+ }
+ 
+ void cPreferences :: Update( void )
diff --git a/games-arcade/smclone/files/smclone-0.97-use-HOME.patch b/games-arcade/smclone/files/smclone-0.97-use-HOME.patch
new file mode 100644
index 000000000000..ee6a32371a6e
--- /dev/null
+++ b/games-arcade/smclone/files/smclone-0.97-use-HOME.patch
@@ -0,0 +1,96 @@
+--- savegame.cpp.orig	2005-08-18 23:41:39.000000000 +0200
++++ savegame.cpp	2005-08-18 23:44:10.000000000 +0200
+@@ -45,8 +45,9 @@
+ 	loaded_save_info.OW_world = 0;
+ 	loaded_save_info.itembox_item = 0;
+ 	
+-	char Full_Save_Name[40];
+-	sprintf( Full_Save_Name, "%s/%d.sav", SAVE_DIR, Save_file );
++	char Full_Save_Name[255];
++	snprintf( Full_Save_Name, sizeof(Full_Save_Name) - 1, "%s/.smclone/%d.sav", getenv("HOME"), Save_file );
++
+ 
+ 	ifstream ifs( Full_Save_Name, ios::in );
+ 
+@@ -79,8 +80,9 @@
+ 
+ int cSavegame :: Save( unsigned int Save_file, Savegame Save_info )
+ {
+-	char Full_Save_Name[45];
+-	sprintf( Full_Save_Name, "%s/%d.sav", SAVE_DIR, Save_file );
++	char Full_Save_Name[255];
++	snprintf( Full_Save_Name, sizeof(Full_Save_Name) - 1, "%s/.smclone/%d.sav", getenv("HOME"), Save_file );
++
+ 
+ 	ifstream ifs( Full_Save_Name, ios::in );
+ 
+@@ -181,10 +183,13 @@
+ 	char buffer[10];
+ 	char desc_tmp[150];
+ 
+-	Full_Save_Name = SAVE_DIR "/.sav";
++	Full_Save_Name = "/.smclone/.sav";
++
+ 	
+ 	sprintf( buffer, "%d", Save_file );
+-	Full_Save_Name.insert( strlen( SAVE_DIR ) + 1, buffer );
++	Full_Save_Name.insert( strlen( "/.smclone/" ) + 1, buffer );
++	Full_Save_Name.insert( 0, getenv("HOME") );
++
+ 
+ 	if( !valid_file( Full_Save_Name ) )
+ 	{
+@@ -235,9 +240,9 @@
+ 
+ bool cSavegame :: is_valid( unsigned int Save_file )
+ {
+-	char savename[50];
++	char savename[255];
+ 
+-	sprintf( savename, "%s/%d.sav", SAVE_DIR, Save_file );
++	snprintf( savename, sizeof(savename) - 1, "%s/.smclone/%d.sav", getenv("HOME"), Save_file );
+ 
+ 	return valid_file( savename );
+ }
+--- preferences.cpp.orig	2005-08-19 07:47:31.000000000 +0200
++++ preferences.cpp	2005-08-19 07:53:39.000000000 +0200
+@@ -31,18 +31,22 @@
+ bool cPreferences :: Load( void )
+ {
+ 	Default();
++
++	char Full_Pref_Name[255];
++
++	snprintf(Full_Pref_Name, sizeof(Full_Pref_Name) - 1, "%s/.smclone/%s", getenv("HOME"), PREF_NAME );
+ 	
+-	if( !valid_file( PREF_NAME ) )
++	if( !valid_file( Full_Pref_Name ) )
+ 	{
+ 		printf( "No Preferences found\n" );
+ 		return 0;
+ 	}
+ 
+-	ifstream ifs( PREF_NAME, ios::in );
++	ifstream ifs( Full_Pref_Name, ios::in );
+ 	
+ 	if( !ifs )
+ 	{
+-		printf( "Couldn't open preferences file : %s\n", PREF_NAME );
++		printf( "Couldn't open preferences file : %s\n", Full_Pref_Name );
+ 		return 0;
+ 	}
+ 	else
+@@ -63,8 +67,12 @@
+ void cPreferences :: Save( void )
+ {
+ 	Update();
++	
++	char Full_Pref_Name[255];
++
++	snprintf(Full_Pref_Name, sizeof(Full_Pref_Name) - 1, "%s/.smclone/%s", getenv("HOME"), PREF_NAME );
+ 
+-	ofstream ofs( PREF_NAME, ios::out | ios::trunc );
++	ofstream ofs( Full_Pref_Name, ios::out | ios::trunc );
+ 
+ 	char row[300];
+ 
diff --git a/games-arcade/smclone/smclone-0.97.ebuild b/games-arcade/smclone/smclone-0.97.ebuild
new file mode 100644
index 000000000000..28f6d9cff5ea
--- /dev/null
+++ b/games-arcade/smclone/smclone-0.97.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/smclone/smclone-0.97.ebuild,v 1.1 2005/08/24 06:40:08 mr_bones_ Exp $
+
+inherit eutils games
+
+MUSIC_V=2.0_RC_1
+DESCRIPTION="clone of Super Mario World"
+HOMEPAGE="http://smclone.sourceforge.net/"
+SRC_URI="mirror://sourceforge/smclone/SMC_${PV}_source.zip
+	mirror://sourceforge/smclone/SMC_${PV}_game.zip
+	mirror://sourceforge/smclone/music_${MUSIC_V}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+RDEPEND="media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf
+	media-libs/sdl-gfx"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	>=sys-apps/portage-2.0.51"
+
+S="${WORKDIR}/${PVR}"
+
+src_unpack() {
+	unpack SMC_${PV}_source.zip SMC_${PV}_game.zip
+	cd "${S}"
+	unpack music_${MUSIC_V}.zip
+
+	find . '(' -name '*.dll' -o -name '*.exe' ')' -exec rm {} \;
+	edos2unix Makefile.am autogen.sh configure.ac src/preferences.cpp src/savegame.cpp
+	chmod a+x autogen.sh
+	epatch "${FILESDIR}"/${P}-gentoo-paths.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:g" \
+		configure.ac src/preferences.cpp
+
+	#Bump VERSION to the correct one for this release
+	sed -i \
+		-e "s/VERSION=0.96/VERSION=0.97/" \
+		configure.ac \
+		|| die "sed failed"
+	./autogen.sh || die "autogen failed"
+	chmod a+x configure
+	cd src
+	epatch "${FILESDIR}"/${P}-use-HOME.patch
+}
+
+src_install() {
+	dogamesbin src/smc || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data/* || die "doins"
+	# Clean up data directory
+	rm -f "${D}${GAMES_DATADIR}"/${PN}/{data/,}Makefile*
+	dodoc *.txt ../readme-linux.txt
+	cd ..
+	dohtml *.html *.css
+	prepgamesdirs
+}