summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-05-05 17:03:37 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-05-05 17:03:37 +0000
commit37f79b7756c67f0df8409ab52f84acb1e53cefd0 (patch)
tree3a5d7ee9ae13bdfcea7bb5586e404ecb6e875257 /games-arcade/slimevolley
parentFixed for gcc-4.5, thanks Xarthisius, bug #318575 (diff)
downloadhistorical-37f79b7756c67f0df8409ab52f84acb1e53cefd0.tar.gz
historical-37f79b7756c67f0df8409ab52f84acb1e53cefd0.tar.bz2
historical-37f79b7756c67f0df8409ab52f84acb1e53cefd0.zip
Don't try to look in pwd for a 'data' directory (bug #318005)
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-arcade/slimevolley')
-rw-r--r--games-arcade/slimevolley/ChangeLog6
-rw-r--r--games-arcade/slimevolley/Manifest5
-rw-r--r--games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch23
-rw-r--r--games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild5
4 files changed, 34 insertions, 5 deletions
diff --git a/games-arcade/slimevolley/ChangeLog b/games-arcade/slimevolley/ChangeLog
index 536097e77edc..e3adc1549335 100644
--- a/games-arcade/slimevolley/ChangeLog
+++ b/games-arcade/slimevolley/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/slimevolley
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/ChangeLog,v 1.3 2010/05/01 20:11:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/ChangeLog,v 1.4 2010/05/05 17:03:36 mr_bones_ Exp $
+
+ 05 May 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ slimevolley-2.4.1-r1.ebuild, +files/slimevolley-2.4.1-nodatalocal.patch:
+ Don't try to look in pwd for a "data" directory (bug #318005)
*slimevolley-2.4.1-r1 (01 May 2010)
diff --git a/games-arcade/slimevolley/Manifest b/games-arcade/slimevolley/Manifest
index 9f182c1b1142..b16f553d3eab 100644
--- a/games-arcade/slimevolley/Manifest
+++ b/games-arcade/slimevolley/Manifest
@@ -1,5 +1,6 @@
+AUX slimevolley-2.4.1-nodatalocal.patch 746 RMD160 fa74c0458559581872adae6bb81d5a54a148f85e SHA1 f323ffc77359b8f10d5675b5f575b213e5cc1806 SHA256 e64358b04f7e9396fe8dc62b4211e76646a3bc2bd29d82c4548a061fdaab9077
DIST slimevolley_2.4.1.tar.gz 1953897 RMD160 948ced667e4307143d291eef5936a5829cb1d0dc SHA1 4b66187323975177bc6f70a2ddbccf5808de420c SHA256 86bcf4524447316cc8646f4b9a71d964d3e2ff62c4f1956773b5a47ee50726de
-EBUILD slimevolley-2.4.1-r1.ebuild 1172 RMD160 7b5f676d81b8b878319561d2a1a91f28a6698a79 SHA1 e6ee3554cf8a23d4eef7227d1e1ae2dd685cb5a1 SHA256 09794c5343dfd5c2d232b189acf2581c7c06301df76f00a40d3465cf2b43baec
+EBUILD slimevolley-2.4.1-r1.ebuild 1238 RMD160 6d18919bad9f84ca4728bcb2ed4bfa56e1a96196 SHA1 193b20a84ecbdd8bb852d2b0d68b8b98ec702031 SHA256 4c1c82ebc97eed6bcda3944d7f3eac30a78b4cec3f8a19201dac2f91312e3db8
EBUILD slimevolley-2.4.1.ebuild 1052 RMD160 eec48229c564a619cc4cb54c5649586593df9306 SHA1 d71ce8f172bc5faeaa8c2e156d2154faafa735f9 SHA256 0c265ad06b65fb2438e408e199938d887cce0d5a86d64defde9b4b9c869906dd
-MISC ChangeLog 686 RMD160 c1bf9cfec8ecc5c39ab32004853148f661f95fc6 SHA1 4c105ed4c228396c0a81830371e11a2ba25cac1e SHA256 dfdf7180d4b538b4dfb17909769c969e68f4a10bcc5c5647b4a6f04750f6852b
+MISC ChangeLog 881 RMD160 0687a38a0cad7cc24225bd34173645536b1d520c SHA1 db79c8e17b4c9c55396e9be96652a0446be568c7 SHA256 76bcc0b24736cf9a7bd3b71158b3baf73f472c702bbbe8efdf68acdd61f820ca
MISC metadata.xml 218 RMD160 7405975de585be2724695401f481fba2c97c38dd SHA1 eb279ae951615e3fc739325ad728c6195db8f252 SHA256 06d0952ef3a464d65dd86912a5385eb7f490c5ebcb71e633663164c7058ffbdf
diff --git a/games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch b/games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch
new file mode 100644
index 000000000000..a1ab7616a645
--- /dev/null
+++ b/games-arcade/slimevolley/files/slimevolley-2.4.1-nodatalocal.patch
@@ -0,0 +1,23 @@
+diff -ru slimevolley-2.4.1.orig/src/themes_std.c slimevolley-2.4.1/src/themes_std.c
+--- slimevolley-2.4.1.orig/src/themes_std.c 2008-11-30 04:36:52.000000000 -0500
++++ slimevolley-2.4.1/src/themes_std.c 2010-05-05 13:00:23.875723904 -0400
+@@ -30,7 +30,6 @@
+ #include "audio.h"
+ #include "themes.h"
+
+-#define DATA_LOCAL "data"
+ #define DOSS_THEMES "themes"
+ #define DOSS_SLIMES "slimes"
+ #define SLIME_D_NOM "slimeJD%d.png"
+@@ -74,10 +73,7 @@
+ chemin[0] = '\0';
+
+ if(var_env == NULL) {
+- if(access(DATA_LOCAL, R_OK | X_OK) == 0) {
+- strncpy(chemin, DATA_LOCAL, sizeof(chemin) - 1);
+-
+- } else if(access(DATA_DIR, R_OK | X_OK) == 0) {
++ if(access(DATA_DIR, R_OK | X_OK) == 0) {
+ strncpy(chemin, DATA_DIR, sizeof(chemin) - 1);
+ }
+
diff --git a/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild
index 6ad9e00aebc8..7de594f2d475 100644
--- a/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild
+++ b/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild,v 1.1 2010/05/01 20:11:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/slimevolley/slimevolley-2.4.1-r1.ebuild,v 1.2 2010/05/05 17:03:36 mr_bones_ Exp $
EAPI=2
-inherit cmake-utils games
+inherit cmake-utils eutils games
DESCRIPTION="A simple volleyball game"
HOMEPAGE="http://slime.tuxfamily.org/index.php"
@@ -32,6 +32,7 @@ src_prepare() {
sed -i \
-e "/DESTINATION/s:games:${GAMES_BINDIR}:" \
CMakeLists.txt || die
+ epatch "${FILESDIR}"/${P}-nodatalocal.patch # bug #318005
}
src_configure() {