summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-19 07:39:12 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-19 07:39:12 +0000
commit299b11150f6bee87aaf0d851c9a4318e1d9cf0a9 (patch)
tree5fe65f9d6c6424f8b431e0c606de5c38e03cf8ce /games-action
parentAdded ~sparc keyword since it works perfectly on my SunBlade 100. (diff)
downloadgentoo-2-299b11150f6bee87aaf0d851c9a4318e1d9cf0a9.tar.gz
gentoo-2-299b11150f6bee87aaf0d851c9a4318e1d9cf0a9.tar.bz2
gentoo-2-299b11150f6bee87aaf0d851c9a4318e1d9cf0a9.zip
Respect LDFLAGS. Bug #331847
(Portage version: 2.1.9.14/cvs/Linux i686)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/xbomber/ChangeLog8
-rw-r--r--games-action/xbomber/files/xbomber-101-ldflags.patch15
-rw-r--r--games-action/xbomber/xbomber-101.ebuild14
3 files changed, 27 insertions, 10 deletions
diff --git a/games-action/xbomber/ChangeLog b/games-action/xbomber/ChangeLog
index 3335454595ee..42d234bd46bd 100644
--- a/games-action/xbomber/ChangeLog
+++ b/games-action/xbomber/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/xbomber
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.12 2009/01/29 02:00:17 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.13 2010/10/19 07:39:11 tupone Exp $
+
+ 19 Oct 2010; Tupone Alfredo <tupone@gentoo.org> xbomber-101.ebuild,
+ +files/xbomber-101-ldflags.patch:
+ Respect LDFLAGS. Bug #331847 by flameeyes@gentoo.org
29 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> xbomber-101.ebuild:
EAPI=2; respect CC
diff --git a/games-action/xbomber/files/xbomber-101-ldflags.patch b/games-action/xbomber/files/xbomber-101-ldflags.patch
new file mode 100644
index 000000000000..c007b6da5940
--- /dev/null
+++ b/games-action/xbomber/files/xbomber-101-ldflags.patch
@@ -0,0 +1,15 @@
+--- Makefile.old 2010-10-19 09:17:43.000000000 +0200
++++ Makefile 2010-10-19 09:18:12.000000000 +0200
+@@ -1,10 +1,8 @@
+-CFLAGS = -O3
+-
+ bomber: bomber.o x.o sound.o matcher
+- $(CC) -o bomber bomber.o x.o sound.o -lX11 -L/usr/X11R6/lib/
++ $(CC) $(LDFLAGS) -o bomber bomber.o x.o sound.o -lX11 -L/usr/X11R6/lib/
+
+ matcher: matcher.c
+- $(CC) matcher.c -o matcher
++ $(CC) $(LDFLAGS) matcher.c -o matcher
+
+ bomber.o: bomber.c bomber.h
+
diff --git a/games-action/xbomber/xbomber-101.ebuild b/games-action/xbomber/xbomber-101.ebuild
index 58e29c7e4a86..e7dd57dc2c49 100644
--- a/games-action/xbomber/xbomber-101.ebuild
+++ b/games-action/xbomber/xbomber-101.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/xbomber-101.ebuild,v 1.14 2009/01/29 02:00:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/xbomber-101.ebuild,v 1.15 2010/10/19 07:39:11 tupone Exp $
EAPI=2
inherit eutils games
@@ -14,7 +14,8 @@ SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE=""
-DEPEND="x11-libs/libX11"
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
src_prepare() {
sed -i \
@@ -31,11 +32,8 @@ src_prepare() {
|| die "sed failed"
epatch \
"${FILESDIR}"/${P}-va_list.patch \
- "${FILESDIR}"/${P}-gcc4.patch
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS}" || die "emake failed"
+ "${FILESDIR}"/${P}-gcc4.patch \
+ "${FILESDIR}"/${P}-ldflags.patch
}
src_install() {