From b55b9cde17b3ca10618d7d195348cdcb22de6558 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 10 Dec 2006 02:25:25 +0000 Subject: [PATCH] Fix GCC-4.x build error and update dependencies. Thanks to peper gentoo org in bug #135029 Package-Manager: portage-2.1.2_rc3 --- dev-python/pyode/ChangeLog | 7 +++++- dev-python/pyode/Manifest | 24 +++++++++---------- dev-python/pyode/pyode-1.1.0.ebuild | 13 ++++++---- dev-python/pyode/pyode-1.1.0_p20060728.ebuild | 4 ++-- 4 files changed, 29 insertions(+), 19 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 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 pyode-1.1.0_p20060728.ebuild: diff --git a/dev-python/pyode/Manifest b/dev-python/pyode/Manifest index abf93e7dce25..7f1fdc641b0e 100644 --- a/dev-python/pyode/Manifest +++ b/dev-python/pyode/Manifest @@ -13,18 +13,18 @@ EBUILD pyode-1.0.0.ebuild 627 RMD160 95ea80da9434f18519e6b4ee33322adefc7e1542 SH MD5 76cec8c1f6757e829c128897da993059 pyode-1.0.0.ebuild 627 RMD160 95ea80da9434f18519e6b4ee33322adefc7e1542 pyode-1.0.0.ebuild 627 SHA256 cfb09c90b22804ae03a0261fbd3e0bfdb9f6712cb1d659efc19f97f9e760eec7 pyode-1.0.0.ebuild 627 -EBUILD pyode-1.1.0.ebuild 917 RMD160 21a2b0a97a0cb2f28b2761cee85620e0c1f56edc SHA1 7acbf923ec5b2803e128d78270cb1c022d69f1a5 SHA256 6c905fea3cc0e2e8609ae88ce03d72522c1c82f424ad22c4580b2a46c66a20e7 -MD5 7c267e321cb1eb025694b0920c6ed596 pyode-1.1.0.ebuild 917 -RMD160 21a2b0a97a0cb2f28b2761cee85620e0c1f56edc pyode-1.1.0.ebuild 917 -SHA256 6c905fea3cc0e2e8609ae88ce03d72522c1c82f424ad22c4580b2a46c66a20e7 pyode-1.1.0.ebuild 917 -EBUILD pyode-1.1.0_p20060728.ebuild 833 RMD160 dd6780bd07dba0dff8146b072e05030fc4251137 SHA1 48acb716d06137edd3cd457db17524bcb76248eb SHA256 ffb8253b65d89cdbf14c2eece0b58501b6d048850ab6e8026d42825f70241746 -MD5 f45170155d690442553fbf9b4cb3b76f pyode-1.1.0_p20060728.ebuild 833 -RMD160 dd6780bd07dba0dff8146b072e05030fc4251137 pyode-1.1.0_p20060728.ebuild 833 -SHA256 ffb8253b65d89cdbf14c2eece0b58501b6d048850ab6e8026d42825f70241746 pyode-1.1.0_p20060728.ebuild 833 -MISC ChangeLog 1143 RMD160 6899d1b861a4ec4d42bfa4716da8a1cf5d635440 SHA1 bfeeaea9c9a3ddba577a1bc3777b475f6b81d53d SHA256 ffbf64cba0f975f81da06133142cf329452343f0003201f71d497bd7f47c465e -MD5 cf9c9097b1d319dd9ce90db6dd0ca78a ChangeLog 1143 -RMD160 6899d1b861a4ec4d42bfa4716da8a1cf5d635440 ChangeLog 1143 -SHA256 ffbf64cba0f975f81da06133142cf329452343f0003201f71d497bd7f47c465e ChangeLog 1143 +EBUILD pyode-1.1.0.ebuild 1125 RMD160 413bacc287bcfe4720a7d30d0e063866426e82d0 SHA1 c5bb9041bae2b693d4b5bbf51c93cdffc84947ff SHA256 75a041335a252f9fef0dc262950c5f746ed171d63be1f09a5cd80b5bb5053339 +MD5 f8fb2b9ded4c86266317f98033d8ef4b pyode-1.1.0.ebuild 1125 +RMD160 413bacc287bcfe4720a7d30d0e063866426e82d0 pyode-1.1.0.ebuild 1125 +SHA256 75a041335a252f9fef0dc262950c5f746ed171d63be1f09a5cd80b5bb5053339 pyode-1.1.0.ebuild 1125 +EBUILD pyode-1.1.0_p20060728.ebuild 836 RMD160 a9372e675a972b34c006cd28b52019954149d4f8 SHA1 a6a0af65caf653d656bee5099c618dddce10fc03 SHA256 316a6c9bc1bc51732f1eef545dfc8567a404a7ef8a2615584f33a859bf1165a2 +MD5 23aae073441d72a9d78817f5158e4685 pyode-1.1.0_p20060728.ebuild 836 +RMD160 a9372e675a972b34c006cd28b52019954149d4f8 pyode-1.1.0_p20060728.ebuild 836 +SHA256 316a6c9bc1bc51732f1eef545dfc8567a404a7ef8a2615584f33a859bf1165a2 pyode-1.1.0_p20060728.ebuild 836 +MISC ChangeLog 1340 RMD160 735e9bc739303546b89607ad23b01e2706430dbd SHA1 d77d4ec36bfe9e8c9516ebb986fed6d3cb08ddaf SHA256 f4cafd6e7a555e202fad6ea7c5bfaf4927fd21952181e071d801a2983ea377f5 +MD5 7eaf7a1beea6416984e3cb9fb1b44649 ChangeLog 1340 +RMD160 735e9bc739303546b89607ad23b01e2706430dbd ChangeLog 1340 +SHA256 f4cafd6e7a555e202fad6ea7c5bfaf4927fd21952181e071d801a2983ea377f5 ChangeLog 1340 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159 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}" -- 2.26.2