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
commit4faba8660f78abfdf3a85f5f57c6ab3bf595305d (patch)
tree5d5d2cc1ac9ad319893f49a0a9bef32bc1014856 /games-action
parentAdded ~sparc keyword since it works perfectly on my SunBlade 100. (diff)
downloadhistorical-4faba8660f78abfdf3a85f5f57c6ab3bf595305d.tar.gz
historical-4faba8660f78abfdf3a85f5f57c6ab3bf595305d.tar.bz2
historical-4faba8660f78abfdf3a85f5f57c6ab3bf595305d.zip
Respect LDFLAGS. Bug #331847
Package-Manager: portage-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/Manifest5
-rw-r--r--games-action/xbomber/files/xbomber-101-ldflags.patch15
-rw-r--r--games-action/xbomber/xbomber-101.ebuild14
4 files changed, 30 insertions, 12 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/Manifest b/games-action/xbomber/Manifest
index ad034c49a316..c9e3de6097e8 100644
--- a/games-action/xbomber/Manifest
+++ b/games-action/xbomber/Manifest
@@ -1,6 +1,7 @@
AUX xbomber-101-gcc4.patch 368 RMD160 e384647293f578aaae129ff7136ec65f5153be06 SHA1 42824a773cd94f1772dd834c0623f9f47c6c4d9d SHA256 19c4ef6ffa1b36f6d965bc49a72c36f92a2e5fd9fec309dff171ff633d99ba3f
+AUX xbomber-101-ldflags.patch 434 RMD160 f2de2efe014f324ab9e04a9160f35c6415b0ec7f SHA1 bfe8d16fbf375f9169895a703cf43ca36842d6cf SHA256 8827e2b8e9737291f2a86c7d9474a587056c60a4f7b3d63dbe9f56bb27fd41cf
AUX xbomber-101-va_list.patch 905 RMD160 2b1d2006b6b23f0ce51fbbbdee84ba6dcbe69871 SHA1 d841fc3c2be8d22bcc1f04babb95cf7ec1c38ffa SHA256 d2bf7f53608623a8b7fc8964e73c2600927054e213c7fbdfe9f6bc9102df25eb
DIST xbomber-101.tgz 396707 RMD160 8bc7df80cf7ca680e2a3d04c2892345b67e4ab1a SHA1 a414b7784dff7afe36e760af3b47d1e9616674da SHA256 d2f127519b779f83e029be4a6dd0299d126505bbe49a9981d913ac10a4b3f640
-EBUILD xbomber-101.ebuild 1117 RMD160 05eb6550a20895b47772bb4dd2a4752f5690879e SHA1 eb9eea752690f1cd6e1347f00c72fd9855a3e895 SHA256 9627f4cea21056d226555d766598afd16b2eee142b9db1b791e50cdefdcd254a
-MISC ChangeLog 1414 RMD160 daa524f6709ea6ae915f2b2e28dd9f2e1c93f170 SHA1 4bb79a4426203505434232b3d6cf5bcf2c74da02 SHA256 89fb290b10bb4835b35699f26dd66ef0c9084b9a35a7bdbc4be03ef0082dbc54
+EBUILD xbomber-101.ebuild 1105 RMD160 0f251d0dea99eb60de04ad7a70eefbaddfb9671e SHA1 225a3204ef47b7e988d36c846e5bf969b9aa1045 SHA256 4b2d617993aa7d2f92b0bf798b3ccc7611ed1416c83a3212c11cf1e3fd3abc1c
+MISC ChangeLog 1573 RMD160 2e8d6592b80d78f9268a6e948e87da047a15eb1e SHA1 a76aa7842a3ed06f5ffeb57904250df40117c5fa SHA256 d8213d0773045464fed80e22fce4b58805440fec56b99a8d24b1214643722900
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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() {