summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-15 13:53:28 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-15 13:53:28 +0000
commit12cebfcace00fbf3bbb0320356221a5719a25964 (patch)
tree6a768babd3b699c7f09d4f1ac18eca1c9e6e502f /games-arcade
parentadd ~arm, bug #316003 (diff)
downloadgentoo-2-12cebfcace00fbf3bbb0320356221a5719a25964.tar.gz
gentoo-2-12cebfcace00fbf3bbb0320356221a5719a25964.tar.bz2
gentoo-2-12cebfcace00fbf3bbb0320356221a5719a25964.zip
Respect LDFLAGS. Bug #334997
(Portage version: 2.1.9.14/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/kajaani-kombat/ChangeLog8
-rw-r--r--games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch11
-rw-r--r--games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild15
3 files changed, 25 insertions, 9 deletions
diff --git a/games-arcade/kajaani-kombat/ChangeLog b/games-arcade/kajaani-kombat/ChangeLog
index f749ed4ab1d1..10e75042bdb0 100644
--- a/games-arcade/kajaani-kombat/ChangeLog
+++ b/games-arcade/kajaani-kombat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/kajaani-kombat
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/kajaani-kombat/ChangeLog,v 1.13 2008/05/22 20:54:56 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/kajaani-kombat/ChangeLog,v 1.14 2010/10/15 13:53:28 tupone Exp $
+
+ 15 Oct 2010; Tupone Alfredo <tupone@gentoo.org> kajaani-kombat-0.7.ebuild,
+ +files/kajaani-kombat-0.7-ldflags.patch:
+ Respect LDFLAGS. Bug #334997 by flameeyes@gentoo.org
22 May 2008; Markus Meier <maekke@gentoo.org> kajaani-kombat-0.7.ebuild:
amd64/x86 stable, bug #223095
diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
new file mode 100644
index 000000000000..c575ff1ef57e
--- /dev/null
+++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-10-15 15:48:06.000000000 +0200
++++ Makefile 2010-10-15 15:48:18.000000000 +0200
+@@ -85,7 +85,7 @@
+ client_net.o: client_net.h client_net.cpp globals.h monitor_queue.h msg.h
+
+ client: $(client_objs)
+- $(CXX) $(client_objs) -o kajaani-kombat $(client_libs)
++ $(CXX) $(LDFLAGS) $(client_objs) -o kajaani-kombat $(client_libs)
+ server: $(server_objs)
+ $(CXX) $(server_objs) -o kajaani-kombat-server $(server_libs)
+
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
index 7b335b1f257f..16b3c6b9de1a 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild,v 1.6 2008/05/22 20:54:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild,v 1.7 2010/10/15 13:53:28 tupone Exp $
+EAPI=2
inherit eutils games
@@ -13,18 +14,18 @@ SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
IUSE=""
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
media-libs/sdl-net
media-libs/sdl-image
media-libs/sdl-ttf
media-libs/sdl-mixer
sys-libs/ncurses
sys-libs/readline"
+DEPEND="${RDEPEND}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PV}-makefile.patch"
+src_prepare() {
+ epatch "${FILESDIR}/${PV}-makefile.patch" \
+ "${FILESDIR}"/${P}-ldflags.patch
sed -i \
-e "s:GENTOODIR:${GAMES_DATADIR}/${PN}/:" \
Makefile \