diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2016-05-11 10:27:16 -0600 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2016-05-11 10:27:29 -0600 |
| commit | fd590279e40969ffd2c75fcf7bc672e3b3e94a29 (patch) | |
| tree | 62f71f68cd2160fc01e6aeb8e3db095b77e3bd56 /sci-libs | |
| parent | sci-libs/nemesis: build fix for newer exodusii (bug #582726) (diff) | |
| download | gentoo-fd590279e40969ffd2c75fcf7bc672e3b3e94a29.tar.gz gentoo-fd590279e40969ffd2c75fcf7bc672e3b3e94a29.tar.bz2 gentoo-fd590279e40969ffd2c75fcf7bc672e3b3e94a29.zip | |
sci-libs/nemesis: version bump
Package-Manager: portage-2.2.28
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/nemesis/Manifest | 1 | ||||
| -rw-r--r-- | sci-libs/nemesis/files/nemesis-6.09-multilib.patch | 53 | ||||
| -rw-r--r-- | sci-libs/nemesis/nemesis-6.09.ebuild | 48 |
3 files changed, 102 insertions, 0 deletions
diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest index 3bd6a0d6f1fc..8ac35752c0ec 100644 --- a/sci-libs/nemesis/Manifest +++ b/sci-libs/nemesis/Manifest @@ -1,2 +1,3 @@ DIST exodus-5.22b.tar.gz 4693236 SHA256 6781b96039af030a98ddb893c40db06959b4843b6e2961c770b5d64d90241265 SHA512 04364b473d074c8bff194c63ed5ef78cb163ccc72a8dd196803646e8a8fe0faf25f9fd9a68d6df0ee821b9a84341b6aeabcc816b476fb3f7befe1e482a9455b7 WHIRLPOOL a95c98db2c6d825602618acaeced503bc1b9e312b6a4968011bd663d4c036976b4f5bf3fd45ceec0f31d3bca8e9a8cb6d53fd2d1b33ab25ec9e0993436abc7c6 DIST exodus-5.24.tar.bz2 4252980 SHA256 c16a70c0572341c7e680f8d6420c79e1fd744ba717dc4f7e023f7421c636515d SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e WHIRLPOOL 5a622fce123d55187c0895934db76c2cfb3ab2e83e13d6f5b6655c388e7cac1107acaa786b75be5275de7398035a5604d0be2975c78da05edbdaa4f8efbf9513 +DIST exodus-6.09.tar.gz 4757028 SHA256 e14db4c1e2ca893c4602055036b827b8332746439f0869489fdc677058faebe8 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516 WHIRLPOOL 97426e487c8f6ae31da4be36f3712ade99eb7e31feb67d3989153dadc394b427b8e38976f06e99c153fae3d04b05357b48b0b537ff0c04fb8199b9aaeb27bcc4 diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch new file mode 100644 index 000000000000..d0f05f23a2d2 --- /dev/null +++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch @@ -0,0 +1,53 @@ + nemesis/CMakeLists.txt | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt +index 64aff5d..bed5ede 100644 +--- a/nemesis/CMakeLists.txt ++++ b/nemesis/CMakeLists.txt +@@ -19,7 +19,7 @@ + find_library( NETCDF_LIBRARY netcdf + $ENV{ACCESS}/lib/shared + $ENV{ACCESS}/lib +- $ENV{NETCDF_DIR}/lib ++ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} + $ENV{NETCDF_DIR}/libsrc/.libs + ) + +@@ -33,13 +33,14 @@ + ../exodusii/cbind/ + $ENV{ACCESS}/lib/shared + $ENV{ACCESS}/lib ++ $ENV{EXODUS_DIR}/${CMAKE_INSTALL_LIBDIR} + ) + + # Hack for HDF5 + find_library( HDF5_LIBRARY hdf5 + $ENV{ACCESS}/lib/shared + $ENV{ACCESS}/lib +- $ENV{NETCDF_DIR}/lib ++ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} + $ENV{NETCDF_DIR}/libsrc/.libs + /usr/local/hdf5/lib + ) +@@ -47,7 +48,7 @@ + find_library( HDF5HL_LIBRARY hdf5_hl + $ENV{ACCESS}/lib/shared + $ENV{ACCESS}/lib +- $ENV{NETCDF_DIR}/lib ++ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR} + $ENV{NETCDF_DIR}/libsrc/.libs + /usr/local/hdf5/lib + ) +@@ -80,8 +81,8 @@ + TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY}) + + INSTALL(TARGETS nemesis +- RUNTIME DESTINATION lib COMPONENT Runtime +- LIBRARY DESTINATION lib COMPONENT Runtime +- ARCHIVE DESTINATION lib COMPONENT Development) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development) + INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development) + diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild new file mode 100644 index 000000000000..62e9e549161e --- /dev/null +++ b/sci-libs/nemesis/nemesis-6.09.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils multilib + +MY_PN="exodus" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Enhancement to the EXODUSII finite element database model" +HOMEPAGE="http://sourceforge.net/projects/exodusii/" +SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs test" + +DEPEND=" + sci-libs/exodusii + sci-libs/netcdf" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MY_P}/${PN} + +PATCHES=( "${FILESDIR}"/${P}-multilib.patch ) + +src_prepare() { + find ../exodus -delete || die + cmake-utils_src_prepare +} + +src_configure() { + mycmakeargs=( + -DLIB_INSTALL_DIR=$(get_libdir) + -DNETCDF_DIR="${EPREFIX}/usr/" + -DEXODUS_DIR="${EPREFIX}/usr/" + $(cmake-utils_use !static-libs BUILD_SHARED_LIBS) + $(cmake-utils_use test BUILD_TESTING) + ) + cmake-utils_src_configure +} + +src_test() { + "${BUILD_DIR}"/ne_test || die +} |