Fixed mis-detection of configure in certain locales (fixes bug#173274).

Package-Manager: portage-2.1.2.3

5 files changed, 145 insertions, 15 deletions

diff --git a/sci-mathematics/octave-forge/ChangeLog b/sci-mathematics/octave-forge/ChangeLog
index e3537e90e0c4..d113938b3d89 100644
--- a/sci-mathematics/octave-forge/ChangeLog
+++ b/sci-mathematics/octave-forge/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/octave-forge
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.21 2007/02/22 01:32:29 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/ChangeLog,v 1.22 2007/04/13 13:51:01 markusle Exp $
+
+*octave-forge-2006.03.17-r1 (13 Apr 2007)
+
+  13 Apr 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/octave-forge-config-fix.patch, +octave-forge-2006.03.17-r1.ebuild:
+  Fixed mis-detection of configure in certain locales 
+  (fixes bug#173274). 
+  Thanks much to MaratIK <marat.buharov@gmail.com> for his patches.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-mathematics/octave-forge/Manifest b/sci-mathematics/octave-forge/Manifest
index 5062e9037eb2..0bca9a2c33df 100644
--- a/sci-mathematics/octave-forge/Manifest
+++ b/sci-mathematics/octave-forge/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX octave-forge-config-fix.patch 3095 RMD160 9233a607627187ed77b353b357fd441d6e14e178 SHA1 d70bd9903b5dcff4ea197e65f497637d1afac9d7 SHA256 36cd0555fa07798594168126e1f76e28a4747adfb98706bfeb64c3b273e03489
+MD5 6627e3ca980e05ec15d997a406ea6bc0 files/octave-forge-config-fix.patch 3095
+RMD160 9233a607627187ed77b353b357fd441d6e14e178 files/octave-forge-config-fix.patch 3095
+SHA256 36cd0555fa07798594168126e1f76e28a4747adfb98706bfeb64c3b273e03489 files/octave-forge-config-fix.patch 3095
 AUX octave-forge-mex.patch 1580 RMD160 013aac012cbe9d556ef50044b3a4c814e917ea55 SHA1 55894611900ce0552f3ce564be819a33fb816582 SHA256 64a013c222944ffd498c60175e330f141d4609975ff2796823b2850557f85807
 MD5 64ae87b1b1190c6a51f7dfd91be73d05 files/octave-forge-mex.patch 1580
 RMD160 013aac012cbe9d556ef50044b3a4c814e917ea55 files/octave-forge-mex.patch 1580
@@ -33,14 +34,18 @@ EBUILD octave-forge-2006.01.28.ebuild 1825 RMD160 91e69e73e2e6c06c090f697c747b7b
 MD5 bbfcb3622afb0311d364bcba47031b68 octave-forge-2006.01.28.ebuild 1825
 RMD160 91e69e73e2e6c06c090f697c747b7bcd2c89b98e octave-forge-2006.01.28.ebuild 1825
 SHA256 4b0539469c26a7fca2b2d09590600cebcad471b3f4b238c4b27b3700f4edc0fc octave-forge-2006.01.28.ebuild 1825
+EBUILD octave-forge-2006.03.17-r1.ebuild 1684 RMD160 3dcc7db79a81dea83b10ae66bc3511cfe7fa573e SHA1 1c0cd9c3a4f787980d0736bc7ceb0c740427c566 SHA256 0d28bfc9ed48dd886680fa369248bf451a6f6eb4ad7b36737e9e07e39b378c54
+MD5 746141011868e89c6de6656f2964a49d octave-forge-2006.03.17-r1.ebuild 1684
+RMD160 3dcc7db79a81dea83b10ae66bc3511cfe7fa573e octave-forge-2006.03.17-r1.ebuild 1684
+SHA256 0d28bfc9ed48dd886680fa369248bf451a6f6eb4ad7b36737e9e07e39b378c54 octave-forge-2006.03.17-r1.ebuild 1684
 EBUILD octave-forge-2006.03.17.ebuild 1561 RMD160 7bc375e8bc724d5ea0e0f1a5b4fa91d1d111f1e1 SHA1 bbae8135fc9650b8f95c3959873016df81eb5d3f SHA256 409ca968f380974aeb897a8d1543d7523c59437942f9d2a4da24a1d3da072293
 MD5 14ebc88603ff3b4009f8351d94de12d2 octave-forge-2006.03.17.ebuild 1561
 RMD160 7bc375e8bc724d5ea0e0f1a5b4fa91d1d111f1e1 octave-forge-2006.03.17.ebuild 1561
 SHA256 409ca968f380974aeb897a8d1543d7523c59437942f9d2a4da24a1d3da072293 octave-forge-2006.03.17.ebuild 1561
-MISC ChangeLog 5996 RMD160 2715643cd4b74d84ceffed40bc18888f047f4fda SHA1 994959a33bd10b6bb49850c084d8ec20d4b2a342 SHA256 f5b90fbea47cb1df3f85e183cf42819e72ed0d5638a594348806461ae4b0730e
-MD5 3bca4743b9d8acf66d7b654772767b6e ChangeLog 5996
-RMD160 2715643cd4b74d84ceffed40bc18888f047f4fda ChangeLog 5996
-SHA256 f5b90fbea47cb1df3f85e183cf42819e72ed0d5638a594348806461ae4b0730e ChangeLog 5996
+MISC ChangeLog 6318 RMD160 afada5acd134d3f67602a215a66df4cf476ecc78 SHA1 c2a66fa2d74ddf285117dea61d19afe64062a6be SHA256 8fe025669dc444664b776a64b6c9c4ad35d82aa39d37818523908dc783a4524c
+MD5 7351936b90ab86742f48c328161b495c ChangeLog 6318
+RMD160 afada5acd134d3f67602a215a66df4cf476ecc78 ChangeLog 6318
+SHA256 8fe025669dc444664b776a64b6c9c4ad35d82aa39d37818523908dc783a4524c ChangeLog 6318
 MISC metadata.xml 304 RMD160 9bf8d3764f2f605704497eb920cf7d496ac77fa1 SHA1 f6b8d455b85f4b18b68d152c3e8179b7d6defe60 SHA256 7de312597cc9f943d78b63b27600b43a55cedc90557552f88dc0d73462c2921a
 MD5 235d4f760824f15143cfe730fc1710a8 metadata.xml 304
 RMD160 9bf8d3764f2f605704497eb920cf7d496ac77fa1 metadata.xml 304
@@ -63,10 +68,6 @@ SHA256 69281fa82e9e6bc6479068eeccee77d9250f746c5f852587d513b11e986deae1 files/di
 MD5 f10dedf1dec0174f8bb74fadb5d2c3dd files/digest-octave-forge-2006.03.17 274
 RMD160 69871a12c0dbe26c4feb4587acfea097545550a3 files/digest-octave-forge-2006.03.17 274
 SHA256 f240e4fc958b011936ec4850bce33852fb6a0f95e387ee84c27462abcf11af4a files/digest-octave-forge-2006.03.17 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3PJAz974XjDVpbkRAtStAJ9zq4GjDHV8DQSSZxq8niuJLGqP1ACg18A6
-efCSZ89aZFMVmdOsw/cqEqA=
-=OT5Z
------END PGP SIGNATURE-----
+MD5 f10dedf1dec0174f8bb74fadb5d2c3dd files/digest-octave-forge-2006.03.17-r1 274
+RMD160 69871a12c0dbe26c4feb4587acfea097545550a3 files/digest-octave-forge-2006.03.17-r1 274
+SHA256 f240e4fc958b011936ec4850bce33852fb6a0f95e387ee84c27462abcf11af4a files/digest-octave-forge-2006.03.17-r1 274
diff --git a/sci-mathematics/octave-forge/files/digest-octave-forge-2006.03.17-r1 b/sci-mathematics/octave-forge/files/digest-octave-forge-2006.03.17-r1
new file mode 100644
index 000000000000..21c52383f52e
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/digest-octave-forge-2006.03.17-r1
@@ -0,0 +1,3 @@
+MD5 d054fa8de6d2494c3efbddaa823da42f octave-forge-2006.03.17.tar.gz 3727272
+RMD160 0875f4ea9c7d4f3b9b0834decdbf590fe5166fa6 octave-forge-2006.03.17.tar.gz 3727272
+SHA256 65c066677556239d0567e5fcfdc55da40be81b2745b0aa852229bc4ebf23cc0f octave-forge-2006.03.17.tar.gz 3727272
diff --git a/sci-mathematics/octave-forge/files/octave-forge-config-fix.patch b/sci-mathematics/octave-forge/files/octave-forge-config-fix.patch
new file mode 100644
index 000000000000..a415b83caebd
--- /dev/null
+++ b/sci-mathematics/octave-forge/files/octave-forge-config-fix.patch
@@ -0,0 +1,60 @@
+diff -Naur octave-forge-2006.03.17/configure octave-forge-2006.03.17.new/configure
+--- octave-forge-2006.03.17/configure	2006-03-17 00:26:16.000000000 -0500
++++ octave-forge-2006.03.17.new/configure	2007-04-13 08:47:33.000000000 -0400
+@@ -4493,7 +4493,7 @@
+ 
+ echo "$as_me:$LINENO: checking for autoload in Octave" >&5
+ echo $ECHO_N "checking for autoload in Octave... $ECHO_C" >&6
+-if test `echo 'disp(exist("autoload"))' | $OCTAVE -qf`X != 0X ; then
++if test `echo 'disp(exist("autoload"))' | $OCTAVE -qf`X != `echo 'disp(0)' | $OCTAVE -qf`X ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+@@ -4517,7 +4517,7 @@
+ 
+ echo "$as_me:$LINENO: checking for do_fortran_indexing in Octave" >&5
+ echo $ECHO_N "checking for do_fortran_indexing in Octave... $ECHO_C" >&6
+-if test `echo 'disp(exist("do_fortran_indexing"))' | $OCTAVE -qf`X != 0X ; then
++if test `echo 'disp(exist("do_fortran_indexing"))' | $OCTAVE -qf`X != `echo 'disp(0)' | $OCTAVE -qf`X ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+    HAVE_DO_FORTRAN_INDEXING="-DHAVE_DO_FORTRAN_INDEXING"
+@@ -4531,7 +4531,7 @@
+ 
+ echo "$as_me:$LINENO: checking for propagate_empty_matrices in Octave" >&5
+ echo $ECHO_N "checking for propagate_empty_matrices in Octave... $ECHO_C" >&6
+-if test `echo 'disp(exist("propagate_empty_matrices"))' | $OCTAVE -qf`X != 0X ; then
++if test `echo 'disp(exist("propagate_empty_matrices"))' | $OCTAVE -qf`X != `echo 'disp(0)' | $OCTAVE -qf`X ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+    PROPAGATE_EMPTY_MATRICES="-DHAVE_PROPAGATE_EMPTY_MATRICES"
+@@ -4545,7 +4545,7 @@
+ 
+ echo "$as_me:$LINENO: checking for ok_to_lose_imaginary_part in Octave" >&5
+ echo $ECHO_N "checking for ok_to_lose_imaginary_part in Octave... $ECHO_C" >&6
+-if test `echo 'disp(exist("ok_to_lose_imaginary_part"))' | $OCTAVE -qf`X != 0X ; then
++if test `echo 'disp(exist("ok_to_lose_imaginary_part"))' | $OCTAVE -qf`X != `echo 'disp(0)' | $OCTAVE -qf`X ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+    HAVE_OK_TO_LOSE_IMAGINARY_PART="-DHAVE_OK_TO_LOSE_IMAGINARY_PART"
+@@ -4582,7 +4582,7 @@
+ 
+ echo "$as_me:$LINENO: checking for class in Octave" >&5
+ echo $ECHO_N "checking for class in Octave... $ECHO_C" >&6
+-if test `echo 'disp(exist("class"))' | $OCTAVE -qf`X != 0X ; then
++if test `echo 'disp(exist("class"))' | $OCTAVE -qf`X != `echo 'disp(0)' | $OCTAVE -qf`X ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+    TYPEID_HAS_CLASS="-DTYPEID_HAS_CLASS"
+diff -Naur octave-forge-2006.03.17/configure.base octave-forge-2006.03.17.new/configure.base
+--- octave-forge-2006.03.17/configure.base	2006-01-07 00:11:56.000000000 -0500
++++ octave-forge-2006.03.17.new/configure.base	2007-04-13 08:47:33.000000000 -0400
+@@ -276,7 +276,7 @@
+ dnl
+ AC_DEFUN(OCTAVE_CHECK_EXIST,
+ [AC_MSG_CHECKING([for $1 in Octave])
+-if test `echo 'disp(exist("$1"))' | $OCTAVE -qf`X != 0X ; then
++if test `echo 'disp(exist("$1"))' | $OCTAVE -qf`X != `echo 'disp(0)' | $OCTAVE -qf`X ; then
+    AC_MSG_RESULT(yes)
+    $2
+ else
diff --git a/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild b/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
new file mode 100644
index 000000000000..e017df9c74ed
--- /dev/null
+++ b/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave-forge/octave-forge-2006.03.17-r1.ebuild,v 1.1 2007/04/13 13:51:01 markusle Exp $
+
+inherit eutils
+
+DESCRIPTION="A collection of custom scripts, functions and extensions for GNU Octave"
+HOMEPAGE="http://octave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/octave/${P}.tar.gz"
+
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="ginac qhull X"
+
+DEPEND=">=sci-mathematics/octave-2.1.72
+		sci-libs/netcdf
+		media-libs/jpeg
+		media-libs/libpng
+		sci-libs/gsl
+		dev-libs/libpcre
+		sys-libs/readline
+		sys-apps/texinfo
+		sys-libs/libtermcap-compat
+		virtual/lapack
+		virtual/blas
+		sci-calculators/units
+		X? ( || ( x11-libs/libX11 virtual/x11 ) )
+		!amd64? ( ginac? ( sci-mathematics/ginac ) )
+		qhull? ( >=media-libs/qhull-3.1-r1 )"
+
+src_unpack() {
+	cd "${S}"
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-config-fix.patch
+}
+
+
+src_compile() {
+	econf $(use_with X x) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS COPYING* ChangeLog RELEASE-NOTES TODO
+}
+
+pkg_postinst() {
+	einfo "If you do not have GiNaC and Qhull installed, octave-forge did not"
+	einfo "compile itself with support for the geometry and symbolic math"
+	einfo "extensions. If you would like these features, please emerge ginac"
+	einfo "and/or qhull and then re-emerge octave-forge. Alternately, you can"
+	einfo "specify USE='ginac qhull' and re-emerge octave-forge; in that case"
+	einfo "the ebuild will automatically install the additional packages."
+}
+