Re-added correct blockcanvas

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-python/blockcanvas/ChangeLog b/dev-python/blockcanvas/ChangeLog
index 0f3f123cd4fc82fb103da7c69e73714afd3442aa..0930c21c2319e2b47847137d5802f94751b822b3 100644 (file)
--- a/dev-python/blockcanvas/ChangeLog
+++ b/dev-python/blockcanvas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/blockcanvas
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/blockcanvas/ChangeLog,v 1.5 2010/03/16 19:11:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blockcanvas/ChangeLog,v 1.6 2010/03/16 19:24:45 bicatali Exp $
+
+  16 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -blockcanvas-3.0.2.ebuild, +blockcanvas-3.1.0.ebuild:
+  Re-added correct blockcanvas
 
   16 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
   -blockcanvas-3.1.0.ebuild:

diff --git a/dev-python/blockcanvas/Manifest b/dev-python/blockcanvas/Manifest
index edd1c7ab2274fd7f6db12ecb0b9b712cead11832..f4bee16ac377132c8502713f6960c4d35fd5874f 100644 (file)
--- a/dev-python/blockcanvas/Manifest
+++ b/dev-python/blockcanvas/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST BlockCanvas-3.0.2.tar.gz 1052777 RMD160 e72a26d7ab4a4d4998faca17b947a476557ca90e SHA1 9f2e1891fa1c1d43f9a0e6a05cce568dff26aa27 SHA256 e35b2420a72de0276022001e9fa47e72875a57bef64bfba9535613e1a1aa922c
-EBUILD blockcanvas-3.0.2.ebuild 1225 RMD160 422448c545b50f18f2e1ccd4eab6819c565544c1 SHA1 cc98c39306a04e41f0aef89000321db59bb4aeb9 SHA256 c283dc7be7fc3006600c36f0c0c901d148d4703639f0a4ec807ac9c39b7972e1
-MISC ChangeLog 872 RMD160 fef859246b2c3a9c595d990beb651b622d6a12ca SHA1 1541a1d26186327bf471b695a25ff59827346f96 SHA256 4ebe579d72f7fa4bdc94d4b45310e6446cf525844ff4d72ab06cec5623783258
+DIST BlockCanvas-3.1.0.tar.gz 1049839 RMD160 1feeeb191acc88fd0eb6ea27b312ea7775fe0b9d SHA1 ba3e7c5b36090d13df38b7d5e0ecbadff218b5e0 SHA256 f7ed3de9329e5e4a389e5a6e1185838bc0bb00cfd56b22939418c084df227297
+EBUILD blockcanvas-3.1.0.ebuild 1416 RMD160 e01ff48afbca524e455ad9e455eb1c8b7b5b1ea3 SHA1 c324a050edbaf8eb2eb6d7bd45302a3f061a92c6 SHA256 7d4863eae3f0270c4217966c07ccffb858cf2ead94b078eb999a569b1be02cda
+MISC ChangeLog 1015 RMD160 091d014f7160ca31a5640bd6cb2d458910d5908a SHA1 a3bede1f888232366a448718561b839fbc4af9cd SHA256 1b31d441b7bf374bd422972bf3519a0ac51ea0b971759ced88cddad4c381f12c
 MISC metadata.xml 661 RMD160 1ecbcddef4bceee9db3d19f01a4c89d1316d60f3 SHA1 a1163e3df49c26ca9cc5af37c1f48e803e388424 SHA256 447e465b4400b6e509c1eeb241dc12741abdc8985b226b2441178b9ad2a80be0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuf194ACgkQ1ycZbhPLE2Co1gCfc7BmFnTwP/zPEvWMTa6GQ+f7
-5awAniFAFoB9+yiVam2+o58X0GOAfh0t
-=xyy+
+iEYEARECAAYFAkuf2wcACgkQ1ycZbhPLE2CIfACggwI9aYKBf21IW2qYJuuJD0Ln
+nM0An262Nq7bwDQqxsq/EdfqIz8rpfJH
+=y7vl
 -----END PGP SIGNATURE-----

diff --git a/dev-python/blockcanvas/blockcanvas-3.0.2.ebuild b/dev-python/blockcanvas/blockcanvas-3.1.0.ebuild
similarity index 50%
rename from dev-python/blockcanvas/blockcanvas-3.0.2.ebuild
rename to dev-python/blockcanvas/blockcanvas-3.1.0.ebuild
index 801e9f53fa646a5d42e6ba0d8f003c4f3bed14cb..efe83061691e7af154c4cd8f092c4b1aa4814036 100644 (file)
--- a/dev-python/blockcanvas/blockcanvas-3.0.2.ebuild
+++ b/dev-python/blockcanvas/blockcanvas-3.1.0.ebuild
@@ -1,8 +1,10 @@
-# 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/dev-python/blockcanvas/blockcanvas-3.0.2.ebuild,v 1.1 2009/03/27 10:46:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/blockcanvas/blockcanvas-3.1.0.ebuild,v 1.3 2010/03/16 19:24:45 bicatali Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-EAPI=2
 inherit distutils
 
 MY_PN="BlockCanvas"
@@ -11,7 +13,8 @@ DESCRIPTION="Enthought Tool Suite numerical modeling framework"
 HOMEPAGE="http://code.enthought.com/projects/block_canvas.php"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
-IUSE="test"
+IUSE=""
+#IUSE="test"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 LICENSE="BSD"
@@ -19,26 +22,31 @@ LICENSE="BSD"
 RDEPEND=">=dev-python/numpy-1.1
        dev-python/configobj
        dev-python/docutils
-       >=dev-python/apptools-3.2
-       >=dev-python/chaco-3.1
-       >=dev-python/enthoughtbase-3.0.2
-       >=dev-python/etsdevtools-3.0.2
-       >=dev-python/scimath-3.0.3
-       >=dev-python/traitsgui-3.0.4
+       >=dev-python/apptools-3.3.0
+       >=dev-python/chaco-3.2.0
+       >=dev-python/enthoughtbase-3.0.3
+       >=dev-python/etsdevtools-3.0.3
+       >=dev-python/scimath-3.0.4
+       >=dev-python/traitsgui-3.1.0
        dev-python/imaging"
-
-DEPEND="dev-python/setuptools
-       test? ( ${RDEPEND} >=dev-python/nose-0.10.3 )"
+DEPEND="dev-python/setuptools"
+# Tests require X display.
+#      test? ( ${RDEPEND} >=dev-python/nose-0.10.3 )
+RESTRICT_PYTHON_ABIS="3.*"
+RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 PYTHON_MODNAME="enthought"
 
 src_prepare() {
-       sed -i -e "/self.run_command('build_docs')/d" setup.py || die
+       sed -e "s/self.run_command('build_docs')/pass/" -i setup.py || die
 }
 
 src_test() {
-       PYTHONPATH=$(dir -d build/lib*) ${python} setup.py test || die "tests failed"
+       testing() {
+               PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
+       }
+       python_execute_function testing
 }
 
 src_install() {