summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-01-17 16:37:24 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-01-17 16:37:24 +0000
commitd0535860134e32a81ec12fccac5b99345b77c498 (patch)
tree5e5465f5d22a237289ed19afbc57e53f099c6f65 /games-roguelike
parentRequest built-in Python sqlite3 support rather than pysqlite package. (diff)
downloadgentoo-2-d0535860134e32a81ec12fccac5b99345b77c498.tar.gz
gentoo-2-d0535860134e32a81ec12fccac5b99345b77c498.tar.bz2
gentoo-2-d0535860134e32a81ec12fccac5b99345b77c498.zip
respect CFLAGS properly, don't install deprecated docs, don't remove data/save dirs for server builds
(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'games-roguelike')
-rw-r--r--games-roguelike/tomenet/ChangeLog7
-rw-r--r--games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch14
-rw-r--r--games-roguelike/tomenet/tomenet-4.5.2.ebuild10
3 files changed, 22 insertions, 9 deletions
diff --git a/games-roguelike/tomenet/ChangeLog b/games-roguelike/tomenet/ChangeLog
index fac234083933..fc9acad912a5 100644
--- a/games-roguelike/tomenet/ChangeLog
+++ b/games-roguelike/tomenet/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-roguelike/tomenet
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.9 2013/01/16 22:28:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/ChangeLog,v 1.10 2013/01/17 16:37:24 hasufell Exp $
+
+ 17 Jan 2013; Julian Ospald <hasufell@gentoo.org> tomenet-4.5.2.ebuild,
+ files/tomenet-4.5.2-makefile.patch:
+ respect CFLAGS properly, don't install deprecated docs, don't remove
+ data/save dirs for server builds
*tomenet-4.5.2 (16 Jan 2013)
diff --git a/games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch
index 7e408ef9f34e..318fc6997b87 100644
--- a/games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch
+++ b/games-roguelike/tomenet/files/tomenet-4.5.2-makefile.patch
@@ -1,5 +1,5 @@
---- makefile
-+++ makefile
+--- src/makefile
++++ src/makefile
@@ -203,7 +203,7 @@
#
# This is my compiler of choice, it seems to work most everywhere
@@ -52,3 +52,13 @@
##
## Without SDL
#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937
+@@ -357,9 +368,6 @@
+ # Compile a client with 'test client' version/tag
+ tomenet.test: CFLAGS += -DTEST_CLIENT -O0
+
+-# Normal release build
+-tomenet: CFLAGS += -O2
+-
+
+ # Lua
+ SRCS += $(LUASRCS)
diff --git a/games-roguelike/tomenet/tomenet-4.5.2.ebuild b/games-roguelike/tomenet/tomenet-4.5.2.ebuild
index 9a776dc8a214..9ccbdccabef6 100644
--- a/games-roguelike/tomenet/tomenet-4.5.2.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.2.ebuild,v 1.1 2013/01/16 22:28:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-roguelike/tomenet/tomenet-4.5.2.ebuild,v 1.2 2013/01/17 16:37:24 hasufell Exp $
EAPI=5
inherit eutils gnome2-utils games
@@ -31,7 +31,7 @@ S=${WORKDIR}/${P}/src
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.patch
- rm -r ../lib/{data,save} || die
+ use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
sed \
-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
@@ -54,7 +54,7 @@ src_compile() {
}
src_install() {
- dodoc ../{ChangeLog,TomeNET-Guide.txt,changes.txt}
+ dodoc ../TomeNET-Guide.txt
if ! use dedicated ; then
newgamesbin ${PN} ${PN}.bin
@@ -67,8 +67,6 @@ src_install() {
if use server || use dedicated ; then
newgamesbin tomenet.server tomenet.server.bin
dogamesbin "${T}"/${PN}.server accedit evilmeta
- docinto server
- dodoc runserv
fi
insinto "${GAMES_DATADIR}/${PN}"
@@ -88,7 +86,7 @@ pkg_postinst() {
gnome2_icon_cache_update
if use sound; then
- elog "You can get soundepacks from here:"
+ elog "You can get soundpacks from here:"
elog ' http://tomenet.net/downloads.php'
elog "They must be placed inside ~/.tomenet directory."
fi