sci-libs/gmsh: delete old version, added some USE-flags

8 files changed, 48 insertions, 237 deletions

diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog
index 5ba544569..3b8247474 100644
--- a/sci-libs/gmsh/ChangeLog
+++ b/sci-libs/gmsh/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/gmsh
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Jan 2011; Oliver Borm (boroli) <oli.borm@web.de> -gmsh-2.3.1-r1.ebuild,
+  -files/gmsh-2.3.1.patch, -gmsh-2.4.2.ebuild, gmsh-2.5.0.ebuild:
+  delete old version, added some USE-flags
+
 *gmsh-2.5.0 (13 Dec 2010)
 
   13 Dec 2010; Nico Schlömer <nico.schloemer@gmail.com>
diff --git a/sci-libs/gmsh/Manifest b/sci-libs/gmsh/Manifest
index 04df11183..a3a53f646 100644
--- a/sci-libs/gmsh/Manifest
+++ b/sci-libs/gmsh/Manifest
@@ -1,10 +1,5 @@
-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
-DIST gmsh-2.4.2-source.tgz 3109391 RMD160 d89906add953c28e4018b6deac7d631a10dc028d SHA1 526cc1f00b308e356fb7a75963816492324c8f70 SHA256 b922b1f8f63085361cb4b94a16eb72b4d75d580d5610ebeeccd0a2223920acc1
 DIST gmsh-2.5.0-source.tgz 3642009 RMD160 49ab2054d546e4549250119cec0453cd1cdfffef SHA1 b541fd9f1aadf1df7bf6fdd97a68ca41966ffeb6 SHA256 db1d3b92e56a85be9ec1c020aa2c705ccf5b7f0d00fa0f29b50efc73b378debc
-EBUILD gmsh-2.3.1-r1.ebuild 2122 RMD160 962094f06b2a4081c3eb22537869995bdb900793 SHA1 bc5531116616e9d41f2220e493e761534d8eec38 SHA256 fbe458af34a6b4eae66d88d69349c3cf65a46bb1d8beaeb87f252ef20c0f75f1
-EBUILD gmsh-2.4.2.ebuild 2312 RMD160 916a799467e8d14f95309cbf54589dd170cddc7f SHA1 7d3d184842d3876c24cafa69fd1a3b61606a6ec4 SHA256 612155cac6e7318e82248a6d3efe37c14cb622be448c9784f6cca3aebcf03e77
-EBUILD gmsh-2.5.0.ebuild 2340 RMD160 52f55359413ee0b5003c4e43b6c229cdde80b4ca SHA1 9fd0449cc25ed00ad20d0d22d7d8037bf2e37bd1 SHA256 169b99229848ec7124d9603640679659a46d9b7efe1005095befc7f51fd60fc7
-EBUILD gmsh-9999.ebuild 2486 RMD160 7d5bc1c0a1ce4e6900a559939b9884f11aab335a SHA1 9bf429c162ac6dcfa85349c8dc9ba66c19935bd8 SHA256 24de9b30979ac91adbf343f648f6c56eb42a33a84b92e2fc507c639dc820bcb9
-MISC ChangeLog 2432 RMD160 117a6890dcbdb9a4fd9bc56399cd073eeff6ef27 SHA1 4209c84064351c2371aaa0d3da1551f68b984d9c SHA256 743f13955ca43d8651d87a660b85050d23c27b1ad3452ded3eba4beae3e2aded
-MISC metadata.xml 509 RMD160 dac7e26320246d0d8bd0864201bb1d21328a5fd3 SHA1 0586bfb90da2c6e7e77edefbb29af9caf4970431 SHA256 865f3b1258187fac0b72205f189340fa2834719e49aef700e931d5c48c73b5c7
+EBUILD gmsh-2.5.0.ebuild 2392 RMD160 c99390d8ef4bd6ae703051149ced096ce4881f5e SHA1 43988bb2ccd31062d357713bc274c1d74ea7d6f8 SHA256 9cd754c75168f3508d7141dc092bc21a54919509b9eff089225fd1fbacc950d7
+EBUILD gmsh-9999.ebuild 2485 RMD160 9c76512a6a3ee61258bd5562d85ca63d478dad87 SHA1 8e3653b039541d2ed0115a154975c85b1fe780a9 SHA256 766015235209c9b2924a651668563a169da756abbbe5dd21b7f84a00689621cb
+MISC ChangeLog 2619 RMD160 450504ef950fc6d8bbba4328088d59bf5910cae9 SHA1 a1ae2f0fc457693dcfd2f458ff937ce59b1113d5 SHA256 852ce5abd795c0f9bd0baebea00d4088272b72595606fc587390feedb7f26954
+MISC metadata.xml 667 RMD160 d900fae7c06f0284afc7dd26116b30f80d75ae99 SHA1 e9b76c55005e3014e2e5a611990467368c0b1290 SHA256 bc2724c5ba7405a467a31367f7811ccc63d904ab86cc608bdb29f3af63d565de
diff --git a/sci-libs/gmsh/files/gmsh-2.3.1.patch b/sci-libs/gmsh/files/gmsh-2.3.1.patch
deleted file mode 100644
index 1f626ae8b..000000000
--- a/sci-libs/gmsh/files/gmsh-2.3.1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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"
-   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}"
-   cat >>confdefs.h <<\_ACEOF
- #define HAVE_FLTK 1
- _ACEOF
-@@ -4884,7 +4884,7 @@
-       GMSH_LIBS="${GMSH_LIBS} ${OCC_LIBS}"
-     else
-       GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
--      FLAGS="${FLAGS} -I${OCC_PREFIX}/inc"
-+      FLAGS="${FLAGS} -DHAVE_WOK_CONFIG_H -DFREEBSD -D${ARCH} -I${OCC_PREFIX}/../inc"
-     fi
-   fi
- fi
diff --git a/sci-libs/gmsh/gmsh-2.3.1-r1.ebuild b/sci-libs/gmsh/gmsh-2.3.1-r1.ebuild
deleted file mode 100644
index 6a68c9c8e..000000000
--- a/sci-libs/gmsh/gmsh-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:  $
-
-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/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="blas chaco cgns doc examples fftw jpeg med metis minimal mpi opencascade png zlib X"
-
-RDEPEND="x11-libs/fltk:1.1
-	blas? ( virtual/blas virtual/lapack )
-	cgns? ( sci-libs/cgnslib )
-	jpeg? ( media-libs/jpeg )
-	med? ( >=sci-libs/med-2.3.4 )
-	opencascade? ( sci-libs/opencascade )
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )
-	fftw? ( sci-libs/fftw:3.0 )
-	mpi? ( sys-cluster/openmpi[cxx] )"
-
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_configure() {
-	local myconf=""
-	use opencascade && myconf="${myconf} --with-occ-prefix=$CASROOT/lin"
-
-	use minimal && ewarn "minimal USE flag disables most of features"
-
-	if use fftw && use !blas ; then
-		die "You MUST compile with the blas USE flag to use the fftw dependency"
-		myconf="${myconf} --with-fftw3-prefix=/usr"
-	fi
-
-	# I'm not sure if this is needed, but it seems to help in some circumstances
-	# see http://bugs.gentoo.org/show_bug.cgi?id=195980#c18
-	append-ldflags -ldl -lmpi
-
-	econf ${myconf} \
-		$(use_enable X gui) \
-		$(use_enable cgns) \
-		$(use_enable jpeg) \
-		$(use_enable minimal) \
-		$(use_enable med) \
-		$(use_enable metis) \
-		$(use_enable mpi) \
-		$(use_enable opencascade occ) \
-		$(use_enable png) \
-		$(use_enable chaco) \
-		$(use_enable zlib)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd doc/texinfo
-		emake pdf || die "could not build documentation"
-	fi
-}
-
-src_install() {
-	einstall || die "could not install"
-
-	if use doc ; then
-		dodoc README doc/{FAQ.txt,README.*,CREDITS.txt} doc/texinfo/*.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r demos tutorial || die "failed to install examples"
-	fi
-}
diff --git a/sci-libs/gmsh/gmsh-2.4.2.ebuild b/sci-libs/gmsh/gmsh-2.4.2.ebuild
deleted file mode 100644
index 3bb8e7c86..000000000
--- a/sci-libs/gmsh/gmsh-2.4.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:  $
-
-EAPI="2"
-
-inherit cmake-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities."
-HOMEPAGE="http://www.geuz.org/gmsh/"
-SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="blas chaco cgns doc examples jpeg med metis mpi opencascade png zlib X"
-
-RDEPEND="X? ( x11-libs/fltk:1.1 )
-		blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-		cgns? ( sci-libs/cgnslib )
-		jpeg? ( media-libs/jpeg )
-		med? ( >=sci-libs/med-2.3.4 )
-		opencascade? ( sci-libs/opencascade )
-		png? ( media-libs/libpng )
-		zlib? ( sys-libs/zlib )
-		mpi? ( sys-cluster/openmpi[cxx] )"
-
-DEPEND="${RDEPEND}
-		dev-util/cmake
-		doc? ( virtual/latex-base )"
-
-pkg_setup() {
-	ewarn "Put the F77 variable in env files to select your fortran compiler"
-	ewarn "example for gfortran:"
-	ewarn "echo \"F77=gfortran\" >> /etc/portage/env/sci-libs/gmsh"
-}
-
-src_unpack() {
-	unpack ${A}
-	mv ${P}-source ${P}
-}
-
-src_configure() {
-	local mycmakeargs=""
-
-	use blas && mycmakeargs="${mycmakeargs}
-						-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
-
-	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable blas BLAS_LAPACK)
-								$(cmake-utils_use_enable cgns CGNS)
-								$(cmake-utils_use_enable chaco CHACO)
-								$(cmake-utils_use_enable X FLTK)
-								$(cmake-utils_use_enable X FL_TREE)
-								$(cmake-utils_use_enable X GRAPHICS)
-								$(cmake-utils_use_enable med MED)
-								$(cmake-utils_use_enable metis METIS)
-								$(cmake-utils_use_enable opencascade OCC)"
-
-#    I'm not sure if this is needed, but it seems to help in some circumstances
-#    see http://bugs.gentoo.org/show_bug.cgi?id=195980#c18
-	append-ldflags -ldl -lmpi
-
-	cmake-utils_src_configure ${mycmakeargs} \
-		|| die "cmake configuration failed"
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	cd "${WORKDIR}"/"${PF}"
-
-	if use doc ; then
-	    cd ${CMAKE_BUILD_DIR}
-		emake pdf || die "failed to build documentation"
-	    cd "${WORKDIR}"/"${PF}"
-		dodoc doc/*.txt doc/texinfo/gmsh.pdf
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r demos tutorial || die "failed to install examples"
-	fi
-}
diff --git a/sci-libs/gmsh/gmsh-2.5.0.ebuild b/sci-libs/gmsh/gmsh-2.5.0.ebuild
index 216df193a..edb8f65d4 100644
--- a/sci-libs/gmsh/gmsh-2.5.0.ebuild
+++ b/sci-libs/gmsh/gmsh-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
@@ -10,53 +10,53 @@ DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre
 HOMEPAGE="http://www.geuz.org/gmsh/"
 SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz"
 
-LICENSE="GPL-3"
+## gmsh comes with its own copies of (at least) metis, netgen and tetgen, therefore inform the user of their special licenses
+LICENSE="GPL-3 free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="blas chaco cgns doc examples jpeg lua med metis mpi opencascade png taucs zlib X"
+## cgns is not compiling ATM, maybe fix cgns lib first
+IUSE="blas chaco cgns doc examples jpeg lua med metis mpi netgen opencascade png taucs tetgen zlib X"
 
 RDEPEND="X? ( x11-libs/fltk:1.1 )
-		blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
-		cgns? ( sci-libs/cgnslib )
-		jpeg? ( virtual/jpeg )
-		lua? ( dev-lang/lua )
-		med? ( >=sci-libs/med-2.3.4 )
-		opencascade? ( sci-libs/opencascade )
-		png? ( media-libs/libpng )
-		zlib? ( sys-libs/zlib )
-		mpi? ( virtual/mpi[cxx] )
-		taucs? ( sci-libs/taucs )"
+	blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 )
+	cgns? ( sci-libs/cgnslib )
+	jpeg? ( virtual/jpeg )
+	lua? ( dev-lang/lua )
+	med? ( >=sci-libs/med-2.3.4 )
+	opencascade? ( sci-libs/opencascade )
+	png? ( media-libs/libpng )
+	zlib? ( sys-libs/zlib )
+	mpi? ( virtual/mpi[cxx] )
+	taucs? ( sci-libs/taucs )"
 
 # taucs needs metis enabled.
 # Wait for the REQUIRED_USE syntax in EAPI4.
 # http://www.gentoo.org/proj/en/council/meeting-logs/20101130-summary.txt
 
 DEPEND="${RDEPEND}
-		dev-util/cmake
-		doc? ( virtual/latex-base )"
+	dev-util/cmake
+	doc? ( virtual/latex-base )"
 
-S="${WORKDIR}/${P}-source"
-
-pkg_setup() {
-	ewarn "Put the F77 variable in env files to select your fortran compiler"
-	ewarn "example for gfortran:"
-	ewarn "echo \"F77=gfortran\" >> /etc/portage/env/sci-libs/gmsh"
-}
+S=${WORKDIR}/${P}-source
 
 src_configure() {
+	local mycmakeargs=""
 	use blas && mycmakeargs="${mycmakeargs}
-						-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
+		-DCMAKE_Fortran_COMPILER=$(tc-getF77)"
 
 	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable blas BLAS_LAPACK)
-								$(cmake-utils_use_enable cgns CGNS)
-								$(cmake-utils_use_enable chaco CHACO)
-								$(cmake-utils_use_enable X FLTK)
-								$(cmake-utils_use_enable X FL_TREE)
-								$(cmake-utils_use_enable X GRAPHICS)
-								$(cmake-utils_use_enable med MED)
-								$(cmake-utils_use_enable metis METIS)
-								$(cmake-utils_use_enable taucs TAUCS)
-								$(cmake-utils_use_enable opencascade OCC)"
+		$(cmake-utils_use_enable cgns CGNS)
+		$(cmake-utils_use_enable chaco CHACO)
+		$(cmake-utils_use_enable X FLTK)
+		$(cmake-utils_use_enable X FL_TREE)
+		$(cmake-utils_use_enable X GRAPHICS)
+		$(cmake-utils_use_enable med MED)
+		$(cmake-utils_use_enable metis METIS)
+		$(cmake-utils_use_enable netgen NETGEN)
+		$(cmake-utils_use_enable taucs TAUCS)
+		$(cmake-utils_use_enable tetgen TETGEN)
+		$(cmake-utils_use_enable opencascade OCC)"
+# 		$(cmake-utils_use_enable tetgen TETGEN_NEW)
 
 	cmake-utils_src_configure ${mycmakeargs} \
 		|| die "cmake configuration failed"
@@ -65,13 +65,11 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	cd "${WORKDIR}/${PF}"
-
 	if use doc ; then
-	    cd ${CMAKE_BUILD_DIR}
+		cd "${CMAKE_BUILD_DIR}"
 		emake pdf || die "failed to build documentation"
-	    cd "${WORKDIR}/${PF}"
-		dodoc doc/*.txt doc/texinfo/gmsh.pdf
+		cd "${S}"
+		dodoc doc/texinfo/gmsh.pdf
 	fi
 
 	if use examples ; then
diff --git a/sci-libs/gmsh/gmsh-9999.ebuild b/sci-libs/gmsh/gmsh-9999.ebuild
index d14e5f341..3e28101aa 100644
--- a/sci-libs/gmsh/gmsh-9999.ebuild
+++ b/sci-libs/gmsh/gmsh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header:  $
 
@@ -30,7 +30,7 @@ RDEPEND="X? ( x11-libs/fltk:1.1 )
 
 DEPEND="${RDEPEND}
 		dev-util/cmake
-		dev-util/subversion
+		dev-vcs/subversion
 		doc? ( virtual/latex-base )"
 
 pkg_setup() {
diff --git a/sci-libs/gmsh/metadata.xml b/sci-libs/gmsh/metadata.xml
index e9976ef07..225285f0a 100644
--- a/sci-libs/gmsh/metadata.xml
+++ b/sci-libs/gmsh/metadata.xml
@@ -7,7 +7,9 @@
 		<flag name="cgns"> Enables cgns output support</flag>
 		<flag name="metis"> Enables metis support</flag>
 		<flag name="med"> Enables med support</flag>
+		<flag name="netgen"> Enable 3D Frontal triangulation using netgen lib</flag>
 		<flag name="opencascade"> Enable OpenCASCADE support</flag>
 		<flag name="taucs"> Enable sci-libs/taucs support</flag>
+		<flag name="tetgen"> Enable 3D delauny triangulation using tetgen lib</flag>
 	</use>
 </pkgmetadata>