Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/exodusii/, sci-libs/exodusii/files/
Date: Sun, 21 Oct 2018 14:58:22
Message-Id: 1540133852.e4a93dfc4d3d70e0fa6ea77223f77a166645a8de.asturm@gentoo
1 commit: e4a93dfc4d3d70e0fa6ea77223f77a166645a8de
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 20 23:22:05 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 21 14:57:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a93dfc
7
8 sci-libs/exodusii: Drop old
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sci-libs/exodusii/Manifest | 1 -
14 sci-libs/exodusii/exodusii-6.02.ebuild | 54 ------------
15 .../exodusii/files/exodusii-5.26-multilib.patch | 95 ----------------------
16 3 files changed, 150 deletions(-)
17
18 diff --git a/sci-libs/exodusii/Manifest b/sci-libs/exodusii/Manifest
19 index 0f1e19466a6..994c13bd1ae 100644
20 --- a/sci-libs/exodusii/Manifest
21 +++ b/sci-libs/exodusii/Manifest
22 @@ -1,2 +1 @@
23 -DIST exodus-6.02.tar.gz 4735364 BLAKE2B 3744bf218e0cc3e8e012ddb61833fd6129f8c394159cc1de9ff4a07af5eb220b468da8148aa3cf70a32aa6d776a10db57aee8576c1592707a1db6c353a639b06 SHA512 d086464f0af2edd06d6e6a49be28d3bdfe00c0e9a9a09abad7822a49c7a7fbb75b61324ea54d2163c73b45ee90222c22754c804ee6868cdb0f9e4b780d6d5ad0
24 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
25
26 diff --git a/sci-libs/exodusii/exodusii-6.02.ebuild b/sci-libs/exodusii/exodusii-6.02.ebuild
27 deleted file mode 100644
28 index dcaf91498fb..00000000000
29 --- a/sci-libs/exodusii/exodusii-6.02.ebuild
30 +++ /dev/null
31 @@ -1,54 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=5
36 -
37 -FORTRAN_NEEDED="test"
38 -
39 -inherit cmake-utils fortran-2 multilib
40 -
41 -MY_PN="${PN%ii}"
42 -MY_P="${MY_PN}-${PV}"
43 -
44 -DESCRIPTION="Model developed to store and retrieve transient data for finite element analyses"
45 -HOMEPAGE="https://sourceforge.net/projects/exodusii/"
46 -SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.gz"
47 -
48 -LICENSE="BSD"
49 -SLOT="0"
50 -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
51 -IUSE="static-libs test"
52 -
53 -RDEPEND="sci-libs/netcdf[hdf5]"
54 -DEPEND="${RDEPEND}
55 - test? ( app-shells/tcsh )
56 -"
57 -
58 -S="${WORKDIR}"/${MY_P}/${MY_PN}
59 -
60 -PATCHES=( "${FILESDIR}"/${PN}-5.26-multilib.patch )
61 -
62 -src_prepare() {
63 - use test || \
64 - sed \
65 - -e 's:Fortran::g' \
66 - -i CMakeLists.txt || die
67 - cmake-utils_src_prepare
68 -}
69 -
70 -src_configure() {
71 - local mycmakeargs=(
72 - -DLIB_INSTALL_DIR=$(get_libdir)
73 - -DNETCDF_DIR="${EPREFIX}/usr/"
74 - $(cmake-utils_use_build !static-libs SHARED)
75 - $(cmake-utils_use_build test TESTING)
76 - )
77 - cmake-utils_src_configure
78 -}
79 -
80 -src_test() {
81 - cd "${BUILD_DIR}"/cbind/test || die
82 - ctest || die
83 - cd "${BUILD_DIR}"/forbind/test || die
84 - emake f_check
85 -}
86
87 diff --git a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch b/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
88 deleted file mode 100644
89 index 1d1c1fca6c2..00000000000
90 --- a/sci-libs/exodusii/files/exodusii-5.26-multilib.patch
91 +++ /dev/null
92 @@ -1,95 +0,0 @@
93 - CMakeLists.txt | 6 +++---
94 - cbind/CMakeLists.txt | 6 +++---
95 - forbind/CMakeLists.txt | 12 ++++++------
96 - 3 files changed, 12 insertions(+), 12 deletions(-)
97 -
98 -diff --git a/CMakeLists.txt b/CMakeLists.txt
99 -index ca372f5..a071d99 100644
100 ---- a/CMakeLists.txt
101 -+++ b/CMakeLists.txt
102 -@@ -27,7 +27,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
103 - find_library( NETCDF_LIBRARY
104 - NAMES netcdf
105 - PATHS "$ENV{ACCESS}/lib"
106 -- "$ENV{NETCDF_DIR}/lib"
107 -+ "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
108 - "$ENV{NETCDF_DIR}/libsrc/.libs"
109 - )
110 -
111 -@@ -41,14 +41,14 @@ find_program (NETCDF_NCDUMP ncdump
112 - find_library( HDF5_LIBRARY hdf5
113 - $ENV{ACCESS}/lib/shared
114 - $ENV{ACCESS}/lib
115 -- $ENV{NETCDF_DIR}/lib
116 -+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
117 - $ENV{NETCDF_DIR}/libsrc/.libs
118 - /usr/local/hdf5/lib
119 - )
120 - find_library( HDF5HL_LIBRARY hdf5_hl
121 - $ENV{ACCESS}/lib/shared
122 - $ENV{ACCESS}/lib
123 -- $ENV{NETCDF_DIR}/lib
124 -+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
125 - $ENV{NETCDF_DIR}/libsrc/.libs
126 - /usr/local/hdf5/lib
127 - )
128 -diff --git a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
129 -index 083891f..66fd17b 100644
130 ---- a/cbind/CMakeLists.txt
131 -+++ b/cbind/CMakeLists.txt
132 -@@ -293,9 +293,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
133 -
134 - IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
135 - INSTALL(TARGETS exoIIv2c
136 -- RUNTIME DESTINATION lib COMPONENT Runtime
137 -- LIBRARY DESTINATION lib COMPONENT Runtime
138 -- ARCHIVE DESTINATION lib COMPONENT Development)
139 -+ RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
140 -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
141 -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
142 - INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
143 - ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
144 -
145 -diff --git a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
146 -index 5ee026c..66ba1b3 100644
147 ---- a/forbind/CMakeLists.txt
148 -+++ b/forbind/CMakeLists.txt
149 -@@ -14,7 +14,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
150 - find_library( NETCDF_LIBRARY
151 - NAMES netcdf
152 - PATHS "$ENV{ACCESS}/lib"
153 -- "$ENV{NETCDF_DIR}/lib"
154 -+ "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
155 - "$ENV{NETCDF_DIR}/libsrc/.libs"
156 - )
157 -
158 -@@ -28,14 +28,14 @@ find_program (NETCDF_NCDUMP ncdump
159 - find_library( HDF5_LIBRARY hdf5
160 - $ENV{ACCESS}/lib/shared
161 - $ENV{ACCESS}/lib
162 -- $ENV{NETCDF_DIR}/lib
163 -+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
164 - $ENV{NETCDF_DIR}/libsrc/.libs
165 - /usr/local/hdf5/lib
166 - )
167 - find_library( HDF5HL_LIBRARY hdf5_hl
168 - $ENV{ACCESS}/lib/shared
169 - $ENV{ACCESS}/lib
170 -- $ENV{NETCDF_DIR}/lib
171 -+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
172 - $ENV{NETCDF_DIR}/libsrc/.libs
173 - /usr/local/hdf5/lib
174 - )
175 -@@ -61,9 +61,9 @@ ENDIF(EXODUS_LIBRARY_PROPERTIES)
176 -
177 - IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
178 - INSTALL(TARGETS exoIIv2for
179 -- RUNTIME DESTINATION lib COMPONENT Runtime
180 -- LIBRARY DESTINATION lib COMPONENT Runtime
181 -- ARCHIVE DESTINATION lib COMPONENT Development)
182 -+ RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
183 -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
184 -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
185 - INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
186 - ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
187 -