Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/games-action
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2007-07-06 06:24:53 +0000
committerAlfredo Tupone <tupone@gentoo.org>2007-07-06 06:24:53 +0000
commit1ee0f7a8e29151f65d95d801bedfc3e8c98d49c1 (patch)
tree9b20dc0315985b518837d9d5b785c5ae509274e3 /games-action
parentFixed gcc-4.2/namespace issue (bug #162165) (diff)
downloadhistorical-1ee0f7a8e29151f65d95d801bedfc3e8c98d49c1.tar.gz
historical-1ee0f7a8e29151f65d95d801bedfc3e8c98d49c1.tar.bz2
historical-1ee0f7a8e29151f65d95d801bedfc3e8c98d49c1.zip
Fix bad data path: bug #184363
Package-Manager: portage-2.1.2.9
Diffstat (limited to 'games-action')
-rw-r--r--games-action/xshipwars/ChangeLog6
-rw-r--r--games-action/xshipwars/Manifest32
-rw-r--r--games-action/xshipwars/files/xshipwars-2.5.5-build.patch17
-rw-r--r--games-action/xshipwars/xshipwars-2.5.5.ebuild5
4 files changed, 42 insertions, 18 deletions
diff --git a/games-action/xshipwars/ChangeLog b/games-action/xshipwars/ChangeLog
index 92c584b79cb4..eaf764d146b2 100644
--- a/games-action/xshipwars/ChangeLog
+++ b/games-action/xshipwars/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/xshipwars
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.17 2007/01/31 19:57:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.18 2007/07/06 06:24:53 tupone Exp $
+
+ 06 Jul 2007; Tupone Alfredo <tupone@gentoo.org>
+ files/xshipwars-2.5.5-build.patch, xshipwars-2.5.5.ebuild:
+ Fix bad data path: bug #184363 by Ken Rushia
31 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+files/xshipwars-2.5.5-64bit.patch, xshipwars-2.5.5.ebuild:
diff --git a/games-action/xshipwars/Manifest b/games-action/xshipwars/Manifest
index ba0df78bb721..f1e4b5f8d60e 100644
--- a/games-action/xshipwars/Manifest
+++ b/games-action/xshipwars/Manifest
@@ -13,10 +13,10 @@ AUX xshipwars-2.5.5-64bit.patch 24246 RMD160 a70bfa97d90ce9378b523d663392f77b1d2
MD5 7ff3446738bb35dc5f89ece56693291c files/xshipwars-2.5.5-64bit.patch 24246
RMD160 a70bfa97d90ce9378b523d663392f77b1d25e331 files/xshipwars-2.5.5-64bit.patch 24246
SHA256 e34917bb8ef479c10a984470544741862ae186ab0631322d1af6bf5691dc42fd files/xshipwars-2.5.5-64bit.patch 24246
-AUX xshipwars-2.5.5-build.patch 1967 RMD160 40c51ac306842c8191509954b2670811c37dcb3a SHA1 78997eeb1b5924266648728051b42fe6b5690b0c SHA256 78b721ec79d00b470511789926aa702f6d95ae010a0dbd895a9433d310662d0a
-MD5 811cc5da95de7952bd8a6df9f984a924 files/xshipwars-2.5.5-build.patch 1967
-RMD160 40c51ac306842c8191509954b2670811c37dcb3a files/xshipwars-2.5.5-build.patch 1967
-SHA256 78b721ec79d00b470511789926aa702f6d95ae010a0dbd895a9433d310662d0a files/xshipwars-2.5.5-build.patch 1967
+AUX xshipwars-2.5.5-build.patch 2762 RMD160 9bd78b0a69632d7e9ef9eced56e27e1fc8c92ec8 SHA1 6ea95ee9b42cc093a1f4b6615dd77eb1291dcea7 SHA256 d674f734a836ba67ea1b7a5ba56020382a348c2d57cf6d620bda727b1d427ce3
+MD5 28f7674a024eba3a483ea751fa254f5e files/xshipwars-2.5.5-build.patch 2762
+RMD160 9bd78b0a69632d7e9ef9eced56e27e1fc8c92ec8 files/xshipwars-2.5.5-build.patch 2762
+SHA256 d674f734a836ba67ea1b7a5ba56020382a348c2d57cf6d620bda727b1d427ce3 files/xshipwars-2.5.5-build.patch 2762
DIST babylon5images1.1.tar.bz2 4531670 RMD160 ebdba429672ee2482066dfb17e2e9b6499318e75 SHA1 11600a8d5eb0d7f142cb4e0eac31eee92d9361cc SHA256 5bd54aee3475246efb915b91ba601de96c4e97e5a119fc3e6b81fce7cfc73f56
DIST stimages-1.11.1.tar.bz2 9707377 RMD160 79130ccaeb3458576d04b15fb82e81776cb0ab93 SHA1 a104bfec0ca56b57d130036c5f223fc4be679977 SHA256 deb34a3e0c7cfd16a1be105039f80a31d1bfd4fc9ed01d43d04e9f5ecd4c4e50
DIST stimages1.7.tar.bz2 6380434 RMD160 38dd6b72bb6e810f00238de2ed4e11921963fb7a SHA1 16eb96fbabb0a7a42902c3dd5b9cdd0ec903cdc1 SHA256 f57993c232d3f5335c925cc53e7481a19c3633c3d6350b286ed13cec127135ae
@@ -30,14 +30,14 @@ EBUILD xshipwars-1.34.0.ebuild 2734 RMD160 7797d5325a3e72bcea930d068c22ff5f3b11c
MD5 f3aaad1c8cbe8e0411ba69f2ac990d3c xshipwars-1.34.0.ebuild 2734
RMD160 7797d5325a3e72bcea930d068c22ff5f3b11cc94 xshipwars-1.34.0.ebuild 2734
SHA256 efea2cfa2238b1727cdee6f3776d194db5eddd53c76219829420091d9d62b628 xshipwars-1.34.0.ebuild 2734
-EBUILD xshipwars-2.5.5.ebuild 2666 RMD160 cb7b6c0723b2c3f3440a73f056e17e965ddc1497 SHA1 7a9527713bedc8283b2ca50ddfbf0122b17667c4 SHA256 10e72f2d6812ad8beffaed9dacccba384cf696d865d48e601a9470e3e3d16c10
-MD5 4c502954f1914b0ef501d18ead7cd53e xshipwars-2.5.5.ebuild 2666
-RMD160 cb7b6c0723b2c3f3440a73f056e17e965ddc1497 xshipwars-2.5.5.ebuild 2666
-SHA256 10e72f2d6812ad8beffaed9dacccba384cf696d865d48e601a9470e3e3d16c10 xshipwars-2.5.5.ebuild 2666
-MISC ChangeLog 3007 RMD160 132252e32eb6943f3c885151cbe233816aa2648c SHA1 306639e461257c708cd974683c5445d1120ff476 SHA256 09e87459d4ac424303a3d6fe57145e4bd718de3b255e290b615174d4b8352d9d
-MD5 d3dfce22b65f642a5ef545949d9aef5e ChangeLog 3007
-RMD160 132252e32eb6943f3c885151cbe233816aa2648c ChangeLog 3007
-SHA256 09e87459d4ac424303a3d6fe57145e4bd718de3b255e290b615174d4b8352d9d ChangeLog 3007
+EBUILD xshipwars-2.5.5.ebuild 2770 RMD160 4bc5648d325eaef631895e7aaa40e6a2c9b89c00 SHA1 b7546f3de10665d113f6e7c761fe0c6957a7b498 SHA256 0fe4a95cefa9513b216309637b195a680969fe08ea655cd817c8741c2ac94200
+MD5 98b5693088a802fa2f0fceaedd2c3ac1 xshipwars-2.5.5.ebuild 2770
+RMD160 4bc5648d325eaef631895e7aaa40e6a2c9b89c00 xshipwars-2.5.5.ebuild 2770
+SHA256 0fe4a95cefa9513b216309637b195a680969fe08ea655cd817c8741c2ac94200 xshipwars-2.5.5.ebuild 2770
+MISC ChangeLog 3164 RMD160 b61df7dab6f126c4c9797dd0fb6e948333883187 SHA1 c7fe1081920e2f1ce6f76b7a7cae3cae11ac74fc SHA256 75c58d0d5e59948c3a6236f6082a89dec247d3baddcf1a394d6922351d5e9249
+MD5 a048eb0071957160b8a9f659e4b675ad ChangeLog 3164
+RMD160 b61df7dab6f126c4c9797dd0fb6e948333883187 ChangeLog 3164
+SHA256 75c58d0d5e59948c3a6236f6082a89dec247d3baddcf1a394d6922351d5e9249 ChangeLog 3164
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -49,9 +49,9 @@ MD5 d974e56ddb0f0e0d99d60cd190f59d82 files/digest-xshipwars-2.5.5 985
RMD160 a0d565fb4b4e5b4b83175e32add3f5d8e2149492 files/digest-xshipwars-2.5.5 985
SHA256 6813208fe9e46e50d649d25f27f7750c00a6d45005530676174242038694112d files/digest-xshipwars-2.5.5 985
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
-iD8DBQFF3VSfdz7hIScOURERAvS7AKCUg35mgfrFEIf110NQGd6Inhzb8ACfXOpu
-wQ9rrdQ2wFD/9RUOaHNyuiY=
-=OqhX
+iD8DBQFGjeA7RmMZkarFlIwRAhPyAKCr8TeIJmKhEM6xV6YgH3Wmc9JoZgCeJvVo
+2dfX5cLpWRFCG08tESx8NU0=
+=sSdB
-----END PGP SIGNATURE-----
diff --git a/games-action/xshipwars/files/xshipwars-2.5.5-build.patch b/games-action/xshipwars/files/xshipwars-2.5.5-build.patch
index 8e59e35b0a9f..60316cd34350 100644
--- a/games-action/xshipwars/files/xshipwars-2.5.5-build.patch
+++ b/games-action/xshipwars/files/xshipwars-2.5.5-build.patch
@@ -66,3 +66,20 @@
UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
HR = "-------------------------------------------------------------------------"
+--- client/xsw.h.old 2007-07-06 08:02:07.000000000 +0200
++++ client/xsw.h 2007-07-06 08:04:05.000000000 +0200
+@@ -135,10 +135,10 @@
+ #define XSW_DEF_SW_SERVER_DIR CWD_STR
+ #else
+ #define XSW_DEF_LOCAL_DATA_DIR ".shipwars"
+-#define XSW_DEF_GLOBAL_DATA_DIR PREFIX "/share/games/xshipwars"
+-#define XSW_DEF_GLOBAL_IMAGES_DIR PREFIX "/share/games/xshipwars/images"
+-#define XSW_DEF_GLOBAL_SOUNDS_DIR PREFIX "/share/games/xshipwars/sounds"
+-#define XSW_DEF_GLOBAL_ETC_DIR PREFIX "/share/games/xshipwars/etc"
++#define XSW_DEF_GLOBAL_DATA_DIR "@GENTOO_DATADIR@"
++#define XSW_DEF_GLOBAL_IMAGES_DIR "@GENTOO_DATADIR@/images"
++#define XSW_DEF_GLOBAL_SOUNDS_DIR "@GENTOO_DATADIR@/sounds"
++#define XSW_DEF_GLOBAL_ETC_DIR "@GENTOO_DATADIR@/etc"
+ #define XSW_DEF_SW_SERVER_DIR "/home/swserv"
+ #endif
+
diff --git a/games-action/xshipwars/xshipwars-2.5.5.ebuild b/games-action/xshipwars/xshipwars-2.5.5.ebuild
index 5b462b19f6fd..a2f894ce6ad2 100644
--- a/games-action/xshipwars/xshipwars-2.5.5.ebuild
+++ b/games-action/xshipwars/xshipwars-2.5.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.5.5.ebuild,v 1.3 2007/01/31 19:57:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.5.5.ebuild,v 1.4 2007/07/06 06:24:53 tupone Exp $
inherit toolchain-funcs eutils games
@@ -35,6 +35,9 @@ src_unpack() {
-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
-e "/^DATADIR/s:=.*:=${GAMES_DATADIR}:" \
*/Makefile.install.UNIX || die
+ sed -i \
+ -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+ client/xsw.h || die "sed on xsw.h failed"
}
src_compile() {