applied upstream's changes to use numpy instead of numeric.

Package-Manager: portage-2.1.3_rc8

5 files changed, 534 insertions, 5 deletions

diff --git a/dev-python/python-biggles/ChangeLog b/dev-python/python-biggles/ChangeLog
index ef104a74ca5c..a4b550b55dac 100644
--- a/dev-python/python-biggles/ChangeLog
+++ b/dev-python/python-biggles/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-biggles
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-biggles/ChangeLog,v 1.8 2007/07/04 21:08:32 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-biggles/ChangeLog,v 1.9 2007/07/21 16:07:33 hawking Exp $
+
+*python-biggles-1.6.4-r1 (21 Jul 2007)
+
+  21 Jul 2007; Ali Polatel <hawking@gentoo.org>
+  +files/python-biggles-1.6.4-numpy.patch, +python-biggles-1.6.4-r1.ebuild:
+  applied upstream's changes to use numpy instead of numeric.
 
   04 Jul 2007; Ali Polatel <hawking@gentoo.org> python-biggles-1.6.3.ebuild:
   use DOCS, mydoc is deprecated
diff --git a/dev-python/python-biggles/Manifest b/dev-python/python-biggles/Manifest
index ddb76d990e67..66b9b1e24025 100644
--- a/dev-python/python-biggles/Manifest
+++ b/dev-python/python-biggles/Manifest
@@ -1,17 +1,25 @@
+AUX python-biggles-1.6.4-numpy.patch 15156 RMD160 364e372247781ce554fd02cde99cc6db89c6f5f2 SHA1 3499b562e4e26b5a0fdf7d4746fdd1e48e99bf88 SHA256 cc347e8d26bab14b88da32dba614ba16a865d13598ce84c822a870b0024a161a
+MD5 47793120630989ebec5e4d37527ff981 files/python-biggles-1.6.4-numpy.patch 15156
+RMD160 364e372247781ce554fd02cde99cc6db89c6f5f2 files/python-biggles-1.6.4-numpy.patch 15156
+SHA256 cc347e8d26bab14b88da32dba614ba16a865d13598ce84c822a870b0024a161a files/python-biggles-1.6.4-numpy.patch 15156
 DIST python-biggles-1.6.3.tar.gz 107760 RMD160 a5723e0ca332bac741079e5ccabff10459ef1be6 SHA1 ada51bb368f504151c3e65d776b0314dd6f534df SHA256 d75cd9c1e75191836a802a0c1d9b5c72656c732e966a7d484b0a5c06c0a0ea93
 DIST python2-biggles-1.6.4.tar.gz 113810 RMD160 4f49a399df1cd2fdda15fe14c82e428830b7bd4d SHA1 327364c9b8f0f065bfc4d48afa785d8e0b9b577e SHA256 421e862f5e410694b55020347484a62eb88061597e97c89c0c7baa436deb7800
 EBUILD python-biggles-1.6.3.ebuild 560 RMD160 acd285d9593bd34e78dfdaaee039351ad7dc7b6d SHA1 395c1d98dc3fc4da7fb2a2e739b27e9934cc8e17 SHA256 cb82b03b31ddea938e9e85860a4d2810980d7416c68c1538c43929f67af11df3
 MD5 e2ee09614d28907972c3239d96660cee python-biggles-1.6.3.ebuild 560
 RMD160 acd285d9593bd34e78dfdaaee039351ad7dc7b6d python-biggles-1.6.3.ebuild 560
 SHA256 cb82b03b31ddea938e9e85860a4d2810980d7416c68c1538c43929f67af11df3 python-biggles-1.6.3.ebuild 560
+EBUILD python-biggles-1.6.4-r1.ebuild 1035 RMD160 336f2b1bef9f74688f46a96ed8f067dce3f880f0 SHA1 0181bf0ead1fd4524955df56fc43ccdaf360d837 SHA256 6022f272d7b24c2b1ad14c1f7fb67295351f32dd183c6a0ec72ba0c21cbbb740
+MD5 14146467406a6f8bc69a21a798341949 python-biggles-1.6.4-r1.ebuild 1035
+RMD160 336f2b1bef9f74688f46a96ed8f067dce3f880f0 python-biggles-1.6.4-r1.ebuild 1035
+SHA256 6022f272d7b24c2b1ad14c1f7fb67295351f32dd183c6a0ec72ba0c21cbbb740 python-biggles-1.6.4-r1.ebuild 1035
 EBUILD python-biggles-1.6.4.ebuild 734 RMD160 3e0bde7edfe050988ef313466f0c360f067d2fcf SHA1 21681f720e25fb224c3ed5316bf2f7bfa3037c27 SHA256 e402c4741e4cc825b7cad7427cea569944d457b29d6ddf387577fd25f22befa5
 MD5 d8b3279bbe6d9c468b9290543aea0870 python-biggles-1.6.4.ebuild 734
 RMD160 3e0bde7edfe050988ef313466f0c360f067d2fcf python-biggles-1.6.4.ebuild 734
 SHA256 e402c4741e4cc825b7cad7427cea569944d457b29d6ddf387577fd25f22befa5 python-biggles-1.6.4.ebuild 734
-MISC ChangeLog 1066 RMD160 27f9fac4f7614e42e167dc5c7ce88284d9dbebf5 SHA1 68acecb41684929f08bd0f230fd68683252d048a SHA256 e18bb16149fe3f5583b6dfc640279614bf96e2016f4b9ecf37492d267495faee
-MD5 9f5dac6498a3526bbd3bbe747831b16b ChangeLog 1066
-RMD160 27f9fac4f7614e42e167dc5c7ce88284d9dbebf5 ChangeLog 1066
-SHA256 e18bb16149fe3f5583b6dfc640279614bf96e2016f4b9ecf37492d267495faee ChangeLog 1066
+MISC ChangeLog 1293 RMD160 3e249f0a9555bb3d81be45d481afd5762de7e147 SHA1 0e79d0a1524b6050641a0065baf3a4f35e697126 SHA256 c66ff258dd01d30919ed55fb547702be969e81a5b496f225ac0da83511b76a68
+MD5 b7839bfa7e6590bdbf85a5c01e5308bb ChangeLog 1293
+RMD160 3e249f0a9555bb3d81be45d481afd5762de7e147 ChangeLog 1293
+SHA256 c66ff258dd01d30919ed55fb547702be969e81a5b496f225ac0da83511b76a68 ChangeLog 1293
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -22,3 +30,6 @@ SHA256 032a5e8e665e5f19a295a1e123831e48103bdade547eae6142749a6fce2689bd files/di
 MD5 a4d6370249aeedd732c9a2ed66bc5035 files/digest-python-biggles-1.6.4 265
 RMD160 2e6e9ca6e858be95e0be29e62204d352ad2c8e18 files/digest-python-biggles-1.6.4 265
 SHA256 e9ffeef7d7c5fc067e1f71951946d1def971f7e1a99383d02c74f63c6fa0c6b4 files/digest-python-biggles-1.6.4 265
+MD5 a4d6370249aeedd732c9a2ed66bc5035 files/digest-python-biggles-1.6.4-r1 265
+RMD160 2e6e9ca6e858be95e0be29e62204d352ad2c8e18 files/digest-python-biggles-1.6.4-r1 265
+SHA256 e9ffeef7d7c5fc067e1f71951946d1def971f7e1a99383d02c74f63c6fa0c6b4 files/digest-python-biggles-1.6.4-r1 265
diff --git a/dev-python/python-biggles/files/digest-python-biggles-1.6.4-r1 b/dev-python/python-biggles/files/digest-python-biggles-1.6.4-r1
new file mode 100644
index 000000000000..9bf4503e497c
--- /dev/null
+++ b/dev-python/python-biggles/files/digest-python-biggles-1.6.4-r1
@@ -0,0 +1,3 @@
+MD5 e07bc9e22d830ada274ea71bc6d12556 python2-biggles-1.6.4.tar.gz 113810
+RMD160 4f49a399df1cd2fdda15fe14c82e428830b7bd4d python2-biggles-1.6.4.tar.gz 113810
+SHA256 421e862f5e410694b55020347484a62eb88061597e97c89c0c7baa436deb7800 python2-biggles-1.6.4.tar.gz 113810
diff --git a/dev-python/python-biggles/files/python-biggles-1.6.4-numpy.patch b/dev-python/python-biggles/files/python-biggles-1.6.4-numpy.patch
new file mode 100644
index 000000000000..110d4db8c373
--- /dev/null
+++ b/dev-python/python-biggles/files/python-biggles-1.6.4-numpy.patch
@@ -0,0 +1,468 @@
+diff -ur python2-biggles-1.6.4/examples/example1.py python2-biggles-1.6.4_numpy/examples/example1.py
+--- python2-biggles-1.6.4/examples/example1.py	2001-03-30 03:32:20.000000000 +0300
++++ python2-biggles-1.6.4_numpy/examples/example1.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,11 +4,11 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-import Numeric, math
++import numpy, math
+ 
+-x = Numeric.arange( 0, 3*math.pi, math.pi/30 )
+-c = Numeric.cos(x)
+-s = Numeric.sin(x)
++x = numpy.arange( 0, 3*math.pi, math.pi/30 )
++c = numpy.cos(x)
++s = numpy.sin(x)
+ 
+ p = biggles.FramedPlot()
+ p.title = "title"
+diff -ur python2-biggles-1.6.4/examples/example2.py python2-biggles-1.6.4_numpy/examples/example2.py
+--- python2-biggles-1.6.4/examples/example2.py	2001-03-30 03:32:20.000000000 +0300
++++ python2-biggles-1.6.4_numpy/examples/example2.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,16 +4,17 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-import Numeric, RandomArray
++import numpy
++import numpy.random
+ 
+ p = biggles.FramedPlot()
+ p.xrange = 0, 100
+ p.yrange = 0, 100
+ p.aspect_ratio = 1
+ 
+-x = Numeric.arange( 0, 100, 5 )
+-yA = RandomArray.normal( 40, 10, (len(x),) )
+-yB = x + RandomArray.normal( 0, 5, (len(x),) )
++x = numpy.arange( 0, 100, 5 )
++yA = numpy.random.normal( 40, 10, (len(x),) )
++yB = x + numpy.random.normal( 0, 5, (len(x),) )
+ 
+ a = biggles.Points( x, yA, type="circle" )
+ a.label = "a points"
+diff -ur python2-biggles-1.6.4/examples/example3.py python2-biggles-1.6.4_numpy/examples/example3.py
+--- python2-biggles-1.6.4/examples/example3.py	2001-03-30 03:32:20.000000000 +0300
++++ python2-biggles-1.6.4_numpy/examples/example3.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,10 +4,10 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-import math, Numeric 
++import math, numpy 
+ 
+-x = Numeric.arange( 0, 3*math.pi, math.pi/10 )
+-y = Numeric.sin(x)
++x = numpy.arange( 0, 3*math.pi, math.pi/10 )
++y = numpy.sin(x)
+ 
+ p = biggles.FramedPlot()
+ p.title = "Title"
+diff -ur python2-biggles-1.6.4/examples/example4.py python2-biggles-1.6.4_numpy/examples/example4.py
+--- python2-biggles-1.6.4/examples/example4.py	2001-03-30 03:32:20.000000000 +0300
++++ python2-biggles-1.6.4_numpy/examples/example4.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,11 +4,11 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-import math, Numeric 
++import math, numpy 
+ 
+-x = Numeric.arange( 0, 2*math.pi, math.pi/20 )
+-s = Numeric.sin(x)
+-c = Numeric.cos(x)
++x = numpy.arange( 0, 2*math.pi, math.pi/20 )
++s = numpy.sin(x)
++c = numpy.cos(x)
+ 
+ inset = biggles.FramedPlot()
+ inset.title = "inset"
+diff -ur python2-biggles-1.6.4/examples/example5.py python2-biggles-1.6.4_numpy/examples/example5.py
+--- python2-biggles-1.6.4/examples/example5.py	2001-03-30 03:32:20.000000000 +0300
++++ python2-biggles-1.6.4_numpy/examples/example5.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,10 +4,10 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-import math, Numeric 
++import math, numpy 
+ 
+-x = Numeric.arange( 0, 3*math.pi, math.pi/10 )
+-y = Numeric.sin(x)
++x = numpy.arange( 0, 3*math.pi, math.pi/10 )
++y = numpy.sin(x)
+ 
+ a = biggles.FramedArray( 2, 2, title='title' )
+ a.aspect_ratio = 0.75
+diff -ur python2-biggles-1.6.4/examples/example6.py python2-biggles-1.6.4_numpy/examples/example6.py
+--- python2-biggles-1.6.4/examples/example6.py	2001-04-01 00:20:11.000000000 +0300
++++ python2-biggles-1.6.4_numpy/examples/example6.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,11 +4,11 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-import Numeric, math
++import numpy, math
+ 
+-x = Numeric.arange( 1*math.pi, 3*math.pi, math.pi/30 )
+-c = Numeric.cos(x)
+-s = Numeric.sin(x)
++x = numpy.arange( 1*math.pi, 3*math.pi, math.pi/30 )
++c = numpy.cos(x)
++s = numpy.sin(x)
+ 
+ p = biggles.FramedPlot()
+ p.aspect_ratio = 1
+diff -ur python2-biggles-1.6.4/examples/example8.py python2-biggles-1.6.4_numpy/examples/example8.py
+--- python2-biggles-1.6.4/examples/example8.py	2004-03-08 06:41:46.000000000 +0200
++++ python2-biggles-1.6.4_numpy/examples/example8.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,22 +4,22 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-import Numeric
++import numpy
+ 
+ #
+ # Create example 2-dimensional data set of two solitons colliding.
+ #
+ n = 64
+-x = Numeric.arange( -10., 10., 20./n )
+-t = Numeric.arange( -1., 1., 2./n )
+-z = Numeric.zeros( (len(x),len(t)), Numeric.Float )
++x = numpy.arange( -10., 10., 20./n )
++t = numpy.arange( -1., 1., 2./n )
++z = numpy.zeros( (len(x),len(t)) )
+ 
+ for i in range(len(x)):
+ 	for j in range(len(t)):
+-		z[i,j] = -12. * (3. + 4.*Numeric.cosh(2.*x[i]-8.*t[j]) \
+-			+ Numeric.cosh(4.*x[i] - 64.*t[j])) / \
+-			(3.*Numeric.cosh(x[i]-28.*t[j]) \
+-			+ Numeric.cosh(3.*x[i]-36.*t[j]))**2
++		z[i,j] = -12. * (3. + 4.*numpy.cosh(2.*x[i]-8.*t[j]) \
++			+ numpy.cosh(4.*x[i] - 64.*t[j])) / \
++			(3.*numpy.cosh(x[i]-28.*t[j]) \
++			+ numpy.cosh(3.*x[i]-36.*t[j]))**2
+ 
+ #
+ # Make contour component.
+diff -ur python2-biggles-1.6.4/examples/example9.py python2-biggles-1.6.4_numpy/examples/example9.py
+--- python2-biggles-1.6.4/examples/example9.py	2004-03-09 01:07:44.000000000 +0200
++++ python2-biggles-1.6.4_numpy/examples/example9.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,7 +4,7 @@
+ sys.path.insert(1,'..')
+ 
+ import biggles
+-from Numeric import *
++from numpy import *
+ 
+ def mag( vec ):
+ 	return sqrt(sum(vec*vec, -1))
+@@ -17,7 +17,7 @@
+ 	# Let's color the points by their distance from the point (3,7)
+ 	center    = (3,7)
+ 	rad       = mag( transpose([x,y]) - center )
+-	scaledrad = (1 - rad/max(rad))[:,NewAxis]
++	scaledrad = (1 - rad/max(rad))[:,newaxis]
+ 
+ 	# Go from light blue to intense red.
+ 	minColor = array([0.6, 0.9, 1.0])
+diff -ur python2-biggles-1.6.4/examples/example-matlab.py python2-biggles-1.6.4_numpy/examples/example-matlab.py
+--- python2-biggles-1.6.4/examples/example-matlab.py	2004-03-09 00:57:09.000000000 +0200
++++ python2-biggles-1.6.4_numpy/examples/example-matlab.py	2007-07-21 18:48:59.000000000 +0300
+@@ -4,14 +4,14 @@
+ sys.path.insert(1,'..')
+ sys.ps1 = None
+ 
+-import Numeric
++import numpy
+ from biggles.matlab import *
+ 
+ def press_return():
+ 	print "[press return]"
+ 	sys.stdin.readline()
+ 
+-x = Numeric.arrayrange(-10,10);
++x = numpy.arange(-10,10);
+ y = x**2;
+ e = y/4
+ 
+diff -ur python2-biggles-1.6.4/make.inc python2-biggles-1.6.4_numpy/make.inc
+--- python2-biggles-1.6.4/make.inc	2004-03-09 00:43:12.000000000 +0200
++++ python2-biggles-1.6.4_numpy/make.inc	2007-07-21 18:48:59.000000000 +0300
+@@ -28,11 +28,11 @@
+ 
+ LIBPLOT_PREFIX		= /usr/local
+ LIBPLOT_CPPFLAGS	= -I$(LIBPLOT_PREFIX)/include
+-LIBPLOT_LDFLAGS		= -L$(LIBPLOT_PREFIX)/lib -lplot \
+-		-L/usr/X11R6/lib -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11
++LIBPLOT_LDFLAGS		= -L$(LIBPLOT_PREFIX)/lib64 -L$(LIBPLOT_PREFIX)/lib \
++		-lplot -L/usr/X11R6/lib64 -L/usr/X11R6/lib \
++		-lXaw -lXmu -lXt -lSM -lICE -lXext -lX11
+ 
+-## uncomment this line if there isn't a Numeric include subdirectory
+-#NUMERIC_CPPFLAGS = -DNO_NUMERIC_INCDIR
++NUMPY_CPPFLAGS	= -I$(shell $(PYTHON) -c 'import numpy; print numpy.get_include()')
+ 
+ ## these options probably don't need to be changed
+ 
+diff -ur python2-biggles-1.6.4/setup.py python2-biggles-1.6.4_numpy/setup.py
+--- python2-biggles-1.6.4/setup.py	2004-03-09 01:40:25.000000000 +0200
++++ python2-biggles-1.6.4_numpy/setup.py	2007-07-21 18:48:59.000000000 +0300
+@@ -33,16 +33,26 @@
+ from distutils.sysconfig import get_python_inc

+ import sys

+ 

+-## libplot

++import numpy

++numpy_include_dirs = numpy.get_include()

++

++## _biggles module

++

++_biggles_include_dirs = [ numpy_include_dirs ]

++

++## libplot module

+ 

+ if sys.platform == "win32":

+ 	libplot_include_dirs = []

+ 	libplot_library_dirs = []

+ 	libplot_libraries = ["plot.dll"]

+ else:

+-	libplot_prefix = "/usr/local"

+-	libplot_include_dirs = [libplot_prefix+"/include"]

+-	libplot_library_dirs = [libplot_prefix+"/lib", "/usr/X11R6/lib"]

++	#libplot_prefix = "/u/mrnolta/local"

++	#libplot_include_dirs = [libplot_prefix+"/include", numpy_include_dirs]

++	#libplot_library_dirs = [libplot_prefix+"/lib64",libplot_prefix+"/lib",

++	#	"/usr/X11R6/lib64","/usr/X11R6/lib"]

++	libplot_include_dirs = [numpy_include_dirs]

++	libplot_library_dirs = ["/usr/X11R6/lib64","/usr/X11R6/lib"]

+ 	libplot_libraries = ["plot","Xaw","Xmu","Xt","SM","ICE","Xext","X11"]

+ 

+ # own install_data class to allow installation of data file

+@@ -83,7 +93,9 @@
+ 

+ 	ext_package	= "biggles",

+ 	ext_modules	= [

+-		Extension( "_biggles", ["src/_biggles.c"] ),

++		Extension( "_biggles",

++			["src/_biggles.c"],

++			include_dirs = _biggles_include_dirs ),

+ 

+ 		Extension( "libplot.libplot",

+ 			["src/libplot/libplot.c"],

+diff -ur python2-biggles-1.6.4/src/_biggles.c python2-biggles-1.6.4_numpy/src/_biggles.c
+--- python2-biggles-1.6.4/src/_biggles.c	2003-01-19 04:30:04.000000000 +0200
++++ python2-biggles-1.6.4_numpy/src/_biggles.c	2007-07-21 18:48:59.000000000 +0300
+@@ -22,12 +22,7 @@
+ 
+ #include <Python.h>
+ #include <math.h>
+-
+-#ifdef NO_NUMERIC_INCDIR
+-#include <arrayobject.h>
+-#else
+-#include <Numeric/arrayobject.h>
+-#endif
++#include <numpy/arrayobject.h>
+ 
+ #ifndef M_PI
+ #define M_PI 3.14159265358979323846
+diff -ur python2-biggles-1.6.4/src/biggles.py python2-biggles-1.6.4_numpy/src/biggles.py
+--- python2-biggles-1.6.4/src/biggles.py	2003-05-13 01:14:41.000000000 +0300
++++ python2-biggles-1.6.4_numpy/src/biggles.py	2007-07-21 18:48:59.000000000 +0300
+@@ -20,7 +20,7 @@
+ #
+ 
+ import copy, math, os, string
+-import Numeric
++import numpy
+ 
+ import config, _biggles
+ from geometry import *
+@@ -102,7 +102,7 @@
+ class _PlotGeometry:
+ 
+ 	_logfunc = math.log10
+-	_logfunc_vec = Numeric.log10
++	_logfunc_vec = numpy.log10
+ 
+ 	def __init__( self, src, dest, xlog=0, ylog=0 ):
+ 		self.src_bbox = src
+@@ -127,8 +127,8 @@
+ 		return self.aff( u, v )
+ 
+ 	def call_vec( self, x, y ):
+-		u = Numeric.asarray( x )
+-		v = Numeric.asarray( y )
++		u = numpy.asarray( x )
++		v = numpy.asarray( y )
+ 		if self.xlog: u = self._logfunc_vec(u)
+ 		if self.ylog: v = self._logfunc_vec(v)
+ 		return self.aff.call_vec( u, v )
+@@ -506,7 +506,7 @@
+ 		return apply( BoundingBox, self.extent )
+ 
+ 	def draw( self, context ):
+-		#from Numeric import rank
++		#from numpy import rank
+ 		#if rank(self.densgrid) == 3:
+ 		if len(self.densgrid.shape) == 3:
+ 			context.draw.color_density_plot( self.densgrid, self.extent )
+diff -ur python2-biggles-1.6.4/src/contour.py python2-biggles-1.6.4_numpy/src/contour.py
+--- python2-biggles-1.6.4/src/contour.py	2004-03-08 06:30:06.000000000 +0200
++++ python2-biggles-1.6.4_numpy/src/contour.py	2007-07-21 18:48:59.000000000 +0300
+@@ -25,10 +25,10 @@
+ from geometry import *
+ import _biggles
+ 
+-import Numeric
++import numpy
+ 
+ def _span( a, b, n ):
+-	return a + float(b - a)*Numeric.arange( 0, n, 1, Numeric.Float )/(n-1)
++	return a + float(b - a)*numpy.arange( 0, n, 1, numpy.Float )/(n-1)
+ 
+ def _pop2( x, i, j ):
+ 	if i < j:
+diff -ur python2-biggles-1.6.4/src/func.py python2-biggles-1.6.4_numpy/src/func.py
+--- python2-biggles-1.6.4/src/func.py	2002-01-25 00:07:10.000000000 +0200
++++ python2-biggles-1.6.4_numpy/src/func.py	2007-07-21 18:48:59.000000000 +0300
+@@ -52,8 +52,8 @@
+ 		x.append( column[num] )
+ 	x = map( atox, x )
+ 	if return_numpy:
+-		import Numeric
+-		return Numeric.array( x )
++		import numpy
++		return numpy.array( x )
+ 	return x
+ 
+ def read_rows( filename, atox=float, comment_char=None, return_numpy=None ):
+@@ -63,7 +63,7 @@
+ 	if return_numpy is None:
+ 		return_numpy = config.value('read_rows','return_numpy')
+ 	if return_numpy:
+-		import Numeric
++		import numpy
+ 	x = []
+ 	f = open( filename )
+ 	lines = map( string.strip, f.readlines() )
+@@ -74,7 +74,7 @@
+ 			continue
+ 		row = map( atox, string.split(line) )
+ 		if return_numpy:
+-			row = Numeric.array( row )
++			row = numpy.array( row )
+ 		x.append( row )
+ 	return x
+ 
+@@ -86,7 +86,7 @@
+ 	m = read_rows( filename, atox=atox, comment_char=comment_char, \
+ 		return_numpy=0 )
+ 	if return_numpy:
+-		import Numeric
+-		return Numeric.array( m )
++		import numpy
++		return numpy.array( m )
+ 	return m
+ 
+diff -ur python2-biggles-1.6.4/src/geometry.py python2-biggles-1.6.4_numpy/src/geometry.py
+--- python2-biggles-1.6.4/src/geometry.py	2003-05-13 01:13:11.000000000 +0300
++++ python2-biggles-1.6.4_numpy/src/geometry.py	2007-07-21 18:48:59.000000000 +0300
+@@ -19,7 +19,7 @@
+ # Boston, MA  02111-1307, USA.
+ #
+ 
+-import math, Numeric
++import math, numpy
+ 
+ # pt_* functions --------------------------------------------------------------
+ 
+@@ -213,8 +213,8 @@
+ 		return p, q
+ 
+ 	def call_vec( self, x, y ):
+-		x_ = Numeric.asarray( x )
+-		y_ = Numeric.asarray( y )
++		x_ = numpy.asarray( x )
++		y_ = numpy.asarray( y )
+ 		p = self.t[0] + self.m[0][0] * x_ + self.m[0][1] * y_
+ 		q = self.t[1] + self.m[1][0] * x_ + self.m[1][1] * y_
+ 		return p, q
+diff -ur python2-biggles-1.6.4/src/libplot/libplot.c python2-biggles-1.6.4_numpy/src/libplot/libplot.c
+--- python2-biggles-1.6.4/src/libplot/libplot.c	2003-05-12 23:57:55.000000000 +0300
++++ python2-biggles-1.6.4_numpy/src/libplot/libplot.c	2007-07-21 18:48:59.000000000 +0300
+@@ -24,11 +24,7 @@
+ #include <math.h>
+ #include <plot.h>
+ 
+-#ifdef NO_NUMERIC_INCDIR
+-#include <arrayobject.h>
+-#else
+-#include <Numeric/arrayobject.h>
+-#endif
++#include <numpy/arrayobject.h>
+ 
+ typedef int bool_t;
+ #define TRUE 1
+diff -ur python2-biggles-1.6.4/src/libplot/Makefile python2-biggles-1.6.4_numpy/src/libplot/Makefile
+--- python2-biggles-1.6.4/src/libplot/Makefile	2001-10-31 04:24:30.000000000 +0200
++++ python2-biggles-1.6.4_numpy/src/libplot/Makefile	2007-07-21 18:48:59.000000000 +0300
+@@ -21,7 +21,7 @@
+ 
+ include ../../make.inc
+ 
+-CPPFLAGS	= $(BASE_CPPFLAGS) $(NUMERIC_CPPFLAGS) $(LIBPLOT_CPPFLAGS)
++CPPFLAGS	= $(BASE_CPPFLAGS) $(NUMPY_CPPFLAGS) $(LIBPLOT_CPPFLAGS)
+ LDFLAGS		= $(BASE_LDFLAGS) $(LIBPLOT_LDFLAGS)
+ TARGETS		= libplot.so
+ 
+diff -ur python2-biggles-1.6.4/src/Makefile python2-biggles-1.6.4_numpy/src/Makefile
+--- python2-biggles-1.6.4/src/Makefile	2001-10-31 04:24:30.000000000 +0200
++++ python2-biggles-1.6.4_numpy/src/Makefile	2007-07-21 18:48:59.000000000 +0300
+@@ -21,7 +21,7 @@
+ 
+ include ../make.inc
+ 
+-CPPFLAGS	= $(BASE_CPPFLAGS) $(NUMERIC_CPPFLAGS)
++CPPFLAGS	= $(BASE_CPPFLAGS) $(NUMPY_CPPFLAGS)
+ LDFLAGS		= $(BASE_LDFLAGS)
+ TARGETS		= _biggles.so
+ 
+diff -ur python2-biggles-1.6.4/src/matlab.py python2-biggles-1.6.4_numpy/src/matlab.py
+--- python2-biggles-1.6.4/src/matlab.py	2001-11-16 06:19:21.000000000 +0200
++++ python2-biggles-1.6.4_numpy/src/matlab.py	2007-07-21 18:48:59.000000000 +0300
+@@ -41,7 +41,7 @@
+ 
+ import biggles
+ import math
+-import Numeric
++import numpy
+ import string
+ 
+ class _MatlabEmulation:
+@@ -228,8 +228,8 @@
+ 	if vmax is None:
+ 		vmax = float(max(v))
+ 	binwidth = (vmax - vmin) / float(nbins-1)
+-	x = Numeric.arrayrange( vmin, vmax+binwidth, binwidth )
+-	y = Numeric.zeros( x.shape, 'i' )
++	x = numpy.arrayrange( vmin, vmax+binwidth, binwidth )
++	y = numpy.zeros( x.shape, int )
+ 
+ 	for i in range(len(v)):
+ 		n = int(round((float(v[i]) - vmin) / binwidth, 0))
+@@ -238,8 +238,8 @@
+ 		except IndexError:
+ 			pass
+ 
+-	xx = Numeric.zeros( 2*len(x) + 3, 'f' )
+-	yy = Numeric.zeros( 2*len(y) + 3 )
++	xx = numpy.zeros( 2*len(x) + 3 )
++	yy = numpy.zeros( 2*len(y) + 3 )
+ 	xx[0] = x[0]
+ 	yy[0] = 0
+ 
diff --git a/dev-python/python-biggles/python-biggles-1.6.4-r1.ebuild b/dev-python/python-biggles/python-biggles-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..6c5aeebd11b8
--- /dev/null
+++ b/dev-python/python-biggles/python-biggles-1.6.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-biggles/python-biggles-1.6.4-r1.ebuild,v 1.1 2007/07/21 16:07:33 hawking Exp $
+
+inherit distutils eutils
+
+MY_P=${P/python/python2}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A Python module for creating publication-quality 2D scientific plots."
+SRC_URI="mirror://sourceforge/biggles/${MY_P}.tar.gz"
+HOMEPAGE="http://biggles.sourceforge.net/"
+
+DEPEND="~media-libs/plotutils-2.4.1
+	dev-python/numpy"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="GPL-2"
+
+PYTHON_MODNAME=biggles
+
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}/${P}-numpy.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	dodir /usr/share/doc/${PF}/examples
+	cp -r examples/* ${D}/usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	ewarn "This version uses numpy instead of the numeric module."
+	ewarn "If this causes any unforeseen problems please file a bug on"
+	ewarn "http://bugs.gentoo.org."
+}