Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/attal: ChangeLog attal-0.10.1.ebuild
Date: Sun, 03 May 2009 07:09:33
Message-Id: E1M0VpK-0002s2-Ez@stork.gentoo.org
1 mr_bones_ 09/05/03 07:09:30
2
3 Modified: ChangeLog attal-0.10.1.ebuild
4 Log:
5 EAPI=2; work around parallel-make bugs without -j1
6 (Portage version: 2.1.6.11/cvs/Linux i686)
7
8 Revision Changes Path
9 1.25 games-strategy/attal/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/ChangeLog?rev=1.25&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/ChangeLog?rev=1.25&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/ChangeLog?r1=1.24&r2=1.25
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v
18 retrieving revision 1.24
19 retrieving revision 1.25
20 diff -u -r1.24 -r1.25
21 --- ChangeLog 30 Jun 2008 15:44:09 -0000 1.24
22 +++ ChangeLog 3 May 2009 07:09:30 -0000 1.25
23 @@ -1,6 +1,9 @@
24 # ChangeLog for games-strategy/attal
25 -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.24 2008/06/30 15:44:09 nyhm Exp $
27 +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/ChangeLog,v 1.25 2009/05/03 07:09:30 mr_bones_ Exp $
29 +
30 + 03 May 2009; Michael Sterrett <mr_bones_@g.o> attal-0.10.1.ebuild:
31 + EAPI=2; work around parallel-make bugs without -j1
32
33 30 Jun 2008; Tristan Heaven <nyhm@g.o> attal-0.10.1.ebuild:
34 Add split qt-4 dependencies, bug #217170
35
36
37
38 1.6 games-strategy/attal/attal-0.10.1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild?rev=1.6&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild?rev=1.6&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild?r1=1.5&r2=1.6
43
44 Index: attal-0.10.1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v
47 retrieving revision 1.5
48 retrieving revision 1.6
49 diff -u -r1.5 -r1.6
50 --- attal-0.10.1.ebuild 30 Jun 2008 15:44:09 -0000 1.5
51 +++ attal-0.10.1.ebuild 3 May 2009 07:09:30 -0000 1.6
52 @@ -1,8 +1,8 @@
53 -# Copyright 1999-2008 Gentoo Foundation
54 +# Copyright 1999-2009 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v 1.5 2008/06/30 15:44:09 nyhm Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/games-strategy/attal/attal-0.10.1.ebuild,v 1.6 2009/05/03 07:09:30 mr_bones_ Exp $
58
59 -EAPI=1
60 +EAPI=2
61 inherit eutils qt4 games
62
63 MY_P="${PN}-src-${PV}"
64 @@ -16,23 +16,15 @@
65 KEYWORDS="~amd64 ~ppc ~x86"
66 IUSE=""
67
68 -DEPEND="|| (
69 - ( x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 )
70 - x11-libs/qt:4
71 - )
72 +DEPEND="x11-libs/qt-gui:4
73 + x11-libs/qt-sql:4
74 + x11-libs/qt-qt3support:4
75 media-libs/libsdl
76 - media-libs/sdl-mixer"
77 + media-libs/sdl-mixer[vorbis]"
78
79 S=${WORKDIR}/${MY_P}
80
81 -pkg_setup() {
82 - QT4_BUILT_WITH_USE_CHECK="qt3support" qt4_pkg_setup
83 - games_pkg_setup
84 -}
85 -
86 -src_unpack() {
87 - unpack ${A}
88 - cd "${S}"
89 +src_prepare() {
90 mv ../themes .
91 ecvs_clean
92 epatch \
93 @@ -46,9 +38,18 @@
94 || die "sed failed"
95 }
96
97 -src_compile() {
98 +src_configure() {
99 eqmake4 Makefile.pro
100 - emake -j1 || die "emake failed"
101 +}
102 +
103 +src_compile() {
104 + local d
105 +
106 + for d in Common Client Fight Server
107 + do
108 + emake sub-lib$d || die "emake failed"
109 + done
110 + emake || die "emake failed"
111 }
112
113 src_install() {