Fix build without X11. Bug #369279

Package-Manager: portage-2.1.10.63/cvs/Linux i686

5 files changed, 27 insertions, 21 deletions

diff --git a/games-roguelike/tome/ChangeLog b/games-roguelike/tome/ChangeLog
index 648a44eb9e97..da61e205eb11 100644
--- a/games-roguelike/tome/ChangeLog
+++ b/games-roguelike/tome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-roguelike/tome
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.34 2010/03/20 20:20:33 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/ChangeLog,v 1.35 2012/05/28 12:23:39 tupone Exp $
+
+  28 May 2012; Tupone Alfredo <tupone@gentoo.org> tome-2.3.5.ebuild,
+  +files/tome-2.3.5-noX.patch, -files/tome-2.3.5-overflow.patch:
+  Fix QA notice about patch with relative file addressing
+  Fix build without X11. Bug #369279 by Piotr Szymaniak
 
   20 Mar 2010; Tupone Alfredo <tupone@gentoo.org> tome-2.3.5.ebuild,
   +files/tome-2.3.5-overflow.patch:
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index fb5859a32c16..26f0fb1443ab 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,6 +1,6 @@
 AUX 2.3.5-gentoo-paths.patch 1172 RMD160 284efaf1eb85ee17f9d08719179f835cf4777100 SHA1 c6c2203e504cd0b09f91c2ed8e3eec9fd6f84280 SHA256 e1978ac45c002a7b40a1f7123430a8aa1a4c45c48468b8d0bd6c670041a538e1
-AUX tome-2.3.5-overflow.patch 632 RMD160 2272d373623c8fd09e738d200e91bf80b61c51a0 SHA1 86b445cf95ae3ab75788c16f49de202f6770e61b SHA256 1f7d840e48470923f30c931058752619832afef6f62efcc9d5c9ddc23a480dff
+AUX tome-2.3.5-noX.patch 453 RMD160 862c5920eaceaac47becd69d8194151316b071c6 SHA1 9a276831fc0a989ae0c8d020c9e8dc76f2ae0424 SHA256 131953319eb1d2c213a881f6e7d0cfe0839d787f298e15e3396aab04d05b56e0
 DIST tome-235-src.tar.bz2 2951227 RMD160 c13bf80cee65287c0d4280a1fa6aeb885eb7f21b SHA1 30e39f5b4464ef42abb9fa9e1b43f2cf7f0f3203 SHA256 8844b0b889bac3943ea2f4d4d43b38e2d91d242a93028e9e07403aaab46d691b
-EBUILD tome-2.3.5.ebuild 3717 RMD160 0aae4d43116c0ee98fbe7d5582008f7fcc6b0145 SHA1 113305e792ba736e3955c014f1a9a70fe9f45346 SHA256 6bcd8c16a81bf4c6a38bed6a0aecbdb927ed0e392b25b34382270c2cf77107a7
-MISC ChangeLog 6181 RMD160 61339a7874663177fde6b3300b80e696948af82a SHA1 9161c2112cb3a29a4930880c82bfe8528fe5845c SHA256 9aa3e18ec81f91cf3600f9c767a61bc8dc7cbed64a5379d7a73d14e76947cd79
+EBUILD tome-2.3.5.ebuild 3761 RMD160 9c21c821f491a20cbc187d5bda45d41b4740291a SHA1 2f8ae6b41083ff9c71fc9c7dd0a1774e9d0c2f93 SHA256 256fb3d3f90d2c2f3f517437f908a91872384059d5cce639eadef5640efbe54b
+MISC ChangeLog 6430 RMD160 9c1b0f3b82a0f62243a16abf634617ed42160e99 SHA1 d6862a2e82a4f6925a9e61a7bc37c9d7cc55224d SHA256 c5f6c2c99f01fdd505bb096bc396185f70435b1399df0c25bd553cadbcf0e626
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch b/games-roguelike/tome/files/tome-2.3.5-noX.patch
new file mode 100644
index 000000000000..5c5982fe730d
--- /dev/null
+++ b/games-roguelike/tome/files/tome-2.3.5-noX.patch
@@ -0,0 +1,11 @@
+--- makefile.old	2012-05-28 14:02:44.787705444 +0200
++++ makefile	2012-05-28 14:03:44.520524011 +0200
+@@ -458,7 +458,7 @@
+ 	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ $(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
+-	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
++	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
+ 
+ #
+ # An install rule.
diff --git a/games-roguelike/tome/files/tome-2.3.5-overflow.patch b/games-roguelike/tome/files/tome-2.3.5-overflow.patch
deleted file mode 100644
index 399fdd1536b0..000000000000
--- a/games-roguelike/tome/files/tome-2.3.5-overflow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../lib/edit/p_info.txt.old	2010-03-20 20:40:53.000000000 +0100
-+++ ../lib/edit/p_info.txt	2010-03-20 20:41:05.000000000 +0100
-@@ -1559,8 +1559,8 @@
- S:O:70:12:25d3
- 
- # Used for corruptions that can change your subrace
--S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-+S:N:9:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-+S:D:A:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- S:S:0:0:0:0:0:0:0:100
- S:K:0:0:0:0:0:0:0:0
- S:P:0:0:0
diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild
index 0ed37952acde..ec84d1f648ff 100644
--- a/games-roguelike/tome/tome-2.3.5.ebuild
+++ b/games-roguelike/tome/tome-2.3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.6 2011/03/01 07:25:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tome/tome-2.3.5.ebuild,v 1.7 2012/05/28 12:23:39 tupone Exp $
 
 EAPI=2
 inherit eutils games
@@ -31,7 +31,10 @@ S=${WORKDIR}/tome-${MY_PV}-src/src
 src_prepare() {
 	mv makefile.std makefile
 	epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \
-		"${FILESDIR}"/${P}-overflow.patch
+		"${FILESDIR}"/${P}-noX.patch
+	sed -i \
+		-e "s:xx:x:" \
+		../lib/edit/p_info.txt
 	sed -i \
 		-e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c \
 		|| die "sed failed"