[gentoo-commits] repo/gentoo:master commit in: sci-libs/exodusii/files/, sci-libs/exodusii/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/exodusii/files/, sci-libs/exodusii/
@ 2016-02-18 16:34 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2016-02-18 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     81bbe40833909f414a1fab8833a479b1ebb7166d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 16:28:06 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 16:34:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81bbe408

sci-libs/exodusii: Drop old

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-libs/exodusii/Manifest                         |   3 -
 sci-libs/exodusii/exodusii-5.22b.ebuild            |  38 --------
 sci-libs/exodusii/exodusii-5.24.ebuild             |  41 ---------
 sci-libs/exodusii/exodusii-5.26.ebuild             |  42 ---------
 .../exodusii/files/exodusii-5.22b-multilib.patch   | 102 ---------------------
 5 files changed, 226 deletions(-)

diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index 11949d6..ae6065b 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1,4 +1 @@
-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-5.26-1.tar.gz 4673391 SHA256 9b681396b345d223bbd1b36b67173d1779afed5fabd0929b51e41ce1f830db2e SHA512 20e106cb0b733b7468002706ec6768502c8528cc8f4de7a5b957f324a76559404d97133bfc0e74e29a30b4dcc5aca9f605db55b45fdbbca6bb2099aad3c23273 WHIRLPOOL e2e4af23b0d521ec52e98636a2b0bc7095153683ff14b5e6d35d0e252c22a09772bcca9cb7029f9bf4f9456a76bd68c19d3ee63a425b09e9dd2496f9be97abcb
 DIST exodus-6.02.tar.gz 4735364 SHA256 a3d7ae6ad433bb9655748c0e3e7a95e66c46d9df1e4c3d8d7e125af3fec89193 SHA512 d086464f0af2edd06d6e6a49be28d3bdfe00c0e9a9a09abad7822a49c7a7fbb75b61324ea54d2163c73b45ee90222c22754c804ee6868cdb0f9e4b780d6d5ad0 WHIRLPOOL 53382f9ec4b11197c4b2424a222b4178de73ac233e2e23110070a7a72f150ec8ed2ad024b4ce1bdfed3ab6b3c9dfb040d243c394af2a60e7330a681f8dac58a2

diff --git a/sci-libs/exodusii/exodusii-5.22b.ebuild b/sci-libs/exodusii/exodusii-5.22b.ebuild
deleted file mode 100644
index 564d7ab..0000000
--- a/sci-libs/exodusii/exodusii-5.22b.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit cmake-utils multilib
-
-DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
-HOMEPAGE="http://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/${PN}/${P/ii/}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="sci-libs/netcdf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${P/ii/}/${PN/ii/}
-
-PATCHES=( "${FILESDIR}"/${P}-multilib.patch )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)"
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/forbind/test
-	csh testall
-	./f_test_nem || die
-}

diff --git a/sci-libs/exodusii/exodusii-5.24.ebuild b/sci-libs/exodusii/exodusii-5.24.ebuild
deleted file mode 100644
index de83032..0000000
--- a/sci-libs/exodusii/exodusii-5.24.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-
-DEPEND="sci-libs/netcdf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}/${MY_PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-5.22b-multilib.patch )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DNETCDF_DIR="${EPREFIX}/usr/"
-		$(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
-		$(cmake-utils_use test BUILD_TESTING)"
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cd "${BUILD_DIR}"/forbind/test
-	csh testall
-	./f_test_nem || die
-}

diff --git a/sci-libs/exodusii/exodusii-5.26.ebuild b/sci-libs/exodusii/exodusii-5.26.ebuild
deleted file mode 100644
index 6d32198..0000000
--- a/sci-libs/exodusii/exodusii-5.26.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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/files/exodusii-5.22b-multilib.patch b/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch
deleted file mode 100644
index 3cde666..0000000
--- a/sci-libs/exodusii/files/exodusii-5.22b-multilib.patch
+++ /dev/null
@@ -1,102 +0,0 @@
- exodus/CMakeLists.txt         |  6 +++---
- exodus/cbind/CMakeLists.txt   |  6 +++---
- exodus/forbind/CMakeLists.txt | 13 +++++++------
- 3 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/exodus/CMakeLists.txt b/exodus/CMakeLists.txt
-index 935da5a..33c68ca 100644
---- a/exodus/CMakeLists.txt
-+++ b/exodus/CMakeLists.txt
-@@ -21,7 +21,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}/${CMAKE_INSTALL_LIBDIR}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -35,14 +35,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}/${CMAKE_INSTALL_LIBDIR}
-   $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}/${CMAKE_INSTALL_LIBDIR}
-   $ENV{NETCDF_DIR}/libsrc/.libs
-   /usr/local/hdf5/lib
-   )
-diff --git a/exodus/cbind/CMakeLists.txt b/exodus/cbind/CMakeLists.txt
-index 9aa54e9..a19a969 100644
---- a/exodus/cbind/CMakeLists.txt
-+++ b/exodus/cbind/CMakeLists.txt
-@@ -259,9 +259,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 ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
-   INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 
-diff --git a/exodus/forbind/CMakeLists.txt b/exodus/forbind/CMakeLists.txt
-index 4a5e7c7..dad37ae 100644
---- a/exodus/forbind/CMakeLists.txt
-+++ b/exodus/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}/${CMAKE_INSTALL_LIBDIR}"
- 	 "$ENV{NETCDF_DIR}/libsrc/.libs"
- )
- 
-@@ -28,20 +28,21 @@ find_program (NETCDF_NCDUMP ncdump
- 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
-   )
- 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
-   )
- 
- INCLUDE_DIRECTORIES(
-   "${CMAKE_CURRENT_SOURCE_DIR}/include"
-+  "${CMAKE_CURRENT_SOURCE_DIR}/../cbind/include"
-   "${CMAKE_CURRENT_BINARY_DIR}/include"
-   "${NETCDF_INCLUDE_DIR}"
- )
-@@ -60,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 ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
-   INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
- ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
- 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/exodusii/files/, sci-libs/exodusii/
@ 2016-05-10 19:51 Christoph Junghans
  0 siblings, 0 replies; 3+ messages in thread
From: Christoph Junghans @ 2016-05-10 19:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f8853b7a862ad723e47b83adfddb38efed6d090b
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 19:50:52 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue May 10 19:51:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8853b7a

sci-libs/exodusii: version bump

Package-Manager: portage-2.2.28

 sci-libs/exodusii/Manifest                         |  1 +
 sci-libs/exodusii/exodusii-6.09.ebuild             | 56 ++++++++++++++
 .../exodusii/files/exodusii-6.09-multilib.patch    | 87 ++++++++++++++++++++++
 3 files changed, 144 insertions(+)

diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
index ae6065b..60d9092 100644
--- a/sci-libs/exodusii/Manifest
+++ b/sci-libs/exodusii/Manifest
@@ -1 +1,2 @@
 DIST exodus-6.02.tar.gz 4735364 SHA256 a3d7ae6ad433bb9655748c0e3e7a95e66c46d9df1e4c3d8d7e125af3fec89193 SHA512 d086464f0af2edd06d6e6a49be28d3bdfe00c0e9a9a09abad7822a49c7a7fbb75b61324ea54d2163c73b45ee90222c22754c804ee6868cdb0f9e4b780d6d5ad0 WHIRLPOOL 53382f9ec4b11197c4b2424a222b4178de73ac233e2e23110070a7a72f150ec8ed2ad024b4ce1bdfed3ab6b3c9dfb040d243c394af2a60e7330a681f8dac58a2
+DIST exodus-6.09.tar.gz 4757028 SHA256 e14db4c1e2ca893c4602055036b827b8332746439f0869489fdc677058faebe8 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516 WHIRLPOOL 97426e487c8f6ae31da4be36f3712ade99eb7e31feb67d3989153dadc394b427b8e38976f06e99c153fae3d04b05357b48b0b537ff0c04fb8199b9aaeb27bcc4

diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
new file mode 100644
index 0000000..20b1c0c
--- /dev/null
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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}"/${P}-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/"
+		-DPYTHON_INSTALL="${EPREFIX}/usr/share/${PN}"
+		$(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-6.09-multilib.patch b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
new file mode 100644
index 0000000..3b1b5e2
--- /dev/null
+++ b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
@@ -0,0 +1,87 @@
+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
+@@ -293,9 +293,9 @@
+ 
+ IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
+   INSTALL(TARGETS exodus
+-    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 -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
+@@ -27,7 +27,7 @@
+ 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_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 -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
+@@ -14,7 +14,7 @@
+ 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_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 @@
+ 
+ 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)
+ 


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-libs/exodusii/files/, sci-libs/exodusii/
@ 2018-10-14 13:35 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-10-14 13:35 UTC (permalink / raw
  To: gentoo-commits

commit:     80cceb37cdd7966792abb91376759b287fd95b94
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 11:44:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 13:35:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cceb37

sci-libs/exodusii: EAPI-6 bump, fix LIB_SUFFIX, unused cmake args

Fix dead HOMEPAGE, SRC_URI.

Closes: https://bugs.gentoo.org/644588
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-libs/exodusii/exodusii-6.09.ebuild             | 29 +++++++++++-----------
 .../exodusii/files/exodusii-6.09-multilib.patch    | 18 +++++++-------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/sci-libs/exodusii/exodusii-6.09.ebuild b/sci-libs/exodusii/exodusii-6.09.ebuild
index a91a3e96e99..7f44f3f24c7 100644
--- a/sci-libs/exodusii/exodusii-6.09.ebuild
+++ b/sci-libs/exodusii/exodusii-6.09.ebuild
@@ -1,18 +1,17 @@
-# 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"
@@ -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-6.09-multilib.patch b/sci-libs/exodusii/files/exodusii-6.09-multilib.patch
index 3b1b5e2ace7..5463fba5001 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-10-14 13:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-18 16:34 [gentoo-commits] repo/gentoo:master commit in: sci-libs/exodusii/files/, sci-libs/exodusii/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2016-05-10 19:51 Christoph Junghans
2018-10-14 13:35 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox