1 |
tupone 12/10/30 15:07:24 |
2 |
|
3 |
Modified: ChangeLog asc-2.5.0.0.ebuild |
4 |
Log: |
5 |
Fix build with gcc-4.7 Bug #423377 |
6 |
|
7 |
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 0145142D) |
8 |
|
9 |
Revision Changes Path |
10 |
1.43 games-strategy/asc/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/ChangeLog?rev=1.43&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/ChangeLog?rev=1.43&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/ChangeLog?r1=1.42&r2=1.43 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v |
19 |
retrieving revision 1.42 |
20 |
retrieving revision 1.43 |
21 |
diff -u -r1.42 -r1.43 |
22 |
--- ChangeLog 16 Jul 2012 15:44:10 -0000 1.42 |
23 |
+++ ChangeLog 30 Oct 2012 15:07:24 -0000 1.43 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for games-strategy/asc |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.42 2012/07/16 15:44:10 mr_bones_ Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.43 2012/10/30 15:07:24 tupone Exp $ |
29 |
+ |
30 |
+ 30 Oct 2012; Tupone Alfredo <tupone@g.o> asc-2.5.0.0.ebuild, |
31 |
+ +files/asc-2.5.0.0-gcc47.patch: |
32 |
+ Fix build with gcc-4.7 Bug #423377 by Diego |
33 |
+ Migration to EAPI 4 |
34 |
|
35 |
16 Jul 2012; Michael Sterrett <mr_bones_@g.o> -asc-2.4.0.0.ebuild: |
36 |
old |
37 |
|
38 |
|
39 |
|
40 |
1.4 games-strategy/asc/asc-2.5.0.0.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild?rev=1.4&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild?rev=1.4&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild?r1=1.3&r2=1.4 |
45 |
|
46 |
Index: asc-2.5.0.0.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v |
49 |
retrieving revision 1.3 |
50 |
retrieving revision 1.4 |
51 |
diff -u -r1.3 -r1.4 |
52 |
--- asc-2.5.0.0.ebuild 22 Jun 2012 07:45:30 -0000 1.3 |
53 |
+++ asc-2.5.0.0.ebuild 30 Oct 2012 15:07:24 -0000 1.4 |
54 |
@@ -1,10 +1,10 @@ |
55 |
# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.3 2012/06/22 07:45:30 jdhore Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.4 2012/10/30 15:07:24 tupone Exp $ |
59 |
|
60 |
-EAPI=2 |
61 |
+EAPI=4 |
62 |
WX_GTK_VER=2.8 |
63 |
-inherit toolchain-funcs flag-o-matic wxwidgets games |
64 |
+inherit eutils toolchain-funcs flag-o-matic wxwidgets games |
65 |
|
66 |
DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series" |
67 |
HOMEPAGE="http://www.asc-hq.org/" |
68 |
@@ -19,7 +19,6 @@ |
69 |
IUSE="" |
70 |
|
71 |
RDEPEND="app-arch/bzip2 |
72 |
- virtual/jpeg |
73 |
media-libs/libsdl |
74 |
media-libs/libpng |
75 |
media-libs/sdl-image[gif,jpeg,png] |
76 |
@@ -27,18 +26,20 @@ |
77 |
media-libs/sdl-sound |
78 |
dev-libs/boost |
79 |
dev-games/physfs |
80 |
- media-libs/libvorbis |
81 |
media-libs/xvid |
82 |
dev-libs/expat |
83 |
media-libs/freetype |
84 |
dev-lang/lua |
85 |
x11-libs/wxGTK:2.8[X] |
86 |
dev-libs/libsigc++:1.2" |
87 |
+ |
88 |
DEPEND="${RDEPEND} |
89 |
dev-lang/perl |
90 |
virtual/pkgconfig |
91 |
app-arch/zip" |
92 |
|
93 |
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch ) |
94 |
+ |
95 |
src_unpack() { |
96 |
local f |
97 |
|
98 |
@@ -61,15 +62,13 @@ |
99 |
replace-flags -O3 -O2 |
100 |
fi |
101 |
egamesconf \ |
102 |
- --disable-dependency-tracking \ |
103 |
--disable-paraguitest \ |
104 |
--disable-paragui \ |
105 |
--datadir="${GAMES_DATADIR_BASE}" |
106 |
} |
107 |
|
108 |
src_install() { |
109 |
- emake DESTDIR="${D}" install || die "emake install failed" |
110 |
- dodoc AUTHORS ChangeLog README TODO |
111 |
+ default |
112 |
dohtml -r doc/* |
113 |
prepgamesdirs |
114 |
} |