[gentoo-commits] proj/sci:master commit in: sci-libs/cgnslib/files/, sci-libs/cgnslib/

[Justin Lecher]

commit:     4c8ef1bc7fda02d8b1981765943a30b8e27f4d6e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 12:52:28 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 12:52:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c8ef1bc

sci-libs/cgnslib: Version Bump

Package-Manager: portage-2.2.7

---
 sci-libs/cgnslib/ChangeLog                       |   8 +-
 sci-libs/cgnslib/cgnslib-3.2.1.ebuild            |  49 ++++++++
 sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch | 149 +++++++++++++++++++++++
 sci-libs/cgnslib/metadata.xml                    |   5 +-
 4 files changed, 209 insertions(+), 2 deletions(-)

diff --git a/sci-libs/cgnslib/ChangeLog b/sci-libs/cgnslib/ChangeLog
index ec92de8..6925f15 100644
--- a/sci-libs/cgnslib/ChangeLog
+++ b/sci-libs/cgnslib/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/cgnslib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cgnslib-3.2.1 (29 Dec 2013)
+
+  29 Dec 2013; Justin Lecher <jlec@g.o> +cgnslib-3.2.1.ebuild,
+  +files/cgnslib-3.2.1-cmake.patch, metadata.xml:
+  Version Bump
+
   22 May 2012; Justin Lecher <jlec@g.o> cgnslib-2.5.4.ebuild,
   metadata.xml:
   Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits

diff --git a/sci-libs/cgnslib/cgnslib-3.2.1.ebuild b/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
new file mode 100644
index 0000000..1738762
--- /dev/null
+++ b/sci-libs/cgnslib/cgnslib-3.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+FORTRAN_NEEDED="fortran"
+
+inherit cmake-utils fortran-2 versionator
+
+MY_P="${PN}_$(replace_version_separator 3 '-')"
+MY_S="${PN}_$(get_version_component_range 1-2)"
+
+DESCRIPTION="The CFD General Notation System (CGNS) is a standard for CFD data"
+HOMEPAGE="http://www.cgns.org/"
+SRC_URI="mirror://sourceforge/project/cgns/${MY_S}/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fortran hdf5 legacy mpi szip zlib"
+
+DEPEND="
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	szip? ( sci-libs/szip )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}_${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGNS_ENABLE_64BIT=ON
+		$(usex x86 -DCGNS_ENABLE_LFS=ON)
+		$(cmake-utils_use fortran CGNS_ENABLE_FORTRAN)
+		$(cmake-utils_use hdf5 CGNS_ENABLE_HDF5)
+		$(cmake-utils_use legacy CGNS_ENABLE_LEGACY)
+		$(cmake-utils_use mpi HDF5_NEED_MPI)
+	)
+	cmake-utils_src_configure
+}

diff --git a/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch b/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
new file mode 100644
index 0000000..bf8ea5f
--- /dev/null
+++ b/sci-libs/cgnslib/files/cgnslib-3.2.1-cmake.patch
@@ -0,0 +1,149 @@
+ CMakeLists.txt     | 20 +--------------
+ src/CMakeLists.txt | 72 +++++++++++++++++++++++++++---------------------------
+ 2 files changed, 37 insertions(+), 55 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9c1b3c..d4c2bf7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,7 +81,7 @@ if (CGNS_ENABLE_LFS)
+     if (HAVE_OPEN64)
+       add_definitions(-DHAVE_LSEEK64)
+     endif (HAVE_OPEN64)
+-    if (HAVE_OPEN64)
++    if (HAVE_LSEEK64)
+       add_definitions(-DHAVE_LSEEK64)
+     endif (HAVE_LSEEK64)
+   endif (WIN32)
+@@ -254,24 +254,6 @@ else (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI)
+   mark_as_advanced(FORCE CGNS_ENABLE_PARALLEL)
+ endif (CGNS_ENABLE_HDF5 AND HDF5_NEED_MPI)
+ 
+-####################
+-# RPATH Management #
+-####################
+-
+-# use, i.e. don't skip the full RPATH for the build tree
+-set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+-
+-# when building, don't use the install RPATH already
+-# (but later on when installing)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-
+-# the RPATH to be used when installing
+-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+-
+-# add the automatically determined parts of the RPATH
+-# which point to directories outside the build tree to the install RPATH
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-
+ ########
+ # CGNS #
+ ########
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3c12c6d..694da42 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -69,7 +69,7 @@ set(SYSCFLAGS "")
+ set(CFGFLAGS "")
+ set(LIBS "")
+ 
+-file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib LIBDIR)
++file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} LIBDIR)
+ file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/include INCLUDEDIR)
+ file(TO_NATIVE_PATH ${CMAKE_C_COMPILER} CC)
+ if (WIN32)
+@@ -102,42 +102,42 @@ set(ZLIBLIB "")
+ set(MPIINC "")
+ set(MPILIBS "")
+ 
+-macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE)
+-  set(${RESULT_VARIABLE} "")
+-  foreach(PATH ${${INPUT_PATH_VARIABLE}})
+-    file(TO_NATIVE_PATH ${PATH} NATIVE_PATH)
+-    list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH})
+-  endforeach(PATH ${${INPUT_PATH_VARIABLE}})
+-endmacro(native_paths)
++macro(native_paths INPUT_PATH_VARIABLE RESULT_VARIABLE)
++  set(${RESULT_VARIABLE} "")
++  foreach(PATH ${${INPUT_PATH_VARIABLE}})
++    file(TO_NATIVE_PATH ${PATH} NATIVE_PATH)
++    list(APPEND ${RESULT_VARIABLE} ${NATIVE_PATH})
++  endforeach(PATH ${${INPUT_PATH_VARIABLE}})
++endmacro(native_paths)
+ 
+ if (CGNS_ENABLE_HDF5)
+   set(BUILDHDF5 1)
+-  if (HDF5_INCLUDE_PATH)
+-    native_paths(HDF5_INCLUDE_PATH HDF5INC)
+-  endif (HDF5_INCLUDE_PATH)
+-  if (HDF5_LIBRARY)
+-    native_paths(HDF5_LIBRARY HDF5LIB)
+-  endif (HDF5_LIBRARY)
+-  if (HDF5_NEED_SZIP)
+-    set(H5NEEDSZIP 1)
+-    if (SZIP_LIBRARY)
+-      native_paths(SZIP_LIBRARY SZIPLIB)
+-    endif (SZIP_LIBRARY)
+-  endif (HDF5_NEED_SZIP)
+-  if (HDF5_NEED_ZLIB)
+-    set(H5NEEDZLIB 1)
+-    if (ZLIB_LIBRARY)
+-      native_paths(${ZLIB_LIBRARY} ZLIBLIB)
+-    endif (ZLIB_LIBRARY)
+-  endif (HDF5_NEED_ZLIB)
+-  if (HDF5_NEED_MPI)
+-    set(H5NEEDMPI 1)
+-    if (MPI_INC)
+-      native_paths(MPI_INC MPIINC)
+-    endif (MPI_INC)
+-    if (MPI_LIBS)
+-      native_paths(MPI_LIBS MPILIBS)
+-    endif (MPI_LIBS)
++  if (HDF5_INCLUDE_PATH)
++    native_paths(HDF5_INCLUDE_PATH HDF5INC)
++  endif (HDF5_INCLUDE_PATH)
++  if (HDF5_LIBRARY)
++    native_paths(HDF5_LIBRARY HDF5LIB)
++  endif (HDF5_LIBRARY)
++  if (HDF5_NEED_SZIP)
++    set(H5NEEDSZIP 1)
++    if (SZIP_LIBRARY)
++      native_paths(SZIP_LIBRARY SZIPLIB)
++    endif (SZIP_LIBRARY)
++  endif (HDF5_NEED_SZIP)
++  if (HDF5_NEED_ZLIB)
++    set(H5NEEDZLIB 1)
++    if (ZLIB_LIBRARY)
++      native_paths(${ZLIB_LIBRARY} ZLIBLIB)
++    endif (ZLIB_LIBRARY)
++  endif (HDF5_NEED_ZLIB)
++  if (HDF5_NEED_MPI)
++    set(H5NEEDMPI 1)
++    if (MPI_INC)
++      native_paths(MPI_INC MPIINC)
++    endif (MPI_INC)
++    if (MPI_LIBS)
++      native_paths(MPI_LIBS MPILIBS)
++    endif (MPI_LIBS)
+     if (CGNS_ENABLE_PARALLEL)
+       set(BUILDPARALLEL 1)
+     endif (CGNS_ENABLE_PARALLEL)
+@@ -251,7 +251,7 @@ if(CGNS_BUILD_SHARED)
+ endif(CGNS_BUILD_SHARED)
+ 
+ # Set the install path of the static library
+-install(TARGETS cgns_static ARCHIVE DESTINATION lib)
++install(TARGETS cgns_static ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ # Set the install path of the shared library
+ if(CGNS_BUILD_SHARED)
+   # for windows, need to install both cgnsdll.dll and cgnsdll.lib
+@@ -259,7 +259,7 @@ if(CGNS_BUILD_SHARED)
+     install(TARGETS cgns_shared ARCHIVE DESTINATION lib)
+     install(TARGETS cgns_shared RUNTIME DESTINATION lib)
+   else (WIN32 OR CYGWIN)
+-    install(TARGETS cgns_shared LIBRARY DESTINATION lib)
++    install(TARGETS cgns_shared LIBRARY DESTINATION lib${LIB_SUFFIX})
+   endif (WIN32 OR CYGWIN)
+ endif(CGNS_BUILD_SHARED)
+ 

diff --git a/sci-libs/cgnslib/metadata.xml b/sci-libs/cgnslib/metadata.xml
index d369d06..7065822 100644
--- a/sci-libs/cgnslib/metadata.xml
+++ b/sci-libs/cgnslib/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
+  <herd>sci</herd>
+  <use>
+    <flag name="legacy">Enable or disable building legacy code (3.0 compatible)</flag>
+  </use>
 </pkgmetadata>