summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2006-12-10 02:25:25 +0000
committerRyan Hill <dirtyepic@gentoo.org>2006-12-10 02:25:25 +0000
commit32ef70e0b0fd0b9486ff61a569e4ba3bd470c03c (patch)
treeb8e755d30b410a8049d004908a6005b8e9b6c0c0
parentfinishing to fix mysql-3 (diff)
downloadgentoo-2-32ef70e0b0fd0b9486ff61a569e4ba3bd470c03c.tar.gz
gentoo-2-32ef70e0b0fd0b9486ff61a569e4ba3bd470c03c.tar.bz2
gentoo-2-32ef70e0b0fd0b9486ff61a569e4ba3bd470c03c.zip
Fix GCC-4.x build error and update dependencies. Thanks to peper gentoo org
in bug #135029 (Portage version: 2.1.2_rc3)
-rw-r--r--dev-python/pyode/ChangeLog7
-rw-r--r--dev-python/pyode/pyode-1.1.0.ebuild13
-rw-r--r--dev-python/pyode/pyode-1.1.0_p20060728.ebuild4
3 files changed, 17 insertions, 7 deletions
diff --git a/dev-python/pyode/ChangeLog b/dev-python/pyode/ChangeLog
index 0a58c9f9dbb4..e78a4bbc565a 100644
--- a/dev-python/pyode/ChangeLog
+++ b/dev-python/pyode/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/pyode
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/ChangeLog,v 1.7 2006/09/04 18:01:13 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/ChangeLog,v 1.8 2006/12/10 02:25:25 dirtyepic Exp $
+
+ 10 Dec 2006; Ryan Hill <dirtyepic@gentoo.org> pyode-1.1.0.ebuild,
+ pyode-1.1.0_p20060728.ebuild:
+ Fix GCC-4.x build error and update dependencies. Thanks to peper gentoo org
+ in bug #135029
04 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
pyode-1.1.0_p20060728.ebuild:
diff --git a/dev-python/pyode/pyode-1.1.0.ebuild b/dev-python/pyode/pyode-1.1.0.ebuild
index c07c0053f6f4..f5712567502b 100644
--- a/dev-python/pyode/pyode-1.1.0.ebuild
+++ b/dev-python/pyode/pyode-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.1.0.ebuild,v 1.3 2005/10/22 05:57:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.1.0.ebuild,v 1.4 2006/12/10 02:25:25 dirtyepic Exp $
inherit distutils
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~ppc x86"
IUSE=""
DEPEND="virtual/python
- >=dev-games/ode-0.5
- >=dev-python/pyrex-0.9.3"
+ ~dev-games/ode-0.5
+ >=dev-python/pyrex-0.9.4.1"
S=${WORKDIR}/${MY_P}
@@ -26,6 +26,11 @@ src_unpack() {
sed -i \
-e "s:#ODE_BASE = .*:ODE_BASE = '/usr/share/ode-0.5':" \
setup.py || die
+
+ # These files were generated with pyrex-0.9.3, which is incompatable with
+ # GCC-4.x. We delete them so they will be regenerated with
+ # >=pyrex-0.9.4.1. Bug #135029
+ rm ode_notrimesh.c ode_trimesh.c
}
src_install() {
diff --git a/dev-python/pyode/pyode-1.1.0_p20060728.ebuild b/dev-python/pyode/pyode-1.1.0_p20060728.ebuild
index 9cc43919e0e5..b6febcbfe2ba 100644
--- a/dev-python/pyode/pyode-1.1.0_p20060728.ebuild
+++ b/dev-python/pyode/pyode-1.1.0_p20060728.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.1.0_p20060728.ebuild,v 1.2 2006/09/04 18:01:13 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.1.0_p20060728.ebuild,v 1.3 2006/12/10 02:25:25 dirtyepic Exp $
inherit distutils
@@ -15,7 +15,7 @@ IUSE=""
DEPEND="virtual/python
>=dev-games/ode-0.5
- >=dev-python/pyrex-0.9.3"
+ >=dev-python/pyrex-0.9.4.1"
S="$WORKDIR/${PN}"