| 1 |
tupone 10/04/19 18:42:36 |
| 2 |
|
| 3 |
Modified: londonlaw-0.2.1-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Force python2 . Fix bug #312269 |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: londonlaw-0.2.1-r2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- londonlaw-0.2.1-r2.ebuild 20 May 2009 16:29:55 -0000 1.4 |
| 22 |
+++ londonlaw-0.2.1-r2.ebuild 19 Apr 2010 18:42:36 -0000 1.5 |
| 23 |
@@ -1,8 +1,9 @@ |
| 24 |
-# Copyright 1999-2009 Gentoo Foundation |
| 25 |
+# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild,v 1.4 2009/05/20 16:29:55 nixnut Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild,v 1.5 2010/04/19 18:42:36 tupone Exp $ |
| 29 |
+PYTHON_DEPEND="2" |
| 30 |
|
| 31 |
-EAPI=1 |
| 32 |
+EAPI=2 |
| 33 |
inherit eutils python games |
| 34 |
|
| 35 |
DESCRIPTION="Clone of the famous Scotland Yard board game" |
| 36 |
@@ -14,13 +15,10 @@ |
| 37 |
KEYWORDS="amd64 ppc x86" |
| 38 |
IUSE="dedicated" |
| 39 |
|
| 40 |
-DEPEND=">=dev-lang/python-2.3 |
| 41 |
- !dedicated? ( dev-python/wxpython:2.6 ) |
| 42 |
+DEPEND="!dedicated? ( dev-python/wxpython:2.6 ) |
| 43 |
dev-python/twisted" |
| 44 |
|
| 45 |
-src_unpack() { |
| 46 |
- unpack ${A} |
| 47 |
- cd "${S}" |
| 48 |
+src_prepare() { |
| 49 |
epatch \ |
| 50 |
"${FILESDIR}"/${P}-setup.py.patch \ |
| 51 |
"${FILESDIR}"/${P}-wxversion.patch |
| 52 |
@@ -55,14 +53,14 @@ |
| 53 |
londonlaw/server/GameRegistry.py \ |
| 54 |
|| die "sed failed" |
| 55 |
fi |
| 56 |
+ python_convert_shebangs -r 2 . |
| 57 |
} |
| 58 |
|
| 59 |
src_install() { |
| 60 |
- python_version |
| 61 |
- python setup.py install \ |
| 62 |
+ $(PYTHON) setup.py install \ |
| 63 |
--root="${D}" \ |
| 64 |
--prefix="${GAMES_PREFIX}" \ |
| 65 |
- --install-lib=/usr/lib/python${PYVER}/site-packages \ |
| 66 |
+ --install-lib=$(python_get_sitedir) \ |
| 67 |
--install-data="${GAMES_DATADIR}" \ |
| 68 |
|| die "install failed" |
| 69 |
dodoc ChangeLog README doc/TODO doc/manual.tex doc/readme.protocol |
| 70 |
@@ -80,6 +78,11 @@ |
| 71 |
prepgamesdirs |
| 72 |
} |
| 73 |
|
| 74 |
+pkg_setup() { |
| 75 |
+ python_set_active_version 2 |
| 76 |
+ games_pkg_setup |
| 77 |
+} |
| 78 |
+ |
| 79 |
pkg_postinst() { |
| 80 |
games_pkg_postinst |
| 81 |
if ! use dedicated ; then |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.18 games-puzzle/londonlaw/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/londonlaw/ChangeLog?rev=1.18&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/londonlaw/ChangeLog?rev=1.18&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/londonlaw/ChangeLog?r1=1.17&r2=1.18 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v |
| 94 |
retrieving revision 1.17 |
| 95 |
retrieving revision 1.18 |
| 96 |
diff -u -r1.17 -r1.18 |
| 97 |
--- ChangeLog 20 May 2009 16:29:55 -0000 1.17 |
| 98 |
+++ ChangeLog 19 Apr 2010 18:42:36 -0000 1.18 |
| 99 |
@@ -1,6 +1,9 @@ |
| 100 |
# ChangeLog for games-puzzle/londonlaw |
| 101 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.17 2009/05/20 16:29:55 nixnut Exp $ |
| 103 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.18 2010/04/19 18:42:36 tupone Exp $ |
| 105 |
+ |
| 106 |
+ 19 Apr 2010; Tupone Alfredo <tupone@g.o> londonlaw-0.2.1-r2.ebuild: |
| 107 |
+ Force python2 . Fix bug #312269 by arfrever@g.o |
| 108 |
|
| 109 |
20 May 2009; nixnut <nixnut@g.o> londonlaw-0.2.1-r2.ebuild: |
| 110 |
ppc stable #265236 |
Archives