diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2010-04-20 08:36:39 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2010-04-20 08:36:39 +0000 |
| commit | 06faf5e47a4414865a44627d771d11f9fa74032b (patch) | |
| tree | d03ae4a82101c421e2af0d284120dc1587dbaae8 | |
| parent | Disable tests since they require no rpc.statd to be running on the system bef... (diff) | |
| download | historical-06faf5e47a4414865a44627d771d11f9fa74032b.tar.gz historical-06faf5e47a4414865a44627d771d11f9fa74032b.tar.bz2 historical-06faf5e47a4414865a44627d771d11f9fa74032b.zip | |
Force python2. Fix bug #312267
Package-Manager: portage-2.1.8.3/cvs/Linux i686
| -rw-r--r-- | games-puzzle/kiki/ChangeLog | 7 | ||||
| -rw-r--r-- | games-puzzle/kiki/Manifest | 14 | ||||
| -rw-r--r-- | games-puzzle/kiki/kiki-1.0.2-r2.ebuild | 15 |
3 files changed, 16 insertions, 20 deletions
diff --git a/games-puzzle/kiki/ChangeLog b/games-puzzle/kiki/ChangeLog index 8473f1de9647..3e96d7aab54b 100644 --- a/games-puzzle/kiki/ChangeLog +++ b/games-puzzle/kiki/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-puzzle/kiki -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.15 2009/06/16 20:28:29 nyhm Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.16 2010/04/20 08:36:39 tupone Exp $ + + 20 Apr 2010; Tupone Alfredo <tupone@gentoo.org> kiki-1.0.2-r2.ebuild: + Force python2. Fix bug #312267 by arfrever@gentoo.org 16 Jun 2009; Tristan Heaven <nyhm@gentoo.org> kiki-1.0.2-r2.ebuild, +files/kiki-1.0.2-build.patch: diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest index 512af386ff5b..16470d2edc6d 100644 --- a/games-puzzle/kiki/Manifest +++ b/games-puzzle/kiki/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX kiki-1.0.2-build.patch 1374 RMD160 cc74d64c5ca953e80667fb95890b385583d422b3 SHA1 966b54721f6c16d89e028eb0f1536dcb12c50b7f SHA256 e4c347944b41a10790cc9e994a08d00493fa3549e746cd0137dac75d13189cec AUX kiki-1.0.2-freeglut.patch 551 RMD160 b6883f4d68f66aca98d42a3a9eeca61e568f7294 SHA1 4ca546c618246f83a1d6cf37d53f8a3aa5719ad1 SHA256 163e6662d38043b537724ded5822580afecb7304b46d83f00e1dae315ebdbf7f AUX kiki-1.0.2-gcc41.patch 308 RMD160 ed9831a808a75da349f91830212d1a4a4295cbd3 SHA1 e7d1915e98fd539fab4f777e2d0a08eae779104d SHA256 bfa2934dd6849c552f90c5dfa2420dcfce96c493b87e988ae62306f6177c9636 AUX kiki-1.0.2-gcc43.patch 2029 RMD160 003a9634db96e2081d683e3db1ffcbf0b6a6ec51 SHA1 77e8acaa2fcaceb9c125e1415676f375fd92de16 SHA256 4770fa15885dc7906c231039b9749a7d19502a9e23a2390e084e41164eb3721b DIST kiki-1.0.2-src.tgz 3366523 RMD160 78e71cae75f7d6957d06fb8c7323d607bc232499 SHA1 57f8583f7dfd3557524c98131e56e35251fdcc07 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246 -EBUILD kiki-1.0.2-r2.ebuild 1746 RMD160 9b7750739b4422f3fce82268bfa3ce898e6a33d4 SHA1 c98c3c77ca6892e34633736b8eb258492c573c11 SHA256 cd84ff763604b3973efe1e12ed1cfeae72117ba0add0e87f6f3999265701d901 -MISC ChangeLog 2170 RMD160 16984a5b5adf5e780d9a6e36a1412ff9a5e2ce55 SHA1 47966c722e04de0b42b6083d0cd56289b14f5714 SHA256 d20f631da7eff910eb7df7d8fea3ffdd000f741e7adb840ac9543eac811128c3 +EBUILD kiki-1.0.2-r2.ebuild 1808 RMD160 cadb3d4c55cad4eaaef4577b07e12c089b96c426 SHA1 e6bddc40f670e0b347b79f7f5ea67a9a543fba1f SHA256 8e9883b37a5859697bd081269c8eef8590e649f1b54effbece5be0ab468ef45c +MISC ChangeLog 2301 RMD160 c9b143ff5989fabb5fa3dfe99bede708f98e8080 SHA1 cce166d95ba25656b00c4ecf9d4c5afd94f98b04 SHA256 545cedb508bfac8364ca3beee2ca4d181415ba6b15a8d9a8ac7b1836835ed229 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAko4AHMACgkQdz7hIScOURGh4QCfRnlHEgC1RG+/+KEopKMb0+RJ -6TUAn3cf4RTYh66Ur/8DRBT+ruiVqMlb -=+Ed6 ------END PGP SIGNATURE----- diff --git a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild index 7d9b9900b7a1..c52b29d63d16 100644 --- a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild +++ b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild @@ -1,7 +1,7 @@ -# 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/kiki/kiki-1.0.2-r2.ebuild,v 1.4 2009/06/16 20:28:29 nyhm Exp $ - +# $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 $ +PYTHON_DEPEND="2" EAPI=2 inherit eutils python toolchain-funcs games @@ -17,7 +17,6 @@ IUSE="" RDEPEND="media-libs/libsdl[opengl] media-libs/sdl-image media-libs/sdl-mixer - dev-lang/python virtual/opengl virtual/glu virtual/glut" @@ -51,8 +50,7 @@ src_prepare() { src_compile() { emake -C kodilib/linux AR="$(tc-getAR)" || die "emake kodilib failed" - python_version - emake -C linux PYTHON_VERSION="${PYVER}" || die "emake linux failed" + emake -C linux PYTHON_VERSION="$(python_get_version)" || die "emake linux failed" } src_install() { @@ -64,3 +62,8 @@ src_install() { dodoc Readme.txt Thanks.txt prepgamesdirs } + +pkg_setup() { + python_set_active_version 2 + games_pkg_setup +} |