summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-05-04 22:04:36 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-05-04 22:04:36 +0000
commit7a3fdf6063ceebb9f3a014a2c50804014264e2c5 (patch)
tree5bd360b23a73b4d456798af7839716771be23e82 /games-rpg
parentVersion bump (diff)
downloadhistorical-7a3fdf6063ceebb9f3a014a2c50804014264e2c5.tar.gz
historical-7a3fdf6063ceebb9f3a014a2c50804014264e2c5.tar.bz2
historical-7a3fdf6063ceebb9f3a014a2c50804014264e2c5.zip
Force python2 fixing bug #312271
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'games-rpg')
-rw-r--r--games-rpg/adonthell/ChangeLog5
-rw-r--r--games-rpg/adonthell/Manifest4
-rw-r--r--games-rpg/adonthell/adonthell-0.3.5.ebuild15
3 files changed, 17 insertions, 7 deletions
diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog
index a1419e596de9..fe656f30bcd4 100644
--- a/games-rpg/adonthell/ChangeLog
+++ b/games-rpg/adonthell/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-rpg/adonthell
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.20 2010/01/06 12:51:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.21 2010/05/04 22:04:36 tupone Exp $
+
+ 04 May 2010; Tupone Alfredo <tupone@gentoo.org> adonthell-0.3.5.ebuild:
+ Force python2 fixing bug #312271 by arfrever@gentoo.org
06 Jan 2010; Joseph Jezak <josejx@gentoo.org> adonthell-0.3.5.ebuild:
Marked ppc stable for bug #288816.
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index e981de53cdb1..fb751b2278d4 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,6 +1,6 @@
AUX adonthell-0.3.5-configure.in.patch 3310 RMD160 4de8ce67f5362c1d89d64d0ac37687c1e9bba5ab SHA1 818fe23ac15bba79712fb269078d41f4766345d1 SHA256 29883a145e5aaecbec3c526dffc9a75933eb1e6b0f0d536b6ecbb440cd26a17e
AUX adonthell-0.3.5-glibc-2.10.patch 792 RMD160 e3516959c0554009628f78cf0e49b3969b054d51 SHA1 0faaeeda028a24ee38671fd5f3b3eb38476027a3 SHA256 23e1a0ad1f49035c80797bec1ba6740bceb84426938ac4a3f7c7169c32424d31
DIST adonthell-src-0.3.5.tar.gz 877439 RMD160 b0633c7c3c89c51d67ca13d053c5f61c22cfa881 SHA1 8e913173225b351b79db45124f627b436794f845 SHA256 b1b24f26b9f32782793b222c687943442be83fc0d7f5dbb4928a61074be36dd7
-EBUILD adonthell-0.3.5.ebuild 1300 RMD160 8e083768c024dcf5765c48b694b97798c6622d65 SHA1 425ed8e1b1aed260d344b4ca7ba3c413905e3ac1 SHA256 861a347c2e6ef865786152450ca6d5ae15c89a0665023324841d1c8e115fa960
-MISC ChangeLog 3528 RMD160 fd14021c4d2df2afb455820ae333ec702f049010 SHA1 caba129ac9bced7f5007f420dab69f6c140579f0 SHA256 ff2df21ca2c7a843fc6ac5ee8ac5a0e02f7e3446ee6eacf5974b0c78606c7404
+EBUILD adonthell-0.3.5.ebuild 1459 RMD160 c0c7d2b4b8d7f4a54679334e3597830cfae72ec4 SHA1 d332d55261f8405b86294de18a9889b3f1c888b7 SHA256 53abf8543b582f9e6af044ebc52bd5c49291c0ba3a5675fb472809f9409ca42f
+MISC ChangeLog 3661 RMD160 9198cb2c0e58cf7f1e135c354b02823dfa78cc33 SHA1 df92fbcabc1cd0466995fbce182587411e5d2eef SHA256 01676bb3d7b827f9f000da7c52e7804a10f66f12e11694513456f896509ce7e8
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-rpg/adonthell/adonthell-0.3.5.ebuild b/games-rpg/adonthell/adonthell-0.3.5.ebuild
index 827f025d552e..78b31bfb9445 100644
--- a/games-rpg/adonthell/adonthell-0.3.5.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.5.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.5.ebuild,v 1.4 2010/01/06 12:51:55 josejx Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.5.ebuild,v 1.5 2010/05/04 22:04:36 tupone Exp $
+PYTHON_DEPEND="2"
EAPI=2
-inherit autotools eutils games
+inherit autotools eutils python games
DESCRIPTION="roleplaying game engine"
HOMEPAGE="http://adonthell.linuxgames.com/"
@@ -21,7 +21,6 @@ RDEPEND="media-libs/sdl-ttf
media-libs/freetype
media-libs/libogg
media-libs/libvorbis
- dev-lang/python
nls? ( virtual/libintl )"
DEPEND="${RDEPEND}
dev-lang/swig
@@ -33,10 +32,18 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN}-${PV/a/}
+pkg_setup() {
+ python_set_active_version 2
+ games_pkg_setup
+}
+
src_prepare() {
epatch \
"${FILESDIR}"/${P}-configure.in.patch \
"${FILESDIR}"/${P}-glibc-2.10.patch
+ sed -i \
+ -e "/AC_PATH_PROGS/s:python:$(PYTHON):" \
+ configure.in || die "sed failed"
rm -f ac{local,include}.m4
eautoreconf
}