summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-19 07:14:44 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-19 07:14:44 +0000
commit365cf9b052a4a6b13dd6a4563116af23e57bb886 (patch)
tree22b4da74272edf53480f2955afa813feb4235264 /games-puzzle/twindistress
parentDrop to ~mips (diff)
downloadhistorical-365cf9b052a4a6b13dd6a4563116af23e57bb886.tar.gz
historical-365cf9b052a4a6b13dd6a4563116af23e57bb886.tar.bz2
historical-365cf9b052a4a6b13dd6a4563116af23e57bb886.zip
Respect LDFLAGS. Bug #331865
Package-Manager: portage-2.1.9.14/cvs/Linux i686
Diffstat (limited to 'games-puzzle/twindistress')
-rw-r--r--games-puzzle/twindistress/ChangeLog6
-rw-r--r--games-puzzle/twindistress/Manifest5
-rw-r--r--games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch11
-rw-r--r--games-puzzle/twindistress/twindistress-1.1.0.ebuild6
4 files changed, 23 insertions, 5 deletions
diff --git a/games-puzzle/twindistress/ChangeLog b/games-puzzle/twindistress/ChangeLog
index 3439425d4537..e9822abae5a7 100644
--- a/games-puzzle/twindistress/ChangeLog
+++ b/games-puzzle/twindistress/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/twindistress
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/twindistress/ChangeLog,v 1.10 2010/01/25 21:47:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/twindistress/ChangeLog,v 1.11 2010/10/19 07:14:44 tupone Exp $
+
+ 19 Oct 2010; Tupone Alfredo <tupone@gentoo.org> twindistress-1.1.0.ebuild,
+ +files/twindistress-1.1.0-ldflags.patch:
+ Respect LDFLAGS. Bug #331865 by flameeyes@gentoo.org
25 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org>
twindistress-1.1.0.ebuild:
diff --git a/games-puzzle/twindistress/Manifest b/games-puzzle/twindistress/Manifest
index 539da1601ff7..255d948d1528 100644
--- a/games-puzzle/twindistress/Manifest
+++ b/games-puzzle/twindistress/Manifest
@@ -1,4 +1,5 @@
+AUX twindistress-1.1.0-ldflags.patch 372 RMD160 af735f62ed817a5766459a23b4e86a127df3a7c5 SHA1 476182657ae9764e28c1b31cc8eb89bffb33bee5 SHA256 73760cc2d2e0b4a1d9ca3d763d2485e7127386d7139a06413f50012bea951f2f
DIST twind-1.1.0.tar.gz 2837845 RMD160 4d811a215ed7ec6aade657bf53760cfe8fd66c51 SHA1 4f13b10485fa644f199d321d70ac6057cdde349c SHA256 392a09e92862cf8a89a9b8c6f5ed7255c15c7f058a89d889c32f59ed8da73382
-EBUILD twindistress-1.1.0.ebuild 1495 RMD160 d42d808de77446da4f8395470a956275c6ec80f3 SHA1 23edbf35078e5574a9aa6cd912573a9cd76b478f SHA256 aa2a4c74cf0d098502d773f0eaec3b9787b3493e08d2e7ed5911e712e804001a
-MISC ChangeLog 1311 RMD160 2d79d52a790166fa8e207ce798b422ec6ae5ab10 SHA1 40eb411bfa31a3a6349b592c682c47c66d8ad8f7 SHA256 ec7861d0aea1f094982fb562604bc63b0b6fe5e3d23107f8b1dea0896b2331d0
+EBUILD twindistress-1.1.0.ebuild 1554 RMD160 28f3ed9d81605edc788d4c95ecdd48ac5ebea567 SHA1 0a13c3ab113971ce2a663e94f2de5e05248056f1 SHA256 9e2bfaf9c2655ba5a11fd1ddbbe113a951258242c75b710d7df7cd0430ef80bc
+MISC ChangeLog 1484 RMD160 570719e3acf1988f5f60bec5e8b0d139d39538df SHA1 7149c3bdc0fbc354c808d6f64cb3e75d99637678 SHA256 7c986f127c2d6437da055ebee52e505a76ec9db4f39437603b35fb61a28702cc
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch b/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch
new file mode 100644
index 000000000000..0ac589d88368
--- /dev/null
+++ b/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old 2010-10-19 09:06:48.000000000 +0200
++++ Makefile 2010-10-19 09:06:59.000000000 +0200
+@@ -50,7 +50,7 @@
+ make twind MIXER_LIB= AUDIOFLAG=NOAUDIO
+
+ twind: twind.o
+- $(CC) twind.o $(LIBS) $(SDL_LIBS) $(MIXER_LIB) -o twind
++ $(CC) $(LDFLAGS) twind.o $(LIBS) $(SDL_LIBS) $(MIXER_LIB) -o twind
+
+ twind.o: twind.c
+ $(CC) $(CFLAGS) $(SDL_CFLAGS) -c twind.c
diff --git a/games-puzzle/twindistress/twindistress-1.1.0.ebuild b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
index 36d84c2b9359..b17acf093862 100644
--- a/games-puzzle/twindistress/twindistress-1.1.0.ebuild
+++ b/games-puzzle/twindistress/twindistress-1.1.0.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-puzzle/twindistress/twindistress-1.1.0.ebuild,v 1.4 2010/01/25 21:47:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/twindistress/twindistress-1.1.0.ebuild,v 1.5 2010/10/19 07:14:44 tupone Exp $
EAPI=2
inherit eutils toolchain-funcs games
@@ -15,9 +15,10 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
-DEPEND="media-libs/libsdl[video]
+RDEPEND="media-libs/libsdl[video]
media-libs/sdl-mixer
media-libs/sdl-image[png]"
+DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
@@ -28,6 +29,7 @@ src_prepare() {
-e "/^DATA_PREFIX/s:/.*$:${GAMES_DATADIR}/${PN}/:" \
-e "/^HIGH_SCORE_PREFIX/s:/.*$:${GAMES_STATEDIR}/${PN}/:" \
Makefile || die "sed failed"
+ epatch "${FILESDIR}"/${P}-ldflags.patch
}
src_install() {