diff options
| author |   Tristan Heaven <tristan@gentoo.org> | 2008-12-05 17:32:44 +0000 |
|---|---|---|
| committer | Tristan Heaven <tristan@gentoo.org> | 2008-12-05 17:32:44 +0000 |
| commit | 9b49405bb59881251d4efed6aadacdb026515563 (patch) | |
| tree | 38a48ae94df0ece0919bafd5bd25fadecf063e52 /games-puzzle | |
| parent | Removed unused icon that would collide with vmware-workstation (diff) | |
| download | historical-9b49405bb59881251d4efed6aadacdb026515563.tar.gz historical-9b49405bb59881251d4efed6aadacdb026515563.tar.bz2 historical-9b49405bb59881251d4efed6aadacdb026515563.zip | |
Respect CC and LDFLAGS, bug #244100
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.7 i686
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/mirrormagic/ChangeLog | 7 | ||||
| -rw-r--r-- | games-puzzle/mirrormagic/Manifest | 14 | ||||
| -rw-r--r-- | games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild | 34 |
3 files changed, 37 insertions, 18 deletions
diff --git a/games-puzzle/mirrormagic/ChangeLog b/games-puzzle/mirrormagic/ChangeLog index 6c6ad38f0bff..ded0498f86e7 100644 --- a/games-puzzle/mirrormagic/ChangeLog +++ b/games-puzzle/mirrormagic/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-puzzle/mirrormagic -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.11 2007/02/22 01:14:19 peper Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.12 2008/12/05 17:32:44 nyhm Exp $ + + 05 Dec 2008; Tristan Heaven <nyhm@gentoo.org> mirrormagic-2.0.2.ebuild: + Respect CC and LDFLAGS, bug #244100 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest index a653a2108ca6..ff2249aef35e 100644 --- a/games-puzzle/mirrormagic/Manifest +++ b/games-puzzle/mirrormagic/Manifest @@ -1,5 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX mirrormagic-2.0.2-gcc41.patch 339 RMD160 d7d8fe4004cf7360a99ddcdf0db2a56e2f55be3c SHA1 beb6a0170e2a749f7826c774c3ca0f2555ae6049 SHA256 ae5e1eee2ed2c37de5d2259d8150b0dace6e6744045989e83b1b0239b6fd0f4f DIST mirrormagic-2.0.2.tar.gz 1168098 RMD160 57de928f2b37575886ddb5cbafcababf9de765dc SHA1 bce7fbf163d5177f59ba4f516b06a3ebb7cc3927 SHA256 79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2 -EBUILD mirrormagic-2.0.2.ebuild 1243 RMD160 928894c97bfd7dbd45aad5e19957296746b22c96 SHA1 84251cc6c081734457ac4a09336850c7344482d6 SHA256 151df9b6948039db5b0a4e0208f52c3387dc322ffdf4a9fa91cb87a894f31665 -MISC ChangeLog 1263 RMD160 0b60dda3220c61fe7636069a94240c26471b68b8 SHA1 aa6f34748a6751c67c61a4e98ea8fdaf496fd27e SHA256 bd6afc945462650b3dc8954e92db3d5420cac22ab4147a9165ec9e649390ba12 +EBUILD mirrormagic-2.0.2.ebuild 1290 RMD160 9ee0c026e7be694bf3e08de9fe94c4bc7f315b3b SHA1 c79c83debf3290466e8ec128b32f8c1edd96e294 SHA256 7cc8d9f877ac28bbd4a45ee70fc12da697a4252c79c5915799527b026abc2885 +MISC ChangeLog 1375 RMD160 ae25cad6b22e59d52cf5a441703dae6f3dd2436b SHA1 b3e0b314f7efda2627933ffc0074f0b59beaa5df SHA256 27dd1acc00c9edb9d35fd8003e261d90b169bbe3d5795bc7154bcc3dc22819e0 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkk5ZcMACgkQdz7hIScOURETDwCfZHXegOtm1c6WOteRp/aeC8Jz +DZ8AnjluyBP/J3EyPkI/eU5zeY/0+e29 +=OXDN +-----END PGP SIGNATURE----- diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild index 883f5f122ecd..3a78f5a1a122 100644 --- a/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild +++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.18 2007/02/25 15:39:21 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.19 2008/12/05 17:32:44 nyhm Exp $ -inherit eutils games +inherit eutils toolchain-funcs games DESCRIPTION="a game like Deflektor (C 64) or Mindbender (Amiga)" HOMEPAGE="http://www.artsoft.org/mirrormagic/" @@ -15,26 +15,32 @@ IUSE="sdl" RDEPEND="!sdl? ( x11-libs/libX11 ) sdl? ( - >=media-libs/libsdl-1.1 - >=media-libs/sdl-mixer-1.2.4 - >=media-libs/sdl-image-1.2.2 )" + media-libs/libsdl + media-libs/sdl-mixer + media-libs/sdl-image + )" DEPEND="${RDEPEND} !sdl? ( x11-libs/libXt )" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}"-gcc41.patch + epatch "${FILESDIR}"/${P}-gcc41.patch + rm -f ${PN} } src_compile() { - local makeopts="X11_PATH=/usr/X11R6 RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}" - emake clean || die - if use sdl ; then - emake ${makeopts} OPTIONS="${CFLAGS}" sdl || die - else - emake ${makeopts} OPTIONS="${CFLAGS}" x11 || die - fi + emake \ + -C src \ + CC="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" \ + OPTIONS="${CFLAGS}" \ + EXTRA_LDFLAGS="${LDFLAGS}" \ + RO_GAME_DIR="${GAMES_DATADIR}"/${PN} \ + RW_GAME_DIR="${GAMES_STATEDIR}"/${PN} \ + TARGET=$(use sdl && echo sdl || echo x11) \ + || die "emake failed" } src_install() { |