diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-10-04 12:38:22 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-10-04 12:38:22 +0000 |
| commit | ef40158161d89b58348f06742fda0b81e9aed933 (patch) | |
| tree | c1f82a4bff416dd9d3522cb985bfa81b63dd63ac /games-engines | |
| parent | Stable on amd64 wrt bug #339140 (diff) | |
| download | historical-ef40158161d89b58348f06742fda0b81e9aed933.tar.gz historical-ef40158161d89b58348f06742fda0b81e9aed933.tar.bz2 historical-ef40158161d89b58348f06742fda0b81e9aed933.zip | |
Respect LDFLAGS. Bug #337241
Package-Manager: portage-2.1.9.13/cvs/Linux i686
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/frotz/ChangeLog | 8 | ||||
| -rw-r--r-- | games-engines/frotz/Manifest | 15 | ||||
| -rw-r--r-- | games-engines/frotz/files/frotz-2.43-ldflags.patch | 20 | ||||
| -rw-r--r-- | games-engines/frotz/frotz-2.43.ebuild | 10 |
4 files changed, 35 insertions, 18 deletions
diff --git a/games-engines/frotz/ChangeLog b/games-engines/frotz/ChangeLog index 617099ce1997..b27d6ee65c71 100644 --- a/games-engines/frotz/ChangeLog +++ b/games-engines/frotz/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/frotz -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/frotz/ChangeLog,v 1.15 2009/06/14 00:04:28 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-engines/frotz/ChangeLog,v 1.16 2010/10/04 12:38:22 tupone Exp $ + + 04 Oct 2010; Tupone Alfredo <tupone@gentoo.org> frotz-2.43.ebuild, + +files/frotz-2.43-ldflags.patch: + Respect LDFLAGS. Bug #337241 by flameeyes@gentoo.org 14 Jun 2009; Tristan Heaven <nyhm@gentoo.org> frotz-2.43.ebuild, +files/frotz-2.43-glibc2.10.patch: diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest index 20c629d4fab2..2fc0c20bebc2 100644 --- a/games-engines/frotz/Manifest +++ b/games-engines/frotz/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX frotz-2.43-glibc2.10.patch 855 RMD160 9b1d398b78d926e8dee2ff73c5a611f6853298e3 SHA1 ddc2c6858db12aab6abf81a283dc3ba0b48c7abc SHA256 231cb68ed8002d195bb1913e87509dcf1bb6373b02810af95ca5737493732124 +AUX frotz-2.43-ldflags.patch 665 RMD160 24e269ab837a851cbe7fd4f0d85953193a902031 SHA1 771fd62f741a4291d8ce38b5fdcd270c42f938e8 SHA256 a3c1a8af579ce479650973e55686642bf0f60b040194fbc01683738d06ebe5d1 DIST frotz-2.43.tar.gz 160771 RMD160 ccfc303e116e517caff0fec8f3bd555dfc02ae4e SHA1 2b2684ec670b471489c15be732c7dd1c59821b00 SHA256 f831eae9182e4a1407a34cb1098a4f5ad5ad6c6632e34eed734b9601a06a764b -EBUILD frotz-2.43.ebuild 1286 RMD160 246cdc63dda804a5b01acd924ceda7328c64b0d4 SHA1 1c6b5f683bb649085340ff8268bf19aaa509e1e5 SHA256 e128964f9ee811c1fb7d16de6fa30c4ce1404cd48885e446751a92f65cfe52f7 -MISC ChangeLog 2192 RMD160 a993fe95678a1b99e88874ff96364c3a5131283c SHA1 790310f184f4199a829167e4c55261b74a2a2fb1 SHA256 f6df0e6d5b74d3c13edbc76bfe69c512e63cbe48720145bb92c3036fd6d2a3b5 +EBUILD frotz-2.43.ebuild 1346 RMD160 8d1a88cbbd22f77c0e26bcb7f52a4674bd90d352 SHA1 706e4d57287b2225fb993279d39147a0d6cccc7b SHA256 0b1290885fcaa776d54433473e44bfef65ceff0ebb86a7b4ceadde09ed459b34 +MISC ChangeLog 2354 RMD160 30924d7240e8ce66be497c6333d38e27b5a4a262 SHA1 9cab0914447409b218bf82dfee3fb689ee558da4 SHA256 82d76c357c62bfc710fda24be9b0580868a2d249e047a21e35f4950f33bc5bd7 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAko0PpEACgkQdz7hIScOURFzcwCfSBvk5czuiuhNmE+c2JNPqO/a -xIYAoL9tktBU1KGazu1yjUvtzaaGv/Cb -=LVDP ------END PGP SIGNATURE----- diff --git a/games-engines/frotz/files/frotz-2.43-ldflags.patch b/games-engines/frotz/files/frotz-2.43-ldflags.patch new file mode 100644 index 000000000000..16a0df362edd --- /dev/null +++ b/games-engines/frotz/files/frotz-2.43-ldflags.patch @@ -0,0 +1,20 @@ +--- Makefile.old 2010-10-04 14:13:37.000000000 +0200 ++++ Makefile 2010-10-04 14:14:06.000000000 +0200 +@@ -162,7 +162,7 @@ + $(NAME): $(NAME)-curses + + $(NAME)-curses: soundcard.h $(COMMON_TARGET) $(CURSES_TARGET) +- $(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \ ++ $(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \ + $(SOUND_LIB) + + all: $(NAME) d$(NAME) +@@ -170,7 +170,7 @@ + dumb: $(NAME)-dumb + d$(NAME): $(NAME)-dumb + $(NAME)-dumb: $(COMMON_TARGET) $(DUMB_TARGET) +- $(CC) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \ ++ $(CC) $(LDFLAGS) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \ + $(DUMB_TARGET) $(LIB) + + .SUFFIXES: diff --git a/games-engines/frotz/frotz-2.43.ebuild b/games-engines/frotz/frotz-2.43.ebuild index 033bd73f94fd..dbc1922b962a 100644 --- a/games-engines/frotz/frotz-2.43.ebuild +++ b/games-engines/frotz/frotz-2.43.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-engines/frotz/frotz-2.43.ebuild,v 1.17 2009/06/14 00:04:27 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/frotz/frotz-2.43.ebuild,v 1.18 2010/10/04 12:38:22 tupone Exp $ EAPI=2 inherit eutils games @@ -14,15 +14,17 @@ SLOT="0" KEYWORDS="amd64 ppc sparc x86" IUSE="alsa oss" -DEPEND="sys-libs/ncurses +RDEPEND="sys-libs/ncurses alsa? ( oss? ( media-libs/alsa-oss ) )" +DEPEND="${RDEPEND}" src_prepare() { sed -i \ -e '/^CC /d' \ Makefile \ || die 'sed failed' - epatch "${FILESDIR}"/${P}-glibc2.10.patch + epatch "${FILESDIR}"/${P}-glibc2.10.patch \ + "${FILESDIR}"/${P}-ldflags.patch } src_compile() { |