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/nemesis/files/, sci-libs/nemesis/
Date: Sun, 14 Oct 2018 13:35:28
Message-Id: 1539524106.7da9c7778847f578f904a01b195776785d8b5260.asturm@gentoo
1 commit: 7da9c7778847f578f904a01b195776785d8b5260
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 14 12:46:14 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 14 13:35:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da9c777
7
8 sci-libs/nemesis: 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/nemesis/Manifest | 1 -
14 .../nemesis/files/nemesis-5.22b-multilib.patch | 57 ----------------------
15 sci-libs/nemesis/nemesis-5.24.ebuild | 47 ------------------
16 3 files changed, 105 deletions(-)
17
18 diff --git a/sci-libs/nemesis/Manifest b/sci-libs/nemesis/Manifest
19 index d47e626e04a..994c13bd1ae 100644
20 --- a/sci-libs/nemesis/Manifest
21 +++ b/sci-libs/nemesis/Manifest
22 @@ -1,2 +1 @@
23 -DIST exodus-5.24.tar.bz2 4252980 BLAKE2B 44c0233077a3dbcba11e79643e2b81c5529e21b0c447e8621f5247817df95f91ee992091135d8ead694f5817e4575eb88825a0e90703b332c79164c91cfb828b SHA512 d31cf17d2112b625259a70a7f73609323b94a3eed77be3b09961e67518d1b8caf82617a18f8c651fa6549988aa9a02455aea04402463b4fb7e66dd4e15b7e87e
24 DIST exodus-6.09.tar.gz 4757028 BLAKE2B 3ea6ccf3faa04e14a6268429bab0968e0b09a1de7907ae50e293abede1f9362df7ca97f8f351bcb807c49965eb845b161ea5ca9d1786e66bb74875fec5ae20f6 SHA512 a48c02952b0edfae416e9b3f77471558dd2d60177471eca3de32890d11afabe3cfb64396de83e728327d43bbea83969ebcdd8ea516a3b9a6ed7353d4cc940516
25
26 diff --git a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch b/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
27 deleted file mode 100644
28 index b99add01ea5..00000000000
29 --- a/sci-libs/nemesis/files/nemesis-5.22b-multilib.patch
30 +++ /dev/null
31 @@ -1,57 +0,0 @@
32 - nemesis/CMakeLists.txt | 15 ++++++++-------
33 - 1 file changed, 8 insertions(+), 7 deletions(-)
34 -
35 -diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt
36 -index 64aff5d..bed5ede 100644
37 ---- a/nemesis/CMakeLists.txt
38 -+++ b/nemesis/CMakeLists.txt
39 -@@ -19,7 +19,7 @@ find_path( NETCDF_INCLUDE_DIR netcdf.h
40 - find_library( NETCDF_LIBRARY netcdf
41 - $ENV{ACCESS}/lib/shared
42 - $ENV{ACCESS}/lib
43 -- $ENV{NETCDF_DIR}/lib
44 -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
45 - $ENV{NETCDF_DIR}/libsrc/.libs
46 - )
47 -
48 -@@ -29,16 +29,17 @@ find_program (NETCDF_NCDUMP ncdump
49 - $ENV{NETCDF_DIR}/ncdump
50 - )
51 -
52 --find_library( EXODUS_LIBRARY exodus
53 -+find_library( EXODUS_LIBRARY exoIIv2c
54 - $ENV{ACCESS}/lib/shared
55 - $ENV{ACCESS}/lib
56 -+ $ENV{EXODUS_DIR}/${CMAKE_INSTALL_LIBDIR}
57 - )
58 -
59 - # Hack for HDF5
60 - find_library( HDF5_LIBRARY hdf5
61 - $ENV{ACCESS}/lib/shared
62 - $ENV{ACCESS}/lib
63 -- $ENV{NETCDF_DIR}/lib
64 -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
65 - $ENV{NETCDF_DIR}/libsrc/.libs
66 - /usr/local/hdf5/lib
67 - )
68 -@@ -46,7 +47,7 @@ find_library( HDF5_LIBRARY hdf5
69 - find_library( HDF5HL_LIBRARY hdf5_hl
70 - $ENV{ACCESS}/lib/shared
71 - $ENV{ACCESS}/lib
72 -- $ENV{NETCDF_DIR}/lib
73 -+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
74 - $ENV{NETCDF_DIR}/libsrc/.libs
75 - /usr/local/hdf5/lib
76 - )
77 -@@ -79,8 +80,8 @@ ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
78 - TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
79 -
80 - INSTALL(TARGETS nemesis
81 -- RUNTIME DESTINATION lib COMPONENT Runtime
82 -- LIBRARY DESTINATION lib COMPONENT Runtime
83 -- ARCHIVE DESTINATION lib COMPONENT Development)
84 -+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
85 -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
86 -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
87 - INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development)
88 -
89
90 diff --git a/sci-libs/nemesis/nemesis-5.24.ebuild b/sci-libs/nemesis/nemesis-5.24.ebuild
91 deleted file mode 100644
92 index 7a5a5b95805..00000000000
93 --- a/sci-libs/nemesis/nemesis-5.24.ebuild
94 +++ /dev/null
95 @@ -1,47 +0,0 @@
96 -# Copyright 1999-2016 Gentoo Foundation
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=5
100 -
101 -inherit cmake-utils multilib
102 -
103 -MY_PN="exodus"
104 -MY_P="${MY_PN}-${PV}"
105 -
106 -DESCRIPTION="Enhancement to the EXODUSII finite element database model"
107 -HOMEPAGE="https://sourceforge.net/projects/exodusii/"
108 -SRC_URI="mirror://sourceforge/project/${MY_PN}ii/${MY_P}.tar.bz2"
109 -
110 -LICENSE="BSD"
111 -SLOT="0"
112 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
113 -IUSE="static-libs test"
114 -
115 -DEPEND="
116 - sci-libs/exodusii
117 - sci-libs/netcdf"
118 -RDEPEND="${DEPEND}"
119 -
120 -S="${WORKDIR}"/${MY_P}/${PN}
121 -
122 -PATCHES=( "${FILESDIR}"/${PN}-5.22b-multilib.patch )
123 -
124 -src_prepare() {
125 - find ../exodus -delete || die
126 - cmake-utils_src_prepare
127 - sed -i 's/exoIIv2c/NAMES exodus &/' CMakeLists.txt || die
128 -}
129 -
130 -src_configure() {
131 - mycmakeargs="${mycmakeargs}
132 - -DLIB_INSTALL_DIR=$(get_libdir)
133 - -DNETCDF_DIR="${EPREFIX}/usr/"
134 - -DEXODUS_DIR="${EPREFIX}/usr/"
135 - $(cmake-utils_use !static-libs BUILD_SHARED_LIBS)
136 - $(cmake-utils_use test BUILD_TESTING)"
137 - cmake-utils_src_configure
138 -}
139 -
140 -src_test() {
141 - "${BUILD_DIR}"/ne_test || die
142 -}