commit: d8a3607669f03743bdb57ca6f780f96e60324e2d Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Thu May 1 03:54:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 1 05:02:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a36076
sci-libs/med: drop 4.1.1-r1, 4.1.1-r3 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41873 Signed-off-by: Sam James <sam <AT> gentoo.org> .../med-4.1.0-0003-build-against-hdf5-1.12.patch | 117 --------------------- sci-libs/med/med-4.1.1-r1.ebuild | 114 -------------------- sci-libs/med/med-4.1.1-r3.ebuild | 109 ------------------- 3 files changed, 340 deletions(-) diff --git a/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch deleted file mode 100644 index 46d7ed21af8d..000000000000 --- a/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <[email protected]> -Date: Tue, 24 Aug 2021 08:32:13 +0200 -Subject: [PATCH] build against hdf5-1.12 - -Signed-off-by: Bernd Waibel <[email protected]> ---- - config/cmake_files/medMacros.cmake | 4 ++-- - src/ci/MEDfileCompatibility.c | 2 +- - src/hdfi/_MEDfileCreate.c | 2 +- - src/hdfi/_MEDfileOpen.c | 2 +- - src/hdfi/_MEDmemFileOpen.c | 2 +- - src/hdfi/_MEDparFileCreate.c | 2 +- - src/hdfi/_MEDparFileOpen.c | 2 +- - 7 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/config/cmake_files/medMacros.cmake b/config/cmake_files/medMacros.cmake -index 957c59b..d73c7af 100644 ---- a/config/cmake_files/medMacros.cmake -+++ b/config/cmake_files/medMacros.cmake -@@ -447,13 +447,13 @@ MACRO(MED_FIND_HDF5) - ## - ## 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) -+ IF(HDF5_VERSION VERSION_LESS 1.10.2) - MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") - ENDIF() - ## - ## - -- ADD_DEFINITIONS(-DH5_USE_16_API) -+ ADD_DEFINITIONS(-DH5_USE_18_API -DH5_USE_16_API) - IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS) - ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1) - ENDIF() -diff --git a/src/ci/MEDfileCompatibility.c b/src/ci/MEDfileCompatibility.c -index 1d6cabf..43b5b50 100644 ---- a/src/ci/MEDfileCompatibility.c -+++ b/src/ci/MEDfileCompatibility.c -@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename, - #if MED_NUM_MAJEUR != 4 - #error "Don't forget to update the test version here when you change the major version of the library !" - #endif --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 - #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" - #error "Cf. _MEDfileCreate ..." - #endif -diff --git a/src/hdfi/_MEDfileCreate.c b/src/hdfi/_MEDfileCreate.c -index 4bc9551..b670c92 100644 ---- a/src/hdfi/_MEDfileCreate.c -+++ b/src/hdfi/_MEDfileCreate.c -@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 - #error "Don't forget to change the compatibility version of the library !" - #endif - -diff --git a/src/hdfi/_MEDfileOpen.c b/src/hdfi/_MEDfileOpen.c -index 8ace00e..ebd875b 100644 ---- a/src/hdfi/_MEDfileOpen.c -+++ b/src/hdfi/_MEDfileOpen.c -@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod - - • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 - #error "Don't forget to change the compatibility version of the library !" - #endif - /* L'avantage de bloquer le modèle interne HDF5 -diff --git a/src/hdfi/_MEDmemFileOpen.c b/src/hdfi/_MEDmemFileOpen.c -index ae92ba7..4a929ff 100644 ---- a/src/hdfi/_MEDmemFileOpen.c -+++ b/src/hdfi/_MEDmemFileOpen.c -@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile - goto ERROR; - } - --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { -diff --git a/src/hdfi/_MEDparFileCreate.c b/src/hdfi/_MEDparFileCreate.c -index f0b77be..b7d1b78 100644 ---- a/src/hdfi/_MEDparFileCreate.c -+++ b/src/hdfi/_MEDparFileCreate.c -@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc - * En HDF5-1.10.0p1 cela n'a aucun effet ! - * Un test autoconf permet de fixer un intervalle de version HDF à MED. - */ --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 - #error "Don't forget to change the compatibility version of the library !" - #endif - -diff --git a/src/hdfi/_MEDparFileOpen.c b/src/hdfi/_MEDparFileOpen.c -index 0a9700d..4933692 100644 ---- a/src/hdfi/_MEDparFileOpen.c -+++ b/src/hdfi/_MEDparFileOpen.c -@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access - MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); - goto ERROR; - } --#if H5_VERS_MINOR > 10 -+#if H5_VERS_MINOR > 12 - #error "Don't forget to change the compatibility version of the library !" - #endif - if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { --- -2.32.0 - diff --git a/sci-libs/med/med-4.1.1-r1.ebuild b/sci-libs/med/med-4.1.1-r1.ebuild deleted file mode 100644 index 9b2d35e26ef3..000000000000 --- a/sci-libs/med/med-4.1.1-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake flag-o-matic 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" -S="${WORKDIR}/${P}_SRC" - -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.14.0:=[fortran?,mpi(+)?] - mpi? ( virtual/mpi[fortran?] ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND="python? ( >=dev-lang/swig-3.0.8 )" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" - "${FILESDIR}/${PN}-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch" - "${FILESDIR}/${PN}-4.1.0-0003-build-against-hdf5-1.12.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" - - # bug #862900, already reported upstream. CHECK on updates! - filter-lto - - 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/med-4.1.1-r3.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild deleted file mode 100644 index 3fc844af69b3..000000000000 --- a/sci-libs/med/med-4.1.1-r3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake flag-o-matic 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" -S="${WORKDIR}/${P}_SRC" - -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}/${PN}-4.1.0-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch" - "${FILESDIR}/${PN}-4.1.0-0002-Re-add-option-for-building-Fortran-library.patch" - "${FILESDIR}/${PN}-4.1.0-0003-build-against-hdf5-1.14.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 - sed -e 's/med-fichier/med/' -i CMakeLists.txt || die "fix paths failed" - sed -e 's|doc/med-${MED_STR_VERSION}|doc/'${PF}'/html|' \ - -i CMakeLists.txt || die "fix doc path failed" - - # bug #862900, already reported upstream. CHECK on updates! - filter-lto - - 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 -}
