* [gentoo-commits] repo/gentoo:master commit in: sci-libs/nemesis/files/, sci-libs/nemesis/
@ 2016-05-11 16:27 Christoph Junghans
0 siblings, 0 replies; 3+ messages in thread
From: Christoph Junghans @ 2016-05-11 16:27 UTC (permalink / raw
To: gentoo-commits
commit: fd590279e40969ffd2c75fcf7bc672e3b3e94a29
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 16:27:16 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed May 11 16:27:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd590279
sci-libs/nemesis: version bump
Package-Manager: portage-2.2.28
sci-libs/nemesis/Manifest | 1 +
sci-libs/nemesis/files/nemesis-6.09-multilib.patch | 53 ++++++++++++++++++++++
sci-libs/nemesis/nemesis-6.09.ebuild | 48 ++++++++++++++++++++
3 files changed, 102 insertions(+)
diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
index 3bd6a0d..8ac3575 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 0000000..d0f05f2
--- /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 0000000..62e9e54
--- /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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/nemesis/files/, sci-libs/nemesis/
@ 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: 7da9c7778847f578f904a01b195776785d8b5260
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 12:46:14 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 13:35:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da9c777
sci-libs/nemesis: Drop old
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sci-libs/nemesis/Manifest | 1 -
.../nemesis/files/nemesis-5.22b-multilib.patch | 57 ----------------------
sci-libs/nemesis/nemesis-5.24.ebuild | 47 ------------------
3 files changed, 105 deletions(-)
diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
index d47e626e04a..994c13bd1ae 100644
--- a/sci-libs/nemesis/Manifest
+++ b/sci-libs/nemesis/Manifest
@@ -1,2 +1 @@
-DIST exodus-5.24.tar.bz2 4252980 BLAKE2B 44c0233077a3dbcba11e79643e2b81c5529e21b0c447e8621f5247817df95f91ee992091135d8ead694f5817e4575eb88825a0e90703b332c79164c91cfb828b SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e
DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
diff --git a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch b/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
deleted file mode 100644
index b99add01ea5..00000000000
--- a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
+++ /dev/null
@@ -1,57 +0,0 @@
- 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_path( NETCDF_INCLUDE_DIR netcdf.h
- 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
- )
-
-@@ -29,16 +29,17 @@ find_program (NETCDF_NCDUMP ncdump
- $ENV{NETCDF_DIR}/ncdump
- )
-
--find_library( EXODUS_LIBRARY exodus
-+find_library( EXODUS_LIBRARY exoIIv2c
- $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
- )
-@@ -46,7 +47,7 @@ find_library( HDF5_LIBRARY hdf5
- 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
- )
-@@ -79,8 +80,8 @@ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
- 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-5.24.ebuild b/sci-libs/nemesis/nemesis-5.24.ebuild
deleted file mode 100644
index 7a5a5b95805..00000000000
--- a/sci-libs/nemesis/nemesis-5.24.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-MY_PN="exodus"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.bz2"
-
-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}"/${PN}-5.22b-multilib.patch )
-
-src_prepare() {
- find ../exodus -delete || die
- cmake-utils_src_prepare
- sed -i 's/exoIIv2c/NAMES exodus &/' CMakeLists.txt || die
-}
-
-src_configure() {
- mycmakeargs="${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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/nemesis/files/, sci-libs/nemesis/
@ 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: 5c772bb3f055335b6c91bf20d5ab85c75dde6f8d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 12:45:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 13:35:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c772bb3
sci-libs/nemesis: EAPI-6 bump, drop unused cmake args
Fix dead HOMEPAGE, SRC_URI.
Bug: 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/nemesis/files/nemesis-6.09-multilib.patch | 6 +++---
sci-libs/nemesis/nemesis-6.09.ebuild | 22 ++++++++++------------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
index d0f05f23a2d..09b5c9a6037 100644
--- a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
+++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch
@@ -1,10 +1,10 @@
nemesis/CMakeLists.txt | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
-diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64aff5d..bed5ede 100644
---- a/nemesis/CMakeLists.txt
-+++ b/nemesis/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -19,7 +19,7 @@
find_library( NETCDF_LIBRARY netcdf
$ENV{ACCESS}/lib/shared
diff --git a/sci-libs/nemesis/nemesis-6.09.ebuild b/sci-libs/nemesis/nemesis-6.09.ebuild
index 4bd332e3b01..3e18bd12f61 100644
--- a/sci-libs/nemesis/nemesis-6.09.ebuild
+++ b/sci-libs/nemesis/nemesis-6.09.ebuild
@@ -1,21 +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
-inherit cmake-utils multilib
+inherit cmake-utils
MY_PN="exodus"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Enhancement to the EXODUSII finite element database model"
-HOMEPAGE="https://sourceforge.net/projects/exodusii/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
+IUSE="static-libs"
DEPEND="
sci-libs/exodusii
@@ -32,13 +32,11 @@ 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)
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=$(usex !static-libs)
)
+ export NETCDF_DIR="${EPREFIX}/usr/"
+ export EXODUS_DIR="${EPREFIX}/usr/"
cmake-utils_src_configure
}
^ 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 --
2018-10-14 13:35 [gentoo-commits] repo/gentoo:master commit in: sci-libs/nemesis/files/, sci-libs/nemesis/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-10-14 13:35 Andreas Sturmlechner
2016-05-11 16:27 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox