diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:11:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:11:03 +0100 |
commit | 2929788def9a92c1eb237eed93fbdb0c02838bbf (patch) | |
tree | 166b01591366d3479084ea774c888bc84aaa8d4f /sci-libs/libmed | |
parent | ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030 (diff) |
Revert "gentoo resync : 13.10.2019"
This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.
Diffstat (limited to 'sci-libs/libmed')
-rw-r--r-- | sci-libs/libmed/Manifest | 9 | ||||
-rw-r--r-- | sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch | 21 | ||||
-rw-r--r-- | sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch | 17 | ||||
-rw-r--r-- | sci-libs/libmed/files/libmed-3.3.1-mpi.patch | 23 | ||||
-rw-r--r-- | sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch | 59 | ||||
-rw-r--r-- | sci-libs/libmed/files/libmed-4.0.0-installdoc.patch | 15 | ||||
-rw-r--r-- | sci-libs/libmed/files/libmed-4.0.0-tests.patch | 17 | ||||
-rw-r--r-- | sci-libs/libmed/libmed-4.0.0-r1.ebuild | 103 | ||||
-rw-r--r-- | sci-libs/libmed/metadata.xml | 12 |
9 files changed, 276 insertions, 0 deletions
diff --git a/sci-libs/libmed/Manifest b/sci-libs/libmed/Manifest new file mode 100644 index 000000000000..4944c28e0496 --- /dev/null +++ b/sci-libs/libmed/Manifest @@ -0,0 +1,9 @@ +AUX libmed-3.3.1-cmake-fortran.patch 588 BLAKE2B 7fbd1619692702edb395402d30ee5ae7b44a801be010547a89ac777db7e86a11975f170eb1713e190b367bf5c5c3bf156dbf3522d263fe480387a7b40af572c3 SHA512 5c23d7afc8aad0c91b96d10953fe4c39cd079e798f0cbc5efdd9f5beb3967af1582f1c47f53d8be8a291222194f05205f06d19b1a3c3192fd4cce778052846b1 +AUX libmed-3.3.1-disable-python-compile.patch 1242 BLAKE2B 5c0a500376665cea4429820b3c41eac1d8bf25b1a172a236327e74768891ca1ec7ed143e0d7c803eac5194a6b762538731c068aca53cc5f2b8071d9b0ce08b57 SHA512 29dd13933412b19a4bb003d2337cfd3d35bedff430325809947d41b276690a3413976b39487e4577ad74a6c6ca1c611e63ee09873f0ea2acae1a21475a6bb2e5 +AUX libmed-3.3.1-mpi.patch 608 BLAKE2B 61c26f3cce21aa92d72f07227076afc477fb5cb94590b2587f5a57dfc662e7a619de84708bf71f7c22f159ca6943991bd8c5f767f2ba1953494f31133dff784d SHA512 f77833448dcf0d7d0949d96d1433cc36956765f4aefd9ff2f03add9ee8451069c3840a5bae054be094a2711631be947d32ea3321b7f79a719e3e5ea2a06fd8cf +AUX libmed-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cffecff9b1b4c906c0f9d17abd6c02ec150420403d8c1b36310b871f5354e100d1038d5620f6ba8719074e0ccd665 SHA512 405669dedc95b3776a2f4f6d64f8a608c914adb7d0666690f1f8b4a0598d6d85c7398622f50c50ead0295ee965fa993c36eb9e4217985079b528714682ea8b5d +AUX libmed-4.0.0-installdoc.patch 1045 BLAKE2B ddc44d986743a4bf1fa59ab20d34835117f2213283ad13ce1e8e16358b87fe64888facb2f32da76a025cc283a5d942554700cc8816c25cb6f0eeaa54970f1f9a SHA512 486eb41af086d2dc92463aa8f64f074f70a39920b4954e4c272bc6b92c960efe198255975b7c594ff801be43e9eb6a31d007f55451901107db90ed6b3389eee6 +AUX libmed-4.0.0-tests.patch 819 BLAKE2B c6352475b917d4300d15eaa8742c44ed609768265beb37d6a4128e52cfcda9b7971e8d770045944e94dfa9c40dd756dba854c6dd793639c3dad4497bba34b651 SHA512 4b13a8dc40d7d666b7853b47df7c432a796bc905b714cdecc22bc242597eddb6c18a13eae0c39b8a00a4b07d710332c413ac5c358ffff7cb19378a8adb12221c +DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7 +EBUILD libmed-4.0.0-r1.ebuild 3020 BLAKE2B 7fdf0682ca017aae35f8cd93e685fcf397880b71a56c51418369f09a2d944cd707df131048ba6a2eb53e353d5101d288397f27954ea618aef21acb962a74dc24 SHA512 c05b59f02f76a9ac37147600dfa27171cbb7fafde529ebb96558e91c6c3b541e3372f1ec1bf1fa7d2d5b10e1cc59238c407339aae44ba8f9b87771702fd47ecc +MISC metadata.xml 379 BLAKE2B d8dc23452e0bc847d6d828192f2665cc74924abb6e5057db84a2a7bd6a1e4b1daa047e7db5694e00b07b1c21666f0fca8d4c374fb3be0f1ce3dbf3742f3b7f93 SHA512 5bc38cad4d81652ac0f16779036d8a3ab1772e504c4d17b614aca53c845518c56f0baa3bf02aa186bb988d6942945b4b5355ade3544f9c0c5da367c9bf0a645f 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 new file mode 100644 index 000000000000..1f475d584843 --- /dev/null +++ b/sci-libs/libmed/files/libmed-3.3.1-cmake-fortran.patch @@ -0,0 +1,21 @@ +Make cmake properly disable fortran upon user requirments + +--- ./CMakeLists.txt.orig 2016-07-01 15:28:57.139304608 +0300 ++++ ./CMakeLists.txt 2016-07-01 15:34:22.295899455 +0300 +@@ -8,10 +8,13 @@ + + INCLUDE(CheckLanguage) + CHECK_LANGUAGE(Fortran) +-IF(CMAKE_Fortran_COMPILER) ++OPTION (MEDFILE_BUILD_FORTRAN "Build fortran library" ON) ++IF(MEDFILE_BUILD_FORTRAN) + ENABLE_LANGUAGE(Fortran) ++ IF(NOT CMAKE_Fortran_COMPILER) ++ MESSAGE(FATAL_EROOR "Fortran support was requested but not found") ++ ENDIF() + ELSE() +- MESSAGE(STATUS "No Fortran support") + ENDIF() + + ## Version number + 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 new file mode 100644 index 000000000000..642b404ba880 --- /dev/null +++ b/sci-libs/libmed/files/libmed-3.3.1-disable-python-compile.patch @@ -0,0 +1,17 @@ +--- ./config/cmake_files/medMacros.cmake 2016-10-24 09:55:35.000000000 +0200 ++++ ./config/cmake_files/medMacros.cmake.new 2018-01-24 10:50:15.146953227 +0100 +@@ -412,9 +412,9 @@ + FOREACH(input ${PYFILE2COMPINST}) + GET_FILENAME_COMPONENT(inputname ${input} NAME) + INSTALL(FILES ${input} DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}) +- INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")") +- INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")") +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")") +- INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")") ++ #INSTALL(CODE "MESSAGE(STATUS \"py compiling ${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}\")") ++ #INSTALL(CODE "SET(CMD \"import py_compile ; py_compile.compile('${CMAKE_INSTALL_PREFIX}/${PYFILELOC}/${inputname}')\")") ++ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c \"\${CMD}\")") ++ #INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -c \"\${CMD}\")") + ENDFOREACH(input ${PYFILE2COMPINST}) + ENDMACRO(INSTALL_AND_COMPILE_PYTHON_FILE PYFILE2COMPINST PYFILELOC) + diff --git a/sci-libs/libmed/files/libmed-3.3.1-mpi.patch b/sci-libs/libmed/files/libmed-3.3.1-mpi.patch new file mode 100644 index 000000000000..0516b344a0bf --- /dev/null +++ b/sci-libs/libmed/files/libmed-3.3.1-mpi.patch @@ -0,0 +1,23 @@ +--- a/include/med.h.in 2018-07-06 10:55:49.247164591 +0200 ++++ a/include/med.h.in.new 2018-07-06 10:55:29.559164666 +0200 +@@ -19,6 +19,11 @@ + #ifndef MED_H + #define MED_H + ++@MED_DEFINE_MED_HAVE_MPI@ ++#ifdef MED_HAVE_MPI ++#include <mpi.h> ++#endif ++ + #include <hdf5.h> + #ifdef HAVE_STDINT_H + #include <stdint.h> // Use the C99 official header +@@ -66,8 +71,6 @@ + #define _MED_VERSION(x,y,z) STR(x) "." STR(y) "." STR(z) + #define MED_VERSION_STR _MED_VERSION(MED_NUM_MAJEUR,MED_NUM_MINEUR,MED_NUM_RELEASE) + +-@MED_DEFINE_MED_HAVE_MPI@ +- + #define MED_NULL (void *) NULL + #define MED_MAX_PARA 20 + diff --git a/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch b/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch new file mode 100644 index 000000000000..4c023cf24b31 --- /dev/null +++ b/sci-libs/libmed/files/libmed-4.0.0-cmakelist.patch @@ -0,0 +1,59 @@ +--- a/src/CMakeLists.txt 2018-07-28 16:37:01.180598992 +0200 ++++ a/src/CMakeLists.txt.new 2018-07-28 17:14:49.147775461 +0200 +@@ -1,7 +1,3 @@ +-INCLUDE_DIRECTORIES( +- ${HDF5_INCLUDE_DIRS} +- ${MPI_INCLUDE_DIRS}) +- + # On Win platform, we need to make sure symbols are properly exported in + # the intermediary OBJECT targes built in the sub-directories: + # The definition "-D<target>_EXPORTS" is normally added automatically by CMake +@@ -19,6 +15,12 @@ + INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include + ${PROJECT_SOURCE_DIR}/include) + ++# these includes must go after project ones to avoid masking by ++# previous versions already installed ++INCLUDE_DIRECTORIES( ++ ${HDF5_INCLUDE_DIRS} ++ ${MPI_INCLUDE_DIRS}) ++ + # Get pure C intermediary targets: + ADD_SUBDIRECTORY(hdfi) + ADD_SUBDIRECTORY(ci) +--- a/tools/mdump/CMakeLists.txt 2018-07-29 09:24:35.714930029 +0200 ++++ a/tools/mdump/CMakeLists.txt.new 2018-07-29 09:58:48.667089767 +0200 +@@ -33,6 +33,6 @@ + CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY) + + INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin) +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") + +--- a/src/2.3.6/CMakeLists.txt 2018-07-30 22:45:56.205079148 +0200 ++++ a/src/2.3.6/CMakeLists.txt.new 2018-07-30 22:49:43.520096835 +0200 +@@ -1,8 +1,3 @@ +-INCLUDE_DIRECTORIES( +- ${HDF5_INCLUDE_DIRS} +- ${MPI_INCLUDE_DIRS} +-) +- + SET(med236_SOURCES MEDaffiche.c) + + # Definitions +@@ -13,6 +8,13 @@ + "${PROJECT_BINARY_DIR}/include/2.3.6" + "${PROJECT_SOURCE_DIR}/include/2.3.6") + ++# these includes must go after project ones to avoid masking by ++# previous versions already installed ++INCLUDE_DIRECTORIES( ++ ${HDF5_INCLUDE_DIRS} ++ ${MPI_INCLUDE_DIRS} ++) ++ + # Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236 + # (and their static counterpart): + ADD_SUBDIRECTORY(cfi) diff --git a/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch b/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch new file mode 100644 index 000000000000..2d9361c42657 --- /dev/null +++ b/sci-libs/libmed/files/libmed-4.0.0-installdoc.patch @@ -0,0 +1,15 @@ +--- ./CMakeLists.txt 2019-02-26 11:59:15.276962751 +0100 ++++ ./CMakeLists.txt.new 2019-02-26 11:59:26.660962707 +0100 +@@ -137,9 +137,10 @@ + ENDIF() + + ## Installation of the doc ++set(MEDFILE_DOC_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} CACHE PATH "install dir for documentation") + IF(MEDFILE_INSTALL_DOC OR MEDFILE_BUILD_DOC) +- INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/med-fichier-${MED_STR_VERSION} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE) +- 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") ++ INSTALL(DIRECTORY doc/html.dox/ DESTINATION ${MEDFILE_DOC_DIRECTORY} REGEX "Makefile*" EXCLUDE PATTERN "*.am" EXCLUDE) ++ INSTALL(DIRECTORY doc/gif doc/jpg doc/png DESTINATION ${MEDFILE_DOC_DIRECTORY} FILES_MATCHING PATTERN "*.gif" PATTERN "*.jpg" PATTERN "*.svg" PATTERN "*.png") + ENDIF() + + ####################### diff --git a/sci-libs/libmed/files/libmed-4.0.0-tests.patch b/sci-libs/libmed/files/libmed-4.0.0-tests.patch new file mode 100644 index 000000000000..91041fb4c126 --- /dev/null +++ b/sci-libs/libmed/files/libmed-4.0.0-tests.patch @@ -0,0 +1,17 @@ +--- ./tests/python/CMakeLists.txt.orig 2018-11-05 14:22:25.000000000 +0100 ++++ ./tests/python/CMakeLists.txt 2019-01-09 17:37:17.142913290 +0100 +@@ -33,11 +33,13 @@ + UseCase_MEDinterp_3.py + ) + ++FILE(COPY tests_params.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) ++ + FOREACH(_s IN LISTS _tst_scripts) + STRING(REPLACE ".py" "_Python" _tst_name ${_s}) + FILE(COPY ${_s} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + ADD_TEST(NAME ${_tst_name} +- COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}") ++ COMMAND "/usr/bin/env" "PYTHONPATH=${PROJECT_BINARY_DIR}/python:${PROJECT_BINARY_DIR}/python/med" "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/${_s}") + ENDFOREACH() + + INSTALL(FILES ${_to_install} DESTINATION bin/testpy) diff --git a/sci-libs/libmed/libmed-4.0.0-r1.ebuild b/sci-libs/libmed/libmed-4.0.0-r1.ebuild new file mode 100644 index 000000000000..c4f4bee90b0f --- /dev/null +++ b/sci-libs/libmed/libmed-4.0.0-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# EAPI=7 uses ninja generator by default but it's incompatible with USE=fortran +# https://github.com/Kitware/ninja/tree/features-for-fortran#readme +CMAKE_MAKEFILE_GENERATOR=emake + +FORTRAN_NEEDED=fortran + +# NOTE:The build for multiple python versions should be possible but +# complicated for the build system +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit cmake-utils fortran-2 python-single-r1 + +MY_P="med-${PV}" + +DESCRIPTION="A library to store and exchange meshed data or computation results" +HOMEPAGE="https://www.salome-platform.org/" +SRC_URI="http://files.salome-platform.org/Salome/other/${MY_P}.tar.gz" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fortran mpi python test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RDEPEND=" + >=sci-libs/hdf5-1.10.2:=[fortran=,mpi=] + mpi? ( virtual/mpi[fortran=] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( >=dev-lang/swig-2.0.9:0 )" + +S="${WORKDIR}"/${MY_P} + +PATCHES=( + "${FILESDIR}/${PN}-3.3.1-cmake-fortran.patch" + "${FILESDIR}/${PN}-3.3.1-disable-python-compile.patch" # managed by function of python eclass + "${FILESDIR}/${PN}-3.3.1-mpi.patch" + "${FILESDIR}/${P}-cmakelist.patch" + "${FILESDIR}/${P}-tests.patch" # disable a few tests not running + "${FILESDIR}/${P}-installdoc.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + # fixes for correct libdir name + sed -i -e "s@SET(_install_dir lib/python@SET(_install_dir $(get_libdir)/python@" \ + ./python/CMakeLists.txt || die "sed failed" + for cm in ./src/CMakeLists.txt ./tools/medimport/CMakeLists.txt + do + sed -i -e "s@INSTALL(TARGETS \(.*\) DESTINATION lib)@INSTALL(TARGETS \1 DESTINATION $(get_libdir))@" \ + "${cm}" || die "sed on ${cm} failed" + done + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + # as indicated in the CMakeLists.txt, the shipped documentation is generated by a custom doxygen, + # so let's avoid rebuilding it because it will be different + -DMEDFILE_BUILD_DOC=OFF + -DMEDFILE_BUILD_FORTRAN=$(usex fortran) + -DMEDFILE_BUILD_PYTHON=$(usex python) + -DMEDFILE_BUILD_SHARED_LIBS=ON + -DMEDFILE_BUILD_STATIC_LIBS=OFF + -DMEDFILE_BUILD_TESTS=$(usex test) + -DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html # custom var created by patches + -DMEDFILE_INSTALL_DOC=$(usex doc) + -DMEDFILE_USE_MPI=$(usex mpi) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + # the optimization done in CMakeLists.txt has been disabled so + # we need to do it manually + use python && python_optimize + + # Prevent test executables being installed + if use test; then + rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables" + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake-utils_src_test +} diff --git a/sci-libs/libmed/metadata.xml b/sci-libs/libmed/metadata.xml new file mode 100644 index 000000000000..e54fc02c2ba5 --- /dev/null +++ b/sci-libs/libmed/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>waebbl@gmail.com</email> + <name>Bernd Waibel</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <description>Proxy Maintainer Team</description> + </maintainer> +</pkgmetadata> |