summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2010-11-08 18:34:45 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2010-11-08 18:34:45 +0000
commitb5da53777328c2727aa304aa3cbc8f768239e8d4 (patch)
tree5916d38f71d0c5e176cade1df0d88d964cd2484b /games-action/0verkill
parentFix dependencies. Set SUPPORT_PYTHON_ABIS. (diff)
downloadgentoo-2-b5da53777328c2727aa304aa3cbc8f768239e8d4.tar.gz
gentoo-2-b5da53777328c2727aa304aa3cbc8f768239e8d4.tar.bz2
gentoo-2-b5da53777328c2727aa304aa3cbc8f768239e8d4.zip
honor CC
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-action/0verkill')
-rw-r--r--games-action/0verkill/0verkill-0.16-r3.ebuild5
-rw-r--r--games-action/0verkill/ChangeLog6
-rw-r--r--games-action/0verkill/files/0verkill-0.16-CC.patch50
3 files changed, 58 insertions, 3 deletions
diff --git a/games-action/0verkill/0verkill-0.16-r3.ebuild b/games-action/0verkill/0verkill-0.16-r3.ebuild
index c5aa39f13cba..df9c5541a85a 100644
--- a/games-action/0verkill/0verkill-0.16-r3.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r3.ebuild,v 1.8 2010/11/08 10:57:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r3.ebuild,v 1.9 2010/11/08 18:34:45 mr_bones_ Exp $
EAPI=2
inherit autotools eutils games
@@ -23,7 +23,8 @@ src_prepare() {
"${FILESDIR}"/${P}-segv.patch \
"${FILESDIR}"/${P}-gentoo-paths.patch \
"${FILESDIR}"/${P}-ovflfix.patch \
- "${FILESDIR}"/${P}-underflow-check.patch #136222
+ "${FILESDIR}"/${P}-CC.patch \
+ "${FILESDIR}"/${P}-underflow-check.patch #136222 \
sed -i \
-e "s:data/:${GAMES_DATADIR}/${PN}/data/:" cfg.h \
|| die "sed failed"
diff --git a/games-action/0verkill/ChangeLog b/games-action/0verkill/ChangeLog
index 94ba0cc881be..7d5ccf4992e8 100644
--- a/games-action/0verkill/ChangeLog
+++ b/games-action/0verkill/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/0verkill
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.17 2010/11/08 10:57:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.18 2010/11/08 18:34:45 mr_bones_ Exp $
+
+ 08 Nov 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ 0verkill-0.16-r3.ebuild, +files/0verkill-0.16-CC.patch:
+ honor CC
08 Nov 2010; Alfredo Tupone <tupone@gentoo.org> 0verkill-0.16-r3.ebuild,
+files/0verkill-0.16-ovflfix.patch:
diff --git a/games-action/0verkill/files/0verkill-0.16-CC.patch b/games-action/0verkill/files/0verkill-0.16-CC.patch
new file mode 100644
index 000000000000..b2ba0f014d86
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-CC.patch
@@ -0,0 +1,50 @@
+--- Makefile.in.orig 2010-11-08 13:30:42.060916323 -0500
++++ Makefile.in 2010-11-08 13:31:03.199940471 -0500
+@@ -24,7 +24,7 @@
+ server.o: server.c server.h net.h data.h hash.h cfg.h time.h math.h config.h error.h
+ client.o: client.c data.h sprite.h cfg.h net.h hash.h time.h math.h console.h help.h blit.h config.h error.h
+ xclient.o: client.c data.h sprite.h cfg.h net.h hash.h time.h math.h console.h help.h config.h error.h
+- gcc -c $(CFLAGS) -DXWINDOW -o xclient.o client.c
++ $(CC) -c $(CFLAGS) -DXWINDOW -o xclient.o client.c
+ time.o: time.c time.h error.h
+ help.o: help.c blit.h error.h
+ avihelp.o: avihelp.c blit.h error.h
+@@ -38,29 +38,29 @@
+
+
+ avi: avi.o blit.o console.o kbd.o time.o avihelp.o error.o
+- gcc $(LDFLAGS) -o avi avi.o blit.o console.o kbd.o error.o time.o avihelp.o $(LIBS)
++ $(CC) $(LDFLAGS) -o avi avi.o blit.o console.o kbd.o error.o time.o avihelp.o $(LIBS)
+
+ xavi: avi.o blit.o xinterface.o xkbd.o time.o avihelp.o error.o
+- gcc $(LDFLAGS) -o xavi avi.o blit.o xinterface.o xkbd.o error.o time.o avihelp.o $(LIBS) $(XLIBS)
++ $(CC) $(LDFLAGS) -o xavi avi.o blit.o xinterface.o xkbd.o error.o time.o avihelp.o $(LIBS) $(XLIBS)
+
+ bot: bot.o data.o hash.o time.o net.o crc32.o md5.o md5hl.o error.o
+- gcc $(LDFLAGS) -o bot bot.o data.o hash.o time.o net.o error.o md5.o md5hl.o crc32.o sprite.o $(LIBS)
++ $(CC) $(LDFLAGS) -o bot bot.o data.o hash.o time.o net.o error.o md5.o md5hl.o crc32.o sprite.o $(LIBS)
+
+ 0verkill: client.o data.o sprite.o blit.o console.o hash.o time.o net.o error.o crc32.o md5.o md5hl.o kbd.o help.o
+- gcc $(LDFLAGS) -o 0verkill client.o data.o sprite.o blit.o console.o error.o hash.o time.o md5.o md5hl.o kbd.o net.o crc32.o help.o $(LIBS)
++ $(CC) $(LDFLAGS) -o 0verkill client.o data.o sprite.o blit.o console.o error.o hash.o time.o md5.o md5hl.o kbd.o net.o crc32.o help.o $(LIBS)
+ @OVERKILL_SPECIAL@
+
+ x0verkill: xclient.o data.o sprite.o blit.o xinterface.o hash.o time.o net.o crc32.o error.o xkbd.o help.o md5.o md5hl.o
+- gcc $(LDFLAGS) -o x0verkill xclient.o data.o blit.o sprite.o xinterface.o xkbd.o error.o md5.o md5hl.o hash.o time.o net.o crc32.o help.o $(LIBS) $(XLIBS)
++ $(CC) $(LDFLAGS) -o x0verkill xclient.o data.o blit.o sprite.o xinterface.o xkbd.o error.o md5.o md5hl.o hash.o time.o net.o crc32.o help.o $(LIBS) $(XLIBS)
+
+ server: server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o net.o crc32.o md5.o md5hl.o error.o
+- gcc $(LDFLAGS) -o server server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o net.o crc32.o $(LIBS)
++ $(CC) $(LDFLAGS) -o server server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o net.o crc32.o $(LIBS)
+
+ editor: editor.o data.o blit.o sprite.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o
+- gcc $(LDFLAGS) -o editor editor.o data.o blit.o sprite.o console.o hash.o md5.o md5hl.o error.o time.o kbd.o $(LIBS)
++ $(CC) $(LDFLAGS) -o editor editor.o data.o blit.o sprite.o console.o hash.o md5.o md5hl.o error.o time.o kbd.o $(LIBS)
+
+ xeditor: editor.o data.o blit.o sprite.o xinterface.o hash.o time.o xkbd.o md5.o md5hl.o error.o
+- gcc $(LDFLAGS) -o xeditor editor.o data.o blit.o sprite.o xinterface.o hash.o md5.o error.o md5hl.o time.o xkbd.o $(LIBS) $(XLIBS)
++ $(CC) $(LDFLAGS) -o xeditor editor.o data.o blit.o sprite.o xinterface.o hash.o md5.o error.o md5hl.o time.o xkbd.o $(LIBS) $(XLIBS)
+
+ test_server: test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o console.o kbd.o md5.o md5hl.o error.o
+- gcc $(LDFLAGS) -o test_server test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o md5.o md5hl.o error.o console.o kbd.o $(LIBS)
++ $(CC) $(LDFLAGS) -o test_server test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o md5.o md5hl.o error.o console.o kbd.o $(LIBS)