Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/puzzles/PKGBUILD
	core/lvm2/PKGBUILD
	core/mdadm/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	testing/mesa/PKGBUILD

2 files changed, 37 insertions, 9 deletions

diff --git a/community/scilab/PKGBUILD b/community/scilab/PKGBUILD
index 5a02d49c4..ed76c2b92 100644
--- a/community/scilab/PKGBUILD
+++ b/community/scilab/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=scilab
 pkgver=5.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Scilab is a scientific software package for numerical computations.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.scilab.org/'
@@ -14,30 +14,32 @@ depends=('libxml2' 'pcre' 'lapack' 'java-batik' 'java-flexdock>=0.5.2'
   'ocaml' 'javahelp2' 'jgraphx=1_4_1_0' 'jlatexmath>=0.9.4' 
   'jlatexmath-fop>=0.9.4' 'junit' 'java-skinlf' 'xalan-java' 
   'java-commons-logging' 'hdf5')
-makedepends=('apache-ant' 'antlr2')
+makedepends=('apache-ant' 'antlr2' 'gcc-fortran' 'java-avalon-framework' 'xorg-fonts-type1')
 [[ $CARCH == x86_64 ]] && \
   source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \
   "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-x86_64-src.tar.gz" \
-  'scilab.desktop' 'classpath.xml')
+  'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch')
 
 [[ $CARCH == i686 ]] && \
   source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \
   "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-src.tar.gz" \
-  'scilab.desktop' 'classpath.xml')
+  'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch')
 
 [[ $CARCH == x86_64 ]] && md5sums=('0002653e670efabb8faf9e6403367134'
          '7c9bda373d8dfd75a4f8227a08ced588'
          'ad6286f324891fe8b86c60e4012a36b7'
-         'efe6e8d06968ba5e1a3e5ab540a79667')
+         'efe6e8d06968ba5e1a3e5ab540a79667'
+	 '7bf1a2149521db9e1c9a2ed684f9ce52')
 [[ $CARCH == i686 ]] && md5sums=('0002653e670efabb8faf9e6403367134'
-         '7545859e4078d3b77436b7f322967f26'
+	 '7545859e4078d3b77436b7f322967f26'
          'ad6286f324891fe8b86c60e4012a36b7'
-         'efe6e8d06968ba5e1a3e5ab540a79667')
+         'efe6e8d06968ba5e1a3e5ab540a79667'
+         '7bf1a2149521db9e1c9a2ed684f9ce52')
 
 options=('!libtool' '!emptydirs')
 
 build() {
-  # we do not want thigs we already have in Arch Linux
+  # we do not want things we already have in Arch Linux
   cd ${pkgname}-${pkgver}/thirdparty
   rm  avalon* batik* commons-* flexdock* gluegen-rt* jeuclid* jgraphx* \
     jhall* jlatexmath* jogl* jrosetta* junit* looks-2.1.1.jar xalan* \
@@ -47,6 +49,9 @@ build() {
   # begin configuring and building
   cd ..
 
+  # dirty hack to remove non-working hdf5 version check from configure
+  patch -Np0 -i ${srcdir}/configure-hdf5-vercheck.patch
+
   ./configure \
     --prefix=/usr \
     --enable-build-localization \
@@ -56,7 +61,6 @@ build() {
     --with-fftw \
     --with-hdf5 \
     --with-gfortran  # Needed for 64 bits, don't hurt for 32 bits
-
   make all doc
 }
 
diff --git a/community/scilab/configure-hdf5-vercheck.patch b/community/scilab/configure-hdf5-vercheck.patch
new file mode 100644
index 000000000..0f1d875f3
--- /dev/null
+++ b/community/scilab/configure-hdf5-vercheck.patch
@@ -0,0 +1,24 @@
+--- configure.bak	2011-07-10 11:28:35.833136771 +0200
++++ configure	2011-07-10 11:28:45.023136232 +0200
+@@ -19495,21 +19495,6 @@
+ // #line 19495 "configure"
+ import ncsa.hdf.hdf5lib.H5;
+ 
+-public class conftest {
+-    public static void main(String[] argv) {
+-        String minVersion="1.8.4";
+-                            int[] vers = new int[3];
+-                try { H5.H5get_libversion(vers); }
+-                catch (Throwable ex) {System.exit(-1);}
+-                String ver = vers[0] + "."+ vers[1] +"."+vers[2];
+-
+-                            System.out.println(ver);
+-                                  if (minVersion.compareTo(ver) > 0) {
+-                                   System.exit(-1);
+-                                }
+-
+-    }
+-}
+ EOF
+ 
+     CLASSPATH=$ac_java_classpath