sci-libs/gmsh: Version bump; del hdf5 patch; dep fixes; EAPI=2

5 files changed, 22 insertions, 40 deletions

diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog
index 32846e499..6a1c78f5b 100644
--- a/sci-libs/gmsh/ChangeLog
+++ b/sci-libs/gmsh/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jul 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog:
+  Version bump and dep. fixes (thanks to  Etienne Lorriaux); Changed to EAPI=2
+
   23 Feb 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog:
   Version bump.
 
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index a4d585f76..e2f6a1f4d 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,6 +1,5 @@
-AUX gmsh-2.3.0.patch 838 RMD160 b93d8dc8914b233350399c75e4aed0da2a299f50 SHA1 96ed76f2e6f52050581f046e074e66c584607af5 SHA256 21525b8d126b6086484463868e6e9db7067d1f3a690ebe22e0ff86a8945286bf
-AUX gmsh-2.3.0_hdf5.patch 710 RMD160 935017ec6608f58afe76e47818094f66612b1c0b SHA1 5558b8ead2e24846300e1c8f6f097dc97b52534e SHA256 bd9e64c01a312965dbf565b73284fc23c116f88bc4a7a2920d26cfde857833db
-DIST gmsh-2.3.0-source.tgz 2793685 RMD160 7f59f7283969a9c0e18363ac633e5c770c5a2e1c SHA1 86386c0872cd7de74dddfad7313725468dae1131 SHA256 6a3fa13b719b173af45997ff51e95c2ed8d2a375225319f82e108f74beaa1f27
-EBUILD gmsh-2.3.0.ebuild 1696 RMD160 de5848d3e9c4b9309968e8de5ae0335f19ee054e SHA1 f30f235bb2e5eea83487b988b7ab5082834e5ff0 SHA256 a3e1c7bddc32d5a67f1875dfc45589c4f0d0c5796fbf21dab5606d61f99ea1f6
-MISC ChangeLog 1157 RMD160 fa16845c8b4ca0d6c07d9e12b09d497df23e1f6e SHA1 10d9b9a459b1974a6c058e8a97371f7244d32969 SHA256 f724b5b4c6e2b37b661a75631601f8fae286a29855e32c36b09ad0e3c02b4cf3
+AUX gmsh-2.3.1.patch 838 RMD160 0ecb52c18839e7628e377d46d1031c095257b2cc SHA1 0b503087c46debc0ba9d5f45b3fb407f06f8afc7 SHA256 73dcb184e961034b6a4ca5e53096f7eaaa5d9dd09e7976c7ecc9f6ecd0a5b3e9
+DIST gmsh-2.3.1-source.tgz 2809970 RMD160 354e8042325edabf14b7f1d5c71393394b8eba2d SHA1 022768498c38c8c6911c4d2c0fb0de1f8f670edb SHA256 895d85082f3688bfa35225a13ed7f52b1fcf3526039fd3456ddff7be1738e9e8
+EBUILD gmsh-2.3.1.ebuild 1785 RMD160 50737012365e3b8805f8dddcfda765185b2b2521 SHA1 3840b2e245cc37b15d5bfe1a79e9dda4130ccfad SHA256 223ef502ba7e4b3d2028a12d5fa85299728b394258b1404b792edb452630c8c5
+MISC ChangeLog 1302 RMD160 1fccadc7b7bbfb250d44a2888cd3dbcb7e7ec782 SHA1 8f0dd8a2e848107dfaa382450faf554a4978525a SHA256 b79760c2e8670333e1f797f0144c6c28d1ea5906a21e876ecb2dfb6e14e95731
 MISC metadata.xml 403 RMD160 c8fc206be45f492f061108b13ab9bff39bc7e211 SHA1 b3bebdfedf1ff8a5df983ec3251c19e35f27a494 SHA256 7e5b17806c50e1c1a26369be3c949cdd32360528c1844ad0a0fc6fae318f6798
diff --git a/sci-libs/gmsh/files/gmsh-2.3.0_hdf5.patch b/sci-libs/gmsh/files/gmsh-2.3.0_hdf5.patch
deleted file mode 100644
index 9e104efe8..000000000
--- a/sci-libs/gmsh/files/gmsh-2.3.0_hdf5.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- gmsh-2.3.0/configure.orig	2009-02-22 15:11:19.000000000 +0100
-+++ gmsh-2.3.0/configure	2009-02-22 15:11:55.000000000 +0100
-@@ -5012,7 +5012,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcgns  $LIBS"
-+LIBS="-lcgns -lhdf5 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5072,9 +5072,9 @@
- 
-     BO="${BO} Cgns"
-     if test "x${CGNS_PREFIX}" = "x"; then
--      GMSH_LIBS="${GMSH_LIBS} -lcgns"
-+      GMSH_LIBS="${GMSH_LIBS} -lcgns -lhdf5"
-     else
--      GMSH_LIBS="${GMSH_LIBS} -L${CGNS_PREFIX}/lib -lcgns"
-+      GMSH_LIBS="${GMSH_LIBS} -L${CGNS_PREFIX}/lib -lcgns -lhdf5 "
-       FLAGS="${FLAGS} -I${CGNS_PREFIX}/include"
-     fi
-   fi
diff --git a/sci-libs/gmsh/files/gmsh-2.3.0.patch b/sci-libs/gmsh/files/gmsh-2.3.1.patch
index 148c101bf..1f626ae8b 100644
--- a/sci-libs/gmsh/files/gmsh-2.3.0.patch
+++ b/sci-libs/gmsh/files/gmsh-2.3.1.patch
@@ -1,5 +1,5 @@
---- gmsh-2.3.0/configure.orig	2009-02-22 15:06:28.000000000 +0100
-+++ gmsh-2.3.0/configure	2009-02-22 15:08:41.000000000 +0100
+--- gmsh-2.3.1/configure.orig	2009-02-22 15:06:28.000000000 +0100
++++ gmsh-2.3.1/configure	2009-02-22 15:08:41.000000000 +0100
 @@ -3714,7 +3714,7 @@
  
    GMSH_DIRS="Common Geo Mesh Post Plugin Numeric Parser Graphics Fltk"
diff --git a/sci-libs/gmsh/gmsh-2.3.0.ebuild b/sci-libs/gmsh/gmsh-2.3.1.ebuild
index 3bffefd7c..77e154769 100644
--- a/sci-libs/gmsh/gmsh-2.3.0.ebuild
+++ b/sci-libs/gmsh/gmsh-2.3.1.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
-inherit eutils multilib
+EAPI="2"
+
+inherit eutils multilib flag-o-matic
 
 DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities."
 HOMEPAGE="http://www.geuz.org/gmsh/"
@@ -14,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="chaco cgns doc examples jpeg metis opencascade png zlib X"
 
 RDEPEND="sci-libs/gsl
-	x11-libs/fltk
+	x11-libs/fltk:1.1
 	cgns? ( sci-libs/cgnslib )
 	jpeg? ( media-libs/jpeg )
 	opencascade? ( sci-libs/opencascade )
@@ -24,23 +26,22 @@ RDEPEND="sci-libs/gsl
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}.patch
-
-	if use cgns && built_with_use sci-libs/cgnslib hdf5; then
-		epatch "${FILESDIR}"/${P}_hdf5.patch
-	fi
 }
 
-src_compile() {
+src_configure() {
 	local myconf=""
 	use opencascade && myconf="${myconf} --with-occ-prefix=$CASROOT/lin"
 
-	# As for now, the MED integration doesnot compile
+	# As for now, the MED integration does not compile
 	myconf="${myconf} --disable-med"
 
+	# I'm not sure if this is neede, but it seems to help in some circumstances
+	# see http://bugs.gentoo.org/show_bug.cgi?id=195980#c18
+	append-ldflags -ldl
+
 	econf ${myconf} \
 		$(use_enable X gui) \
 		$(use_enable cgns) \
@@ -50,7 +51,9 @@ src_compile() {
 		$(use_enable png) \
 		$(use_enable chaco) \
 		$(use_enable zlib)
+}
 
+src_compile() {
 	emake -j1 || die "emake failed"
 
 	if use doc ; then