sci-libs/exodusii: Version Bump

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 189 insertions, 2 deletions

diff --git a/sci-libs/exodusii/ChangeLog b/sci-libs/exodusii/ChangeLog
index abce57077174..3d862e1d4840 100644
--- a/sci-libs/exodusii/ChangeLog
+++ b/sci-libs/exodusii/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/exodusii
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/exodusii/ChangeLog,v 1.6 2013/07/18 23:31:13 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/exodusii/ChangeLog,v 1.7 2014/01/01 14:35:18 jlec Exp $
+
+*exodusii-6.02 (01 Jan 2014)
+*exodusii-5.26 (01 Jan 2014)
+
+  01 Jan 2014; Justin Lecher <jlec@gentoo.org> +exodusii-5.26.ebuild,
+  +exodusii-6.02.ebuild, +files/exodusii-5.26-multilib.patch:
+  Version Bump
 
   18 Jul 2013; Zac Medico <zmedico@gentoo.org> exodusii-5.24.ebuild:
   Fix SRC_URI.
diff --git a/sci-libs/exodusii/exodusii-5.26.ebuild b/sci-libs/exodusii/exodusii-5.26.ebuild
new file mode 100644
index 000000000000..265ef14bd883
--- /dev/null
+++ b/sci-libs/exodusii/exodusii-5.26.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/exodusii/exodusii-5.26.ebuild,v 1.1 2014/01/01 14:35:18 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+MY_PN="${PN%ii}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
+HOMEPAGE="http://sourceforge.net/projects/exodusii/"
+SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}-1.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+DEPEND="sci-libs/netcdf[hdf5]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}/
+
+PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DNETCDF_DIR="${EPREFIX}/usr/"
+		$(cmake-utils_use_build !static-libs SHARED)
+		$(cmake-utils_use_build test TESTING)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/forbind/test || die
+	csh testall || die
+	./f_test_nem || die
+}
diff --git a/sci-libs/exodusii/exodusii-6.02.ebuild b/sci-libs/exodusii/exodusii-6.02.ebuild
new file mode 100644
index 000000000000..fdd03ee71e51
--- /dev/null
+++ b/sci-libs/exodusii/exodusii-6.02.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/exodusii/exodusii-6.02.ebuild,v 1.1 2014/01/01 14:35:18 jlec Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+MY_PN="${PN%ii}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
+HOMEPAGE="http://sourceforge.net/projects/exodusii/"
+SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+DEPEND="sci-libs/netcdf[hdf5]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}/${MY_PN}
+
+PATCHES=( "${FILESDIR}"/${PN}-5.26-multilib.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DNETCDF_DIR="${EPREFIX}/usr/"
+		$(cmake-utils_use_build !static-libs SHARED)
+		$(cmake-utils_use_build test TESTING)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/cbind/test || die
+	ctest || die
+	cd "${BUILD_DIR}"/forbind/test || die
+	emake f_check
+}
diff --git a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
new file mode 100644
index 000000000000..1d1c1fca6c2b
--- /dev/null
+++ b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
@@ -0,0 +1,95 @@
+ CMakeLists.txt         |  6 +++---
+ cbind/CMakeLists.txt   |  6 +++---
+ forbind/CMakeLists.txt | 12 ++++++------
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca372f5..a071d99 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
+ find_library( NETCDF_LIBRARY
+    NAMES netcdf
+    PATHS "$ENV{ACCESS}/lib"
+-         "$ENV{NETCDF_DIR}/lib"
++         "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
+ 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
+ )
+ 
+@@ -41,14 +41,14 @@ find_program (NETCDF_NCDUMP ncdump
+ find_library( HDF5_LIBRARY hdf5
+   $ENV{ACCESS}/lib/shared
+   $ENV{ACCESS}/lib
+-  $ENV{NETCDF_DIR}/lib
++  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
+   $ENV{NETCDF_DIR}/libsrc/.libs
+   /usr/local/hdf5/lib
+   )
+ find_library( HDF5HL_LIBRARY hdf5_hl
+   $ENV{ACCESS}/lib/shared
+   $ENV{ACCESS}/lib
+-  $ENV{NETCDF_DIR}/lib
++  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
+   $ENV{NETCDF_DIR}/libsrc/.libs
+   /usr/local/hdf5/lib
+   )
+diff --git a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
+index 083891f..66fd17b 100644
+--- a/cbind/CMakeLists.txt
++++ b/cbind/CMakeLists.txt
+@@ -293,9 +293,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
+ 
+ IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS exoIIv2c
+-    RUNTIME DESTINATION lib COMPONENT Runtime
+-    LIBRARY DESTINATION lib COMPONENT Runtime
+-    ARCHIVE DESTINATION lib COMPONENT Development)
++    RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
++    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
++    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
+   INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
+ ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+ 
+diff --git a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
+index 5ee026c..66ba1b3 100644
+--- a/forbind/CMakeLists.txt
++++ b/forbind/CMakeLists.txt
+@@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
+ find_library( NETCDF_LIBRARY
+    NAMES netcdf
+    PATHS "$ENV{ACCESS}/lib"
+-         "$ENV{NETCDF_DIR}/lib"
++         "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
+ 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
+ )
+ 
+@@ -28,14 +28,14 @@ find_program (NETCDF_NCDUMP ncdump
+ find_library( HDF5_LIBRARY hdf5
+   $ENV{ACCESS}/lib/shared
+   $ENV{ACCESS}/lib
+-  $ENV{NETCDF_DIR}/lib
++  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
+   $ENV{NETCDF_DIR}/libsrc/.libs
+   /usr/local/hdf5/lib
+   )
+ find_library( HDF5HL_LIBRARY hdf5_hl
+   $ENV{ACCESS}/lib/shared
+   $ENV{ACCESS}/lib
+-  $ENV{NETCDF_DIR}/lib
++  $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
+   $ENV{NETCDF_DIR}/libsrc/.libs
+   /usr/local/hdf5/lib
+   )
+@@ -61,9 +61,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
+ 
+ IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS exoIIv2for
+-    RUNTIME DESTINATION lib COMPONENT Runtime
+-    LIBRARY DESTINATION lib COMPONENT Runtime
+-    ARCHIVE DESTINATION lib COMPONENT Development)
++    RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
++    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
++    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
+   INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
+ ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+