diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /sci-libs/med | |
parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) |
gentoo resync : 14.12.2020
Diffstat (limited to 'sci-libs/med')
7 files changed, 179 insertions, 176 deletions
diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest index 21baf8a82db3..b214a11c1a08 100644 --- a/sci-libs/med/Manifest +++ b/sci-libs/med/Manifest @@ -1,9 +1,11 @@ AUX med-3.3.1-cmake-fortran.patch 588 BLAKE2B 7fbd1619692702edb395402d30ee5ae7b44a801be010547a89ac777db7e86a11975f170eb1713e190b367bf5c5c3bf156dbf3522d263fe480387a7b40af572c3 SHA512 5c23d7afc8aad0c91b96d10953fe4c39cd079e798f0cbc5efdd9f5beb3967af1582f1c47f53d8be8a291222194f05205f06d19b1a3c3192fd4cce778052846b1 AUX med-3.3.1-disable-python-compile.patch 1242 BLAKE2B 5c0a500376665cea4429820b3c41eac1d8bf25b1a172a236327e74768891ca1ec7ed143e0d7c803eac5194a6b762538731c068aca53cc5f2b8071d9b0ce08b57 SHA512 29dd13933412b19a4bb003d2337cfd3d35bedff430325809947d41b276690a3413976b39487e4577ad74a6c6ca1c611e63ee09873f0ea2acae1a21475a6bb2e5 -AUX med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch 1683 BLAKE2B 7b5c58e14c36d08e534139df2deba0cd3dd14bc3b66ed3472f89c8693aad73b7215806b4a4a6e3696e5e54855e4deea428309cea48519c85bf99f94f6355f5ba SHA512 4175e0c4b89e541cf27932392333e08960849ebd8e2897a340bce09c7500782064afadfaa51ff8dea89d420636e8bbb28a60fa8fe23432531b233da4462f568a AUX med-4.0.0-cmakelist.patch 2421 BLAKE2B 38991513aabbb8237a8b0d9456d9bb76f38cffecff9b1b4c906c0f9d17abd6c02ec150420403d8c1b36310b871f5354e100d1038d5620f6ba8719074e0ccd665 SHA512 405669dedc95b3776a2f4f6d64f8a608c914adb7d0666690f1f8b4a0598d6d85c7398622f50c50ead0295ee965fa993c36eb9e4217985079b528714682ea8b5d AUX med-4.0.0-installdoc.patch 1045 BLAKE2B ddc44d986743a4bf1fa59ab20d34835117f2213283ad13ce1e8e16358b87fe64888facb2f32da76a025cc283a5d942554700cc8816c25cb6f0eeaa54970f1f9a SHA512 486eb41af086d2dc92463aa8f64f074f70a39920b4954e4c272bc6b92c960efe198255975b7c594ff801be43e9eb6a31d007f55451901107db90ed6b3389eee6 +AUX med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch 1412 BLAKE2B 50602ca4a76ba4d15072d6bb96f9ce8576ac819c36b2a2a30268b506e1f453966e2846ea81ab8919d59c47e5f2ca41bc433b9fddee13797834f3a0c11a8fbb0f SHA512 cf810b8f8f2466d0b2bbf6fae1167faf57ce0b01812630ab165401432fee474b6ce80b50e122c36c61f0c347f89a1975cb91ac7ea3939eee2c15bf9e1a1dcdbe +AUX med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch 1061 BLAKE2B 1856be8c2189e5d7541f041182e48315d686cadfeb409872eee25a90ff657cf1b6a5c76a4632a6d3d12af29b2f7ee67201d67c40cbc98927702ce1c905aa2509 SHA512 c40235bed175f84615115c899fad9f78a03205a7192bdf68f1b79a1711a7a15c58145102fce9850898f463d6d7ad16bbb89416f689d4013364955036628e7263 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63 SHA512 2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7 -EBUILD med-4.0.0-r1.ebuild 2903 BLAKE2B b8c986a2d5bbbc666005d8780c6dea1cf1210fb059b36b6d2a737b35ac8bed4c7b9cbece442c93e48df952aab32c5233bb1137e143a6d99cbadbcdf6505897e5 SHA512 7b4e2142c3c2a581f0aa0a37ea9d44ed244c464d4379599af4b7881707c2d106558e034beed100dd984700eb89bbac727636fe61b281d5962c5675c1ef2724bd +DIST med-4.1.0.tar.gz 50375039 BLAKE2B 514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4 SHA512 94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8 EBUILD med-4.0.0-r2.ebuild 3493 BLAKE2B 119f7121365e2467dd99d77aa39eefe69356b78a09a4d7926d5386520d0150612ad0cdc1c6e462f41bd3b4eb8367169262c4d5d15e901f1b6c041b8b435a0fc5 SHA512 b613150305bd7b95312b05addfbb140d61f5d19a860798379f26e5690fa624fcdc5186f6f9493835dd8b32a694712a3d6a12c55e2fb8816ada8850078408a706 -MISC metadata.xml 743 BLAKE2B 26b8d89344c704c98c0819d9c10818667619f77ac704086ee645cbae2d15a59c36533edfe13e787da7e20f0611ddedbc2d761e33277d5a0b1f3328f2704971f9 SHA512 65a7ccf699c82ba6830d0172c87e83651f7d02182f3974fbd725e027046e4a2496fbdab9be852d1796f254622a73f697a3677fbb771a30a06a0b8d9c0a54c4bf +EBUILD med-4.1.0.ebuild 3231 BLAKE2B 336bfbfba073d30dd9ef1efb0b00ef5cdc90f53ab3de07002219f3750d433c8aabccdd02c439ef262058cfc3ce9676562e808863ce09af741671b2a107953c73 SHA512 d45cc92458137499e6f735fb4f440d5f823710dd0167c71302dbdea59e0d1938e009fe25d23d60f0aef9eb5df785f9288ea6faedcf30f65c31cda71aa65294c1 +MISC metadata.xml 618 BLAKE2B ab2f432dd6d02b0a02c8963cf9895ed800b94a30814e761363ff85d4e07801cb187a7f6ecb45084d6cb61683afc0b2e00bc0b2418a33b8d4ab25c974e7f67407 SHA512 f1553fb2e6269fc0b6db2dd5b08765987ac9e80da53aa40445ef7b80d3e2ccc11b6266984544476dc6ba5e1817bf9f06b7e9d16553e1e24e6e7b9c3ba04c506b diff --git a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch deleted file mode 100644 index e9dad6d5febe..000000000000 --- a/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 73a776f76043d122438d716d0958489fc67bab8e Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl@gmail.com> -Date: Sun, 1 Sep 2019 22:02:42 +0200 -Subject: [PATCH] doc/html.doc/Makefile.am: install into $htmldir - -Patches the install-data-local target to use $htmldir instead of $docdir - -Signed-off-by: Bernd Waibel <waebbl@gmail.com> ---- - doc/html.dox/Makefile.am | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/doc/html.dox/Makefile.am b/doc/html.dox/Makefile.am -index 9dc5b08..3946777 100644 ---- a/doc/html.dox/Makefile.am -+++ b/doc/html.dox/Makefile.am -@@ -36,25 +36,25 @@ html-local: $(builddir)/../dox/Doxyfile.cfg - diff $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am || @CP@ $(builddir)/htmllistfile2.am.tmp $(srcdir)/htmllistfile2.am - - install-data-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3) -- test -z "$(DESTDIR)$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" -+ test -z "$(DESTDIR)$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" - for i in $(htmllistfile1) ; do \ - $(INSTALL_DATA) \ - `test -f $$i || echo $(srcdir)/`$$i \ -- $(DESTDIR)$(docdir) ; \ -+ $(DESTDIR)$(htmldir) ; \ - done - for i in $(htmllistfile2) ; do \ - $(INSTALL_DATA) \ - `test -f $$i || echo $(srcdir)/`$$i \ -- $(DESTDIR)$(docdir) ; \ -+ $(DESTDIR)$(htmldir) ; \ - done - for i in $(htmllistfile3) ; do \ - $(INSTALL_DATA) \ - `test -f $$i || echo $(srcdir)/`$$i \ -- $(DESTDIR)$(docdir) ; \ -+ $(DESTDIR)$(htmldir) ; \ - done - - uninstall-local: $(htmllistfile1) $(htmllistfile2) $(htmllistfile3) -- rm -rf $(DESTDIR)$(docdir); -+ rm -rf $(DESTDIR)$(htmldir); - - .PHONY: htmlclean - --- -2.22.0 - diff --git a/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch b/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch new file mode 100644 index 000000000000..e066385def8f --- /dev/null +++ b/sci-libs/med/files/med-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch @@ -0,0 +1,26 @@ +From ccc372d4fa95ea2e083505ec5c536a48c49dd151 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Wed, 25 Nov 2020 21:08:46 +0100 +Subject: [PATCH] [Gentoo-specific] Adjust install path for build dir + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + tools/mdump/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/mdump/CMakeLists.txt b/tools/mdump/CMakeLists.txt +index 991b5af..dd2018a 100644 +--- a/tools/mdump/CMakeLists.txt ++++ b/tools/mdump/CMakeLists.txt +@@ -44,6 +44,6 @@ CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY) + CONFIGURE_FILE(xmdump4.in ${PROJECT_BINARY_DIR}/xmdump4 @ONLY) + + INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 ${PROJECT_BINARY_DIR}/xmdump4 DESTINATION bin) +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump4 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") +-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump4 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump4 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/bin\")") ++INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump4 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/bin\")") + +-- +2.29.2 + diff --git a/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch b/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch new file mode 100644 index 000000000000..b5c3364b799e --- /dev/null +++ b/sci-libs/med/files/med-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch @@ -0,0 +1,39 @@ +From 3c8eb1ca6be13f185f20ee726f91f31d717947d2 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl@gmail.com> +Date: Sat, 28 Nov 2020 21:52:29 +0100 +Subject: [PATCH] Re-add option for building Fortran library + +Signed-off-by: Bernd Waibel <waebbl@gmail.com> +--- + CMakeLists.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2262275..7cb014c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,12 +6,15 @@ PROJECT(MEDFile C CXX) + ## See http://www.cmake.org/Bug/view.php?id=10227 + #ENABLE_LANGUAGE(Fortran OPTIONAL) + +-INCLUDE(CheckLanguage) +-CHECK_LANGUAGE(Fortran) +-IF(CMAKE_Fortran_COMPILER) +- ENABLE_LANGUAGE(Fortran) +-ELSE() +- MESSAGE(STATUS "No Fortran support") ++OPTION (MEDFILE_BUILD_FORTRAN "Build MED-file fortran library" ON) ++IF (MEDFILE_BUILD_FORTRAN) ++ INCLUDE(CheckLanguage) ++ CHECK_LANGUAGE(Fortran) ++ IF(CMAKE_Fortran_COMPILER) ++ ENABLE_LANGUAGE(Fortran) ++ ELSE() ++ MESSAGE(STATUS "No Fortran support") ++ ENDIF() + ENDIF() + + ## Version number +-- +2.29.2 + diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild deleted file mode 100644 index 267105d848af..000000000000 --- a/sci-libs/med/med-4.0.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit autotools flag-o-matic fortran-2 python-single-r1 - -#DESCRIPTION="A library to store and exchange meshed data or computation results" -DESCRIPTION="Modeling and Exchange of Data library" -HOMEPAGE="https://www.salome-platform.org/user-section/about/med" -SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc fortran hdf5-16-api python test" - -# fails to run parallel tests -RESTRICT="test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -# dev-lang/tk is needed for wish-based xmdump utility -RDEPEND=" - !sci-libs/libmed - dev-lang/tk:0= - >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)] - virtual/mpi[fortran=] - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" - -PATCHES=( - "${FILESDIR}/${P}-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch" -) - -DOCS=( AUTHORS ChangeLog README ) - -pkg_setup() { - use python && python-single-r1_pkg_setup - use fortran && fortran-2_pkg_setup -} - -src_prepare() { - if use hdf5-16-api; then - append-cppflags -DH5_USE_16_API - fi - - # add flag to produce python 3 code - sed -e 's|SWIG_PYTHON_OPT += -c++|SWIG_PYTHON_OPT += -c++ -relativeimport -py3|' \ - -i ./python/Makefile.am || die "failed to change swig options" - - # don't use version information when linking python libraries - sed -e 's|= -module|= -avoid-version -module|' \ - -i ./python/Makefile.am || die "failed to change python link flags" - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-api23 - --disable-installtest - --disable-static - --with-hdf5="${EPREFIX}"/usr - --with-hdf5-lib="${EPREFIX}"/usr/$(get_libdir) - $(use_enable fortran) - $(use_enable python) - ) - - if ! use fortran; then - myconf+=( - --with-f90=no - ) - fi - - if use python; then - myconf+=( - --with-swig="${EPREFIX}/usr" - ) - fi - - export MPICC=mpicc - export MPICXX=mpicxx - export MPIFC=mpif90 - export MPIF77=mpif77 - export FC=mpif90 - export F77=mpif77 - - econf "${myconf[@]}" -} - -src_install() { - use python && python_optimize - - default - - find "${ED}/usr/$(get_libdir)" -type f -name '*.la' -delete || die "failed to delete *.la files" - - # remove unnecessary doc subdirs - rm -r "${ED}"/usr/share/doc/${PF}/{gif,jpg,odt,png} || die "failed to remove unneeded doc subdirs" - if ! use doc; then - rm -r "${ED}"/usr/share/doc/${PF}/html || die "failed to remove html documentation" - fi - - # Prevent test executables being installed - if use test; then - rm -r "${ED}"/usr/bin/{testc,testf,testpy} || die "failed to delete test executables" - fi - - # we don't need old 2.3.6 include files - rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" - - rm "${ED}"/usr/$(get_libdir)/libmed3.settings || die "failed to remove libmed3.settings" -} diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild new file mode 100644 index 000000000000..ab5056e4a4d7 --- /dev/null +++ b/sci-libs/med/med-4.1.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +FORTRAN_NEEDED=fortran + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit cmake fortran-2 python-single-r1 + +DESCRIPTION="A library to store and exchange meshed data or computation results" +HOMEPAGE="https://www.salome-platform.org/user-section/about/med" +SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz" +LICENSE="LGPL-3" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc fortran mpi python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test ) python? ( test )" + +RDEPEND=" + !sci-libs/libmed + dev-lang/tk:0= + >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] + mpi? ( virtual/mpi[fortran?] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" +BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" + +PATCHES=( + "${FILESDIR}/${P}-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" + "${FILESDIR}/${P}-0002-Re-add-option-for-building-Fortran-library.patch" +) + +DOCS=( AUTHORS ChangeLog NEWS README README.CMAKE TODO ) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + if use python; then + # fixes for correct libdir name + local pysite=$(python_get_sitedir) + pysite="${pysite##/usr/}" + sed \ + -e 's@SET(_install_dir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/med)@SET(_install_dir '${pysite}'/med)@' \ + -i ./python/CMakeLists.txt || die "sed on ./python/CMakeLists.txt failed" + fi + 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 + sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed" + sed -e 's|doc/med-${MED_STR_VERSION}|doc/med-${MED_STR_VERSION}/html|' \ + -i CMakeLists.txt || die "fix doc path failed" + + cmake_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_INSTALL_DOC=$(usex doc) + -DMEDFILE_USE_MPI=$(usex mpi) + -DMEDFILE_USE_UNICODE=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # we don't need old 2.3.6 include files + rm -r "${ED}"/usr/include/2.3.6 || die "failed to delete obsolete include dir" + + # 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 || die "failed to delete C test executables" + if use fortran; then + rm -r "${ED}"/usr/bin/testf || die "failed to delete fortran test executables" + fi + if use python; then + rm -r "${ED}"/usr/bin/testpy || die "failed to delete python test executables" + fi + fi +} + +src_test() { + # override parallel mode only for tests + local myctestargs=( "-j 1" ) + cmake_src_test +} diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml index 508afc5ef9c1..9f49ce730ae1 100644 --- a/sci-libs/med/metadata.xml +++ b/sci-libs/med/metadata.xml @@ -17,9 +17,4 @@ <email>proxy-maint@gentoo.org</email> <description>Gentoo Proxy Maintainers</description> </maintainer> - <use> - <flag name="hdf5-16-api"> - Use -DH5_USE_16_API to build the package against old 1.6 API of HDF5 - </flag> - </use> </pkgmetadata> |