diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 16:13:45 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-09-30 16:13:45 +0000 |
| commit | 3bce5552ce768a0f67cb6064e0ff854d84504a58 (patch) | |
| tree | 57453f3d1a5db8e51c2c33f98db223c5aa86a07f /games-arcade | |
| parent | Cleanup, improve directory structure, bug 139537, thanks to Roberto Castagnol... (diff) | |
| download | historical-3bce5552ce768a0f67cb6064e0ff854d84504a58.tar.gz historical-3bce5552ce768a0f67cb6064e0ff854d84504a58.tar.bz2 historical-3bce5552ce768a0f67cb6064e0ff854d84504a58.zip | |
Respect LDFLAGS. Bug #337435
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-arcade')
| -rw-r--r-- | games-arcade/xtux/ChangeLog | 6 | ||||
| -rw-r--r-- | games-arcade/xtux/Manifest | 15 | ||||
| -rw-r--r-- | games-arcade/xtux/files/xtux-20030306-ldflags.patch | 22 | ||||
| -rw-r--r-- | games-arcade/xtux/xtux-20030306.ebuild | 10 |
4 files changed, 35 insertions, 18 deletions
diff --git a/games-arcade/xtux/ChangeLog b/games-arcade/xtux/ChangeLog index 8f536e3e747f..54ab51d046b3 100644 --- a/games-arcade/xtux/ChangeLog +++ b/games-arcade/xtux/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/xtux # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.13 2010/03/09 12:57:51 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/ChangeLog,v 1.14 2010/09/30 16:13:45 tupone Exp $ + + 30 Sep 2010; Tupone Alfredo <tupone@gentoo.org> xtux-20030306.ebuild, + +files/xtux-20030306-ldflags.patch: + Respect LDFLAGS. Bug #337435 by flameeyes@gentoo.org 09 Mar 2010; Jonathan Callen <abcd@gentoo.org> xtux-20030306.ebuild: QA: Do not use absolute path to icon when in standard dirs (in diff --git a/games-arcade/xtux/Manifest b/games-arcade/xtux/Manifest index c09442f2f712..9ff5eb5e0222 100644 --- a/games-arcade/xtux/Manifest +++ b/games-arcade/xtux/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX xtux-20030306-ldflags.patch 797 RMD160 379543520919defefcaf8d7812af17fd78bd50e9 SHA1 3c320b73a012ac22abee90e290dcb7f348d0d95d SHA256 4da45bde5349b47339af6130bb377911c96c405895db54ef7cf03b97969456d8 AUX xtux-20030306-particles.patch 1411 RMD160 7e5e73e6a594f5863ee0be3bc93f8cf34c47ba2f SHA1 0f8d6f1f8036edd5fc239534e050f12a63f452d1 SHA256 eecd3464ed508a9eb72432591cf89a5b53ae6a383322128567581e19ff95c3a3 DIST xtux-src-20030306.tar.gz 1640928 RMD160 0535e37d7bc94e5e7a103d8ae2482200cc18ea24 SHA1 8db4f42c382ccf52eae7077e9e834f5bc00c54bf SHA256 3ef2c3d7615d05b1d6efa6a99358aa907c5cf635ffb017f5cad59c8d91c47670 -EBUILD xtux-20030306.ebuild 1466 RMD160 49cd0b591ebca3501d29ac678ab0e26782c073fc SHA1 84d75ccf2fa19401c10aff31572ee62640c38be6 SHA256 6da859b463d59ebe7ddf26612698b52da82d2665e404984506134977d299487e -MISC ChangeLog 1906 RMD160 980050a3966700013885cc6d4b3542a1ee5036a4 SHA1 1093bffbbe9c3b92b976c672ac41fca02d1f476c SHA256 7f3a4065a67c328b40ac4c6c58b0ff008a0108f8bbace2f8bc1c91852cf21bbb +EBUILD xtux-20030306.ebuild 1491 RMD160 c74d220c43b49d225fcf275d5b51c9b0e3825f84 SHA1 17006b439ff133c3c46731d8e4153737c42343ef SHA256 412f8f77f8e5ea1a78d4e6da0d85de206a486527e880eb5357ba3a3b327ad1a8 +MISC ChangeLog 2074 RMD160 729f7d770eadab6d71abdfd7742774ea2b3c8481 SHA1 12a61e23864e2acade6b092d7380af83cc8ea1c9 SHA256 85b8d3b16e4ca6e4c59289868dc76f6bcb0dc2041334f6c426b3491e337b9c31 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuWRdUACgkQOypDUo0oQOoWZgCfR+1YX4whTTpl4gPf+kk8z2Jj -Je0AnRNiNj24DipDJcf9+/GvgFTVnRT+ -=5Onp ------END PGP SIGNATURE----- diff --git a/games-arcade/xtux/files/xtux-20030306-ldflags.patch b/games-arcade/xtux/files/xtux-20030306-ldflags.patch new file mode 100644 index 000000000000..d2c798d0795d --- /dev/null +++ b/games-arcade/xtux/files/xtux-20030306-ldflags.patch @@ -0,0 +1,22 @@ +--- src/client/Makefile.old 2010-09-30 18:08:16.000000000 +0200 ++++ src/client/Makefile 2010-09-30 18:08:41.000000000 +0200 +@@ -48,7 +48,7 @@ + + #Apps + client: $(OBJECTS) +- $(CC) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB) ++ $(CC) -o $(BINARY) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB) + + # OBJECTS + .c.o: client.h $*.c +--- src/server/Makefile.old 2010-09-30 18:09:55.000000000 +0200 ++++ src/server/Makefile 2010-09-30 18:10:16.000000000 +0200 +@@ -41,7 +41,7 @@ + + #Apps + server: $(OBJECTS) +- $(CC) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB) ++ $(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB) + + # OBJECTS + .c.o: server.h $*.h $*.c diff --git a/games-arcade/xtux/xtux-20030306.ebuild b/games-arcade/xtux/xtux-20030306.ebuild index 7da2eb09077e..755bb2ef9614 100644 --- a/games-arcade/xtux/xtux-20030306.ebuild +++ b/games-arcade/xtux/xtux-20030306.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/xtux-20030306.ebuild,v 1.16 2010/03/09 12:57:51 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/xtux/xtux-20030306.ebuild,v 1.17 2010/09/30 16:13:45 tupone Exp $ +EAPI="2" inherit eutils games @@ -17,9 +18,7 @@ DEPEND="x11-libs/libXpm" S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { find data/ -type d -name .xvpics -exec rm -rf \{\} + sed -i \ -e "s:-g -Wall -O2:${CFLAGS}:" \ @@ -29,7 +28,8 @@ src_unpack() { -e "s:./tux_serv:tux_serv:" \ src/client/menu.c \ || die "sed failed" - epatch "${FILESDIR}/${P}-particles.patch" + epatch "${FILESDIR}/${P}-particles.patch" \ + "${FILESDIR}"/${P}-ldflags.patch } src_compile() { |