Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libmed/, sci-libs/libmed/files/
Date: Wed, 02 Oct 2019 18:17:16
Message-Id: 1570039916.148bd7fa2b0f0d6749c435854d92d417030c9198.dilfridge@gentoo
1 commit: 148bd7fa2b0f0d6749c435854d92d417030c9198
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 2 18:05:18 2019 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 2 18:11:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148bd7fa
7
8 sci-libs/libmed: remove last-rited package
9
10 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
11
12 sci-libs/libmed/Manifest | 1 -
13 .../libmed/files/libmed-3.3.1-cmake-fortran.patch | 21 -----
14 .../libmed-3.3.1-disable-python-compile.patch | 17 ----
15 sci-libs/libmed/files/libmed-3.3.1-mpi.patch | 23 -----
16 sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch | 59 ------------
17 .../libmed/files/libmed-4.0.0-installdoc.patch | 15 ---
18 sci-libs/libmed/files/libmed-4.0.0-tests.patch | 17 ----
19 sci-libs/libmed/libmed-4.0.0-r1.ebuild | 103 ---------------------
20 sci-libs/libmed/metadata.xml | 12 ---
21 9 files changed, 268 deletions(-)
22
23 diff --git a/sci-libs/libmed/Manifest b/sci-libs/libmed/Manifest
24 deleted file mode 100644
25 index cec3ed3d3f8..00000000000
26 --- a/sci-libs/libmed/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
30
31 diff --git a/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch b/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch
32 deleted file mode 100644
33 index 1f475d58484..00000000000
34 --- a/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch
35 +++ /dev/null
36 @@ -1,21 +0,0 @@
37 -Make cmake properly disable fortran upon user requirments
38 -
39 ---- ./CMakeLists.txt.orig 2016-07-01 15:28:57.139304608 +0300
40 -+++ ./CMakeLists.txt 2016-07-01 15:34:22.295899455 +0300
41 -@@ -8,10 +8,13 @@
42 -
43 - INCLUDE(CheckLanguage)
44 - CHECK_LANGUAGE(Fortran)
45 --IF(CMAKE_Fortran_COMPILER)
46 -+OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON)
47 -+IF(MEDFILE_BUILD_FORTRAN)
48 - ENABLE_LANGUAGE(Fortran)
49 -+ IF(NOT CMAKE_Fortran_COMPILER)
50 -+ MESSAGE(FATAL_EROOR "Fortran support was requested but not found")
51 -+ ENDIF()
52 - ELSE()
53 -- MESSAGE(STATUS "No Fortran support")
54 - ENDIF()
55 -
56 - ## Version number
57 -
58
59 diff --git a/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch b/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch
60 deleted file mode 100644
61 index 642b404ba88..00000000000
62 --- a/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch
63 +++ /dev/null
64 @@ -1,17 +0,0 @@
65 ---- ./config/cmake_files/medMacros.cmake 2016-10-24 09:55:35.000000000 +0200
66 -+++ ./config/cmake_files/medMacros.cmake.new 2018-01-24 10:50:15.146953227 +0100
67 -@@ -412,9 +412,9 @@
68 - FOREACH(input ${PYFILE2COMPINST})
69 - GET_FILENAME_COMPONENT(inputname ${input} NAME)
70 - INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC})
71 -- INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
72 -- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
73 -- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
74 -- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
75 -+ #INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")")
76 -+ #INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")")
77 -+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")")
78 -+ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")")
79 - ENDFOREACH(input ${PYFILE2COMPINST})
80 - ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC)
81 -
82
83 diff --git a/sci-libs/libmed/files/libmed-3.3.1-mpi.patch b/sci-libs/libmed/files/libmed-3.3.1-mpi.patch
84 deleted file mode 100644
85 index 0516b344a0b..00000000000
86 --- a/sci-libs/libmed/files/libmed-3.3.1-mpi.patch
87 +++ /dev/null
88 @@ -1,23 +0,0 @@
89 ---- a/include/med.h.in 2018-07-06 10:55:49.247164591 +0200
90 -+++ a/include/med.h.in.new 2018-07-06 10:55:29.559164666 +0200
91 -@@ -19,6 +19,11 @@
92 - #ifndef MED_H
93 - #define MED_H
94 -
95 -+@MED_DEFINE_MED_HAVE_MPI@
96 -+#ifdef MED_HAVE_MPI
97 -+#include <mpi.h>
98 -+#endif
99 -+
100 - #include <hdf5.h>
101 - #ifdef HAVE_STDINT_H
102 - #include <stdint.h> // Use the C99 official header
103 -@@ -66,8 +71,6 @@
104 - #define _MED_VERSION(x,y,z) STR(x) "." STR(y) "." STR(z)
105 - #define MED_VERSION_STR _MED_VERSION(MED_NUM_MAJEUR,MED_NUM_MINEUR,MED_NUM_RELEASE)
106 -
107 --@MED_DEFINE_MED_HAVE_MPI@
108 --
109 - #define MED_NULL (void *) NULL
110 - #define MED_MAX_PARA 20
111 -
112
113 diff --git a/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch b/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch
114 deleted file mode 100644
115 index 4c023cf24b3..00000000000
116 --- a/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch
117 +++ /dev/null
118 @@ -1,59 +0,0 @@
119 ---- a/src/CMakeLists.txt 2018-07-28 16:37:01.180598992 +0200
120 -+++ a/src/CMakeLists.txt.new 2018-07-28 17:14:49.147775461 +0200
121 -@@ -1,7 +1,3 @@
122 --INCLUDE_DIRECTORIES(
123 -- ${HDF5_INCLUDE_DIRS}
124 -- ${MPI_INCLUDE_DIRS})
125 --
126 - # On Win platform, we need to make sure symbols are properly exported in
127 - # the intermediary OBJECT targes built in the sub-directories:
128 - # The definition "-D<target>_EXPORTS" is normally added automatically by CMake
129 -@@ -19,6 +15,12 @@
130 - INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include
131 - ${PROJECT_SOURCE_DIR}/include)
132 -
133 -+# these includes must go after project ones to avoid masking by
134 -+# previous versions already installed
135 -+INCLUDE_DIRECTORIES(
136 -+ ${HDF5_INCLUDE_DIRS}
137 -+ ${MPI_INCLUDE_DIRS})
138 -+
139 - # Get pure C intermediary targets:
140 - ADD_SUBDIRECTORY(hdfi)
141 - ADD_SUBDIRECTORY(ci)
142 ---- a/tools/mdump/CMakeLists.txt 2018-07-29 09:24:35.714930029 +0200
143 -+++ a/tools/mdump/CMakeLists.txt.new 2018-07-29 09:58:48.667089767 +0200
144 -@@ -33,6 +33,6 @@
145 - CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY)
146 -
147 - INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin)
148 --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
149 --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")
150 -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
151 -+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
152 -
153 ---- a/src/2.3.6/CMakeLists.txt 2018-07-30 22:45:56.205079148 +0200
154 -+++ a/src/2.3.6/CMakeLists.txt.new 2018-07-30 22:49:43.520096835 +0200
155 -@@ -1,8 +1,3 @@
156 --INCLUDE_DIRECTORIES(
157 -- ${HDF5_INCLUDE_DIRS}
158 -- ${MPI_INCLUDE_DIRS}
159 --)
160 --
161 - SET(med236_SOURCES MEDaffiche.c)
162 -
163 - # Definitions
164 -@@ -13,6 +8,13 @@
165 - "${PROJECT_BINARY_DIR}/include/2.3.6"
166 - "${PROJECT_SOURCE_DIR}/include/2.3.6")
167 -
168 -+# these includes must go after project ones to avoid masking by
169 -+# previous versions already installed
170 -+INCLUDE_DIRECTORIES(
171 -+ ${HDF5_INCLUDE_DIRS}
172 -+ ${MPI_INCLUDE_DIRS}
173 -+)
174 -+
175 - # Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236
176 - # (and their static counterpart):
177 - ADD_SUBDIRECTORY(cfi)
178
179 diff --git a/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch b/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch
180 deleted file mode 100644
181 index 2d9361c4265..00000000000
182 --- a/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch
183 +++ /dev/null
184 @@ -1,15 +0,0 @@
185 ---- ./CMakeLists.txt 2019-02-26 11:59:15.276962751 +0100
186 -+++ ./CMakeLists.txt.new 2019-02-26 11:59:26.660962707 +0100
187 -@@ -137,9 +137,10 @@
188 - ENDIF()
189 -
190 - ## Installation of the doc
191 -+set(MEDFILE_DOC_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} CACHE PATH "install dir for documentation")
192 - IF(MEDFILE_INSTALL_DOC OR MEDFILE_BUILD_DOC)
193 -- INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
194 -- INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
195 -+ INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${MEDFILE_DOC_DIRECTORY} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE)
196 -+ INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${MEDFILE_DOC_DIRECTORY} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png")
197 - ENDIF()
198 -
199 - #######################
200
201 diff --git a/sci-libs/libmed/files/libmed-4.0.0-tests.patch b/sci-libs/libmed/files/libmed-4.0.0-tests.patch
202 deleted file mode 100644
203 index 91041fb4c12..00000000000
204 --- a/sci-libs/libmed/files/libmed-4.0.0-tests.patch
205 +++ /dev/null
206 @@ -1,17 +0,0 @@
207 ---- ./tests/python/CMakeLists.txt.orig 2018-11-05 14:22:25.000000000 +0100
208 -+++ ./tests/python/CMakeLists.txt 2019-01-09 17:37:17.142913290 +0100
209 -@@ -33,11 +33,13 @@
210 - UseCase_MEDinterp_3.py
211 - )
212 -
213 -+FILE(COPY tests_params.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
214 -+
215 - FOREACH(_s IN LISTS _tst_scripts)
216 - STRING(REPLACE ".py" "_Python" _tst_name ${_s})
217 - FILE(COPY ${_s} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
218 - ADD_TEST(NAME ${_tst_name}
219 -- COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}")
220 -+ COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python:${PROJECT_BINARY_DIR}/python/med" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}")
221 - ENDFOREACH()
222 -
223 - INSTALL(FILES ${_to_install} DESTINATION bin/testpy)
224
225 diff --git a/sci-libs/libmed/libmed-4.0.0-r1.ebuild b/sci-libs/libmed/libmed-4.0.0-r1.ebuild
226 deleted file mode 100644
227 index c4f4bee90b0..00000000000
228 --- a/sci-libs/libmed/libmed-4.0.0-r1.ebuild
229 +++ /dev/null
230 @@ -1,103 +0,0 @@
231 -# Copyright 1999-2019 Gentoo Authors
232 -# Distributed under the terms of the GNU General Public License v2
233 -
234 -EAPI=7
235 -
236 -# EAPI=7 uses ninja generator by default but it's incompatible with USE=fortran
237 -# https://github.com/Kitware/ninja/tree/features-for-fortran#readme
238 -CMAKE_MAKEFILE_GENERATOR=emake
239 -
240 -FORTRAN_NEEDED=fortran
241 -
242 -# NOTE:The build for multiple python versions should be possible but
243 -# complicated for the build system
244 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
245 -
246 -inherit cmake-utils fortran-2 python-single-r1
247 -
248 -MY_P="med-${PV}"
249 -
250 -DESCRIPTION="A library to store and exchange meshed data or computation results"
251 -HOMEPAGE="https://www.salome-platform.org/"
252 -SRC_URI="http://files.salome-platform.org/Salome/other/${MY_P}.tar.gz"
253 -
254 -LICENSE="GPL-3 LGPL-3"
255 -SLOT="0"
256 -KEYWORDS="~amd64 ~x86"
257 -IUSE="doc fortran mpi python test"
258 -
259 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
260 -RDEPEND="
261 - >=sci-libs/hdf5-1.10.2:=[fortran=,mpi=]
262 - mpi? ( virtual/mpi[fortran=] )
263 - python? ( ${PYTHON_DEPS} )
264 -"
265 -DEPEND="${RDEPEND}"
266 -BDEPEND="python? ( >=dev-lang/swig-2.0.9:0 )"
267 -
268 -S="${WORKDIR}"/${MY_P}
269 -
270 -PATCHES=(
271 - "${FILESDIR}/${PN}-3.3.1-cmake-fortran.patch"
272 - "${FILESDIR}/${PN}-3.3.1-disable-python-compile.patch" # managed by function of python eclass
273 - "${FILESDIR}/${PN}-3.3.1-mpi.patch"
274 - "${FILESDIR}/${P}-cmakelist.patch"
275 - "${FILESDIR}/${P}-tests.patch" # disable a few tests not running
276 - "${FILESDIR}/${P}-installdoc.patch"
277 -)
278 -
279 -DOCS=( AUTHORS ChangeLog NEWS README TODO )
280 -
281 -pkg_setup() {
282 - use python && python-single-r1_pkg_setup
283 - use fortran && fortran-2_pkg_setup
284 -}
285 -
286 -src_prepare() {
287 - # fixes for correct libdir name
288 - sed -i -e "s@SET(_install_dir lib/python@SET(_install_dir $(get_libdir)/python@" \
289 - ./python/CMakeLists.txt || die "sed failed"
290 - for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt
291 - do
292 - sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \
293 - "${cm}" || die "sed on ${cm} failed"
294 - done
295 -
296 - cmake-utils_src_prepare
297 -}
298 -
299 -src_configure() {
300 - local mycmakeargs=(
301 - # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen,
302 - # so let's avoid rebuilding it because it will be different
303 - -DMEDFILE_BUILD_DOC=OFF
304 - -DMEDFILE_BUILD_FORTRAN=$(usex fortran)
305 - -DMEDFILE_BUILD_PYTHON=$(usex python)
306 - -DMEDFILE_BUILD_SHARED_LIBS=ON
307 - -DMEDFILE_BUILD_STATIC_LIBS=OFF
308 - -DMEDFILE_BUILD_TESTS=$(usex test)
309 - -DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html # custom var created by patches
310 - -DMEDFILE_INSTALL_DOC=$(usex doc)
311 - -DMEDFILE_USE_MPI=$(usex mpi)
312 - )
313 - cmake-utils_src_configure
314 -}
315 -
316 -src_install() {
317 - cmake-utils_src_install
318 -
319 - # the optimization done in CMakeLists.txt has been disabled so
320 - # we need to do it manually
321 - use python && python_optimize
322 -
323 - # Prevent test executables being installed
324 - if use test; then
325 - rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables"
326 - fi
327 -}
328 -
329 -src_test() {
330 - # override parallel mode only for tests
331 - local myctestargs=( "-j 1" )
332 - cmake-utils_src_test
333 -}
334
335 diff --git a/sci-libs/libmed/metadata.xml b/sci-libs/libmed/metadata.xml
336 deleted file mode 100644
337 index e54fc02c2ba..00000000000
338 --- a/sci-libs/libmed/metadata.xml
339 +++ /dev/null
340 @@ -1,12 +0,0 @@
341 -<?xml version="1.0" encoding="UTF-8"?>
342 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
343 -<pkgmetadata>
344 - <maintainer type="person">
345 - <email>waebbl@×××××.com</email>
346 - <name>Bernd Waibel</name>
347 - </maintainer>
348 - <maintainer type="project">
349 - <email>proxy-maint@g.o</email>
350 - <description>Proxy Maintainer Team</description>
351 - </maintainer>
352 -</pkgmetadata>