sci-mathematics/netgen: Changed opencascade path to /opt/opencascade-6.3/ros 4.9.11; removed old 4.4er versions

5 files changed, 11 insertions, 263 deletions

diff --git a/sci-mathematics/netgen/ChangeLog b/sci-mathematics/netgen/ChangeLog
index 6d3e71ee5..4c24e68c5 100644
--- a/sci-mathematics/netgen/ChangeLog
+++ b/sci-mathematics/netgen/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Oct 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog:
+  Changed opencascade path to $CASROOT; removed old 4.4er versions
+
   18 Sep 2009; Oliver Borm (boroli) <oli.borm@web.de> ChangeLog:
   Version bump
 
@@ -20,14 +23,14 @@
 
   20 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
   -files/debian-inspired-netgen_4.4-9.patch, -files/debian-inspired-netgen_4.4-9.2.patch, -files/icon/netgen.desktop, -files/icon/netgen-icon.png, +netgen-4.4-makefiles.patch, +netgen.png, +netgen-4.4-order.patch, +netgen-4.4-datadir.patch, +netgen-4.4-stdlib.patch, +netgen-4.4-declarations.patch, +netgen-4.4-tkversion.patch
-  Extensive rework of the ebuild and the epatches by Sébastien Fabbro <bicatali@gentoo.org>. At the moment, the OpenCascade support is broken.
+  Extensive rework of the ebuild and the epatches by Sébastien Fabbro <bicatali@gentoo.org>. At the moment, the OpenCascade support is broken.
 
   12 May 2008; Daniel Tourde <daniel.tourde@caelae.se>
   +files/debian-inspired-netgen_4.4-9.patch, +files/debian-inspired-netgen_4.4-9.2.patch, +files/icon/netgen.desktop, +files/icon/netgen-icon.png +netgen-4.4-r1.ebuild:
   General improvement, better amd64 support, icon in the menu etc..
-  Many thanks to Richard Westwell <garlicbread@ntlworld.com> and Sébastien Fabbro <bicatali@gentoo.org> for their inputs and their modifications.
+  Many thanks to Richard Westwell <garlicbread@ntlworld.com> and Sébastien Fabbro <bicatali@gentoo.org> for their inputs and their modifications.
 
-  15 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  15 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/debian-netgen_4.4-7.patch, +files/densemat.patch,
   +files/meshtype.patch, +files/togl_tk.patch, +metadata.xml,
   +netgen-4.4.ebuild:
diff --git a/sci-mathematics/netgen/Manifest b/sci-mathematics/netgen/Manifest
index 3e0891358..55fa88030 100644
--- a/sci-mathematics/netgen/Manifest
+++ b/sci-mathematics/netgen/Manifest
@@ -10,10 +10,7 @@ AUX netgen-4.4-tkversion.patch 834 RMD160 5ac31a57aeebabd51385b6718fac79d54f1886
 AUX netgen.desktop 175 RMD160 f801118f44d826b1b6335a07fcb1706f6e9fd502 SHA1 daf39d365fe782b5dc1416e427e813fb74ab1e29 SHA256 bfffdfe0a573ef80e689001a8864e3691b9c3e53aabdb235c9be3682c0461c07
 AUX netgen.png 4220 RMD160 05fb7ef5da0075c7ccc77e7b6084974d2309e798 SHA1 eee96e5b55c62379580bfe3cd873d7ddc87dba05 SHA256 4db00f0c652265728d994fc5b9ab8d65a91b2704d1b939c334c789d358b10dd3
 AUX togl_tk.patch 2606 RMD160 cb5956af8f10d18dd824c268626a77bd2199efcd SHA1 8d40e3bddd87bf8be239ea6c1a76416c35c2f2f8 SHA256 60f0a1819f1b5a9832575e7aeeafc678a6c49596206fdac5a883a0d4f8d34511
-DIST download.cgi?ID=ngs44.tar.gz 3421202 RMD160 a4f193bcec237d54e28cca0d32c37046ddbaa350 SHA1 8b61cd720a7d1a1548c48c7d02ea6cd8d1a61740 SHA256 21e1ce63204a90f4a8d85cadc54847d9f1f58fb76d500a46baab2022fe7709d4
 DIST netgen-4.9.11.tar.gz 1816718 RMD160 676fe7f583e5d30b10226473e7e25e0b3ff9f385 SHA1 ac1be02b12f4562993099754a972e92093694520 SHA256 a51137e5c13fba1487bb8f9293a0c110399ab6154a259f5774277a693b115562
-EBUILD netgen-4.4-r1.ebuild 3335 RMD160 ee60f0dbabc46bbedf7d6c64617bb12b20b88988 SHA1 e4023d04bdea276d0d6c12c6b573b303ab7d1455 SHA256 29c76f0d654214872264761c3ee1ca1d154838688301d15e4c53bdac70168937
-EBUILD netgen-4.4.ebuild 5350 RMD160 19ffcd2894dadacf6f9bc757882707874dddf891 SHA1 e14bd40a6821f1127a663d5c0e98df36401ae0e7 SHA256 199aa94291289e8badb346c905953d8a2dd3f0bce97dfc674bd9e273353d1a32
-EBUILD netgen-4.9.11.ebuild 2206 RMD160 e582687cff729aa9b1b10af54cb3f532e1006db9 SHA1 66677b0f31e41c27e916d154007dd875e1bf944d SHA256 9fa1c3bc347fd576a65754caf2f500fea7f63837b0f0dab7ae8917837598ed9b
-MISC ChangeLog 1969 RMD160 8138ee07e5ba86054383765c98f74edd80e693ab SHA1 6527b7f59836fd1839c7093b1a9a7e0ca35453e4 SHA256 6875f7e584b06b2fbc7d14e715110db6a5513d7c8b6c877cb0614cca9127982e
+EBUILD netgen-4.9.11.ebuild 2068 RMD160 ff82b08659a942d82a362b486ee394585c0c9a99 SHA1 fd62766a9c6e9da12150d1cf4a22d777dda88931 SHA256 d11cfac21f5115e5515dc99ee6dd5ad5e91d2528b79aa1734db2ef8ef766a617
+MISC ChangeLog 2120 RMD160 c594712c6a4ad302b3b47672a5d4bbfb3936b60c SHA1 0025843588c2d83b191b2abb063ac2412bd3be68 SHA256 286ddc5abc028cefe7f3ab7ae88a7ddb7a526662e7a241c4a2d75f7e6c33f668
 MISC metadata.xml 233 RMD160 258648efcb3283d6b5b57e0f83f5b7e70e2e8934 SHA1 7ffea1043099218d27a7d14fa7650a23f730597c SHA256 778cb286d3500e67c946ae599348456970be42cddc9e6a5f683633e46d244066
diff --git a/sci-mathematics/netgen/netgen-4.4-r1.ebuild b/sci-mathematics/netgen/netgen-4.4-r1.ebuild
deleted file mode 100644
index 97cf4f0c5..000000000
--- a/sci-mathematics/netgen/netgen-4.4-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:  $
-
-inherit eutils versionator multilib
-
-MY_P=ngs$(delete_version_separator 1)
-
-DESCRIPTION="Automatic 3d tetrahedral mesh generator"
-HOMEPAGE="http://www.hpfem.jku.at/netgen/"
-SRC_URI="http://www.hpfem.jku.at/cgi/download.cgi?ID=${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc opencascade lapack gmp"
-SLOT="0"
-
-RDEPEND="dev-tcltk/tix
-	virtual/opengl
-	x11-libs/libXmu
-	gmp? ( dev-libs/gmp )
-	lapack? ( virtual/lapack )
-	opencascade? ( sci-libs/opencascade )"
-
-DEPEND="${RDEPEND}
-	lapack? ( dev-util/pkgconfig )"
-
-src_unpack() {
-
-	# workaround bad downloaded file name (gone in 4.5?)
-	ln -s "${DISTDIR}/download.cgi?ID=${MY_P}.tar.gz" ${MY_P}.tar.gz
-	unpack ./${MY_P}.tar.gz
-	mv ${MY_P} ${P}
-
-	cd "${S}"
-
-	# de-hardcode tcl/tk versions
-	epatch "${FILESDIR}"/${P}-tkversion.patch
-	# fix missing declarations of class and functions and templates
-	epatch "${FILESDIR}"/${P}-declarations.patch
-	# set default datadir in /usr/share/netgen
-	epatch "${FILESDIR}"/${P}-datadir.patch
-	# compatibility with c++ stdlib headers and namespace
-	epatch "${FILESDIR}"/${P}-stdlib.patch
-	# fix missing second argument in order.cpp
-	epatch "${FILESDIR}"/${P}-order.patch
-	# big patch for makefiles, more generic and allowing shared libs
-	epatch "${FILESDIR}"/${P}-makefiles.patch
-
-	# The install location of libtix has changed from 8.2* to 8.4
-	local tixver=$(grep -m1 TIX_PATCH_LEVEL /usr/include/tix.h | cut -d \" -f2)
-	[[ $(get_version_component_range 3 ${tixver}) = 0 ]] && \
-		tixver=$(get_version_component_range 1-2 ${tixver})
-	if version_is_at_least "8.4" ${tixver} ; then
-		sed -i -e "s:-lTix:-lTix${tixver}:" Makefile
-	else
-		sed -i -e "s:Tix:tix${tixver}:" Makefile
-	fi
-}
-
-src_compile() {
-	export MACHINE="LINUX"
-
-	# include math libraries
-	local mathlibs
-	use lapack && mathlibs="${mathlibs} $(pkg-config --libs lapack)"
-	use gmp    && mathlibs="${mathlibs} -lgmp"
-	sed -i \
-		-e "s:#.*lapack.*=*$:lapack = ${mathlibs}:g" \
-		Makefile libsrc/makefile.mach.LINUX \
-		|| die "sed for math libraries failed"
-
-	local myconf
-	use opencascade && myconf="WITH_OCC=1"
-	emake ${myconf} || die "emake failed"
-}
-
-src_install() {
-	dobin ng || die "failed to install binary executable"
-	dolib lib/${MACHINE}/*.a lib/${MACHINE}/*.so* \
-		|| die "failed to install libraries"
-	dodoc VERSION
-
-	# Headers
-	insinto /usr/include/${PN}
-	doins libsrc/include/*.hpp
-	insinto /usr/include/${PN}/ngsolve
-	doins ngsolve/*.hpp
-
-	for headers_dir in \
-		csg general geom2d gprim interface linalg \
-		meshing opti stlgeom visualization; do
-		insinto /usr/include/${PN}/${headers_dir}
-		doins libsrc/${headers_dir}/*.hpp
-	done
-	if use opencascade; then
-		insinto /usr/include/${PN}/occ
-		doins libsrc/occ/*.hpp
-	fi
-
-	# tcl files, machine independent
-	insinto /usr/share/${PN}
-	find . -name "*.tcl" -exec doins {} \;
-
-	# docs
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/ng4.pdf tutorials || die "failed to install doc"
-	fi
-
-	# icon and menu entry
-	doicon "${FILESDIR}"/netgen.png
-	make_desktop_entry ng Netgen netgen.png "Science;NumericalAnalysis"
-}
-
-pkg_postinst() {
-	elog "Netgen ebuild is still under development."
-	elog "Help us improve the ebuild in:"
-	elog "http://bugs.gentoo.org/show_bug.cgi?id=155424"
-}
diff --git a/sci-mathematics/netgen/netgen-4.4.ebuild b/sci-mathematics/netgen/netgen-4.4.ebuild
deleted file mode 100644
index 9a71aa40e..000000000
--- a/sci-mathematics/netgen/netgen-4.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:  $
-
-inherit eutils toolchain-funcs versionator flag-o-matic
-
-MY_P="ngs$(delete_version_separator 1)"
-
-DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
-HOMEPAGE="http://www.hpfem.jku.at/netgen/"
-SRC_URI="http://www.hpfem.jku.at/cgi/download.cgi?ID=${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="opencascade blas lapack gmp"
-SLOT=0
-
-RDEPEND="opencascade? ( sci-libs/opencascade )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	gmp? ( dev-libs/gmp ) "
-
-DEPEND="${RDEPEND}
-	virtual/opengl
-	x11-base/xorg-x11
-	>=dev-lang/tk-8.0
-	>=dev-lang/tcl-8.0
-	>=dev-tcltk/tix-8.1"
-
-src_unpack() {
-	ln -s "${DISTDIR}"/"download.cgi?ID=${MY_P}.tar.gz" ${MY_P}.tar.gz
-	unpack ./${MY_P}.tar.gz
-	MY_S="${WORKDIR}"/"${MY_P}"
-	cd "${MY_S}"
-	epatch "${FILESDIR}"/togl_tk.patch
-	epatch "${FILESDIR}"/meshtype.patch
-	epatch "${FILESDIR}"/densemat.patch
-	epatch "${FILESDIR}"/debian-netgen_4.4-7.patch
-}
-
-src_compile() {
-	cd "${MY_S}"
-	local LAPACK="-lg2c"
-	export MACHINE="LINUX"
-	# gcc>=4.0 does not have libg2c anymore
-	if version_is_at_least "4.0" $(gcc-version) ; then
-		 LAPACK=""
-	fi
-
-	# Fix the Makefiles
-	local tk_version
-	tk_version=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
-	tk_release_serial=$(grep TK_RELEASE_SERIAL /usr/include/tk.h | awk '{print $3}')
-	sed -i "s:tk8.4:tk${tk_version}:g" ./Makefile
-	sed -i "s:tk8.4:tk${tk_version}:g" ./libsrc/makefile.mach.LINUX
-
-	# The install location of libtix has changed from 8.2* to 8.4
-	tix_version=$(grep TIX_VER /usr/include/tix.h | sed 's/^.*"\(.*\)".*/\1/')
-	if version_is_at_least "8.4" ${tix_version} ; then
-		tix_patch_level=$(sed -n '/TIX_PATCH_LEVEL/p' /usr/include/tix.h | sed -n '1p' | sed 's/^.*"\(.*\)".*/\1/')
-		sed -i "s:-ltix8.1.8.4:-L/usr/$(get_libdir)/Tix${tix_patch_level} -lTix${tix_patch_level}:g" ./Makefile
-	else
-		sed -i "s:tix8.1.8.4:tix${tix_version}:g" ./Makefile
-	fi
-
-	local tcl_version
-	tcl_version=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-	sed -i "s:tcl8.4:tcl${tcl_version}:g" ./Makefile
-	sed -i "s:tcl8.4:tcl${tcl_version}:g" ./libsrc/makefile.mach.LINUX
-
-	sed -i "s:CPP_DIR=.:CPP_DIR=${MY_S}:g" ./Makefile
-	sed -i "s:-L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5:-L/usr/X11R6/$(get_libdir) -L/usr/$(get_libdir)/GL:g" ./libsrc/makefile.mach.LINUX
-
-	if use opencascade; then
-		sed -i "s:/opt/OpenCASCADE5.2:$CASROOT/../:g" ./Makefile
-		sed -i "s:/opt/OpenCASCADE5.2:$CASROOT/../:g" ./libsrc/makefile.mach.LINUX
-	else
-		sed -i "s:OCC_DIR=/opt/OpenCASCADE5.2:# OCC_DIR=/opt/OpenCASCADE5.2:g" ./Makefile
-		sed -i "s:OCC_DIR=/opt/OpenCASCADE5.2:# OCC_DIR=/opt/OpenCASCADE5.2:g" ./libsrc/makefile.mach.LINUX
-		sed -i "s:OCCINC_DIR=\$(OCC_DIR)/ros/inc:# OCCINC_DIR=\$(OCC_DIR)/ros/inc:g" ./Makefile
-		sed -i "s:OCCINC_DIR=\$(OCC_DIR)/ros/inc:# OCCINC_DIR=\$(OCC_DIR)/ros/inc:g" ./libsrc/makefile.mach.LINUX
-		sed -i "s:OCCLIB_DIR=\$(OCC_DIR)/ros/lin/lib:# OCCLIB_DIR=\$(OCC_DIR)/ros/lin/lib:g" ./Makefile
-		sed -i "s:OCCLIB_DIR=\$(OCC_DIR)/ros/lin/lib:# OCCLIB_DIR=\$(OCC_DIR)/ros/lin/lib:g" ./libsrc/makefile.mach.LINUX
-		sed -i "s:CPLUSPLUSFLAGS2 += -DOCCGEOMETRY -DOCC52 -DUSE_STL_STREAM -DHAVE_IOSTREAM -DHAVE_LIMITS -I\$(OCCINC_DIR):# CPLUSPLUSFLAGS2 += -DOCCGEOMETRY -DOCC52 -DUSE_STL_STREAM -DHAVE_IOSTREAM -DHAVE_LIMITS -I\$(OCCINC_DIR):g" ./libsrc/makefile.mach.LINUX
-		sed -i "s:LINKFLAGS2 += -L\$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool:# LINKFLAGS2 += -L\$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool:g" ./libsrc/makefile.mach.LINUX
-		sed -i "s:-locc::g" ./Makefile
-		sed -i "s:occlib:# occlib:g" ./Makefile
-	fi
-
-	if use lapack; then
-		LAPACK="${LAPACK} -llapack"
-	fi
-
-	if use blas; then
-		LAPACK="${LAPACK} -lblas"
-	fi
-
-	if use gmp; then
-		LAPACK="${LAPACK} -lgmp"
-	fi
-
-	sed -i "s:# lapack =  -llapack  -lblas -lgmp -lg2c:lapack = $LAPACK:g" ./Makefile
-	sed -i "s:# lapack =  -llapack  -lblas -lgmp -lg2c:lapack = $LAPACK:g" ./libsrc/makefile.mach.LINUX
-
-	# Copy tkInt.h from the system to the source to correct the issue with togl.cpp
-	cp -p /usr/$(get_libdir)/tk${tk_version}/include/generic/tkInt.h ./togl/tkInt${tk_version}p${tk_release_serial}.h
-	cp -p /usr/$(get_libdir)/tk${tk_version}/include/generic/tkIntDecls.h ./togl/tkIntDecls${tk_version}p${tk_release_serial}.h
-	sed -i "s:tkIntDecls.h:./tkIntDecls${tk_version}p${tk_release_serial}.h:g" ./togl/tkInt${tk_version}p${tk_release_serial}.h
-
-	# Build 2 extra demo applications
-	#sed -i "s:# appdemo:appdemo:g" ./Makefile
-	#sed -i "s:# appaddon:appaddon:g" ./Makefile
-	#sed -i "s:# appngs:appngs:g" ./Makefile
-	#sed -i "s:#	cd demoapp:	cd demoapp:g" ./Makefile
-	#sed -i "s:#	cd ngsolve:	cd ngsolve:g" ./Makefile
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${MY_S}"
-	dobin ng
-	dodoc ./doc/ng4.pdf VERSION
-	dodir /usr/share/"${PF}"
-	insinto /usr/share/"${PF}"
-	find . -name "*.tcl" -exec doins --parents {} \;
-	dodir /usr/share/"${PF}"/tutorials
-	insinto /usr/share/"${PF}"/tutorials
-	doins ./tutorials/*
-}
diff --git a/sci-mathematics/netgen/netgen-4.9.11.ebuild b/sci-mathematics/netgen/netgen-4.9.11.ebuild
index 09f52db59..e52970d92 100644
--- a/sci-mathematics/netgen/netgen-4.9.11.ebuild
+++ b/sci-mathematics/netgen/netgen-4.9.11.ebuild
@@ -32,10 +32,8 @@ src_configure() {
 	local myconf=""
 
 	if use opencascade; then
-		OCCV=$(qatom `best_version sci-libs/opencascade` | cut -d ' ' -f 3)
-		OCC_PATH="/opt/opencascade-${OCCV}/ros"
-		myconf="${myconf} --enable-occ --with-occ=${OCC_PATH}"
-		append-ldflags -L${OCC_PATH}/lin/$(get_libdir)
+		myconf="${myconf} --enable-occ --with-occ=$CASROOT"
+		append-ldflags -L$CASROOT/lin/$(get_libdir)
 	fi
 
 	use mpi && myconf="${myconf} --enable-parallel"
@@ -50,7 +48,7 @@ src_configure() {
 	# This would be the more elegant way:
 # 	econf \
 # 		$(use_enable opencascade occ) \
-# 		$(use_with opencascade "occ=/opt/opencascade-6.2/ros/inc") \
+# 		$(use_with opencascade "occ=$CASROOT") \
 # 		$(use_enable mpi parallel) \
 # 		$(use_enable ffmpeg) \
 # 		$(use_enable jpeg jpeglib)