diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-22 11:09:47 +0100 |
commit | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch) | |
tree | 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /sci-libs/exodusii | |
parent | 957235cf19a691360c720f7913672adda4258ed0 (diff) |
gentoo resync : 22.10.2018
Diffstat (limited to 'sci-libs/exodusii')
-rw-r--r-- | sci-libs/exodusii/Manifest | 7 | ||||
-rw-r--r-- | sci-libs/exodusii/exodusii-6.02.ebuild | 54 | ||||
-rw-r--r-- | sci-libs/exodusii/exodusii-6.09.ebuild | 31 | ||||
-rw-r--r-- | sci-libs/exodusii/files/exodusii-5.26-multilib.patch | 95 | ||||
-rw-r--r-- | sci-libs/exodusii/files/exodusii-6.09-multilib.patch | 18 |
5 files changed, 27 insertions, 178 deletions
diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest index c2e4d887173f..1ff7d7998db4 100644 --- a/sci-libs/exodusii/Manifest +++ b/sci-libs/exodusii/Manifest @@ -1,7 +1,4 @@ -AUX exodusii-5.26-multilib.patch 3148 BLAKE2B 09e88bebddc10fb1940ec14c43a75352059f0fe07082b75adfe4a494371f67da1649b85eecee6e27b3fbc36ee77c9864b27f8e3d458b3f8adad28dfb07313ebf SHA512 f37a2463b7c8a243a6fdd690e8a2b18601188ba144862842833e81120226c6969f4ed815eef89a3b4f47b2fa55dbe3d0799441783f4acc478eaeed4c0217644b -AUX exodusii-6.09-multilib.patch 3125 BLAKE2B 9b6151c227d235689f99155e53c20053adb0cbcdcda265f2e66c4fb7c4ddf2da36d3657d9cc43ec723d6f5ef8e099acfb94a4b9a40a1f3bbbfddf3bc917fe71b SHA512 7575ea71ed4d21135c6ddeb6932298951ac4d1cdef3b0129104f12c475308bd9224fef4f85233e9ffb644dabba0dec2bdc1819f7d6c0f6b4adb73bc98636f41c -DIST exodus-6.02.tar.gz 4735364 BLAKE2B 3744bf218e0cc3e8e012ddb61833fd6129f8c394159cc1de9ff4a07af5eb220b468da8148aa3cf70a32aa6d776a10db57aee8576c1592707a1db6c353a639b06 SHA512 d086464f0af2edd06d6e6a49be28d3bdfe00c0e9a9a09abad7822a49c7a7fbb75b61324ea54d2163c73b45ee90222c22754c804ee6868cdb0f9e4b780d6d5ad0 +AUX exodusii-6.09-multilib.patch 2891 BLAKE2B 0bca9f2e768b409f1683c3d1925add553f86a9fca393551b98fefac1d4cc9913d50be4660bd4c62474a95f2aae129480533d2a51aaa2083cb5461b91c8655f7f SHA512 189047d12455c539308b8eeb81334d980f847d68b96df7cef442f8d552404e5c70f42a3e3649d62cc7db395ae2ca2f6988ee0638eebf52b3cab9c3bf964d5fc2 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516 -EBUILD exodusii-6.02.ebuild 1156 BLAKE2B 7c10f3a8506bdde2165f00eb5a339e623b4072b95e8a8db6f65d4655d7eaef46772a187128fc65ee2098ff074e62bdc000d10241b0e576183b0f4949836601b8 SHA512 916371ad1b1d62e046b4f52f9b88b32292fc8cedc456aa3d4a469757bb7eb1ddf7ff1d610ddd466c4745b3cc6b495fb436fe634aab6a025cfffbcadd7f708cd8 -EBUILD exodusii-6.09.ebuild 1200 BLAKE2B 004033d07cdd7b20252d7666d1672102f05104eed94cb66d60e2811acc6373ae849774b7f3fe16a2d0f3fd47e15fa7cd4c72a043c49c1685b4aee8699f9f4c0b SHA512 891bf37f0810fbde2cfac9e8141971c3feccc43bd42966ed63af01dd09fbd350c24a2abf48550743be291f91f9aa701e0ff1be9ae0d95eb4c09351dc4d1b8788 +EBUILD exodusii-6.09.ebuild 1196 BLAKE2B c2ec5c8ed0c7665420cfa52edfac0e0deb6c504345775e31324d552e2dd103fed776ad31144f360b0b17ffbb33238130e73d1eb92025992368a4bcae7e611a0d SHA512 93d3dec6907f696c84ff8962dd9d942ddbabb0195e220332537500418d6d916c0281de58774eb4311cb78c5d513a63860a1b40af3a153024f5f581da99fa1804 MISC metadata.xml 603 BLAKE2B 99e4fc167e1cf5e96571a2024a8b217083a200fa3850d09c2d520939a87608ecc70708dd302f1c292338aa4c07d0a586c77da80392f85c16e2fb122f98c86cee SHA512 9d703efe9fbf4d49438d83bcdca60db2cd9a40f0b853fcf8cd796d9f96d304c84825c9e2cb26ba98f1893e3e85ddd1af8a5e15c4c4e179d6de25b1df98be3a55 diff --git a/sci-libs/exodusii/exodusii-6.02.ebuild b/sci-libs/exodusii/exodusii-6.02.ebuild deleted file mode 100644 index dcaf91498fb5..000000000000 --- a/sci-libs/exodusii/exodusii-6.02.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -FORTRAN_NEEDED="test" - -inherit cmake-utils fortran-2 multilib - -MY_PN="${PN%ii}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses" -HOMEPAGE="https://sourceforge.net/projects/exodusii/" -SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="static-libs test" - -RDEPEND="sci-libs/netcdf[hdf5]" -DEPEND="${RDEPEND} - test? ( app-shells/tcsh ) -" - -S="${WORKDIR}"/${MY_P}/${MY_PN} - -PATCHES=( "${FILESDIR}"/${PN}-5.26-multilib.patch ) - -src_prepare() { - use test || \ - sed \ - -e 's:Fortran::g' \ - -i CMakeLists.txt || die - cmake-utils_src_prepare -} - -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/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild index a91a3e96e992..1b8221b53486 100644 --- a/sci-libs/exodusii/exodusii-6.09.ebuild +++ b/sci-libs/exodusii/exodusii-6.09.ebuild @@ -1,22 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 FORTRAN_NEEDED="test" - -inherit cmake-utils fortran-2 multilib +inherit cmake-utils fortran-2 MY_PN="${PN%ii}" MY_P="${MY_PN}-${PV}" DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses" -HOMEPAGE="https://sourceforge.net/projects/exodusii/" -SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz" +HOMEPAGE="https://github.com/certik/exodus" +SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="static-libs test" RDEPEND="sci-libs/netcdf[hdf5]" @@ -29,21 +28,23 @@ S="${WORKDIR}"/${MY_P}/${MY_PN} PATCHES=( "${FILESDIR}"/${P}-multilib.patch ) src_prepare() { - use test || \ - sed \ - -e 's:Fortran::g' \ - -i CMakeLists.txt || die cmake-utils_src_prepare + + if ! use test; then + sed -e 's:Fortran::g' -i CMakeLists.txt || die + fi } src_configure() { + local libdir="$(get_libdir)" + local mycmakeargs=( - -DLIB_INSTALL_DIR=$(get_libdir) - -DNETCDF_DIR="${EPREFIX}/usr/" + -DLIB_SUFFIX=${libdir#lib} -DPYTHON_INSTALL="${EPREFIX}/usr/share/${PN}" - $(cmake-utils_use_build !static-libs SHARED) - $(cmake-utils_use_build test TESTING) + -DBUILD_SHARED=$(usex !static-libs) + -DBUILD_TESTING=$(usex test) ) + export NETCDF_DIR="${EPREFIX}/usr/" cmake-utils_src_configure } diff --git a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch deleted file mode 100644 index 1d1c1fca6c2b..000000000000 --- a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch +++ /dev/null @@ -1,95 +0,0 @@ - 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) - diff --git a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch index 3b1b5e2ace7f..5463fba50019 100644 --- a/sci-libs/exodusii/files/exodusii-6.09-multilib.patch +++ b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch @@ -1,6 +1,6 @@ -diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind/CMakeLists.txt ---- exodus-6.09.orig/exodus/cbind/CMakeLists.txt 2016-05-10 13:20:06.408385120 -0600 -+++ exodus-6.09/exodus/cbind/CMakeLists.txt 2016-05-10 13:22:35.378385120 -0600 +diff -Naur a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt +--- a/cbind/CMakeLists.txt 2016-05-10 13:20:06.408385120 -0600 ++++ b/cbind/CMakeLists.txt 2016-05-10 13:22:35.378385120 -0600 @@ -293,9 +293,9 @@ IF(NOT EXODUS_INSTALL_NO_LIBRARIES) @@ -14,9 +14,9 @@ diff -Naur exodus-6.09.orig/exodus/cbind/CMakeLists.txt exodus-6.09/exodus/cbind INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development) ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES) -diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists.txt ---- exodus-6.09.orig/exodus/CMakeLists.txt 2016-05-10 13:20:06.418385120 -0600 -+++ exodus-6.09/exodus/CMakeLists.txt 2016-05-10 13:21:25.928385120 -0600 +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2016-05-10 13:20:06.418385120 -0600 ++++ b/CMakeLists.txt 2016-05-10 13:21:25.928385120 -0600 @@ -27,7 +27,7 @@ find_library( NETCDF_LIBRARY NAMES netcdf @@ -43,9 +43,9 @@ diff -Naur exodus-6.09.orig/exodus/CMakeLists.txt exodus-6.09/exodus/CMakeLists. $ENV{NETCDF_DIR}/libsrc/.libs /usr/local/hdf5/lib ) -diff -Naur exodus-6.09.orig/exodus/forbind/CMakeLists.txt exodus-6.09/exodus/forbind/CMakeLists.txt ---- exodus-6.09.orig/exodus/forbind/CMakeLists.txt 2016-05-10 13:20:06.418385120 -0600 -+++ exodus-6.09/exodus/forbind/CMakeLists.txt 2016-05-10 13:21:25.928385120 -0600 +diff -Naur a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt +--- a/forbind/CMakeLists.txt 2016-05-10 13:20:06.418385120 -0600 ++++ b/forbind/CMakeLists.txt 2016-05-10 13:21:25.928385120 -0600 @@ -14,7 +14,7 @@ find_library( NETCDF_LIBRARY NAMES netcdf |