Gentoo Archives: gentoo-commits

From: "Alfredo Tupone (tupone)" <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-puzzle/kiki: ChangeLog kiki-1.0.2-r2.ebuild
Date: Tue, 20 Apr 2010 08:36:44
Message-Id: 20100420083640.1CAD92C04B@corvid.gentoo.org
1 tupone 10/04/20 08:36:39
2
3 Modified: ChangeLog kiki-1.0.2-r2.ebuild
4 Log:
5 Force python2. Fix bug #312267
6 (Portage version: 2.1.8.3/cvs/Linux i686)
7
8 Revision Changes Path
9 1.16 games-puzzle/kiki/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/kiki/ChangeLog?rev=1.16&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/kiki/ChangeLog?rev=1.16&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/kiki/ChangeLog?r1=1.15&r2=1.16
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v
18 retrieving revision 1.15
19 retrieving revision 1.16
20 diff -u -r1.15 -r1.16
21 --- ChangeLog 16 Jun 2009 20:28:29 -0000 1.15
22 +++ ChangeLog 20 Apr 2010 08:36:39 -0000 1.16
23 @@ -1,6 +1,9 @@
24 # ChangeLog for games-puzzle/kiki
25 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.15 2009/06/16 20:28:29 nyhm Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.16 2010/04/20 08:36:39 tupone Exp $
29 +
30 + 20 Apr 2010; Tupone Alfredo <tupone@g.o> kiki-1.0.2-r2.ebuild:
31 + Force python2. Fix bug #312267 by arfrever@g.o
32
33 16 Jun 2009; Tristan Heaven <nyhm@g.o> kiki-1.0.2-r2.ebuild,
34 +files/kiki-1.0.2-build.patch:
35
36
37
38 1.5 games-puzzle/kiki/kiki-1.0.2-r2.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild?rev=1.5&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild?rev=1.5&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild?r1=1.4&r2=1.5
43
44 Index: kiki-1.0.2-r2.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v
47 retrieving revision 1.4
48 retrieving revision 1.5
49 diff -u -r1.4 -r1.5
50 --- kiki-1.0.2-r2.ebuild 16 Jun 2009 20:28:29 -0000 1.4
51 +++ kiki-1.0.2-r2.ebuild 20 Apr 2010 08:36:39 -0000 1.5
52 @@ -1,7 +1,7 @@
53 -# Copyright 1999-2009 Gentoo Foundation
54 +# Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.4 2009/06/16 20:28:29 nyhm Exp $
57 -
58 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.5 2010/04/20 08:36:39 tupone Exp $
59 +PYTHON_DEPEND="2"
60 EAPI=2
61 inherit eutils python toolchain-funcs games
62
63 @@ -17,7 +17,6 @@
64 RDEPEND="media-libs/libsdl[opengl]
65 media-libs/sdl-image
66 media-libs/sdl-mixer
67 - dev-lang/python
68 virtual/opengl
69 virtual/glu
70 virtual/glut"
71 @@ -51,8 +50,7 @@
72
73 src_compile() {
74 emake -C kodilib/linux AR="$(tc-getAR)" || die "emake kodilib failed"
75 - python_version
76 - emake -C linux PYTHON_VERSION="${PYVER}" || die "emake linux failed"
77 + emake -C linux PYTHON_VERSION="$(python_get_version)" || die "emake linux failed"
78 }
79
80 src_install() {
81 @@ -64,3 +62,8 @@
82 dodoc Readme.txt Thanks.txt
83 prepgamesdirs
84 }
85 +
86 +pkg_setup() {
87 + python_set_active_version 2
88 + games_pkg_setup
89 +}