commit: 030212b91690534d54e31b67da3e5ae78fae5ff4 Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> AuthorDate: Mon Sep 1 19:44:11 2014 +0000 Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org> CommitDate: Mon Sep 1 19:44:11 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=030212b9
sci-libs/gmsh: remove old and live versions old version is outdated and has problems with compilation svn repo can not be accessed anonymously --- sci-libs/gmsh/ChangeLog | 5 ++ sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch | 10 --- sci-libs/gmsh/files/gmsh-2.5.0-link.patch | 16 ----- sci-libs/gmsh/gmsh-2.5.0-r2.ebuild | 95 ------------------------- sci-libs/gmsh/gmsh-9999.ebuild | 87 ---------------------- 5 files changed, 5 insertions(+), 208 deletions(-) diff --git a/sci-libs/gmsh/ChangeLog b/sci-libs/gmsh/ChangeLog index 97574bb..9d83124 100644 --- a/sci-libs/gmsh/ChangeLog +++ b/sci-libs/gmsh/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Sep 2014; Jauhien Piatlicki <jauh...@gentoo.org> -gmsh-2.5.0-r2.ebuild, + -gmsh-9999.ebuild, -files/gmsh-2.5.0-libpng-1.5.patch, + -files/gmsh-2.5.0-link.patch: + remove old and live versions + 01 Sep 2014; Jauhien Piatlicki <jauh...@gentoo.org> gmsh-2.8.5.ebuild: fix sci-mathematics/petsc dependency diff --git a/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch b/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch deleted file mode 100644 index 7920d99..0000000 --- a/sci-libs/gmsh/files/gmsh-2.5.0-libpng-1.5.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Graphics/gl2png.cpp -+++ b/Graphics/gl2png.cpp -@@ -16,6 +16,7 @@ - #else - - #include <png.h> -+#include <zlib.h> - - #ifndef png_jmpbuf - # define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) diff --git a/sci-libs/gmsh/files/gmsh-2.5.0-link.patch b/sci-libs/gmsh/files/gmsh-2.5.0-link.patch deleted file mode 100644 index f019cae..0000000 --- a/sci-libs/gmsh/files/gmsh-2.5.0-link.patch +++ /dev/null @@ -1,16 +0,0 @@ - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5549d6a..48a106d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -879,7 +879,7 @@ elseif(HAVE_QT) - else(HAVE_FLTK) - add_executable(gmsh Common/Main.cpp ${GMSH_SRC}) - endif(HAVE_FLTK) --target_link_libraries(gmsh ${LINK_LIBRARIES}) -+target_link_libraries(gmsh ${LINK_LIBRARIES} -ldl) - - # increase stack to 16Mb on Windows to avoid overflows in recursive - # tet classification for large 3D Delaunay grids diff --git a/sci-libs/gmsh/gmsh-2.5.0-r2.ebuild b/sci-libs/gmsh/gmsh-2.5.0-r2.ebuild deleted file mode 100644 index 25db3df..0000000 --- a/sci-libs/gmsh/gmsh-2.5.0-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit cmake-utils fortran-2 toolchain-funcs - -DESCRIPTION="3D finite element mesh generator with built-in pre- and post-processing facilities" -HOMEPAGE="http://www.geuz.org/gmsh/" -SRC_URI="http://www.geuz.org/gmsh/src/${P}-source.tgz" - -## gmsh comes with its own copies of (at least) metis, netgen and tetgen, therefore inform the user of their special licenses -LICENSE="GPL-3 free-noncomm" -SLOT="0" -KEYWORDS="~amd64 ~x86" -## cgns is not compiling ATM, maybe fix cgns lib first -IUSE="blas cgns chaco doc examples jpeg lua med metis mpi netgen opencascade petsc taucs tetgen X" - -RDEPEND=" - media-libs/libpng - sys-libs/zlib - virtual/fortran - virtual/glu - virtual/opengl - X? ( x11-libs/fltk:1[opengl] ) - blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) - cgns? ( sci-libs/cgnslib ) - jpeg? ( virtual/jpeg ) - lua? ( dev-lang/lua ) - med? ( >=sci-libs/med-2.3.4 ) - opencascade? ( sci-libs/opencascade ) - petsc? ( sci-mathematics/petsc ) - mpi? ( virtual/mpi[cxx] ) - taucs? ( sci-libs/taucs ) - " - -REQUIRED_USE=" - taucs? ( || ( metis ) ) - " - -DEPEND="${RDEPEND} - doc? ( virtual/latex-base )" - -S=${WORKDIR}/${P}-source - -PATCHES=( - "${FILESDIR}/${P}-link.patch" - "${FILESDIR}/${P}-libpng-1.5.patch" ) - -REQUIRED_USE="taucs? ( metis )" - -src_configure() { - use blas && \ - myargs="-DCMAKE_Fortran_COMPILER=$(tc-getF77)" - - mycmakeargs=( - $(cmake-utils_use_enable blas BLAS_LAPACK) - $(cmake-utils_use_enable cgns CGNS) - $(cmake-utils_use_enable chaco CHACO) - $(cmake-utils_use_enable X FLTK) - $(cmake-utils_use_enable X FL_TREE) - $(cmake-utils_use_enable X GRAPHICS) - $(cmake-utils_use_enable med MED) - $(cmake-utils_use_enable metis METIS) - $(cmake-utils_use_enable netgen NETGEN) - $(cmake-utils_use_enable taucs TAUCS) - $(cmake-utils_use_enable tetgen TETGEN) - $(cmake-utils_use_enable opencascade OCC) - $(cmake-utils_use_enable petsc PETSC) - ${myargs} - ) -# $(cmake-utils_use_enable tetgen TETGEN_NEW) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc ; then - emake pdf -C "${CMAKE_BUILD_DIR}" - fi -} - -src_install() { - cmake-utils_src_install - - # TODO: tutorials get installed twice ATM - use doc && dodoc doc/texinfo/gmsh.pdf - - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r demos tutorial - fi -} diff --git a/sci-libs/gmsh/gmsh-9999.ebuild b/sci-libs/gmsh/gmsh-9999.ebuild deleted file mode 100644 index fb15737..0000000 --- a/sci-libs/gmsh/gmsh-9999.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit cmake-utils flag-o-matic fortran-2 subversion toolchain-funcs - -DESCRIPTION="A three-dimensional finite element mesh generator with built-in pre- and post-processing facilities" -HOMEPAGE="http://www.geuz.org/gmsh/" -ESVN_REPO_URI="https://geuz.org/svn/gmsh/trunk" -ESVN_USER="gmsh" -ESVN_PASSWORD="gmsh" - -LICENSE="GPL-3 free-noncomm" -SLOT="0" -KEYWORDS="" -IUSE="blas cgns chaco doc examples jpeg med metis mpi opencascade png taucs X zlib" - -RDEPEND=" - virtual/fortran - X? ( x11-libs/fltk:1 ) - blas? ( virtual/blas virtual/lapack sci-libs/fftw:3.0 ) - cgns? ( sci-libs/cgnslib ) - jpeg? ( virtual/jpeg ) - med? ( >=sci-libs/med-2.3.4 ) - mpi? ( sys-cluster/openmpi[cxx] ) - opencascade? ( sci-libs/opencascade ) - png? ( media-libs/libpng ) - zlib? ( sys-libs/zlib ) - taucs? ( sci-libs/taucs )" - -DEPEND="${RDEPEND} - dev-util/cmake - dev-vcs/subversion - doc? ( virtual/latex-base )" - -pkg_setup() { - fortran-2_pkg_setup - use taucs && ! use metis && \ - die "taucs USE flag requires metis USE flag to be enabled" -} - -src_configure() { - local mycmakeargs="" - - use blas && \ - mycmakeargs="${mycmakeargs} - -DCMAKE_Fortran_COMPILER=$(tc-getF77)" - - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_enable blas BLAS_LAPACK) - $(cmake-utils_use_enable cgns CGNS) - $(cmake-utils_use_enable chaco CHACO) - $(cmake-utils_use_enable X FLTK) - $(cmake-utils_use_enable X FL_TREE) - $(cmake-utils_use_enable X GRAPHICS) - $(cmake-utils_use_enable med MED) - $(cmake-utils_use_enable metis METIS) - $(cmake-utils_use_enable taucs TAUCS) - $(cmake-utils_use_enable opencascade OCC)" - -# I'm not sure if this is needed, but it seems to help in some circumstances -# see http://bugs.gentoo.org/show_bug.cgi?id=195980#c18 - append-ldflags -ldl -lmpi - - cmake-utils_src_configure ${mycmakeargs} \ - || die "cmake configuration failed" -} - -src_install() { - cmake-utils_src_install - - cd "${WORKDIR}"/"${PF}" - - if use doc ; then - cd ${CMAKE_BUILD_DIR} - emake pdf || die "failed to build documentation" - cd "${WORKDIR}"/"${PF}" - dodoc doc/*.txt doc/texinfo/gmsh.pdf - fi - - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r demos tutorial || die "failed to install examples" - fi -}