[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/

2022-11-15 Thread Andrew Ammerlaan 
commit: f73f853373a42bd8b02c51c79651a847d0c34058
Author: Bernd Waibel  posteo  net>
AuthorDate: Mon Oct 31 14:35:10 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Nov 15 12:01:33 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f73f8533

sci-mathematics/netgen: add 6.2.2204

- OpenMP doesn't seem to be used, remove USE flag
- dev-tcltk/tix doesn't seem to be used, remove dependency
- dev-tcltk/togl is build internal and doesn't use a system togl installation
- Stub generation from pybind11 doesn't currently work in a sandbox, see
  https://github.com/NGSolve/netgen/issues/126
- only depend on sci-libs/metis for USE=mpi

Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 ...tgen-6.2.2204-find-Tk-include-directories.patch |  21 
 ...etgen-6.2.2204-find-libjpeg-turbo-library.patch |  34 +
 .../netgen-6.2.2204-link-against-ffmpeg.patch  |  20 +++
 .../netgen-6.2.2204-use-external-pybind11.patch|  30 +
 sci-mathematics/netgen/netgen-6.2.2204.ebuild  | 137 +
 5 files changed, 242 insertions(+)

diff --git 
a/sci-mathematics/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch
 
b/sci-mathematics/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch
new file mode 100644
index 0..cf7b9d31e
--- /dev/null
+++ 
b/sci-mathematics/netgen/files/netgen-6.2.2204-find-Tk-include-directories.patch
@@ -0,0 +1,21 @@
+From 53c45343f5a26841be10d930467e215da4a779f2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 30 Oct 2022 15:17:55 +0100
+Subject: [PATCH] find Tk include directories
+
+Signed-off-by: Bernd Waibel 
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -270,6 +270,9 @@ if (USE_GUI)
+ endif(APPLE)
+ find_package(OpenGL REQUIRED)
+ 
++include_directories(${TK_INCLUDE_PATH}/generic)
++include_directories(${TK_INCLUDE_PATH}/unix)
++
+ target_compile_definitions(netgen_gui INTERFACE -DTCL -DOPENGL 
-DUSE_TOGL_2 -DUSE_TCL_STUBS -DUSE_TK_STUBS)
+ target_include_directories(netgen_gui INTERFACE ${TCL_INCLUDE_PATH} 
${TK_INCLUDE_PATH})
+ target_link_libraries(netgen_gui INTERFACE ${TCL_STUB_LIBRARY} 
${TK_STUB_LIBRARY})
+-- 
+2.38.1
+

diff --git 
a/sci-mathematics/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch 
b/sci-mathematics/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch
new file mode 100644
index 0..c45f5a4e4
--- /dev/null
+++ 
b/sci-mathematics/netgen/files/netgen-6.2.2204-find-libjpeg-turbo-library.patch
@@ -0,0 +1,34 @@
+From 39160b692fd051f2638f1a6e1df38eb616b6d6cb Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Sun, 30 Oct 2022 16:09:43 +0100
+Subject: [PATCH] find libjpeg-turbo library
+
+Signed-off-by: Bernd Waibel 
+--- a/libsrc/visualization/CMakeLists.txt
 b/libsrc/visualization/CMakeLists.txt
+@@ -7,7 +7,7 @@ target_sources(nggui PRIVATE
+ vssolution.cpp
+ visualpkg.cpp
+ )
+-target_link_libraries( nggui PUBLIC "$" 
${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} )
++target_link_libraries( nggui PUBLIC "$" 
${MPI_CXX_LIBRARIES} ${OPENGL_LIBRARIES} ${JPEG_LIBRARIES} )
+ 
+ install(FILES
+   meshdoc.hpp mvdraw.hpp visual_api.hpp
+--- a/nglib/CMakeLists.txt
 b/nglib/CMakeLists.txt
+@@ -7,6 +7,11 @@ endif(USE_OCC)
+ 
+ target_link_libraries(nglib PUBLIC ngcore)
+ 
++if(TARGET JPEG::JPEG)
++get_target_property(JPEG_LIBRARIES JPEG::JPEG IMPORTED_LOCATION_RELEASE)
++else()
++set(JPEG_LIBRARIES ${JPEG_LIBRARY_RELEASE})
++endif()
+ target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} 
${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} 
${OCC_LIBRARIES} netgen_cgns )
+ 
+ install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})
+-- 
+2.38.1
+

diff --git 
a/sci-mathematics/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch 
b/sci-mathematics/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch
new file mode 100644
index 0..6f7a8bc3c
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-6.2.2204-link-against-ffmpeg.patch
@@ -0,0 +1,20 @@
+From 69d9c2da29adc9b7a209e78aae950d9834683f58 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Mon, 31 Oct 2022 13:07:05 +0100
+Subject: [PATCH] link against ffmpeg
+
+Signed-off-by: Bernd Waibel 
+--- a/ng/CMakeLists.txt
 b/ng/CMakeLists.txt
+@@ -28,7 +28,7 @@ if(USE_GUI)
+ if(APPLE)
+ set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen)
+ endif(APPLE)
+-target_link_libraries( netgen ${PYTHON_LIBRARIES} ${TCL_LIBRARY} 
${TK_LIBRARY})
++target_link_libraries( netgen ${PYTHON_LIBRARIES} ${TCL_LIBRARY} 
${TK_LIBRARY} ${FFMPEG_LIBRARIES})
+ endif(NOT BUILD_FOR_CONDA)
+ 
+ install(TARGETS nggui ${NG_INSTALL_DIR})
+-- 
+2.38.1
+

diff --git 
a/sci-mathematics/netgen/files/netgen-6.2.2204-use-external-pybind11.patch 
b/sci-mathematics/netgen/files/netgen-6.2.2204-use-external-pybind11.patch
new file mode 100644
index 0..ef11c8b08
---

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/

2022-01-13 Thread Andrew Ammerlaan 
commit: 430efe1166a93e1acf87c1980142052339f1ac5a
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Jan 13 14:18:03 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jan 13 14:18:03 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=430efe11

sci-mathematics/netgen: add version 6.2.2105

Bug: https://github.com/NGSolve/netgen/issues/72
Bug: https://github.com/NGSolve/netgen/issues/77
Closes: https://bugs.gentoo.org/155424
Closes: https://bugs.gentoo.org/756214
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../netgen/files/netgen-6.2.2105-find-tk.patch |  35 +++
 sci-mathematics/netgen/metadata.xml|   2 +-
 sci-mathematics/netgen/netgen-6.2.2105.ebuild  | 102 +
 3 files changed, 138 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/netgen/files/netgen-6.2.2105-find-tk.patch 
b/sci-mathematics/netgen/files/netgen-6.2.2105-find-tk.patch
new file mode 100644
index 0..c638d83a7
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-6.2.2105-find-tk.patch
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcc24af..24f444e 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -246,7 +246,8 @@ if (USE_GUI)
+ 
+ add_definitions(-DTCL -DOPENGL -DUSE_TOGL_2)
+ include_directories(${TCL_INCLUDE_PATH})
+-include_directories(${TK_INCLUDE_PATH})
++include_directories(${TK_INCLUDE_PATH}/generic)
++include_directories(${TK_INCLUDE_PATH}/unix)
+ set(LIBTOGL togl)
+ 
+ if(WIN32)
+@@ -268,7 +269,7 @@ else()
+ endif()
+ 
+ if (USE_PYTHON)
+-add_subdirectory(external_dependencies/pybind11)
++find_package(pybind11)
+ find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS 
${PYTHON_INCLUDE_DIR})
+ if( PYBIND_INCLUDE_DIR )
+ message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
+diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
+index c24b631..2354a09 100644
+--- a/cmake/SuperBuild.cmake
 b/cmake/SuperBuild.cmake
+@@ -39,7 +39,6 @@ endif(NOT WIN32)
+ ###
+ if (USE_PYTHON)
+   find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS 
${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include 
NO_DEFAULT_PATH)
+-set(NG_INSTALL_PYBIND ON)
+ if( NOT PYBIND_INCLUDE_DIR )
+   # if the pybind submodule is missing, try to initialize and update all 
submodules
+   execute_process(COMMAND git submodule update --init --recursive 
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/sci-mathematics/netgen/metadata.xml 
b/sci-mathematics/netgen/metadata.xml
index a2cd926a4..cb94caeca 100644
--- a/sci-mathematics/netgen/metadata.xml
+++ b/sci-mathematics/netgen/metadata.xml
@@ -9,6 +9,6 @@
 Enable OpenCASCADE support


-   netgen-mesher
+   NGSolve/netgen

 

diff --git a/sci-mathematics/netgen/netgen-6.2.2105.ebuild 
b/sci-mathematics/netgen/netgen-6.2.2105.ebuild
new file mode 100644
index 0..ba602adf6
--- /dev/null
+++ b/sci-mathematics/netgen/netgen-6.2.2105.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake desktop python-single-r1 xdg
+
+DESCRIPTION="Automatic 3d tetrahedral mesh generator"
+HOMEPAGE="https://ngsolve.org/ https://github.com/NGSolve/netgen;
+SRC_URI="https://github.com/NGSolve/netgen/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ffmpeg jpeg mpi opencascade openmp python +gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+   dev-lang/tcl:0/8.6
+   dev-lang/tk:0/8.6
+   dev-tcltk/tix
+   dev-tcltk/togl:0
+   gui? (
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXmu
+   )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pybind11[${PYTHON_USEDEP}]
+   dev-python/pybind11-stubgen[${PYTHON_USEDEP}]
+   '
+   )
+   mpi? (
+   $(python_gen_cond_dep 
'dev-python/mpi4py[${PYTHON_USEDEP}]' )
+   )
+   )
+   opencascade? ( sci-libs/opencascade:* )
+   ffmpeg? ( media-video/ffmpeg )
+   jpeg? ( virtual/jpeg:0= )
+   mpi? ( virtual/mpi sci-libs/parmetis opencascade? ( sci-libs/hdf5[mpi] 
) )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-vcs/git"
+
+PATCHES=( "${FILESDIR}/${P}-find-tk.patch" )
+
+src_prepare() {
+   # https://github.com/NGSolve/netgen/issues/72
+   git init -q || die
+   git config --global user.email "y...@example.com" || die
+   git config --global user.name "Your Name" || die
+   git add . || die

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/

2022-01-13 Thread Andrew Ammerlaan 
commit: eba68f56ba8542eff2e545451a3285f44f8546ce
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Jan 13 14:19:31 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Jan 13 14:19:31 2022 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=eba68f56

sci-mathematics/netgen: cleanup old

Closes: https://bugs.gentoo.org/670050
Closes: https://bugs.gentoo.org/502962
Bug: https://bugs.gentoo.org/688120
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../netgen-5.x-compile-against-occ-6.5.x.patch |  28 --
 .../netgen/files/netgen-5.x-fedora-fixes.patch | 223 ---
 .../netgen/files/netgen-5.x-includes-fixes.patch   |  29 --
 .../netgen/files/netgen-5.x-makefiles-fixes.patch  | 412 -
 .../netgen/files/netgen-5.x-metis-fixes.patch  | 102 -
 .../netgen/files/netgen-5.x-missing-define.patch   |  38 --
 .../files/netgen-5.x-occ-stl-api-change.patch  |  94 -
 .../files/netgen-5.x-parallelmetis4-fix.patch  |  36 --
 sci-mathematics/netgen/netgen-5.3.1.ebuild | 121 --
 sci-mathematics/netgen/netgen-6.0_beta.ebuild  | 121 --
 10 files changed, 1204 deletions(-)

diff --git 
a/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch 
b/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch
deleted file mode 100644
index ce581cee3..0
--- a/sci-mathematics/netgen/files/netgen-5.x-compile-against-occ-6.5.x.patch
+++ /dev/null
@@ -1,28 +0,0 @@
 libsrc/occ/Partition_Spliter.cxx.old   2012-11-14 16:14:39.440625195 
+0100
-+++ libsrc/occ/Partition_Spliter.cxx   2012-11-14 16:15:20.035646075 +0100
-@@ -1169,8 +1169,8 @@
-   for (; j<=nbj && ok; ++j) {
- if (Extrema.IsMin(j)) {
- hasMin = Standard_True;
--ok = Extrema.Value(j) <= tol;  // V6.3
--// ok = Extrema.SquareDistance(j) <= tol;  // V6.5
-+// ok = Extrema.Value(j) <= tol;  // V6.3
-+ok = Extrema.SquareDistance(j) <= tol;  // V6.5
-   }
-   }
- }
 libsrc/occ/Partition_Inter3d.cxx.old   2012-11-14 16:13:11.149581085 
+0100
-+++ libsrc/occ/Partition_Inter3d.cxx   2012-11-14 16:14:20.017615214 +0100
-@@ -243,9 +243,9 @@
-   Standard_Integer i, nbExt = anExtPS.NbExt();
-   Extrema_POnSurf aPOnSurf;
-   for (i = 1; i <= nbExt; ++i )
--  if (anExtPS.Value( i ) <= TolE)   // V6.3
--// if (anExtPS.SquareDistance( i ) <= TolE)   // V6.5
--{
-+  //  if (anExtPS.Value( i ) <= TolE)   // V6.3
-+  if (anExtPS.SquareDistance( i ) <= TolE)   // V6.5
-+  {
-   aPOnSurf = anExtPS.Point( i );
-   break;
- }

diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch 
b/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
deleted file mode 100644
index 5cb399edb..0
--- a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.cpp 
netgen/libsrc/meshing/meshtype.cpp
 netgen-5.3.1/libsrc/meshing/meshtype.cpp   2016-02-20 21:55:59.226450843 
+0100
-+++ netgen/libsrc/meshing/meshtype.cpp 2016-02-20 23:54:12.293646166 +0100
-@@ -1,4 +1,5 @@
- #include 
-+#include  // to get DBL_MIN defined
- 
- #include "meshing.hpp"  
- 
-@@ -666,7 +667,8 @@
- 
- double det = trans.Det();
- 
--if (det <= 0)
-+// if (det <= 0)
-+if (det <= DBL_MIN) // avoid FPE
-   err += 1e12;
- else
-   err += frob * frob / det;
-@@ -722,7 +724,8 @@
- 
- double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1);
- 
--if (det <= 0)
-+// if (det <= 0)
-+if (det <= DBL_MIN)  // avoid FPE
-   {
- dd = 0;
- return 1e12;
-@@ -806,7 +809,8 @@
-   = dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0)
-   + trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0);
- 
--if (det <= 0)
-+// if (det <= 0)
-+if (det <= DBL_MIN) // avoid FPE
-   err += 1e12;
- else
-   {
-@@ -856,7 +860,8 @@
- frob /= 2;
- 
- double det = trans.Det();
--if (det <= 0)
-+//if (det <= 0)
-+if (det <= DBL_MIN) // avoid FPE
-   err += 1e12;
- else
-   err += frob * frob / det;
-@@ -1864,7 +1869,8 @@
-   case PYRAMID:
- {
-   double noz = 1-p(2);
--  if (noz == 0.0) noz = 1e-10;
-+  //if (noz == 0.0) noz = 1e-10;
-+  if (noz <= DBL_MIN) noz = 1e-10; // avoid FPE
- 
-   double xi  = p(0) / noz;
-   double eta = p(1) / noz;
-@@ -2513,10 +2519,10 @@
- 
-   MeshingParameters :: MeshingParameters ()
-   {
--optimize3d = "cmdmustm";
-+optimize3d = (char*)"cmdmustm"; // optimize3d =

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2021-12-16 Thread Andrew Ammerlaan 
commit: 405ed7bc9a1fd39aff8263832d36b3a49b915d9b
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Dec 16 10:52:25 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Dec 16 10:52:25 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=405ed7bc

sci-mathematics/netgen: fix inherits

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-mathematics/netgen/netgen-5.3.1.ebuild| 4 +---
 sci-mathematics/netgen/netgen-6.0_beta.ebuild | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index c759afec4..3cd4d956d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib xdg
+inherit autotools desktop flag-o-matic xdg
 
 MY_PN=${PN}-mesher
 MY_PV=$(ver_cut 1-2)
@@ -109,8 +109,6 @@ src_install() {
# Install icon and .desktop for menu entry
doicon "${FILESDIR}"/${PN}.png
domenu "${FILESDIR}"/${PN}.desktop
-
-   prune_libtool_files
 }
 
 pkg_postinst() {

diff --git a/sci-mathematics/netgen/netgen-6.0_beta.ebuild 
b/sci-mathematics/netgen/netgen-6.0_beta.ebuild
index 3206c4755..8acc255d4 100644
--- a/sci-mathematics/netgen/netgen-6.0_beta.ebuild
+++ b/sci-mathematics/netgen/netgen-6.0_beta.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib xdg
+inherit autotools desktop flag-o-matic xdg
 
 MY_PN=${PN}-mesher
 MY_PV=${PV//_/-}
@@ -109,8 +109,6 @@ src_install() {
# Install icon and .desktop for menu entry
doicon "${FILESDIR}"/${PN}.png
domenu "${FILESDIR}"/${PN}.desktop
-
-   prune_libtool_files
 }
 
 pkg_postinst() {

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2021-02-25 Thread Andrew Ammerlaan 
commit: 334c8eb4f7ee4e94f5478cfad8f1a5d0b9c2cbd5
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Thu Feb 25 15:06:13 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Thu Feb 25 15:06:13 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=334c8eb4

sci-mathematics/netgen: fixup dep,  riseup.net>

 sci-mathematics/netgen/netgen-5.3.1.ebuild| 2 +-
 sci-mathematics/netgen/netgen-6.0_beta.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 594347da5..c759afec4 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -29,7 +29,7 @@ DEPEND="
opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg:0= )
-   mpi? ( virtual/mpi || ( sci-libs/parmetis

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2021-01-28 Thread Andrew Ammerlaan 
commit: 87f3353e9c170e07a5f21e2d295e93a2d50f9c7d
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Thu Jan 28 19:26:35 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Thu Jan 28 19:26:35 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=87f3353e

sci-mathematics/netgen: EAPI bump, add 6.0-beta

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/netgen/netgen-4.9.13.ebuild| 77 ---
 sci-mathematics/netgen/netgen-5.0.0.ebuild | 88 --
 sci-mathematics/netgen/netgen-5.3.1.ebuild | 14 ++--
 ...{netgen-5.3.1.ebuild => netgen-6.0_beta.ebuild} | 22 +++---
 4 files changed, 22 insertions(+), 179 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-4.9.13.ebuild 
b/sci-mathematics/netgen/netgen-4.9.13.ebuild
deleted file mode 100644
index 1e98480e3..0
--- a/sci-mathematics/netgen/netgen-4.9.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib versionator
-
-DESCRIPTION="Automatic 3d tetrahedral mesh generator"
-HOMEPAGE="https://sourceforge.net/projects/netgen/;
-SRC_URI="mirror://sourceforge/netgen-mesher/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade"
-
-DEPEND="
-   dev-tcltk/tix
-   dev-tcltk/togl:1.7
-   virtual/opengl
-   x11-libs/libXmu
-   opencascade? ( sci-libs/opencascade:* )
-   ffmpeg? ( media-video/ffmpeg )
-   jpeg? ( virtual/jpeg:0= )
-   mpi? ( virtual/mpi ) "
-RDEPEND="${DEPEND}"
-# Note, MPI has not be tested.
-
-src_configure() {
-   # This is not the most clever way to deal with these flags
-   # but --disable-xxx does not seem to work correcly, so...
-   local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
-
-   if use opencascade; then
-   myconf="${myconf} --enable-occ --with-occ=$CASROOT"
-   append-ldflags -L$CASROOT/lin/$(get_libdir)
-   fi
-
-   use mpi && myconf="${myconf} --enable-parallel"
-   use ffmpeg && myconf="${myconf} --enable-ffmpeg"
-   use jpeg && myconf="${myconf} --enable-jpeglib"
-
-   append-flags -I/usr/include/togl-1.7
-
-   econf \
-   ${myconf}
-
-   # This would be the more elegant way:
-#  econf \
-#  $(use_enable opencascade occ) \
-#  $(use_with opencascade "occ=$CASROOT") \
-#  $(use_enable mpi parallel) \
-#  $(use_enable ffmpeg) \
-#  $(use_enable jpeg jpeglib)
-}
-
-src_install() {
-   local NETGENDIR="/usr/share/netgen"
-
-   echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > 
./99netgen
-   doenvd 99netgen
-
-   default
-   mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}"
-
-   # Install icon and .desktop for menu entry
-   doicon "${FILESDIR}"/${PN}.png
-   domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-   elog "Please make sure to update your environment variables:"
-   elog "env-update && source /etc/profile"
-   elog "Netgen ebuild is still under development."
-   elog "Help us improve the ebuild in:"
-   elog "https://bugs.gentoo.org/show_bug.cgi?id=155424;
-}

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
deleted file mode 100644
index 639122f31..0
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_PN=${PN}-mesher
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
-HOMEPAGE="https://sourceforge.net/projects/netgen/;
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade"
-
-DEPEND="
-   dev-tcltk/tix
-   dev-tcltk/togl:1.7
-   virtual/opengl
-   x11-libs/libXmu
-   opencascade? ( sci-libs/opencascade:* )
-   ffmpeg? ( media-video/ffmpeg )
-   jpeg? ( virtual/jpeg:0= )
-   mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
-RDEPEND="${DEPEND}"
-# Note, MPI has not be tested.
-
-src_prepare() {
-   # Adapted from 
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
-   epatch "${FILESDIR}/${PN}-5.x-compile-against-occ-6.5.x.patch"
-   epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
-   eautoreconf
-}
-
-src_configure() {
-   # This is not the most clever way to deal with these flags
-   # but --disable-xxx does not seem to work correcly, so...
-   sed -i -e

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2021-01-19 Thread Andrew Ammerlaan 
commit: 976cfc11cb864d225d9aec747718dbe019595d37
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Tue Jan 19 15:56:23 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Tue Jan 19 15:56:23 2021 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=976cfc11

sci-mathematics/netgen: use https

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan  riseup.net>

 sci-mathematics/netgen/netgen-4.9.13.ebuild | 4 ++--
 sci-mathematics/netgen/netgen-5.0.0.ebuild  | 4 ++--
 sci-mathematics/netgen/netgen-5.3.1.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-4.9.13.ebuild 
b/sci-mathematics/netgen/netgen-4.9.13.ebuild
index 22f900973..1e98480e3 100644
--- a/sci-mathematics/netgen/netgen-4.9.13.ebuild
+++ b/sci-mathematics/netgen/netgen-4.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -73,5 +73,5 @@ pkg_postinst() {
elog "env-update && source /etc/profile"
elog "Netgen ebuild is still under development."
elog "Help us improve the ebuild in:"
-   elog "http://bugs.gentoo.org/show_bug.cgi?id=155424;
+   elog "https://bugs.gentoo.org/show_bug.cgi?id=155424;
 }

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 7c245c883..639122f31 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -84,5 +84,5 @@ pkg_postinst() {
elog "env-update && source /etc/profile"
elog "Netgen ebuild is still under development."
elog "Help us improve the ebuild in:"
-   elog "http://bugs.gentoo.org/show_bug.cgi?id=155424;
+   elog "https://bugs.gentoo.org/show_bug.cgi?id=155424;
 }

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 5ccbcea2f..25b4da389 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -115,5 +115,5 @@ pkg_postinst() {
elog "env-update && source /etc/profile"
elog "Netgen ebuild is still under development."
elog "Help us improve the ebuild in:"
-   elog "http://bugs.gentoo.org/show_bug.cgi?id=155424;
+   elog "https://bugs.gentoo.org/show_bug.cgi?id=155424;
 }

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 3addb11abe96717bdd72e01ee5dff2a47aa3f9e7
Author: Grégory Salvan  gmail  com>
AuthorDate: Sat Feb 13 11:40:48 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=3addb11a

patch netgen for occ to integrate version 5.3.1 see #436

 .../files/netgen-5.x-occ-stl-api-change.patch  | 94 ++
 sci-mathematics/netgen/netgen-5.3.1.ebuild | 16 +++-
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch 
b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
new file mode 100644
index 000..05f3a54
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
@@ -0,0 +1,94 @@
+--- libsrc/occ/occgeom.cpp 2014-08-29 11:54:03.0 +0200
 libsrc/occ/occgeom.cpp 2016-02-12 21:14:49.258982206 +0100
+@@ -149,7 +149,7 @@
+ 
+  for (exp0.Init (shape, TopAbs_FACE); exp0.More(); exp0.Next())
+  {
+-// Variable to hold the colour (if there exists one) of 
++// Variable to hold the colour (if there exists one) of
+ // the current face being processed
+ Quantity_Color face_colour;
+ 
+@@ -190,7 +190,7 @@
+rebuild->Replace(face, newface, Standard_False);
+ }
+ 
+-// Set the original colour of the face to the newly created 
++// Set the original colour of the face to the newly created
+ // face (after the healing process)
+ face = TopoDS::Face (exp0.Current());
+ face_colours->SetColor(face,face_colour,XCAFDoc_ColorSurf);
+@@ -815,11 +815,11 @@
+   face_maxh.SetSize (fmap.Extent());
+   face_maxh = mparam.maxh;
+ 
+-  // Philippose - 15/01/2010  
+-  face_maxh_modified.DeleteAll();  
+-  face_maxh_modified.SetSize(fmap.Extent());  
++  // Philippose - 15/01/2010
++  face_maxh_modified.DeleteAll();
++  face_maxh_modified.SetSize(fmap.Extent());
+   face_maxh_modified = 0;
+-  
++
+ 
+   // Philippose - 17/01/2009
+   face_sel_status.DeleteAll();
+@@ -845,7 +845,7 @@
+   cout << "Trying to sew faces ..." << flush;
+ 
+   BRepOffsetAPI_Sewing sewedObj(1);
+- 
++
+   for (int i = 1; i <= fmap.Extent(); i++)
+   {
+  TopoDS_Face face = TopoDS::Face (fmap(i));
+@@ -1038,9 +1038,6 @@
+{
+   cout << "writing stl..."; cout.flush();
+   StlAPI_Writer writer;
+-  writer.RelativeMode() = Standard_False;
+-
+-  writer.SetDeflection(0.02);
+   writer.Write(shape,filename);
+ 
+   cout << "done" << endl;
+@@ -1109,7 +1106,7 @@
+   }
+ 
+ 
+-  // For the IGES Reader, all the shapes can be exported as one compund 
shape 
++  // For the IGES Reader, all the shapes can be exported as one compund 
shape
+   // using the "OneShape" member
+   occgeo->shape = reader.OneShape();
+   occgeo->face_colours = iges_colour_contents;
+@@ -1187,7 +1184,7 @@
+   }
+ 
+ 
+-  // For the STEP File Reader in OCC, the 1st Shape contains the entire 
++  // For the STEP File Reader in OCC, the 1st Shape contains the entire
+   // compound geometry as one shape
+   occgeo->shape = step_shape_contents->GetShape(step_shapes.Value(1));
+   occgeo->face_colours = step_colour_contents;
+@@ -1218,7 +1215,7 @@
+   }
+ 
+   // Philippose - 23/02/2009
+-  // Fixed a bug in the OpenCascade XDE Colour handling when 
++  // Fixed a bug in the OpenCascade XDE Colour handling when
+   // opening BREP Files, since BREP Files have no colour data.
+   // Hence, the face_colours Handle needs to be created as a NULL handle.
+   occgeo->face_colours = Handle_XCAFDoc_ColorTool();
+@@ -1236,9 +1233,9 @@
+   void OCCGeometry :: Save (string sfilename) const
+   {
+ const char * filename = sfilename.c_str();
+-if (strlen(filename) < 4) 
++if (strlen(filename) < 4)
+   throw NgException ("illegal filename");
+-
++
+ if (strcmp ([strlen(filename)-3], "igs") == 0)
+   {
+   IGESControl_Writer writer("millimeters", 1);

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 8a2f60b..16441ff 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg:0= )
-   mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
+   mpi? ( virtual/mpi ( || ( sci-libs/parmetis http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
+   epatch

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 7a9027cbd4c3510b8e5010422505a70e1420b7a4
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 23:58:20 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7a9027cb

fix parallelmetis for metis version 4

 .../files/netgen-5.x-parallelmetis4-fix.patch  | 36 ++
 sci-mathematics/netgen/netgen-5.3.1.ebuild |  1 +
 2 files changed, 37 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch 
b/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch
new file mode 100644
index 000..0170fb8
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-parallelmetis4-fix.patch
@@ -0,0 +1,36 @@
+diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 
netgen/libsrc/meshing/parallelmesh.cpp
+--- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp   2016-02-22 
00:22:28.885598956 +0100
 netgen/libsrc/meshing/parallelmesh.cpp 2016-02-22 00:46:17.030638283 
+0100
+@@ -962,10 +962,15 @@
+   }
+   
+ 
+-#ifdef METIS5
++#ifdef METIS
+   void Mesh :: ParallelMetis (Array & volume_weights , Array & 
surface_weights, Array & segment_weights)  
+   {
++
++  #ifdef METIS5
+ PrintMessage (3, "call metis 5 with weights ...");
++#else
++PrintMessage (3, "call metis 4 with weights ...");
++#endif
+ 
+ // cout << "segment_weights " << segment_weights << endl;
+ // cout << "surface_weights " << surface_weights << endl;
+@@ -1034,9 +1039,15 @@
+ 
+ 
+ metis::idx_t ncommon = 3;
++#ifdef METIS5
+ METIS_PartMeshDual (, , [0], [0], [0], NULL, 
, ,
+   NULL, NULL,
+   , [0], [0]);
++#else
++int numflag = 0;
++METIS_PartMeshDual (, , [0], [0], , ,
++  , [0], [0]);
++#endif
+ /*
+ METIS_PartMeshNodal (, , [0], [0], NULL, NULL, ,
+NULL, NULL,

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index d39d45c..9aac92d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -44,6 +44,7 @@ src_prepare() {
# Adapted from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"
+   epatch "${FILESDIR}/${PN}-5.x-parallelmetis4-fix.patch"
if use mpi; then
export CC=mpicc
export CXX=mpic++

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/

2016-02-22 Thread Justin Lecher 
commit: 78243c13f605b381127b48cbeea5ef36e05e3e02
Author: Grégory Salvan  gmail  com>
AuthorDate: Sat Feb 20 23:59:46 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=78243c13

replace fedora occ include dir by gentoo one

 sci-mathematics/netgen/files/netgen-5.3.1_build.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch 
b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch
index dd8d395..82c6ac9 100644
--- a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch
+++ b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch
@@ -6,7 +6,7 @@ diff -rupN netgen-5.3.1/configure.ac 
netgen-5.3.1-new/configure.ac
  [occdir=$withval] 
[occon=true],
 -  [occdir=/opt/OpenCASCADE]
-+  [occdir=/usr]
++  [occdir=$CASROOT]
  )
  
  
@@ -15,7 +15,7 @@ diff -rupN netgen-5.3.1/configure.ac 
netgen-5.3.1-new/configure.ac
  
 -  AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc 
-I/usr/include/opencascade"])
 -  AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath 
-lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh 
-lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep 
-lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES 
-lTKXCAF -lTKLCAF -lFWOSPlugin"])
-+  AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I/usr/include/oce"])
++  AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc"])
 +  AC_SUBST([OCCLIBS], ["-lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d 
-lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo 
-lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP 
-lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF 
-lFWOSPlugin"])
  
  #  -lTKDCAF

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 903b613b84b3e2622dd16d94dbee41d368ba8fe3
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 00:52:54 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=903b613b

Added fedora fixes patch

 .../netgen/files/netgen-5.x-fedora-fixes.patch | 223 +
 sci-mathematics/netgen/netgen-5.3.1.ebuild |   2 +
 2 files changed, 225 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch 
b/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
new file mode 100644
index 000..5cb399e
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-fedora-fixes.patch
@@ -0,0 +1,223 @@
+diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.cpp 
netgen/libsrc/meshing/meshtype.cpp
+--- netgen-5.3.1/libsrc/meshing/meshtype.cpp   2016-02-20 21:55:59.226450843 
+0100
 netgen/libsrc/meshing/meshtype.cpp 2016-02-20 23:54:12.293646166 +0100
+@@ -1,4 +1,5 @@
+ #include 
++#include  // to get DBL_MIN defined
+ 
+ #include "meshing.hpp"  
+ 
+@@ -666,7 +667,8 @@
+ 
+ double det = trans.Det();
+ 
+-if (det <= 0)
++// if (det <= 0)
++if (det <= DBL_MIN) // avoid FPE
+   err += 1e12;
+ else
+   err += frob * frob / det;
+@@ -722,7 +724,8 @@
+ 
+ double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1);
+ 
+-if (det <= 0)
++// if (det <= 0)
++if (det <= DBL_MIN)  // avoid FPE
+   {
+ dd = 0;
+ return 1e12;
+@@ -806,7 +809,8 @@
+   = dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0)
+   + trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0);
+ 
+-if (det <= 0)
++// if (det <= 0)
++if (det <= DBL_MIN) // avoid FPE
+   err += 1e12;
+ else
+   {
+@@ -856,7 +860,8 @@
+ frob /= 2;
+ 
+ double det = trans.Det();
+-if (det <= 0)
++//if (det <= 0)
++if (det <= DBL_MIN) // avoid FPE
+   err += 1e12;
+ else
+   err += frob * frob / det;
+@@ -1864,7 +1869,8 @@
+   case PYRAMID:
+ {
+   double noz = 1-p(2);
+-  if (noz == 0.0) noz = 1e-10;
++  //if (noz == 0.0) noz = 1e-10;
++  if (noz <= DBL_MIN) noz = 1e-10; // avoid FPE
+ 
+   double xi  = p(0) / noz;
+   double eta = p(1) / noz;
+@@ -2513,10 +2519,10 @@
+ 
+   MeshingParameters :: MeshingParameters ()
+   {
+-optimize3d = "cmdmustm";
++optimize3d = (char*)"cmdmustm"; // optimize3d = "cmdmustm";
+ //optimize3d = "cmdmstm";
+ optsteps3d = 3;
+-optimize2d = "smsmsmSmSmSm";
++optimize2d = (char*)"smsmsmSmSmSm"; // optimize2d = "smsmsmSmSmSm";
+ optsteps2d = 3;
+ opterrpow = 2;
+ blockfill = 1;
+diff -uwrN netgen-5.3.1/libsrc/meshing/meshtype.hpp 
netgen/libsrc/meshing/meshtype.hpp
+--- netgen-5.3.1/libsrc/meshing/meshtype.hpp   2016-02-20 21:55:59.226450843 
+0100
 netgen/libsrc/meshing/meshtype.hpp 2016-02-20 23:54:12.295646166 +0100
+@@ -15,6 +15,7 @@
+ Classes for NETGEN
+   */
+ 
++class Mesh; // added due to compilation errors on some platforms
+ 
+ 
+   enum ELEMENT_TYPE { 
+diff -uwrN netgen-5.3.1/libsrc/meshing/smoothing2.cpp 
netgen/libsrc/meshing/smoothing2.cpp
+--- netgen-5.3.1/libsrc/meshing/smoothing2.cpp 2016-02-20 21:55:59.228450843 
+0100
 netgen/libsrc/meshing/smoothing2.cpp   2016-02-20 23:54:12.298646166 
+0100
+@@ -361,7 +361,8 @@
+ vgrad = 0;
+ double badness = 0;
+ 
+-ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n);
++//normal already computed: ld.meshthis -> GetNormalVector (ld.surfi, 
ld.sp1, ld.gi1, n);
++n = ld.normal;
+ pp1 = ld.sp1 + x(0) * ld.t1 + x(1) * ld.t2;
+ 
+ //  meshthis -> ProjectPoint (surfi, pp1);
+@@ -577,7 +578,8 @@
+ vgrad = 0;
+ badness = 0;
+ 
+-ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n);
++//normal already computed: ld.meshthis -> GetNormalVector (ld.surfi, 
ld.sp1, ld.gi1, n);
++n = ld.normal;
+ 
+ pp1 = ld.sp1 + x(0) * ld.t1 + x(1) * ld.t2;
+ 
+@@ -649,7 +651,8 @@
+ vgrad = 0;
+ badness = 0;
+ 
+-ld.meshthis -> GetNormalVector (ld.surfi, ld.sp1, ld.gi1, n);
++//normal already computed: ld.meshthis -> GetNormalVector (ld.surfi, 
ld.sp1, ld.gi1, n);
++n = ld.normal;
+ 
+ // pp1 = sp1;
+ //pp1.Add2 (x.Get(1), t1, x.Get(2), t2);
+diff -uwrN netgen-5.3.1/libsrc/occ/occconstruction.cpp 
netgen/libsrc/occ/occconstruction.cpp
+--- netgen-5.3.1/libsrc/occ/occconstruction.cpp2016-02-20 
21:53:44.420447131 +0100
 netgen/libsrc/occ/occconstruction.cpp  2016-02-20 23:54:12.299646166 
+0100
+@@ -28,7 +28,7 @@
+ #include 
+ #include 
+ #include 
+-#include 
++//#include 
+ //#include 
+ #include 
+ #include 
+diff -uwrN netgen-5.3.1/libsrc/occ/occmeshsurf.cpp

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 77890639257266037035bd07c0edebd3a7e6b26d
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 20:38:46 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=77890639

Added includes fixes patch

 .../netgen/files/netgen-5.x-includes-fixes.patch   | 29 ++
 sci-mathematics/netgen/netgen-5.3.1.ebuild |  1 +
 2 files changed, 30 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch 
b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch
new file mode 100644
index 000..650b575
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-includes-fixes.patch
@@ -0,0 +1,29 @@
+diff -uwrN -x.git netgen-5.3.1/libsrc/include/meshing.hpp 
netgen/libsrc/include/meshing.hpp
+--- netgen-5.3.1/libsrc/include/meshing.hpp2016-02-21 20:12:55.885186643 
+0100
 netgen/libsrc/include/meshing.hpp  2016-02-21 20:09:26.275180871 +0100
+@@ -1 +1 @@
+-#include <../meshing/meshing.hpp>
++#include "../meshing/meshing.hpp"
+diff -uwrN -x.git netgen-5.3.1/libsrc/include/myadt.hpp 
netgen/libsrc/include/myadt.hpp
+--- netgen-5.3.1/libsrc/include/myadt.hpp  2016-02-21 20:12:55.886186643 
+0100
 netgen/libsrc/include/myadt.hpp2016-02-21 20:09:26.275180871 +0100
+@@ -1 +1 @@
+-#include <../general/myadt.hpp>
++#include "../general/myadt.hpp"
+diff -uwrN -x.git netgen-5.3.1/libsrc/include/stlgeom.hpp 
netgen/libsrc/include/stlgeom.hpp
+--- netgen-5.3.1/libsrc/include/stlgeom.hpp2016-02-21 20:12:55.886186643 
+0100
 netgen/libsrc/include/stlgeom.hpp  2016-02-21 20:09:26.275180871 +0100
+@@ -1 +1 @@
+-#include <../stlgeom/stlgeom.hpp>
++#include "../stlgeom/stlgeom.hpp"
+diff -uwrN -x.git netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 
netgen/libsrc/meshing/parallelmesh.cpp
+--- netgen-5.3.1/libsrc/meshing/parallelmesh.cpp   2016-02-21 
20:12:55.888186643 +0100
 netgen/libsrc/meshing/parallelmesh.cpp 2016-02-21 20:09:26.276180871 
+0100
+@@ -1,6 +1,6 @@
+ #ifdef PARALLEL
+ 
+-#include 
++#include "meshing.hpp"
+ #include "paralleltop.hpp"
+ 
+ // #define METIS4

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 4cc2cd9..d3cf9f9 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -43,6 +43,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-5.3.1_build.patch"
# Adapted from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
+   epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"
if use mpi; then
export CC=mpicc
export CXX=mpic++

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 54e396528967d270987480227b966494684811f4
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 00:51:07 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=54e39652

remove sed for togl as it is fixed in build patch

 sci-mathematics/netgen/netgen-5.3.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 5cdb4ab..1161cbd 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -53,12 +53,11 @@ src_prepare() {
 src_configure() {
# This is not the most clever way to deal with these flags
# but --disable-xxx does not seem to work correcly, so...
-   sed -i -e 's:-lTogl:-lTogl1.7:' ng/Makefile.am || die
local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
 
if use opencascade; then
myconf="${myconf} --enable-occ --with-occ=$CASROOT"
-   append-ldflags -L$CASROOT/lin/$(get_libdir)
+   append-ldflags -L$CASROOT/$(get_libdir)
fi
if use mpi; then
ewarn 
"*"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/

2016-02-22 Thread Justin Lecher 
commit: 5fe163f16c48e49e7dbcce805fd177df657e9cf7
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Feb 22 08:36:11 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5fe163f1

sci-mathematics/netgen: Amend patches for -p1

* Use PATCHES=()
* Convert myconf to array
* Prune .la files
* Add missing SLOT operators

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher  gentoo.org>

 .../netgen/files/netgen-5.x-missing-define.patch   |  8 ++--
 .../files/netgen-5.x-occ-stl-api-change.patch  |  4 +-
 sci-mathematics/netgen/netgen-5.3.1.ebuild | 45 --
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch 
b/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch
index 4ad5c52..d9d8f99 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-missing-define.patch
@@ -1,5 +1,5 @@
 libsrc/occ/Partition_Loop2d.cxx.orig   2012-11-14 21:16:22.876287910 
+0100
-+++ libsrc/occ/Partition_Loop2d.cxx2012-11-14 21:22:30.909650554 +0100
+--- a/libsrc/occ/Partition_Loop2d.cxx  2012-11-14 21:16:22.876287910 +0100
 b/libsrc/occ/Partition_Loop2d.cxx  2012-11-14 21:22:30.909650554 +0100
 @@ -13,6 +13,7 @@
  
  //using namespace std;
@@ -26,8 +26,8 @@
{
  // an angle is too close to PI; assure that an angle sign really
  // reflects an edge position: +PI - an edge is worst,
 configure.ac.orig  2012-11-15 14:55:45.048938870 +0100
-+++ configure.ac   2012-11-15 14:55:12.545923777 +0100
+--- a/configure.ac 2012-11-15 14:55:45.048938870 +0100
 b/configure.ac 2012-11-15 14:55:12.545923777 +0100
 @@ -14,6 +14,7 @@
  AC_DISABLE_STATIC
  

diff --git a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch 
b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
index 05f3a54..0452d6b 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-occ-stl-api-change.patch
@@ -1,5 +1,5 @@
 libsrc/occ/occgeom.cpp 2014-08-29 11:54:03.0 +0200
-+++ libsrc/occ/occgeom.cpp 2016-02-12 21:14:49.258982206 +0100
+--- a/libsrc/occ/occgeom.cpp   2014-08-29 11:54:03.0 +0200
 b/libsrc/occ/occgeom.cpp   2016-02-12 21:14:49.258982206 +0100
 @@ -149,7 +149,7 @@
  
   for (exp0.Init (shape, TopAbs_FACE); exp0.More(); exp0.Next())

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 9aac92d..b3f383d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="-ffmpeg jpeg -mpi opencascade openmp"
 
 DEPEND="
-   dev-lang/tcl
-   dev-lang/tk
+   dev-lang/tcl:0
+   dev-lang/tk:0
dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
@@ -32,19 +32,22 @@ DEPEND="
 RDEPEND="${DEPEND}"
 # Note, MPI has not be tested.
 
-src_prepare() {
-   default
+PATCHES=(
# Adapted from 
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
-   epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
+   "${FILESDIR}"/${PN}-5.x-missing-define.patch
# Adapted from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
-   epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch"
-   epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
+   "${FILESDIR}"/${PN}-5.x-metis-fixes.patch
+   "${FILESDIR}"/${PN}-5.x-occ-stl-api-change.patch
# Adapted from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch
-   epatch "${FILESDIR}/${PN}-5.x-makefiles-fixes.patch"
+   "${FILESDIR}"/${PN}-5.x-makefiles-fixes.patch
# Adapted from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
-   epatch "${FILESDIR}/${PN}-5.x-fedora-fixes.patch"
-   epatch "${FILESDIR}/${PN}-5.x-includes-fixes.patch"
-   epatch "${FILESDIR}/${PN}-5.x-parallelmetis4-fix.patch"
+   "${FILESDIR}"/${PN}-5.x-fedora-fixes.patch
+   "${FILESDIR}"/${PN}-5.x-includes-fixes.patch
+   "${FILESDIR}"/${PN}-5.x-parallelmetis4-fix.patch
+)
+
+src_prepare() {
+   default
if use mpi; then
export CC=mpicc
export CXX=mpic++
@@ -58,14 +61,12 @@ src_prepare() {
 src_configure() {
# This is not the most clever way to deal with these flags
# but --disable-xxx does not seem to work correcly, so...
-   local

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/

2016-02-22 Thread Justin Lecher 
commit: f83f93985041a9cd241f2f8d3937d4c1e6fe731d
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 20:54:51 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f83f9398

Remove -DTOGL_X11 and merge with build patch

 ...uild.patch => netgen-5.x-makefiles-fixes.patch} | 148 +
 sci-mathematics/netgen/netgen-5.3.1.ebuild |   4 +-
 2 files changed, 96 insertions(+), 56 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch 
b/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch
similarity index 69%
rename from sci-mathematics/netgen/files/netgen-5.3.1_build.patch
rename to sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch
index 82c6ac9..b6c8fd4 100644
--- a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-makefiles-fixes.patch
@@ -1,7 +1,15 @@
-diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac
 netgen-5.3.1/configure.ac  2014-10-07 21:38:21.990021106 +0200
-+++ netgen-5.3.1-new/configure.ac  2014-10-07 21:39:14.530034275 +0200
-@@ -35,15 +35,15 @@ AC_ARG_WITH([occ],
+diff -uwrN -x.git netgen-5.3.1/configure.ac netgen/configure.ac
+--- netgen-5.3.1/configure.ac  2016-02-21 21:40:41.852331652 +0100
 netgen/configure.ac2016-02-21 21:39:31.355329711 +0100
+@@ -14,7 +14,6 @@
+ AC_DISABLE_STATIC
+ 
+ AC_LANG([C++])
+-AM_PROG_AR
+ AC_PROG_CXX
+ 
+ AC_OPENMP
+@@ -36,15 +35,15 @@
  [AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in 
directory dir])],
  [occdir=$withval] 
[occon=true],
@@ -20,7 +28,7 @@ diff -rupN netgen-5.3.1/configure.ac 
netgen-5.3.1-new/configure.ac
  
  #  -lTKDCAF
  
-@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui],
+@@ -90,18 +89,18 @@
  [AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])],
  [if test "$enableval" = yes; then ngguion=true; else ngguion=false; 
fi])
  
@@ -43,10 +51,10 @@ diff -rupN netgen-5.3.1/configure.ac 
netgen-5.3.1-new/configure.ac
  )   
  #  -DVTRACE
  #  -lvt-hyb
-diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am 
netgen-5.3.1-new/libsrc/csg/Makefile.am
 netgen-5.3.1/libsrc/csg/Makefile.am2014-10-07 21:38:21.787017193 
+0200
-+++ netgen-5.3.1-new/libsrc/csg/Makefile.am2014-10-07 21:39:14.530034275 
+0200
-@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp
+diff -uwrN -x.git netgen-5.3.1/libsrc/csg/Makefile.am 
netgen/libsrc/csg/Makefile.am
+--- netgen-5.3.1/libsrc/csg/Makefile.am2016-02-21 21:40:41.852331652 
+0100
 netgen/libsrc/csg/Makefile.am  2016-02-21 21:39:31.355329711 +0100
+@@ -8,24 +8,24 @@
  AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include  $(TCL_INCLUDES)
  METASOURCES = AUTO
  
@@ -77,10 +85,10 @@ diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am 
netgen-5.3.1-new/libsrc/csg/Makef
  endif
  
  #   $(top_builddir)/libsrc/geom2d/libgeom2d.la 
-diff -rupN netgen-5.3.1/libsrc/general/Makefile.am 
netgen-5.3.1-new/libsrc/general/Makefile.am
 netgen-5.3.1/libsrc/general/Makefile.am2014-10-07 21:38:21.638014320 
+0200
-+++ netgen-5.3.1-new/libsrc/general/Makefile.am2014-10-07 
21:39:14.531034296 +0200
-@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp
+diff -uwrN -x.git netgen-5.3.1/libsrc/general/Makefile.am 
netgen/libsrc/general/Makefile.am
+--- netgen-5.3.1/libsrc/general/Makefile.am2016-02-21 21:40:41.852331652 
+0100
 netgen/libsrc/general/Makefile.am  2016-02-21 21:39:31.356329711 +0100
+@@ -4,8 +4,8 @@
  
  AM_CPPFLAGS =  $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include
  METASOURCES = AUTO
@@ -91,10 +99,10 @@ diff -rupN netgen-5.3.1/libsrc/general/Makefile.am 
netgen-5.3.1-new/libsrc/gener
hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \
profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp \
mpi_interface.cpp gzstream.cpp
-diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am 
netgen-5.3.1-new/libsrc/geom2d/Makefile.am
 netgen-5.3.1/libsrc/geom2d/Makefile.am 2014-10-07 21:38:21.832018060 
+0200
-+++ netgen-5.3.1-new/libsrc/geom2d/Makefile.am 2014-10-07 21:39:14.531034296 
+0200
-@@ -4,18 +4,18 @@ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/inc
+diff -uwrN -x.git netgen-5.3.1/libsrc/geom2d/Makefile.am 
netgen/libsrc/geom2d/Makefile.am
+--- netgen-5.3.1/libsrc/geom2d/Makefile.am 2016-02-21 21:40:41.852331652 
+0100
 netgen/libsrc/geom2d/Makefile.am   2016-02-21 21:39:31.356329711 +0100
+@@ -4,18 +4,18 @@
  
  METASOURCES = AUTO
  
@@ -119,10 +127,10 @@ diff -rupN netgen-5.3.1/libsrc/geom2d/Makefile.am 
netgen-5.3.1-new/libsrc/geom2d
 +libnggeom2dvis_la_LIBADD = libnggeom2d.la -lGL $(MPI_LIBS)
  
  
-diff -rupN netgen-5.3.1/libsrc/gprim/Makefile.am 
netgen-5.3.1-new/libsrc/gprim/Makefile.am
 netgen-5.3.1/libsrc/gprim/Makefile.am  2014-10-07 21:38:21.719015882 
+0200
-+++

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 9eb7b1d6383e100614799a895342ede31a3734f3
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 14:05:42 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9eb7b1d6

added openmp use flag

 sci-mathematics/netgen/netgen-5.3.1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 3d5b624..6f385f7 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade"
+IUSE="-ffmpeg jpeg -mpi opencascade -openmp"
 
 DEPEND="
dev-lang/tk
@@ -57,6 +57,10 @@ src_configure() {
# but --disable-xxx does not seem to work correcly, so...
local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
 
+   if use !openmp; then
+   myconf="${myconf} --disable-openmp"
+   fi
+
if use opencascade; then
myconf="${myconf} --enable-occ --with-occ=$CASROOT"
append-ldflags -L$CASROOT/$(get_libdir)

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 87e254cf7f809f2b54f201e16f5c11455c27a704
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 21:22:52 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=87e254cf

Remove NETGEN from description

 sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index b23cd8a..d39d45c 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools eutils flag-o-matic multilib versionator
 
 MY_PN=${PN}-mesher
 MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
+DESCRIPTION="Automatic 3d tetrahedral mesh generator"
 HOMEPAGE="http://www.hpfem.jku.at/netgen/;
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 7882cf4cfd2995f94b03c608ceb7090b97258cf2
Author: Grégory Salvan  gmail  com>
AuthorDate: Sat Feb 20 22:42:39 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7882cf4c

Added build patch from fedora (fix Mesh :: ParallelMetis linking error...)

 .../netgen/files/netgen-5.3.1_build.patch  | 372 +
 sci-mathematics/netgen/netgen-5.3.1.ebuild |   2 +
 2 files changed, 374 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-5.3.1_build.patch 
b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch
new file mode 100644
index 000..dd8d395
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.3.1_build.patch
@@ -0,0 +1,372 @@
+diff -rupN netgen-5.3.1/configure.ac netgen-5.3.1-new/configure.ac
+--- netgen-5.3.1/configure.ac  2014-10-07 21:38:21.990021106 +0200
 netgen-5.3.1-new/configure.ac  2014-10-07 21:39:14.530034275 +0200
+@@ -35,15 +35,15 @@ AC_ARG_WITH([occ],
+ [AC_HELP_STRING([--with-occ=dir],[use OpenCascade installed in 
directory dir])],
+ [occdir=$withval] 
+   [occon=true],
+-  [occdir=/opt/OpenCASCADE]
++  [occdir=/usr]
+ )
+ 
+ 
+ 
+ if test a$occon = atrue ; then
+ 
+-  AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc 
-I/usr/include/opencascade"])
+-  AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath 
-lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh 
-lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep 
-lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES 
-lTKXCAF -lTKLCAF -lFWOSPlugin"])
++  AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I/usr/include/oce"])
++  AC_SUBST([OCCLIBS], ["-lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d 
-lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo 
-lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP 
-lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF 
-lFWOSPlugin"])
+ 
+ #  -lTKDCAF
+ 
+@@ -89,18 +89,18 @@ AC_ARG_ENABLE([gui],
+ [AC_HELP_STRING([--disable-gui],[don't build netgen with GUI])],
+ [if test "$enableval" = yes; then ngguion=true; else ngguion=false; 
fi])
+ 
+-metisdir=/usr/local
++metisdir=/usr
+ AC_ARG_WITH([metis], 
+ [AC_HELP_STRING([--with-metis=dir],[path to metis 5.x])],
+ [metisdir=$withval],
+-[metisdir=/usr/local]
++[metisdir=/usr]
+   )
+ 
+ AC_ARG_ENABLE([parallel],
+ [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])],
+-  [AC_SUBST([MPI_INCLUDES], "-I$metisdir/include -DMETIS")]
++  [AC_SUBST([MPI_INCLUDES], "-DMETIS")]
+ [CXXFLAGS="$CXXFLAGS -DPARALLEL"]
+-  [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")]
++  [AC_SUBST([MPI_LIBS], "-lmetis")]
+ )   
+ #  -DVTRACE
+ #  -lvt-hyb
+diff -rupN netgen-5.3.1/libsrc/csg/Makefile.am 
netgen-5.3.1-new/libsrc/csg/Makefile.am
+--- netgen-5.3.1/libsrc/csg/Makefile.am2014-10-07 21:38:21.787017193 
+0200
 netgen-5.3.1-new/libsrc/csg/Makefile.am2014-10-07 21:39:14.530034275 
+0200
+@@ -8,24 +8,24 @@ revolution.hpp spline3d.hpp vscsg.hpp
+ AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include  $(TCL_INCLUDES)
+ METASOURCES = AUTO
+ 
+-lib_LTLIBRARIES = libcsg.la
++lib_LTLIBRARIES = libngcsg.la
+ 
+ 
+-libcsg_la_SOURCES = algprim.cpp brick.cpp   \
++libngcsg_la_SOURCES = algprim.cpp brick.cpp   \
+ bspline2d.cpp csgeom.cpp csgparser.cpp curve2d.cpp edgeflw.cpp   \
+ explicitcurve2d.cpp extrusion.cpp gencyl.cpp genmesh.cpp identify.cpp  \
+ manifold.cpp meshsurf.cpp polyhedra.cpp revolution.cpp singularref.cpp \
+ solid.cpp specpoin.cpp spline3d.cpp surface.cpp triapprox.cpp
+ 
+-libcsg_la_LIBADD =  $(top_builddir)/libsrc/meshing/libmesh.la
++libngcsg_la_LIBADD =  $(top_builddir)/libsrc/meshing/libngmesh.la
+ 
+ 
+ 
+ if NGGUI
+-lib_LTLIBRARIES += libcsgvis.la 
++lib_LTLIBRARIES += libngcsgvis.la
+ 
+-libcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp
+-libcsgvis_la_LIBADD = libcsg.la
++libngcsgvis_la_SOURCES = vscsg.cpp csgpkg.cpp
++libngcsgvis_la_LIBADD = libngcsg.la
+ endif
+ 
+ #   $(top_builddir)/libsrc/geom2d/libgeom2d.la 
+diff -rupN netgen-5.3.1/libsrc/general/Makefile.am 
netgen-5.3.1-new/libsrc/general/Makefile.am
+--- netgen-5.3.1/libsrc/general/Makefile.am2014-10-07 21:38:21.638014320 
+0200
 netgen-5.3.1-new/libsrc/general/Makefile.am2014-10-07 
21:39:14.531034296 +0200
+@@ -4,8 +4,8 @@ include_HEADERS = ngexception.hpp
+ 
+ AM_CPPFLAGS =  $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include
+ METASOURCES = AUTO
+-noinst_LTLIBRARIES = libgen.la
+-libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \
++noinst_LTLIBRARIES = libnggen.la
++libnggen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \
+   hashtabl.cpp

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: 9ec238e476e7ace367d89b0498d181e69be91d6d
Author: Grégory Salvan  gmail  com>
AuthorDate: Sun Feb 21 14:36:39 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=9ec238e4

set hdf5[mpi] only if opencascade flag is selected and add tcl

 sci-mathematics/netgen/netgen-5.3.1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 6f385f7..4cc2cd9 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -15,9 +15,10 @@ 
SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade -openmp"
+IUSE="-ffmpeg jpeg -mpi opencascade openmp"
 
 DEPEND="
+   dev-lang/tcl
dev-lang/tk
dev-tcltk/tix
dev-tcltk/togl:1.7
@@ -27,7 +28,7 @@ DEPEND="
opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg:0= )
-   mpi? ( virtual/mpi ( || ( sci-libs/parmetis

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/

2016-02-22 Thread Justin Lecher 
commit: b4b71a0c2ce78b32be5e264fe2585b27f7b3c487
Author: Grégory Salvan  gmail  com>
AuthorDate: Fri Feb 12 18:08:41 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=b4b71a0c

added the right patch for metis numflag

 .../netgen/files/netgen-5.x-metis-numflag.patch | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch 
b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
index 4c32304..9e5ba88 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
@@ -1,21 +1,20 @@
-diff -uwrN ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 
netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp
 ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-11 
19:12:14.474185736 +0100
-+++ netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp  2014-08-29 
11:54:05.0 +0200
+--- libsrc/meshing/parallelmesh.cpp2014-08-29 11:54:05.0 +0200
 libsrc/meshing/parallelmesh.cpp2016-02-11 19:12:14.474185736 +0100
 @@ -1318,7 +1318,7 @@
  idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
- 
+
  int weightflag = 0;
--int numflag = 0;
-+// int numflag = 0;
+-// int numflag = 0;
++int numflag = 0;
  int nparts = ntasks - 1;
- 
+
  int options[5];
 @@ -1485,7 +1485,7 @@
  idxtype *v_weights = NULL, *e_weights = NULL;
- 
+
  int weightflag = 0;
--int numflag = 0;
-+// int numflag = 0;
+-// int numflag = 0;
++int numflag = 0;
  int nparts = ntasks - 1;
- 
+
  int edgecut;

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: aa4f4321b26e8565c3d4abcff9b5d17865577b88
Author: Grégory Salvan  gmail  com>
AuthorDate: Sat Feb 20 20:33:45 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=aa4f4321

change to EAPI 6

 sci-mathematics/netgen/netgen-5.3.1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 16441ff..adae126 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}"
 # Note, MPI has not be tested.
 
 src_prepare() {
+   default
# Adapted from 
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: c9bee13d7464e8937ac2afba9f50e436b84c1f08
Author: Grégory Salvan  gmail  com>
AuthorDate: Sat Feb 20 20:34:21 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c9bee13d

added required dependencies libX11 and and tk

 sci-mathematics/netgen/netgen-5.3.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index adae126..9a1f35c 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -18,9 +18,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="-ffmpeg jpeg -mpi opencascade"
 
 DEPEND="
+   dev-lang/tk
dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
+   x11-libs/libX11
x11-libs/libXmu
opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/

2016-02-22 Thread Justin Lecher 
commit: 4a0832f4a3fbc03195c3f9a2bbadde48c40b58a4
Author: Grégory Salvan  gmail  com>
AuthorDate: Sat Feb 20 22:26:59 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4a0832f4

merge parallelmesh.cpp patches

 ...dora-metis.patch => netgen-5.x-metis-fixes.patch} | 15 ---
 .../netgen/files/netgen-5.x-metis-numflag.patch  | 20 
 sci-mathematics/netgen/netgen-5.3.1.ebuild   |  5 ++---
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch 
b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
similarity index 85%
rename from sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
rename to sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
index 68b3396..cf59613 100644
--- a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
+++ b/sci-mathematics/netgen/files/netgen-5.x-metis-fixes.patch
@@ -1,5 +1,5 @@
 ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-20 
21:55:59.227450843 +0100
-+++ ./netgen/libsrc/meshing/parallelmesh.cpp   2016-02-20 21:46:32.331435233 
+0100
+--- netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp  2014-08-29 
11:54:05.0 +0200
 netgen/libsrc/meshing/parallelmesh.cpp 2016-02-20 23:07:00.350568182 
+0100
 @@ -14,7 +14,7 @@
  
  #if METIS_VER_MAJOR >= 5
@@ -47,6 +47,15 @@
BubbleSort(array);
}
  
+@@ -1318,7 +1318,7 @@
+ idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
+ 
+ int weightflag = 0;
+-// int numflag = 0;
++int numflag = 0;
+ int nparts = ntasks - 1;
+ 
+ int options[5];
 @@ -1377,7 +1377,7 @@
  
  for ( int el = 0; el < ne; el++ )
@@ -72,7 +81,7 @@
  idxtype *v_weights = NULL, *e_weights = NULL;
  
 -int weightflag = 0;
--int numflag = 0;
+-// int numflag = 0;
 -int nparts = ntasks - 1;
 +metis::idx_t weightflag = 0;
 +metis::idx_t numflag = 0;

diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch 
b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
deleted file mode 100644
index 9e5ba88..000
--- a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 libsrc/meshing/parallelmesh.cpp2014-08-29 11:54:05.0 +0200
-+++ libsrc/meshing/parallelmesh.cpp2016-02-11 19:12:14.474185736 +0100
-@@ -1318,7 +1318,7 @@
- idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
-
- int weightflag = 0;
--// int numflag = 0;
-+int numflag = 0;
- int nparts = ntasks - 1;
-
- int options[5];
-@@ -1485,7 +1485,7 @@
- idxtype *v_weights = NULL, *e_weights = NULL;
-
- int weightflag = 0;
--// int numflag = 0;
-+int numflag = 0;
- int nparts = ntasks - 1;
-
- int edgecut;

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index cf09c82..0c2da7d 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -35,9 +35,8 @@ src_prepare() {
default
# Adapted from 
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
-   epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
-   # Taken from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
-   epatch "${FILESDIR}/${PN}-5.x-fedora-metis.patch"
+   # Adapted from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
+   epatch "${FILESDIR}/${PN}-5.x-metis-fixes.patch"
epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
if use mpi; then
export CC=mpicc

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/, sci-mathematics/netgen/files/

2016-02-22 Thread Justin Lecher 
commit: 5ec3233859aac528082c693381300f5b237c4a91
Author: Grégory Salvan  gmail  com>
AuthorDate: Thu Feb 11 18:24:57 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=5ec32338

added netgen-5.3.1 ebuild and patch for metis

 .../netgen/files/netgen-5.x-metis-numflag.patch| 21 +
 sci-mathematics/netgen/netgen-5.3.1.ebuild | 89 ++
 2 files changed, 110 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch 
b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
new file mode 100644
index 000..4c32304
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-metis-numflag.patch
@@ -0,0 +1,21 @@
+diff -uwrN ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 
netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp
+--- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-11 
19:12:14.474185736 +0100
 netgen-5.3.1.ORIG/libsrc/meshing/parallelmesh.cpp  2014-08-29 
11:54:05.0 +0200
+@@ -1318,7 +1318,7 @@
+ idxtype  *xadj, * adjacency, *v_weights = NULL, *e_weights = NULL;
+ 
+ int weightflag = 0;
+-int numflag = 0;
++// int numflag = 0;
+ int nparts = ntasks - 1;
+ 
+ int options[5];
+@@ -1485,7 +1485,7 @@
+ idxtype *v_weights = NULL, *e_weights = NULL;
+ 
+ int weightflag = 0;
+-int numflag = 0;
++// int numflag = 0;
+ int nparts = ntasks - 1;
+ 
+ int edgecut;

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
new file mode 100644
index 000..8a2f60b
--- /dev/null
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_PN=${PN}-mesher
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
+HOMEPAGE="http://www.hpfem.jku.at/netgen/;
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="-ffmpeg jpeg -mpi opencascade"
+
+DEPEND="
+   dev-tcltk/tix
+   dev-tcltk/togl:1.7
+   virtual/opengl
+   x11-libs/libXmu
+   opencascade? ( sci-libs/opencascade:* )
+   ffmpeg? ( media-video/ffmpeg )
+   jpeg? ( virtual/jpeg:0= )
+   mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
+RDEPEND="${DEPEND}"
+# Note, MPI has not be tested.
+
+src_prepare() {
+   # Adapted from 
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
+   epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
+   epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
+   eautoreconf
+}
+
+src_configure() {
+   # This is not the most clever way to deal with these flags
+   # but --disable-xxx does not seem to work correcly, so...
+   sed -i -e 's:-lTogl:-lTogl1.7:' ng/Makefile.am || die
+   local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
+
+   if use opencascade; then
+   myconf="${myconf} --enable-occ --with-occ=$CASROOT"
+   append-ldflags -L$CASROOT/lin/$(get_libdir)
+   fi
+   if use mpi; then
+   myconf="${myconf} --enable-parallel"
+   append-cppflags -I/usr/include/metis
+   fi
+   use ffmpeg && myconf="${myconf} --enable-ffmpeg"
+   use jpeg && myconf="${myconf} --enable-jpeglib"
+   append-cppflags -I/usr/include/togl-1.7
+
+   econf \
+   ${myconf}
+
+   # This would be the more elegant way:
+#  econf \
+#  $(use_enable opencascade occ) \
+#  $(use_with opencascade "occ=$CASROOT") \
+#  $(use_enable mpi parallel) \
+#  $(use_enable ffmpeg) \
+#  $(use_enable jpeg jpeglib)
+}
+
+src_install() {
+   local NETGENDIR="/usr/share/netgen"
+
+   echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > 
./99netgen
+   doenvd 99netgen
+
+   default
+   mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
+
+   # Install icon and .desktop for menu entry
+   doicon "${FILESDIR}"/${PN}.png
+   domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+   elog "Please make sure to update your environment variables:"
+   elog "env-update && source /etc/profile"
+   elog "Netgen ebuild is still under development."
+   elog "Help us improve the ebuild in:"
+   elog "http://bugs.gentoo.org/show_bug.cgi?id=155424;
+}

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/files/, sci-mathematics/netgen/

2016-02-22 Thread Justin Lecher 
commit: ff32a770a509011f0f527f2972e7f4825d3f6281
Author: Grégory Salvan  gmail  com>
AuthorDate: Sat Feb 20 21:18:33 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Feb 22 08:36:31 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=ff32a770

added fedora metis patch

 .../netgen/files/netgen-5.x-fedora-metis.patch | 93 ++
 sci-mathematics/netgen/netgen-5.3.1.ebuild |  2 +
 2 files changed, 95 insertions(+)

diff --git a/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch 
b/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
new file mode 100644
index 000..68b3396
--- /dev/null
+++ b/sci-mathematics/netgen/files/netgen-5.x-fedora-metis.patch
@@ -0,0 +1,93 @@
+--- ./netgen-5.3.1/libsrc/meshing/parallelmesh.cpp 2016-02-20 
21:55:59.227450843 +0100
 ./netgen/libsrc/meshing/parallelmesh.cpp   2016-02-20 21:46:32.331435233 
+0100
+@@ -14,7 +14,7 @@
+ 
+ #if METIS_VER_MAJOR >= 5
+ #define METIS5
+-typedef idx_t idxtype;   
++typedef metis::idx_t idxtype;
+ #else
+ #define METIS4
+ typedef idxtype idx_t;  
+@@ -794,10 +794,10 @@
+ eptr.Append (eind.Size());
+ Array epart(ne), npart(nn);
+ 
+-int nparts = ntasks-1;
+-int edgecut;
++metis::idx_t nparts = ntasks-1;
++metis::idx_t edgecut;
+ 
+-int ncommon = 3;
++metis::idx_t ncommon = 3;
+ METIS_PartMeshDual (, , [0], [0], NULL, NULL, , 
,
+   NULL, NULL,
+   , [0], [0]);
+@@ -1029,11 +1029,11 @@
+ eptr.Append (eind.Size());
+ Array epart(ne), npart(nn);
+ 
+-int nparts = ntasks-1;
+-int edgecut;
++metis::idx_t nparts = ntasks-1;
++metis::idx_t edgecut;
+ 
+ 
+-int ncommon = 3;
++metis::idx_t ncommon = 3;
+ METIS_PartMeshDual (, , [0], [0], [0], NULL, 
, ,
+   NULL, NULL,
+   , [0], [0]);
+@@ -1266,7 +1266,7 @@
+ 
+ for ( int vert = 0; vert < nn; vert++ )
+   {
+-  FlatArray array ( cnt[vert], [ xadj[vert] ] );
++  FlatArray array ( cnt[vert], [ xadj[vert] ] );
+   BubbleSort(array);
+   }
+ 
+@@ -1377,7 +1377,7 @@
+ 
+ for ( int el = 0; el < ne; el++ )
+   {
+-  FlatArray array ( cnt[el], [ xadj[el] ] );
++  FlatArray array ( cnt[el], [ xadj[el] ] );
+   BubbleSort(array);
+   }
+ 
+@@ -1428,8 +1428,8 @@
+   void Mesh :: PartDualHybridMesh2D ( ) 
+   {
+ #ifdef METIS
+-int ne = GetNSE();
+-int nv = GetNV();
++metis::idx_t ne = GetNSE();
++metis::idx_t nv = GetNV();
+ 
+ Array xadj(ne+1);
+ Array adjacency(ne*4);
+@@ -1484,18 +1484,18 @@
+ 
+ idxtype *v_weights = NULL, *e_weights = NULL;
+ 
+-int weightflag = 0;
+-int numflag = 0;
+-int nparts = ntasks - 1;
++metis::idx_t weightflag = 0;
++metis::idx_t numflag = 0;
++metis::idx_t nparts = ntasks - 1;
+ 
+-int edgecut;
++metis::idx_t edgecut;
+ Array part(ne);
+ 
+ for ( int el = 0; el < ne; el++ )
+   BubbleSort (adjacency.Range (xadj[el], xadj[el+1]));
+ 
+ #ifdef METIS4 
+-int options[5];
++metis::idx_t options[5];
+ options[0] = 0;
+ METIS_PartGraphKway ( , [0], [0], v_weights, e_weights, 
, 
+ , , options, , [0] );

diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild 
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 9a1f35c..cf09c82 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -36,6 +36,8 @@ src_prepare() {
# Adapted from 
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
epatch "${FILESDIR}/${PN}-5.x-metis-numflag.patch"
+   # Taken from 
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
+   epatch "${FILESDIR}/${PN}-5.x-fedora-metis.patch"
epatch "${FILESDIR}/${PN}-5.x-occ-stl-api-change.patch"
if use mpi; then
export CC=mpicc

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-09-21 Thread Justin Lecher 
commit: 55066272be3a52a2cb2c012c201537c6ee4782cd
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Sep 21 18:54:17 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Sep 21 18:54:17 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=55066272

sci-mathematics/netgen: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-mathematics/netgen/netgen-4.9.13.ebuild | 21 +++--
 sci-mathematics/netgen/netgen-5.0.0.ebuild  | 14 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-4.9.13.ebuild 
b/sci-mathematics/netgen/netgen-4.9.13.ebuild
index 2a0d501..fac506b 100644
--- a/sci-mathematics/netgen/netgen-4.9.13.ebuild
+++ b/sci-mathematics/netgen/netgen-4.9.13.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
+EAPI=5
 
 inherit eutils flag-o-matic multilib versionator
 
-DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
+DESCRIPTION="Automatic 3d tetrahedral mesh generator"
 HOMEPAGE="http://www.hpfem.jku.at/netgen/;
 SRC_URI="mirror://sourceforge/netgen-mesher/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="-ffmpeg jpeg -mpi opencascade"
-SLOT="0"
 
-DEPEND="dev-tcltk/tix
+DEPEND="
+   dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
x11-libs/libXmu
-   opencascade? ( sci-libs/opencascade )
+   opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
-   jpeg? ( virtual/jpeg )
+   jpeg? ( virtual/jpeg:0= )
mpi? ( virtual/mpi ) "
 RDEPEND="${DEPEND}"
 # Note, MPI has not be tested.
@@ -60,12 +61,12 @@ src_install() {
echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > 
./99netgen
doenvd 99netgen
 
-   emake DESTDIR="${D}" install || die "make install failed"
+   default
mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}"
 
# Install icon and .desktop for menu entry
-   doicon "${FILESDIR}"/${PN}.png || die "doicon failed"
-   domenu "${FILESDIR}"/${PN}.desktop || die "domenu failed"
+   doicon "${FILESDIR}"/${PN}.png
+   domenu "${FILESDIR}"/${PN}.desktop
 }
 
 pkg_postinst() {

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 071a89b..96434c2 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -12,24 +12,24 @@ DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh 
generator"
 HOMEPAGE="http://www.hpfem.jku.at/netgen/;
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="-ffmpeg jpeg -mpi opencascade"
-SLOT="0"
 
-DEPEND="dev-tcltk/tix
+DEPEND="
+   dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
x11-libs/libXmu
-   opencascade? ( sci-libs/opencascade )
+   opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
-   jpeg? ( virtual/jpeg )
+   jpeg? ( virtual/jpeg:0= )
mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
 RDEPEND="${DEPEND}"
 # Note, MPI has not be tested.
 
-src_prepare()
-{
+src_prepare() {
# Adapted from 
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
epatch "${FILESDIR}/${PN}-5.x-compile-against-occ-6.5.x.patch"
epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
@@ -72,7 +72,7 @@ src_install() {
echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > 
./99netgen
doenvd 99netgen
 
-   emake DESTDIR="${D}" install
+   default
mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
 
# Install icon and .desktop for menu entry

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-06-08 Thread Justin Lecher 
commit: c12dd88337c84ae5c95a3b9cd4ca8ae4fcde6f4b
Author: Justin Lecher jlec AT gentoo DOT org
AuthorDate: Mon Jun  8 11:40:49 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Jun  8 11:40:49 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=c12dd883

sci-mathematics/netgen: Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20

 sci-mathematics/netgen/ChangeLog|  3 +++
 sci-mathematics/netgen/metadata.xml | 11 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/netgen/ChangeLog b/sci-mathematics/netgen/ChangeLog
index 665d587..4484817 100644
--- a/sci-mathematics/netgen/ChangeLog
+++ b/sci-mathematics/netgen/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Jun 2015; Justin Lecher j...@gentoo.org metadata.xml:
+  sci-mathematics/netgen: Updating remote-id in metadata.xml
+
   26 Apr 2015; Marius Brehler mar...@linux.sungazer.de netgen-5.0.0.ebuild:
   Bump to EAPI=5; Update Manifest (Bug #407)
 

diff --git a/sci-mathematics/netgen/metadata.xml 
b/sci-mathematics/netgen/metadata.xml
index 450140b..a4ba975 100644
--- a/sci-mathematics/netgen/metadata.xml
+++ b/sci-mathematics/netgen/metadata.xml
@@ -1,8 +1,11 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
-herdsci-mathematics/herd
-   use
-   flag name=opencascade Enable OpenCASCADE support/flag
-   /use
+  herdsci-mathematics/herd
+  use
+flag name=opencascade Enable OpenCASCADE support/flag
+  /use
+  upstream
+remote-id type=sourceforgenetgen-mesher/remote-id
+  /upstream
 /pkgmetadata

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-05-04 Thread Justin Lecher 
commit: 68fe586fa3ceb7826f5c8bc141d8f4d6f88744c9
Author: Grégory Salvan apieum AT gmail DOT com
AuthorDate: Mon Apr 27 05:19:24 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Mon Apr 27 05:19:24 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=68fe586f

fix #408 (add spaces)

 sci-mathematics/netgen/netgen-5.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 488cdd8..0dc41d5 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -21,7 +21,7 @@ DEPEND=dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
x11-libs/libXmu
-   || (sci-libs/parmetis sci-libs/metis)
+   || ( sci-libs/parmetis sci-libs/metis )
opencascade? ( sci-libs/opencascade )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg )

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-05-04 Thread Justin Lecher 
commit: f50c8259cf81b2bfe83f90f171fd81c71a9b7bd6
Author: Grégory Salvan apieum AT gmail DOT com
AuthorDate: Wed Apr 29 14:22:36 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Wed Apr 29 14:22:36 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f50c8259

make metis requirement only with mpi use flag

 sci-mathematics/netgen/netgen-5.0.0.ebuild | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 0dc41d5..7490cff 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -21,11 +21,11 @@ DEPEND=dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
x11-libs/libXmu
-   || ( sci-libs/parmetis sci-libs/metis )
+   
opencascade? ( sci-libs/opencascade )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg )
-   mpi? ( virtual/mpi ) 
+   mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) 
 RDEPEND=${DEPEND}
 # Note, MPI has not be tested.
 
@@ -47,13 +47,16 @@ src_configure() {
myconf=${myconf} --enable-occ --with-occ=$CASROOT
append-ldflags -L$CASROOT/lin/$(get_libdir)
fi
-
-   use mpi  myconf=${myconf} --enable-parallel
+   
+   if use mpi; then
+   myconf=${myconf} --enable-parallel
+   append-cppflags -I/usr/include/metis
+   fi
+   
use ffmpeg  myconf=${myconf} --enable-ffmpeg
use jpeg  myconf=${myconf} --enable-jpeglib
 
append-cppflags -I/usr/include/togl-1.7
-   append-cppflags -I/usr/include/metis
 
econf \
${myconf}

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-05-04 Thread Justin Lecher 
commit: 7cb4cc3e11f1f6a9178c4ea1f6153160709cd54d
Author: Grégory Salvan apieum AT gmail DOT com
AuthorDate: Sun Apr 26 14:56:27 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Sun Apr 26 14:56:27 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=7cb4cc3e

fix #408

Added dependency with metis and metis include directory

 sci-mathematics/netgen/netgen-5.0.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 057d935..488cdd8 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -21,6 +21,7 @@ DEPEND=dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
x11-libs/libXmu
+   || (sci-libs/parmetis sci-libs/metis)
opencascade? ( sci-libs/opencascade )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg )
@@ -52,6 +53,7 @@ src_configure() {
use jpeg  myconf=${myconf} --enable-jpeglib
 
append-cppflags -I/usr/include/togl-1.7
+   append-cppflags -I/usr/include/metis
 
econf \
${myconf}

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-05-04 Thread Justin Lecher 
commit: bdd2756cb2acb60626d0828d8ee243baacb3beb6
Author: Grégory Salvan apieum AT gmail DOT com
AuthorDate: Wed Apr 29 14:29:55 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Wed Apr 29 14:29:55 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=bdd2756c

remove trailing space errors

 sci-mathematics/netgen/netgen-5.0.0.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 7490cff..d610bff 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -21,7 +21,6 @@ DEPEND=dev-tcltk/tix
dev-tcltk/togl:1.7
virtual/opengl
x11-libs/libXmu
-   
opencascade? ( sci-libs/opencascade )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg )
@@ -47,7 +46,6 @@ src_configure() {
myconf=${myconf} --enable-occ --with-occ=$CASROOT
append-ldflags -L$CASROOT/lin/$(get_libdir)
fi
-   
if use mpi; then
myconf=${myconf} --enable-parallel
append-cppflags -I/usr/include/metis
@@ -55,7 +53,6 @@ src_configure() {

use ffmpeg  myconf=${myconf} --enable-ffmpeg
use jpeg  myconf=${myconf} --enable-jpeglib
-
append-cppflags -I/usr/include/togl-1.7
 
econf \

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-05-04 Thread Justin Lecher 
commit: 6e49f94950432fa7ac8c7b34fc5269d160e41089
Author: Grégory Salvan apieum AT gmail DOT com
AuthorDate: Wed Apr 29 14:31:31 2015 +
Commit: Justin Lecher jlec AT gentoo DOT org
CommitDate: Wed Apr 29 14:31:31 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6e49f949

remove trailing whitespace errors

 sci-mathematics/netgen/netgen-5.0.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index d610bff..8bfb513 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -50,7 +50,6 @@ src_configure() {
myconf=${myconf} --enable-parallel
append-cppflags -I/usr/include/metis
fi
-   
use ffmpeg  myconf=${myconf} --enable-ffmpeg
use jpeg  myconf=${myconf} --enable-jpeglib
append-cppflags -I/usr/include/togl-1.7

[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

2015-05-03 Thread Andrew Savchenko 
commit: 47ece0ee4df44e83e3501bcfa8799ed0030ed977
Author: Marius Brehler marbre AT linux DOT sungazer DOT de
AuthorDate: Sun Apr 26 09:29:38 2015 +
Commit: Andrew Savchenko bircoph AT gentoo DOT org
CommitDate: Sun Apr 26 09:29:59 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=47ece0ee

sci-mathematics/netgen: Bump to EAPI=5; Update Manifest (Bug #407)

Package-Manager: portage-2.2.14

 sci-mathematics/netgen/ChangeLog   |  6 --
 sci-mathematics/netgen/netgen-5.0.0.ebuild | 12 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sci-mathematics/netgen/ChangeLog b/sci-mathematics/netgen/ChangeLog
index f8dc833..665d587 100644
--- a/sci-mathematics/netgen/ChangeLog
+++ b/sci-mathematics/netgen/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-mathematics/netgen
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Apr 2015; Marius Brehler mar...@linux.sungazer.de netgen-5.0.0.ebuild:
+  Bump to EAPI=5; Update Manifest (Bug #407)
+
   14 Mar 2011; Justin Lecher j...@gentoo.org netgen-4.9.13.ebuild:
   Moved media-libs/jpeg - virtual/jpeg
 
@@ -52,4 +55,3 @@
   Initial import. See bug #155424 for anything relating the building process.
   Ebuild from Daniel Tourde daniel.tou...@caelae.se and Oliver Borm
   oli.b...@web.de.
-

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild 
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 2e8a7a4..057d935 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -71,12 +71,12 @@ src_install() {
echo -e NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7  
./99netgen
doenvd 99netgen
 
-   emake DESTDIR=${D} install || die make install failed
-   mv ${D}/usr/bin/{*.tcl,*.ocf} ${D}${NETGENDIR}
+   emake DESTDIR=${D} install
+   mv ${D}/usr/bin/{*.tcl,*.ocf} ${D}${NETGENDIR} || die
 
# Install icon and .desktop for menu entry
-   doicon ${FILESDIR}/${PN}.png || die doicon failed
-   domenu ${FILESDIR}/${PN}.desktop || die domenu failed
+   doicon ${FILESDIR}/${PN}.png
+   domenu ${FILESDIR}/${PN}.desktop
 }
 
 pkg_postinst() {