| 1 |
nyhm 08/12/05 17:32:44 |
| 2 |
|
| 3 |
Modified: mirrormagic-2.0.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Respect CC and LDFLAGS, bug #244100 |
| 6 |
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.7 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.19 games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild?rev=1.19&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild?rev=1.19&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild?r1=1.18&r2=1.19 |
| 14 |
|
| 15 |
Index: mirrormagic-2.0.2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v |
| 18 |
retrieving revision 1.18 |
| 19 |
retrieving revision 1.19 |
| 20 |
diff -u -r1.18 -r1.19 |
| 21 |
--- mirrormagic-2.0.2.ebuild 25 Feb 2007 15:39:21 -0000 1.18 |
| 22 |
+++ mirrormagic-2.0.2.ebuild 5 Dec 2008 17:32:44 -0000 1.19 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.18 2007/02/25 15:39:21 nyhm Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/mirrormagic-2.0.2.ebuild,v 1.19 2008/12/05 17:32:44 nyhm Exp $ |
| 29 |
|
| 30 |
-inherit eutils games |
| 31 |
+inherit eutils toolchain-funcs games |
| 32 |
|
| 33 |
DESCRIPTION="a game like Deflektor (C 64) or Mindbender (Amiga)" |
| 34 |
HOMEPAGE="http://www.artsoft.org/mirrormagic/" |
| 35 |
@@ -15,26 +15,32 @@ |
| 36 |
|
| 37 |
RDEPEND="!sdl? ( x11-libs/libX11 ) |
| 38 |
sdl? ( |
| 39 |
- >=media-libs/libsdl-1.1 |
| 40 |
- >=media-libs/sdl-mixer-1.2.4 |
| 41 |
- >=media-libs/sdl-image-1.2.2 )" |
| 42 |
+ media-libs/libsdl |
| 43 |
+ media-libs/sdl-mixer |
| 44 |
+ media-libs/sdl-image |
| 45 |
+ )" |
| 46 |
DEPEND="${RDEPEND} |
| 47 |
!sdl? ( x11-libs/libXt )" |
| 48 |
|
| 49 |
src_unpack() { |
| 50 |
unpack ${A} |
| 51 |
cd "${S}" |
| 52 |
- epatch "${FILESDIR}/${P}"-gcc41.patch |
| 53 |
+ epatch "${FILESDIR}"/${P}-gcc41.patch |
| 54 |
+ rm -f ${PN} |
| 55 |
} |
| 56 |
|
| 57 |
src_compile() { |
| 58 |
- local makeopts="X11_PATH=/usr/X11R6 RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}" |
| 59 |
- emake clean || die |
| 60 |
- if use sdl ; then |
| 61 |
- emake ${makeopts} OPTIONS="${CFLAGS}" sdl || die |
| 62 |
- else |
| 63 |
- emake ${makeopts} OPTIONS="${CFLAGS}" x11 || die |
| 64 |
- fi |
| 65 |
+ emake \ |
| 66 |
+ -C src \ |
| 67 |
+ CC="$(tc-getCC)" \ |
| 68 |
+ AR="$(tc-getAR)" \ |
| 69 |
+ RANLIB="$(tc-getRANLIB)" \ |
| 70 |
+ OPTIONS="${CFLAGS}" \ |
| 71 |
+ EXTRA_LDFLAGS="${LDFLAGS}" \ |
| 72 |
+ RO_GAME_DIR="${GAMES_DATADIR}"/${PN} \ |
| 73 |
+ RW_GAME_DIR="${GAMES_STATEDIR}"/${PN} \ |
| 74 |
+ TARGET=$(use sdl && echo sdl || echo x11) \ |
| 75 |
+ || die "emake failed" |
| 76 |
} |
| 77 |
|
| 78 |
src_install() { |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.12 games-puzzle/mirrormagic/ChangeLog |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/ChangeLog?rev=1.12&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/ChangeLog?rev=1.12&content-type=text/plain |
| 86 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/mirrormagic/ChangeLog?r1=1.11&r2=1.12 |
| 87 |
|
| 88 |
Index: ChangeLog |
| 89 |
=================================================================== |
| 90 |
RCS file: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v |
| 91 |
retrieving revision 1.11 |
| 92 |
retrieving revision 1.12 |
| 93 |
diff -u -r1.11 -r1.12 |
| 94 |
--- ChangeLog 22 Feb 2007 01:14:19 -0000 1.11 |
| 95 |
+++ ChangeLog 5 Dec 2008 17:32:44 -0000 1.12 |
| 96 |
@@ -1,6 +1,9 @@ |
| 97 |
# ChangeLog for games-puzzle/mirrormagic |
| 98 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 99 |
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.11 2007/02/22 01:14:19 peper Exp $ |
| 100 |
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 101 |
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/mirrormagic/ChangeLog,v 1.12 2008/12/05 17:32:44 nyhm Exp $ |
| 102 |
+ |
| 103 |
+ 05 Dec 2008; Tristan Heaven <nyhm@g.o> mirrormagic-2.0.2.ebuild: |
| 104 |
+ Respect CC and LDFLAGS, bug #244100 |
| 105 |
|
| 106 |
22 Feb 2007; Piotr Jaroszyński <peper@g.o> ChangeLog: |
| 107 |
Transition to Manifest2. |
Archives