Version bump

Package-Manager: portage-2.1.3.4

6 files changed, 180 insertions, 9 deletions

diff --git a/games-simulation/cultivation/ChangeLog b/games-simulation/cultivation/ChangeLog
index e147daede7dd..3562ae56aec6 100644
--- a/games-simulation/cultivation/ChangeLog
+++ b/games-simulation/cultivation/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/cultivation
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/cultivation/ChangeLog,v 1.2 2007/05/19 21:17:02 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cultivation/ChangeLog,v 1.3 2007/08/12 01:21:30 nyhm Exp $
+
+*cultivation-8 (12 Aug 2007)
+
+  12 Aug 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/cultivation-8-paths.patch, +files/cultivation-8-portaudio.patch,
+  +cultivation-8.ebuild:
+  Version bump
 
   19 May 2007; Tupone Alfredo <tupone@gentoo.org> cultivation-7.ebuild:
   Added ~x86 keyword. Bug #150406 by Antoine
diff --git a/games-simulation/cultivation/Manifest b/games-simulation/cultivation/Manifest
index 30b491546065..d08570461cdf 100644
--- a/games-simulation/cultivation/Manifest
+++ b/games-simulation/cultivation/Manifest
@@ -5,15 +5,28 @@ AUX cultivation-7-gentoo.patch 3186 RMD160 b4ec07202d8a61901a1989c59251731e660e1
 MD5 8d8eeb0a38d1a80a2d6151e111033d31 files/cultivation-7-gentoo.patch 3186
 RMD160 b4ec07202d8a61901a1989c59251731e660e168c files/cultivation-7-gentoo.patch 3186
 SHA256 08939a9c9ed35410ae1e790fd3c7d9899621534bd949b43eb86c64fb407a1fc1 files/cultivation-7-gentoo.patch 3186
+AUX cultivation-8-paths.patch 1628 RMD160 a1c78741dcb31ab2f29735b6f79a4be44741d756 SHA1 8ba708cf3e1f6966ed016e43ee0bb2f40a121f22 SHA256 21d12876b196cec575f904fb4421ad69a97af5addeb921445972972d1327f492
+MD5 defd424b234401dc867aacd8b11a2477 files/cultivation-8-paths.patch 1628
+RMD160 a1c78741dcb31ab2f29735b6f79a4be44741d756 files/cultivation-8-paths.patch 1628
+SHA256 21d12876b196cec575f904fb4421ad69a97af5addeb921445972972d1327f492 files/cultivation-8-paths.patch 1628
+AUX cultivation-8-portaudio.patch 1231 RMD160 ac55b5819f5a5617d8aa7151623d8565e78e0f46 SHA1 e16b535cdf5a9df104db7bea5ad37bfe74d91e8a SHA256 0c2d0e9cc1be4be34f790c302b610e6093999c3930c3e28f6731343cf417fa61
+MD5 6038f603c4704eda49873c2feddfdbd7 files/cultivation-8-portaudio.patch 1231
+RMD160 ac55b5819f5a5617d8aa7151623d8565e78e0f46 files/cultivation-8-portaudio.patch 1231
+SHA256 0c2d0e9cc1be4be34f790c302b610e6093999c3930c3e28f6731343cf417fa61 files/cultivation-8-portaudio.patch 1231
 DIST Cultivation_7_UnixSource.tar.gz 1117852 RMD160 94a9ce95e774c5ca981d2bcd41cfa2228daf7c67 SHA1 64f3b4a59815c8cd3976de0ec6c67b99d21729a8 SHA256 17c3b2efcf6bf059178058a04bd0b555e257bfb9117a25445d6fbf00a70ac8b2
+DIST Cultivation_8_UnixSource.tar.gz 1125886 RMD160 6099e5aafc894cda830add2650d6c9698f34019b SHA1 f2c0aae6b0554dbcc3ee30aaeb7d8d6c471bec82 SHA256 001805c03711f0c32b99ed87cdd65f5ffa47b540bd9266ff5948801019ff7da3
 EBUILD cultivation-7.ebuild 1214 RMD160 1c86737bff22dfad97406ef58972fba3ee7b346e SHA1 309feace3829213d1d32642868ded738bb80a5ea SHA256 06765e63318783452d92c1efd011837323c3bc3c8a25cc3f210dfa22b0d9e9ca
 MD5 c75d371ea547a516ae3792eab2990c5e cultivation-7.ebuild 1214
 RMD160 1c86737bff22dfad97406ef58972fba3ee7b346e cultivation-7.ebuild 1214
 SHA256 06765e63318783452d92c1efd011837323c3bc3c8a25cc3f210dfa22b0d9e9ca cultivation-7.ebuild 1214
-MISC ChangeLog 564 RMD160 453c51d81c27b2ab9b17074e257e27f1dfdb6e2b SHA1 10880e2e65de902f4212c2dadf05004c23844802 SHA256 3ee597f834dfa183a515ba4294e8794df8eab3a3fdf0b704edbb7a03955552a8
-MD5 98fad01349f51525269316cf8283d81e ChangeLog 564
-RMD160 453c51d81c27b2ab9b17074e257e27f1dfdb6e2b ChangeLog 564
-SHA256 3ee597f834dfa183a515ba4294e8794df8eab3a3fdf0b704edbb7a03955552a8 ChangeLog 564
+EBUILD cultivation-8.ebuild 1372 RMD160 4415dafa8de7ec24d5730e18a4ae01e53cda91dc SHA1 926dd0a842f28222c63c8f1149a96a0651a7a536 SHA256 d5c3b4ac4aa3a6dbd37fefce118ea41985a1a68bd1b8a360665ecebe7200ef5b
+MD5 d98feb98898afb3d1045a388585fbdc9 cultivation-8.ebuild 1372
+RMD160 4415dafa8de7ec24d5730e18a4ae01e53cda91dc cultivation-8.ebuild 1372
+SHA256 d5c3b4ac4aa3a6dbd37fefce118ea41985a1a68bd1b8a360665ecebe7200ef5b cultivation-8.ebuild 1372
+MISC ChangeLog 755 RMD160 1e6f576defc25e05e97a1a00b9886e2ce7450bb8 SHA1 897e53e6f9f0f72e6f8ca58ab44c663d72ed1727 SHA256 7924ba64299557a4ea27e7e48389a5ad07b3b7c9b37eb7029a8b1c1670c71958
+MD5 6dd824ea0a6beac3473a197d3bed513e ChangeLog 755
+RMD160 1e6f576defc25e05e97a1a00b9886e2ce7450bb8 ChangeLog 755
+SHA256 7924ba64299557a4ea27e7e48389a5ad07b3b7c9b37eb7029a8b1c1670c71958 ChangeLog 755
 MISC metadata.xml 982 RMD160 835e540eb7bc0b9e4a16f21ebf3c70ed2c2062ff SHA1 975211e7e000ceccf671f00d5f432f9b031844bf SHA256 fbb4a448f5d958f99372d8fbacd9938da0e477302ada4e048845d1c772577025
 MD5 acdb2dc3510778aeb3929f97dcd0494c metadata.xml 982
 RMD160 835e540eb7bc0b9e4a16f21ebf3c70ed2c2062ff metadata.xml 982
@@ -21,10 +34,13 @@ SHA256 fbb4a448f5d958f99372d8fbacd9938da0e477302ada4e048845d1c772577025 metadata
 MD5 8164218497b3fef31cff80abe1f95eee files/digest-cultivation-7 277
 RMD160 7599c15a5067c2e345ce73fdbdd22c8d1e1a6832 files/digest-cultivation-7 277
 SHA256 7a0d2e83c70a7fa92eea7bfb3a09b3d00b253c7f0874c2183cd3e63a98559768 files/digest-cultivation-7 277
+MD5 19c40f5c845225d9eb49069c15abc384 files/digest-cultivation-8 277
+RMD160 83bfd2969c58420c7738d036c92ce9f86a0754e2 files/digest-cultivation-8 277
+SHA256 09231a6d521642e667d209cbbf486ed1433f1bed17a0c3f4b5b2c2f04a27a8cc files/digest-cultivation-8 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGbpnxdz7hIScOURERAlWsAJ9TbCf+wuKWL9hoJdZEIGxKtkzQ9gCfcgSg
-599DmtKo2mBoxKDr0xiFKw4=
-=awjc
+iD8DBQFGvmCgdz7hIScOURERAnChAKCvJdSlMg73Iwgdo+vPjIJRqfqKBwCdEv+M
+YFMBXNMPcAkD8vRmQ6bK9LQ=
+=TKrF
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/cultivation/cultivation-8.ebuild b/games-simulation/cultivation/cultivation-8.ebuild
new file mode 100644
index 000000000000..26537802170d
--- /dev/null
+++ b/games-simulation/cultivation/cultivation-8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/cultivation/cultivation-8.ebuild,v 1.1 2007/08/12 01:21:30 nyhm Exp $
+
+inherit eutils toolchain-funcs games
+
+MY_P=Cultivation_${PV}_UnixSource
+DESCRIPTION="A game about the interactions within a gardening community"
+HOMEPAGE="http://cultivation.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	virtual/glu
+	virtual/glut
+	media-libs/pablio"
+
+S=${WORKDIR}/${MY_P}/game2
+
+src_unpack() {
+	unpack ${A}
+	cd ${MY_P}
+	rm -rf minorGems/sound/portaudio
+	epatch \
+		"${FILESDIR}"/${P}-portaudio.patch \
+		"${FILESDIR}"/${P}-paths.patch
+	sed -i "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		game2/gameSource/features.cpp \
+		game2/gameSource/game.cpp \
+		minorGems/util/TranslationManager.cpp \
+		|| die "sed failed"
+}
+
+src_compile() {
+	# not an autoconf script
+	platformSelection=1 ./configure || die
+	tc-export CXX
+	emake -C gameSource || die "emake failed"
+}
+
+src_install() {
+	cd gameSource
+	newgamesbin Cultivation ${PN} || die "newgamesbin failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r features.txt font.tga language.txt languages || die "doins failed"
+	dodoc ../documentation/*.txt
+	prepgamesdirs
+}
diff --git a/games-simulation/cultivation/files/cultivation-8-paths.patch b/games-simulation/cultivation/files/cultivation-8-paths.patch
new file mode 100644
index 000000000000..eac34c85eca5
--- /dev/null
+++ b/games-simulation/cultivation/files/cultivation-8-paths.patch
@@ -0,0 +1,51 @@
+--- game2/gameSource/features.cpp
++++ game2/gameSource/features.cpp
+@@ -57,7 +57,7 @@
+ 
+ 
+ void initializeFeatures() {
+-    FILE *featuresFile = fopen( "features.txt", "r" );
++    FILE *featuresFile = fopen( "@GENTOO_DATADIR@/features.txt", "r" );
+ 
+     char stringBuffer[100];
+     int switchValue;
+--- game2/gameSource/game.cpp
++++ game2/gameSource/game.cpp
+@@ -592,7 +592,7 @@
+       mStartTimeSeconds( time( NULL ) ),
+       mPaused( false ),
+       mMaxFrameRate( 400 ),  // don't limit frame rate
+-      mPrintFrameRate( true ),
++      mPrintFrameRate( false ),
+       mNumFrames( 0 ), mFrameBatchSize( 100 ),
+       mFrameBatchStartTimeSeconds( time( NULL ) ),
+       mFrameBatchStartTimeMilliseconds( 0 ),
+@@ -902,7 +902,7 @@
+     // load font image
+     TGAImageConverter tga;
+ 
+-    File fontFile( NULL, "font.tga" );
++    File fontFile( NULL, "@GENTOO_DATADIR@/font.tga" );
+     FileInputStream fontInput( &fontFile );
+ 
+     Image *fontImage = tga.deformatImage( &fontInput );
+@@ -985,7 +985,7 @@
+     mCurrentTipStoredItem = -1;
+     
+     // translation language for tool tips
+-    File languageNameFile( NULL, "language.txt" );
++    File languageNameFile( NULL, "@GENTOO_DATADIR@/language.txt" );
+ 
+     if( languageNameFile.exists() ) {
+         char *languageNameText = languageNameFile.readFileContents();
+--- minorGems/util/TranslationManager.cpp
++++ minorGems/util/TranslationManager.cpp
+@@ -147,7 +147,7 @@
+       mNaturalLanguageStrings( NULL ) {
+ 
+     // default
+-    setDirectoryAndLanguage( "languages", "English" );
++    setDirectoryAndLanguage( "@GENTOO_DATADIR@/languages", "English" );
+     }
+ 
+ 
diff --git a/games-simulation/cultivation/files/cultivation-8-portaudio.patch b/games-simulation/cultivation/files/cultivation-8-portaudio.patch
new file mode 100644
index 000000000000..1ce8f8a75c85
--- /dev/null
+++ b/games-simulation/cultivation/files/cultivation-8-portaudio.patch
@@ -0,0 +1,42 @@
+--- game2/gameSource/sound/SoundPlayer.h
++++ game2/gameSource/sound/SoundPlayer.h
+@@ -52,8 +52,8 @@
+ #include "SoundFilter.h"
+ #include "PlayableSound.h"
+ 
+-#include "minorGems/sound/portaudio/pa_common/portaudio.h"
+-#include "minorGems/sound/portaudio/pablio/pablio.h"
++#include <portaudio/portaudio.h>
++#include <portaudio/pablio.h>
+ 
+ 
+ #include "minorGems/util/SimpleVector.h"
+--- game2/Makefile.common
++++ game2/Makefile.common
+@@ -52,7 +52,7 @@
+ 
+ 
+ 
+-COMPILE_FLAGS = -Wall ${DEBUG_FLAG} ${PLATFORM_COMPILE_FLAGS} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -I${ROOT_PATH} -I${PORT_AUDIO_PATH}/pa_common
++COMPILE_FLAGS = -Wall ${PLATFORM_COMPILE_FLAGS} $(CXXFLAGS) -I${ROOT_PATH}
+ 
+ 
+ COMPILE = ${GXX} ${COMPILE_FLAGS} -c
+--- game2/Makefile.GnuLinux
++++ game2/Makefile.GnuLinux
+@@ -20,12 +20,12 @@
+ 
+ # various GL and X windows  librariesneeded for linux
+ # also need portaudio library (which in turn needs pthreads)
+-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread
++PLATFORM_LINK_FLAGS = -lGL -lglut -lGLU -lX11 -lportaudio -lpthread
+ 
+ 
+ # All platforms but OSX support g++ and need no linker hacks
+-GXX = g++ 
+-LINK_FLAGS = 
++GXX = $(CXX)
++LINK_FLAGS = $(LDFLAGS)
+ 
+ 
+ 
diff --git a/games-simulation/cultivation/files/digest-cultivation-8 b/games-simulation/cultivation/files/digest-cultivation-8
new file mode 100644
index 000000000000..e3b4e090754b
--- /dev/null
+++ b/games-simulation/cultivation/files/digest-cultivation-8
@@ -0,0 +1,3 @@
+MD5 775de01907613f80f468b73c8d66920b Cultivation_8_UnixSource.tar.gz 1125886
+RMD160 6099e5aafc894cda830add2650d6c9698f34019b Cultivation_8_UnixSource.tar.gz 1125886
+SHA256 001805c03711f0c32b99ed87cdd65f5ffa47b540bd9266ff5948801019ff7da3 Cultivation_8_UnixSource.tar.gz 1125886