games-rpg/penumbra-collection: Version bump. Make cache files newer than models to avoid crashes like reported in #278326 comment #6. No need for bundled libopenal anymore.

svn path=/sunrise/; revision=10568

3 files changed, 20 insertions, 7 deletions

diff --git a/games-rpg/penumbra-collection/ChangeLog b/games-rpg/penumbra-collection/ChangeLog
index 12baaef29..f8167608f 100644
--- a/games-rpg/penumbra-collection/ChangeLog
+++ b/games-rpg/penumbra-collection/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 May 2010; Robert Cernansky (HS) <openhs@users.sourceforge.net>
+  -penumbra-collection-1.0.ebuild, +penumbra-collection-1.1.ebuild:
+  Version bump. Make cache files newer than models to avoid crashes like
+  reported in #278326 comment #6. No need for bundled libopenal anymore.
+
   05 May 2010; Robert Cernansky (HS) <openhs@users.sourceforge.net>
   penumbra-collection-1.0.ebuild:
   Depend either on xz-utils or lzma-utils. Thanks to Arun Raghavan for reporting.
diff --git a/games-rpg/penumbra-collection/Manifest b/games-rpg/penumbra-collection/Manifest
index 064216be5..04b920a82 100644
--- a/games-rpg/penumbra-collection/Manifest
+++ b/games-rpg/penumbra-collection/Manifest
@@ -1,4 +1,4 @@
-DIST PenumbraCollection-1.0.sh 935899676 RMD160 8aa679751455fb5f0f1373ff9b89052602ee9dab SHA1 ac18a19cce5ce389a163fc3a55aad736f1cb1224 SHA256 2a23a6334c55cb1f2498fcce66d618c51c9918d193855c41d3ff55fd13e5a777
-EBUILD penumbra-collection-1.0.ebuild 5006 RMD160 a1bcd7f32500dc1ad5fc9c367cf349a1612b408f SHA1 73553f2bd8b6f7501e487637cca0095ab13fab33 SHA256 80d919e19b18dc61035a51b14c499927a1c7c6616674d97a88bdbde7e60151de
-MISC ChangeLog 555 RMD160 68f64b400213756820fcdc4907208d67d88d2193 SHA1 0a54a4af9071c417d5da9436b94f117042f4c0cb SHA256 4d32563fcff1250758117752d3b9dce9abb1e135a2dfe7f82c66685e79d8b9e8
+DIST PenumbraCollection-1.1.sh 949267761 RMD160 12a95483e4fc03e0610184a68855344e78934d7b SHA1 247de2b7f1cd1331efca2fe98a371673463e6e76 SHA256 e0fdbdbb7e3766629cabd3903675a2f54f1a5206f67d590dd1553576338f3dab
+EBUILD penumbra-collection-1.1.ebuild 5313 RMD160 0e385a153681f3e9054eaa5635fb6295a13ca717 SHA1 115955190423eb45cfe951d82b6477eeff53541b SHA256 27f0e4e1afa83794ada5328558249fc168c6229287a0512178b775618c708694
+MISC ChangeLog 838 RMD160 054a5a7b2062aeacc9dbaa3be836313ba22bf7a8 SHA1 95c9bbd5d5eddeda418bc0ab7acf566f31791da3 SHA256 37b3aa51e9508dd24b69864ac590e83aa9ff3280ac4ea22bb8990a128f39a0a0
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/games-rpg/penumbra-collection/penumbra-collection-1.0.ebuild b/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
index 7bf697cad..b0e1b3806 100644
--- a/games-rpg/penumbra-collection/penumbra-collection-1.0.ebuild
+++ b/games-rpg/penumbra-collection/penumbra-collection-1.1.ebuild
@@ -49,6 +49,11 @@ pkg_nofetch() {
 src_unpack() {
 	unpack_makeself || die "unpack installator"
 
+	# give proper extension to subarchive so unpack recognizes it
+	mv subarch subarch.tar.lzma || die "rename subarch"
+
+	unpack ./subarch.tar.lzma || die "unpack install archive"
+
 	# give proper extension to install archive so unpack recognizes it
 	mv instarchive_all instarchive_all.tar.lzma || \
 		die "rename instarchive_all"
@@ -61,9 +66,10 @@ src_install() {
 	# perform instalation for each episode; note that Requiem is extension of
 	# Black Plague so it has no dedicated directory at this level
 	for episodeDir in Overture BlackPlague; do
+		local destDir="${dir}/${episodeDir}"
 
 		# install game data files
-		insinto "${dir}/${episodeDir}"
+		insinto ${destDir}
 
 		# >install every directory recursively except lib
 		for directory in \
@@ -75,7 +81,7 @@ src_install() {
 		doins ${episodeDir}/*.cfg || die "doins .cfg files"
 
 		# install libraries and executables
-		exeinto "${dir}/${episodeDir}"
+		exeinto ${destDir}
 		doexe ${episodeDir}/openurl.sh ${episodeDir}/*.bin || \
 			die "doexe binaries"
 
@@ -84,14 +90,16 @@ src_install() {
 			exeinto "${dir}/${episodeDir}/lib"
 			for library in \
 				libfltk.so.1.1 \
-				libopenal.so.1.3.253 \
 				libCgGL.so \
 				libCg.so; do
 				doexe ${episodeDir}/lib/${library} || die "doexe libraries"
 			done
-			dosym libopenal.so.1.3.253 "${dir}/${episodeDir}/lib/libopenal.so.1"
 		fi
 
+		# make sure that cache files are newer than models otherwise the game
+		# tries to regenerate them which sometimes causes a crash (as reported
+		# in bug #278326 comment #6)
+		touch ${D}/${destDir}/core/*cache/*
 	done
 
 	# install icons