sci-libs/gmsh: Version bump

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1349 32389bae-6d03-0410-99cf-db05cde120eb

6 files changed, 18 insertions, 36 deletions

diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog
index 446921126..60f889c99 100644
--- a/sci-libs/gmsh/ChangeLog
+++ b/sci-libs/gmsh/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Dec 2008; Oliver Borm (boroli) <oli.borm@web.de> -gmsh-2.2.5.ebuild,
+  -files/gmsh-2.2.5_hdf5.patch, -files/gmsh-2.2.5_metis.patch,
+  -files/gmsh-2.2.5.patch, +gmsh-2.2.6.ebuild, +files/gmsh-2.2.6_hdf5.patch,
+  +files/gmsh-2.2.6.patch:
+  Version bump
+
   26 Nov 2008; Oliver Borm (boroli) <oli.borm@web.de> gmsh-2.2.5.ebuild,
   +files/gmsh-2.2.5_metis.patch, metadata.xml:
   Fixed metis compilation problem and added chaco USE-flag
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index ebe350aab..153477166 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,7 +1,6 @@
-AUX gmsh-2.2.5.patch 869 RMD160 139993b6d8ece207594c10c97c2695304c20654d SHA1 b7c53df17629afdb0b18dc6d5c4e3a22bffd4e35 SHA256 6ac0f6f04436441d993c7a160000509f46582ddece759feb1208bf48ccd140c7
-AUX gmsh-2.2.5_hdf5.patch 781 RMD160 d6aa50726f6d429c92293b07020f32844863df77 SHA1 924b2752e02ecb0edba1da1b1e88ffd0b4733f93 SHA256 0db2947bb98129769b5a9c03c6beed1fcdf3713c69da63715f58b05435fb6062
-AUX gmsh-2.2.5_metis.patch 612 RMD160 92c439fae49884bffd8b6d655e6a52da241d3d23 SHA1 489f6129fbcf52e02004d179086a801656b915c3 SHA256 c78eff1d3c29c2c2f8356069a7ee82c05ebbbdd50704b1abf020eac39e753d3a
-DIST gmsh-2.2.5-source.tgz 2579409 RMD160 83ad36406aed4952abeb4ab6dd8153e1c98f0314 SHA1 ca1f4f7dba22b94fa3af1f632b500081487b5c72 SHA256 c989c06f4d89a74d8e3fdfd1bfec8d3394d798214c5b7b152cdbd0d78a0ed4b8
-EBUILD gmsh-2.2.5.ebuild 1727 RMD160 f7ea5a1fb318c141de96f1a583475248a0783ee1 SHA1 07feebdeb6f48e28d6a8574f8013f823de00987d SHA256 caed7674fe4ce9ac8a6d981119fdf8f0149371f1f886dc6980fcc50426bef84a
-MISC ChangeLog 818 RMD160 0d4f4a8ee160bc5342fb7f51ae245251394de806 SHA1 d3fbed6e119a3d50ab3388910a692a893c674c04 SHA256 a6212c0e205cc7120bf2a9c9ac89308a996a71bbb0ea26ce33cf58ccf1899473
+AUX gmsh-2.2.6.patch 869 RMD160 4da24aa2a77b7405b6c1c6add6944321b3fb9c0b SHA1 1a2c28c16bff3ef9e8774f883c4b11beaf3daffc SHA256 e9a7776255cc2f230cd71733588362714cb32a8932323f61cfa7e181f35b2c75
+AUX gmsh-2.2.6_hdf5.patch 781 RMD160 d8b28810db47d0b8c4f5f7ee024d540dfbdb5732 SHA1 445091379df09a3a21fa1ef3c3a290c88b1a1fda SHA256 19fca832ada4a1df9df6c94ea84a383fcd7fcdfa24df634b0715b75f4a9b640b
+DIST gmsh-2.2.6-source.tgz 2735677 RMD160 36b3faec5ca04f023a2720bb670e7fb7ce2b55ac SHA1 646a31f8f116ff1fedf5104c1017c6cc3c93412a SHA256 4ddfdf29756efa5b9afae6bc4f97a8d13b6bc1d88893ee05fafbbdfdd09d574a
+EBUILD gmsh-2.2.6.ebuild 1688 RMD160 acc4c50bdb0ef91f2c20404e08b2f07fd1b14b40 SHA1 a52f8eb8e08cc87b7b6990e5c63cece9440831f0 SHA256 512f6b2e77b28c5950dc51ce9a5c1b8469e16ff1cb1f22d50f28df67f148f144
+MISC ChangeLog 1075 RMD160 9ef105bf1fc44a0b89b79c614d168e9f99a930f4 SHA1 01642c4948006cd6dc5b8b0e951bf346cbf8a3e4 SHA256 282414488bc1069f66751143f20e70a247f330c02182db5b2adc69a89f5fdb39
 MISC metadata.xml 403 RMD160 c8fc206be45f492f061108b13ab9bff39bc7e211 SHA1 b3bebdfedf1ff8a5df983ec3251c19e35f27a494 SHA256 7e5b17806c50e1c1a26369be3c949cdd32360528c1844ad0a0fc6fae318f6798
diff --git a/sci-libs/gmsh/files/gmsh-2.2.5_metis.patch b/sci-libs/gmsh/files/gmsh-2.2.5_metis.patch
deleted file mode 100644
index 3bf6c408f..000000000
--- a/sci-libs/gmsh/files/gmsh-2.2.5_metis.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gmsh-2.2.5.orig/Mesh/Partition.cpp  2008-11-26 18:07:27.000000000 +0100
-+++ gmsh-2.2.5/Mesh/Partition.cpp       2008-11-26 18:08:04.000000000 +0100
-@@ -146,8 +146,8 @@
-   int ier = 0;
-
-   switch(options.partitioner){
--  case 1:  // Chacho
- #ifdef HAVE_CHACO
-+  case 1:  // Chacho
-     {
-       Msg::Info("Launching Chaco graph partitioner");
-       // Some setup (similar to that of Chaco/input/input.c)
-@@ -196,8 +196,8 @@
-     }
-     break;
- #endif
--  case 2:  // Metis
- #ifdef HAVE_METIS
-+  case 2:  // Metis
-     {
-       Msg::Info("Launching METIS graph partitioner");
-       // "C" numbering for Metis
diff --git a/sci-libs/gmsh/files/gmsh-2.2.5.patch b/sci-libs/gmsh/files/gmsh-2.2.6.patch
index 973783343..4b4a1437d 100644
--- a/sci-libs/gmsh/files/gmsh-2.2.5.patch
+++ b/sci-libs/gmsh/files/gmsh-2.2.6.patch
@@ -1,15 +1,15 @@
---- gmsh-2.2.5/configure.orig	2008-07-07 15:13:33.000000000 +0200
-+++ gmsh-2.2.5/configure	2008-07-22 17:36:11.000000000 +0200
-@@ -3668,7 +3668,7 @@
+--- gmsh-2.2.6/configure.orig	2008-07-07 15:13:33.000000000 +0200
++++ gmsh-2.2.6/configure	2008-07-22 17:36:11.000000000 +0200
+@@ -3688,7 +3688,7 @@
  
    GMSH_DIRS="Common Geo Mesh Post Plugin Numeric Parser Graphics Fltk"
-   GMSH_LIBS="-Llib -lGmshFltk -lGmshCommon -lGmshGeo -lGmshMesh -lGmshPost -lGmshPlugin"
+   GMSH_LIBS="-Llib -lGmshFltk -lGmshCommon -lGmshMesh -lGmshGeo -lGmshPost -lGmshPlugin"
 -  GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshGraphics -lGmshParser -lGmshNumeric"
 +  GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshGraphics -lGmshParser -lGmshNumeric ${LDFLAGS}"
    FLAGS="-DHAVE_FLTK ${FLAGS}"
  
    if test "x${FLTK_PREFIX}" != "x" ; then
-@@ -5094,7 +5094,7 @@
+@@ -5046,7 +5046,7 @@
        FLAGS="${FLAGS} -DHAVE_OCC"
      else
        GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
diff --git a/sci-libs/gmsh/files/gmsh-2.2.5_hdf5.patch b/sci-libs/gmsh/files/gmsh-2.2.6_hdf5.patch
index 9e0bf05df..37bf8f0ef 100644
--- a/sci-libs/gmsh/files/gmsh-2.2.5_hdf5.patch
+++ b/sci-libs/gmsh/files/gmsh-2.2.6_hdf5.patch
@@ -1,5 +1,5 @@
---- gmsh-2.2.5/configure.orig	2008-07-07 15:13:33.000000000 +0200
-+++ gmsh-2.2.5/configure	2008-07-22 17:36:11.000000000 +0200
+--- gmsh-2.2.6/configure.orig	2008-07-07 15:13:33.000000000 +0200
++++ gmsh-2.2.6/configure	2008-07-22 17:36:11.000000000 +0200
 @@ -4943,7 +4943,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
diff --git a/sci-libs/gmsh/gmsh-2.2.5.ebuild b/sci-libs/gmsh/gmsh-2.2.6.ebuild
index 0e312fd1f..6d61142ae 100644
--- a/sci-libs/gmsh/gmsh-2.2.5.ebuild
+++ b/sci-libs/gmsh/gmsh-2.2.6.ebuild
@@ -29,7 +29,6 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}.patch
 
-	epatch "${FILESDIR}"/${P}_metis.patch
 	if use cgns && built_with_use sci-libs/cgnslib hdf5; then
 		epatch "${FILESDIR}"/${P}_hdf5.patch
 	fi