From 6f8038813c460b4f0572d5ef595cdfa94af3a94d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2019 10:20:03 +0100 Subject: gentoo resync : 21.05.2019 --- sci-libs/libmed/Manifest | 5 +- .../files/libmed-4.0.0-hdf5-1.8-support.patch | 15 --- sci-libs/libmed/libmed-4.0.0-r1.ebuild | 103 +++++++++++++++++++++ sci-libs/libmed/libmed-4.0.0.ebuild | 100 -------------------- sci-libs/libmed/metadata.xml | 8 +- 5 files changed, 111 insertions(+), 120 deletions(-) delete mode 100644 sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch create mode 100644 sci-libs/libmed/libmed-4.0.0-r1.ebuild delete mode 100644 sci-libs/libmed/libmed-4.0.0.ebuild (limited to 'sci-libs/libmed') diff --git a/sci-libs/libmed/Manifest b/sci-libs/libmed/Manifest index fb849d855760..2d3b68c78ba3 100644 --- a/sci-libs/libmed/Manifest +++ b/sci-libs/libmed/Manifest @@ -2,12 +2,11 @@ AUX libmed-3.3.1-cmake-fortran.patch 588 BLAKE2B 7fbd1619692702edb395402d30ee5ae 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-hdf5-1.8-support.patch 735 BLAKE2B 675ef189ed25e2366b1be89dcb253ecf81dcf61ca4af623a73830701baf2012134e2718d924c4554861768498016d7c4224ebc6110de56184b2c4e9d7c320583 SHA512 2eb7d3ec57afeecf8e78c6df094187989cc4336e9eed7a8145975a5a7f31c7aef5c7a3cbad358402cee4c3b47d63b546a74e4e0d4108ea036b2613ce91fa914d 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 libmed-3.3.1-r1-gentoo.tar.bz2 36127 BLAKE2B c112215932ac5c84cc75911c20712fcf428a8fc6e8adfd497066315fbc99a70816e0276196ff6366f34eeb3bf6d40586a735dd35cc13579640d7128f563fbf2b SHA512 e55dc96b8282dfba0dc9746dba7ef2ea8616d5617deabd3164d0134ca680e27c2a121432ae22f38fc53a52ffb0ac66a9a17c131488a9d01a757601afbcdc0bff DIST med-3.3.1.tar.gz 43379218 BLAKE2B 101033a766b3b8f184de8b18437a020129da3a11fd947742c30d8b9d274542e7445f1ee1d5827194a1ebc02c701ea6911105102f7b61c24d9d07bb15dbfe45f7 SHA512 f1eba3bc69520b862bdab89ce76694f91ed0e6be42c037df8ec655b6314e8ae776083d5ead61fb34097eb8440302969229d1859b6d8fcce51e7551b75d8ebf5f DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7 EBUILD libmed-3.3.1-r1.ebuild 2959 BLAKE2B affec9e8225346068e8efae6aac6565aec3e2e7e03d49f7c29283002bd302d9f7c82cb01ec35900937cbc49bb3a4875ab170d20cc9ab9bccfa9ee64299e93dc4 SHA512 41d3458105c5847461b8e7077361fa735bb157e4eca8bc9853748a7ff3f1993ddf476a32663f75ebffb2c304bd962b8e180885d59702dbc6dd1022b1deceb706 -EBUILD libmed-4.0.0.ebuild 3003 BLAKE2B 4727e86ebbd16a04ebde8749d9f4eb12703f572743eddcb3b4977b99e852ac6cdc9d805bee315dc8d483cb01476a4a4cf9f30508f821dc79d60ed03c5895696b SHA512 45bea97ffb92f7123140def57cd0b3d3d336dc0a88b604f4a6cb1601d3e8b1f1c467182fa9515ebf42491b6539cbfdb4bd4b4c48148497c9ddab90c737a41bb5 -MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25 +EBUILD libmed-4.0.0-r1.ebuild 3018 BLAKE2B 0c9a76d5168b930d3f747026a1969724b6907d1777d89fdf1dd5b8166839468b45e0606870dc823125673c7dc328c389bcec60ffefd9d4e2e90d1d7b68b1cf5c SHA512 159fae6c4a5c82ad146fb0188d93c120d6a6b036cbe71c012adef0f45a248f165968dcf56d9ffdf910add49d9fe47b7560202126040716661e43c446ab58df50 +MISC metadata.xml 379 BLAKE2B d8dc23452e0bc847d6d828192f2665cc74924abb6e5057db84a2a7bd6a1e4b1daa047e7db5694e00b07b1c21666f0fca8d4c374fb3be0f1ce3dbf3742f3b7f93 SHA512 5bc38cad4d81652ac0f16779036d8a3ab1772e504c4d17b614aca53c845518c56f0baa3bf02aa186bb988d6942945b4b5355ade3544f9c0c5da367c9bf0a645f diff --git a/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch b/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch deleted file mode 100644 index 72838c3dee90..000000000000 --- a/sci-libs/libmed/files/libmed-4.0.0-hdf5-1.8-support.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./config/cmake_files/medMacros.cmake 2019-01-09 17:16:00.951884862 +0100 -+++ ./config/cmake_files/medMacros.cmake.new 2019-01-09 17:18:48.753888600 +0100 -@@ -396,10 +396,10 @@ - ## - ## Requires 1.10.x version - ## -- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) -- MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") -- ENDIF() -+ #IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) -+ # MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") -+ #ENDIF() - ## - ## - 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..832a6c7398fd --- /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.0[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/libmed-4.0.0.ebuild b/sci-libs/libmed/libmed-4.0.0.ebuild deleted file mode 100644 index 94a5e5bd221d..000000000000 --- a/sci-libs/libmed/libmed-4.0.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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 complecated for the build system -PYTHON_COMPAT=( python2_7 python3_{5,6} ) - -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 static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=" - sci-libs/hdf5[fortran=,mpi=] - mpi? ( virtual/mpi[fortran=] ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND} - 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}-hdf5-1.8-support.patch" - "${FILESDIR}/${P}-cmakelist.patch" - "${FILESDIR}/${P}-tests.patch" # disable a few tests not running - "${FILESDIR}/${P}-installdoc.patch" -) - -DOCS=( AUTHORS COPYING COPYING.LESSER 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=( - -DMEDFILE_BUILD_FORTRAN=$(usex fortran) - -DMEDFILE_BUILD_STATIC_LIBS=$(usex static-libs) - -DMEDFILE_BUILD_PYTHON=$(usex python) - -DMEDFILE_BUILD_TESTS=$(usex test) - -DMEDFILE_INSTALL_DOC=$(usex doc) - -DMEDFILE_USE_MPI=$(usex mpi) - -DMEDFILE_DOC_DIRECTORY="${EPREFIX}"/usr/share/doc/${PF}/html # custom var created by patches - # 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 - ) - 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 - use test && rm -rf "${D}"/usr/bin/{testc,testf,testpy} -} - -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 index 11287d1296cc..e54fc02c2ba5 100644 --- a/sci-libs/libmed/metadata.xml +++ b/sci-libs/libmed/metadata.xml @@ -2,7 +2,11 @@ - fordfrog@gentoo.org - Miroslav Šulc + waebbl@gmail.com + Bernd Waibel + + + proxy-maint@gentoo.org + Proxy Maintainer Team -- cgit v1.2.3