diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-04-19 18:42:36 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-04-19 18:42:36 +0000 |
| commit | 0000ac379722d7dad7106f4c58fe83392cd3afae (patch) | |
| tree | bd9d7cce7722f4be6272e7178d43373c9622994e /games-puzzle/londonlaw | |
| parent | Version bump dev-python/sqlalchemy to 0.6. (diff) | |
| download | historical-0000ac379722d7dad7106f4c58fe83392cd3afae.tar.gz historical-0000ac379722d7dad7106f4c58fe83392cd3afae.tar.bz2 historical-0000ac379722d7dad7106f4c58fe83392cd3afae.zip | |
Force python2 . Fix bug #312269
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-puzzle/londonlaw')
| -rw-r--r-- | games-puzzle/londonlaw/ChangeLog | 7 | ||||
| -rw-r--r-- | games-puzzle/londonlaw/Manifest | 4 | ||||
| -rw-r--r-- | games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild | 25 |
3 files changed, 21 insertions, 15 deletions
diff --git a/games-puzzle/londonlaw/ChangeLog b/games-puzzle/londonlaw/ChangeLog index f35723d5cf61..8a2112afbd6b 100644 --- a/games-puzzle/londonlaw/ChangeLog +++ b/games-puzzle/londonlaw/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-puzzle/londonlaw -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.17 2009/05/20 16:29:55 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/londonlaw/ChangeLog,v 1.18 2010/04/19 18:42:36 tupone Exp $ + + 19 Apr 2010; Tupone Alfredo <tupone@gentoo.org> londonlaw-0.2.1-r2.ebuild: + Force python2 . Fix bug #312269 by arfrever@gentoo.org 20 May 2009; nixnut <nixnut@gentoo.org> londonlaw-0.2.1-r2.ebuild: ppc stable #265236 diff --git a/games-puzzle/londonlaw/Manifest b/games-puzzle/londonlaw/Manifest index b36992e8f075..746e1fccd944 100644 --- a/games-puzzle/londonlaw/Manifest +++ b/games-puzzle/londonlaw/Manifest @@ -3,6 +3,6 @@ AUX londonlaw-0.2.1-wxversion.patch 639 RMD160 7b2ea38340b1ac527b1bbaac06e2bf7a5 AUX londonlaw.confd 60 RMD160 6d230b5a42f264c17f5190aff9ab59a9f25899c6 SHA1 a39653106438fb3794313d9a3cf3def226f9828d SHA256 c849dc072ada1f84619754111401ddeaf391aee9c891d531bcc02fc9fcf201c7 AUX londonlaw.rc 498 RMD160 d85ca5c3438904dfe1f15b000a155abe34289753 SHA1 cd414c00776f2440b2f8d667af46d3159b122799 SHA256 cc132dfe41eb7cf17ade769de975d3dd5c52f1c580abcd3a3af09f76567762e9 DIST londonlaw-0.2.1.tar.gz 3139208 RMD160 20a32d4b527b220a0ae0e261c5f84dd5563db7b2 SHA1 e38b536d6966c460edd7211c09601a63ee64c1c7 SHA256 e7453f2e261315384d991ecde31de16e0024fc5f14bacd4642e1daf5d9a4eb87 -EBUILD londonlaw-0.2.1-r2.ebuild 2553 RMD160 fbd26fff1229eb81b14e786a3e76505ccae84a75 SHA1 8c3995a5ba16c4a8c20845784b67317c1c694ead SHA256 3f8358406447e9c7da01b922bd99574f3e90d81c9826c33ffc0c6861bb2e0aea -MISC ChangeLog 2558 RMD160 8f4b50d3af9bc817a06c17f71a0e885277ef28f8 SHA1 b453afc042a23ef156729acf00e3249540797da4 SHA256 35389a72bb40f73c798dbf71d7365773528dc2cf8857a4ed35e6dab6fdd5a1e4 +EBUILD londonlaw-0.2.1-r2.ebuild 2591 RMD160 9dce6c64825eb2937180452a446730ad366c4066 SHA1 4fd8f7572785996552f25656f3d75bf9c768214c SHA256 4e741569552390633112cc48123bfd982579d8556b60b81ae1b571223b30c13b +MISC ChangeLog 2693 RMD160 e090caa84e5ca688bc18a5e28e7f18fe6c4f1c08 SHA1 fc42d642b1467e1f10ba89b07f2aa6855a789e82 SHA256 021f0e3af62d055da7ac93ab917bee82320de36c9fd8a754ee8cc495ac9307fe MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild b/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild index a5de98c03051..8ef3593df1ff 100644 --- a/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild +++ b/games-puzzle/londonlaw/londonlaw-0.2.1-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ +PYTHON_DEPEND="2" -EAPI=1 +EAPI=2 inherit eutils python games DESCRIPTION="Clone of the famous Scotland Yard board game" @@ -14,13 +15,10 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="dedicated" -DEPEND=">=dev-lang/python-2.3 - !dedicated? ( dev-python/wxpython:2.6 ) +DEPEND="!dedicated? ( dev-python/wxpython:2.6 ) dev-python/twisted" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch \ "${FILESDIR}"/${P}-setup.py.patch \ "${FILESDIR}"/${P}-wxversion.patch @@ -55,14 +53,14 @@ src_unpack() { londonlaw/server/GameRegistry.py \ || die "sed failed" fi + python_convert_shebangs -r 2 . } src_install() { - python_version - python setup.py install \ + $(PYTHON) setup.py install \ --root="${D}" \ --prefix="${GAMES_PREFIX}" \ - --install-lib=/usr/lib/python${PYVER}/site-packages \ + --install-lib=$(python_get_sitedir) \ --install-data="${GAMES_DATADIR}" \ || die "install failed" dodoc ChangeLog README doc/TODO doc/manual.tex doc/readme.protocol @@ -80,6 +78,11 @@ src_install() { prepgamesdirs } +pkg_setup() { + python_set_active_version 2 + games_pkg_setup +} + pkg_postinst() { games_pkg_postinst if ! use dedicated ; then |