changelog :p

4 files changed, 131 insertions, 6 deletions

diff --git a/app-sci/kmatplot/ChangeLog b/app-sci/kmatplot/ChangeLog
index 716d3f88e050..e2793207ff8b 100644
--- a/app-sci/kmatplot/ChangeLog
+++ b/app-sci/kmatplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/kmatplot
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/kmatplot/ChangeLog,v 1.9 2003/09/27 18:01:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/kmatplot/ChangeLog,v 1.10 2003/09/27 19:10:53 lanius Exp $
+
+  27 Sep 2003; Heinrich Wendel <lanius@gentoo.org> kmatplot-0.4-r2.ebuild,
+  files/kmatplot-0.4-octave.patch:
+  added patch for octave 2.1 from debian
 
   27 Sep 2003; Heinrich Wendel <lanius@gentoo.org> kmatplot-0.4-r2.ebuild:
   changed octave dep to any version, 2.0 does only compile with gcc2.x
diff --git a/app-sci/kmatplot/Manifest b/app-sci/kmatplot/Manifest
index e19a877f229b..5d39daa89e46 100644
--- a/app-sci/kmatplot/Manifest
+++ b/app-sci/kmatplot/Manifest
@@ -1,8 +1,8 @@
-MD5 da5ef5fffba7adbd1291663043fbab09 ChangeLog 1278
+MD5 336577d4ebd07ad3fa57bac516b76df7 ChangeLog 1431
 MD5 42797b6ce8f30461a03302de032789fe kmatplot-0.4-r1.ebuild 623
 MD5 d3ea0071482017f48d60c6be417ff853 kmatplot-0.4.ebuild 585
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 2d8855ae0b1d97a599c95667531ebefc kmatplot-0.4-r2.ebuild 661
+MD5 6c257db006270bed1cc199459eb4a520 kmatplot-0.4-r2.ebuild 697
 MD5 cd4f07358148cf90bf6fa35989e737f4 files/digest-kmatplot-0.4 64
 MD5 cd4f07358148cf90bf6fa35989e737f4 files/digest-kmatplot-0.4-r1 64
 MD5 574bb4c70503b9caaad9cfd4c8495a78 files/kmatplot-0.4-gentoo.patch 9650
@@ -10,3 +10,4 @@ MD5 375f4e27883476a021c3aabef1c2dbfd files/kmatplot-0.4-gentoo2.patch 965
 MD5 b2dd1ec732fb8452052b4b7f0b05f01b files/kmatplot-0.4-inline.patch 1037
 MD5 65e9ee5ac2b4919fa378b2d460d96ac3 files/kmatplot-0.4-kmatplotrc.patch 583
 MD5 cd4f07358148cf90bf6fa35989e737f4 files/digest-kmatplot-0.4-r2 64
+MD5 632ac5e27beb8c6a845987a8f22f038f files/kmatplot-0.4-octave.patch 3411
diff --git a/app-sci/kmatplot/files/kmatplot-0.4-octave.patch b/app-sci/kmatplot/files/kmatplot-0.4-octave.patch
new file mode 100644
index 000000000000..b833a39614ab
--- /dev/null
+++ b/app-sci/kmatplot/files/kmatplot-0.4-octave.patch
@@ -0,0 +1,119 @@
+--- kmatplot/octave/kadd.cpp
++++ kmatplot/octave/kadd.cpp
+@@ -46,6 +46,6 @@
+  	dataset_number = plot_add_dataset( socket_fd, axesNumber(), (PlotType )type );
+  	plot_disconnect( socket_fd );
+      }
+- return octave_value_list( (double )dataset_number );
++ return octave_value_list(1, octave_value((double )dataset_number) );
+ }
+ 
+--- kmatplot/octave/kplot.cpp
++++ kmatplot/octave/kplot.cpp
+@@ -48,7 +48,7 @@
+ " See also: ksetapp, ksetaxes, kadd, kremove, kremoveall, kaddaxes, kremoveaxes, kimage, kcontour, kmesh, ksetmatrix"
+ )
+ {
+-  octave_value_list result(-1.0);
++  octave_value_list result(1, octave_value(-1.0));
+   int nargin = args.length();
+ 
+   int socket_fd = plot_connect( appNumber(), NULL, NULL );
+@@ -113,7 +113,7 @@
+    // Disconnect
+    //		
+    plot_disconnect( socket_fd );
+-   return octave_value_list( (double )dataset_number );			
++   return octave_value_list( 1, octave_value((double )dataset_number) );			
+  }
+ 
+ 
+--- kmatplot/octave/ksetaxes.cpp
++++ kmatplot/octave/ksetaxes.cpp
+@@ -34,6 +34,6 @@
+      setAxes( new_plot_num );
+      }
+ 
+-  return octave_value_list( (double )plot_num );
++  return octave_value_list(1, octave_value((double )plot_num) );
+ }
+ 
+--- kmatplot/octave/kmesh.cpp
++++ kmatplot/octave/kmesh.cpp
+@@ -26,7 +26,7 @@
+ "\n"
+ "See also: ksetapp, ksetaxes, kadd, kremove, kremoveall, kaddaxes, kremoveaxes, kplot, kimage, kcontour, ksetmatrix" )
+ {
+-  octave_value_list result(-1.0);
++  octave_value_list result(1, octave_value(-1.0));
+ 
+   int nargin = args.length();
+   if ( nargin != 1 && nargin != 3  ) {
+@@ -105,7 +105,7 @@
+     }
+ 
+   plot_disconnect( socket_fd );
+-  return octave_value_list( (double )dataset_number );
++  return octave_value_list(1, octave_value((double )dataset_number) );
+ }
+ 
+ 
+--- kmatplot/octave/kimage.cpp
++++ kmatplot/octave/kimage.cpp
+@@ -28,7 +28,7 @@
+ "\n"
+ "See also: kadd, kremove, kremoveall, kaddaxes, kremoveaxes, ksetapp, ksetaxes, kplot, kcontour, kmesh, ksetmatrix" )
+ {
+-  octave_value_list result(-1.0);
++  octave_value_list result(1, octave_value(-1.0));
+   int nargin = args.length ();
+ 
+   if ( nargin != 1 &&
+@@ -132,7 +132,7 @@
+    }
+ 
+   plot_disconnect( socket_fd );
+-  return octave_value_list( (double )dataset_number );
++  return octave_value_list(1, octave_value((double )dataset_number) );
+ }
+ 
+ 
+--- kmatplot/octave/kaddaxes.cpp
++++ kmatplot/octave/kaddaxes.cpp
+@@ -45,6 +45,6 @@
+  	if ( axes_number > 0 ) setAxes( axes_number );
+  	plot_disconnect( socket_fd );
+      }
+- return octave_value_list( (double )axes_number );
++ return octave_value_list(1, octave_value((double )axes_number) );
+ }
+ 
+--- kmatplot/octave/ksetapp.cpp
++++ kmatplot/octave/ksetapp.cpp
+@@ -44,6 +44,6 @@
+ 		 setenv( ENV_APP_NUMBER, buff, 1 );
+ 		}
+ 
+-  return octave_value_list( (double )app_num );
++  return octave_value_list(1, octave_value((double )app_num) );
+ }
+ 
+--- kmatplot/octave/kcontour.cpp
++++ kmatplot/octave/kcontour.cpp
+@@ -26,7 +26,7 @@
+ "\n"
+ "See also: ksetapp, ksetaxes, kadd, kremove, kremoveall, kaddaxes, kremoveaxes, kplot, kimage, kmesh, ksetmatrix" )
+ {
+-  octave_value_list result( -1.0 );
++  octave_value_list result(1, octave_value( -1.0) );
+ 
+   int nargin = args.length();
+   if ( nargin != 1 && nargin != 3  ) {
+@@ -94,6 +94,6 @@
+     }
+ 
+   plot_disconnect( socket_fd );
+-  return octave_value_list( (double )dataset_number );
++  return octave_value_list(1, octave_value((double )dataset_number) );
+ }
+ 
diff --git a/app-sci/kmatplot/kmatplot-0.4-r2.ebuild b/app-sci/kmatplot/kmatplot-0.4-r2.ebuild
index 5ecb760efedb..e71a6164edee 100644
--- a/app-sci/kmatplot/kmatplot-0.4-r2.ebuild
+++ b/app-sci/kmatplot/kmatplot-0.4-r2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/kmatplot/kmatplot-0.4-r2.ebuild,v 1.2 2003/09/27 18:01:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/kmatplot/kmatplot-0.4-r2.ebuild,v 1.3 2003/09/27 19:10:53 lanius Exp $
 
 PATCHES="${FILESDIR}/${P}-gentoo.patch
 	${FILESDIR}/${P}-inline.patch
 	${FILESDIR}/${P}-gentoo2.patch
-	${FILESDIR}/${P}-kmatplotrc.patch"
+	${FILESDIR}/${P}-kmatplotrc.patch
+	${FILESDIR}/${P}-octave.patch"
 
 inherit kde
 need-kde 3
@@ -17,5 +18,5 @@ SRC_URI="http://kmatplot.sourceforge.net/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
-DEPEND="app-sci/octave*
+DEPEND=">=app-sci/octave-2.1
 	>=app-sci/scilab-2.6"