[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2024-06-03 Thread Andrew Ammerlaan 
commit: bb0447df9c6d5484edf1ac52105645dafbb651db
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Mon Jun  3 14:59:49 2024 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Jun  3 14:59:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0447df

sci-libs/med: enable py3.12

Closes: https://bugs.gentoo.org/929782
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/med/med-4.1.1-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/med/med-4.1.1-r3.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild
index c5d4f76fecce..3fc844af69b3 100644
--- a/sci-libs/med/med-4.1.1-r3.ebuild
+++ b/sci-libs/med/med-4.1.1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 FORTRAN_NEEDED=fortran
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake flag-o-matic fortran-2 python-single-r1

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2023-05-26 Thread Sam James 
commit: 896ac92d45f1e4b2c9af3b38c7ef2727530ffe49
Author: Sam James  gentoo  org>
AuthorDate: Fri May 26 14:38:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 26 14:38:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=896ac92d

sci-libs/med: Stabilize 4.1.1-r3 amd64, #907206

Signed-off-by: Sam James  gentoo.org>

 sci-libs/med/med-4.1.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/med/med-4.1.1-r3.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild
index 6fa0f413d8c9..c5d4f76fecce 100644
--- a/sci-libs/med/med-4.1.1-r3.ebuild
+++ b/sci-libs/med/med-4.1.1-r3.ebuild
@@ -16,7 +16,7 @@ LICENSE="LGPL-3"
 S="${WORKDIR}/${P}_SRC"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fortran mpi python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test ) python? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2023-04-23 Thread Andrew Ammerlaan 
commit: d3c472a255bf04085815a1464da403e4328d38de
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Apr 23 09:13:37 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Apr 23 11:18:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c472a2

sci-libs/med: fix doc installation path

- install documentation correctly into ${PF}
- drop a sed statement to fix library installation path, which has
  become obsolete

Closes: https://bugs.gentoo.org/904522
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30716
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/med/{med-4.1.1-r2.ebuild => med-4.1.1-r3.ebuild} | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sci-libs/med/med-4.1.1-r2.ebuild b/sci-libs/med/med-4.1.1-r3.ebuild
similarity index 91%
rename from sci-libs/med/med-4.1.1-r2.ebuild
rename to sci-libs/med/med-4.1.1-r3.ebuild
index 6b6346b2560b..6fa0f413d8c9 100644
--- a/sci-libs/med/med-4.1.1-r2.ebuild
+++ b/sci-libs/med/med-4.1.1-r3.ebuild
@@ -53,13 +53,8 @@ src_prepare() {
-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|' \
+   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!

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/

2023-04-22 Thread Andrew Ammerlaan 
commit: 2001255cec8591e8fc18e821fdf40dad753cedea
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Sat Apr 22 07:53:12 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Apr 22 07:53:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2001255c

sci-libs/med: extend patch to hdf5 1.14

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../med-4.1.0-0003-build-against-hdf5-1.14.patch   | 117 +
 sci-libs/med/med-4.1.1-r2.ebuild   | 114 
 2 files changed, 231 insertions(+)

diff --git a/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.14.patch 
b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.14.patch
new file mode 100644
index ..8a95866b7b0a
--- /dev/null
+++ b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.14.patch
@@ -0,0 +1,117 @@
+From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Tue, 24 Aug 2021 08:32:13 +0200
+Subject: [PATCH] build against hdf5-1.12
+
+Signed-off-by: Bernd Waibel 
+---
+ 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 > 14
+ #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 > 14
+ #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 > 14
+ #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 > 14
+ #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
++#i

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2023-04-18 Thread Andrew Ammerlaan 
commit: 66079ad2ea94202ceed50c0ebbb0eb5f895fa3d4
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Tue Apr 18 15:53:21 2023 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Apr 18 15:53:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66079ad2

sci-libs/med: restrict to hdf5<14

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/med/{med-4.1.1.ebuild => med-4.1.1-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/med/med-4.1.1.ebuild b/sci-libs/med/med-4.1.1-r1.ebuild
similarity index 98%
rename from sci-libs/med/med-4.1.1.ebuild
rename to sci-libs/med/med-4.1.1-r1.ebuild
index b2c10421a196..9b2d35e26ef3 100644
--- a/sci-libs/med/med-4.1.1.ebuild
+++ b/sci-libs/med/med-4.1.1-r1.ebuild
@@ -24,7 +24,7 @@ RESTRICT="!test? ( test ) python? ( test )"
 RDEPEND="
!sci-libs/libmed
dev-lang/tk:0=
-   >=sci-libs/hdf5-1.10.2:=[fortran?,mpi(+)?]
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2022-09-26 Thread Andrew Ammerlaan 
commit: 4106f52c5dbf3f39751ec5e15ee267e20205bf95
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Sep 25 07:52:23 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Mon Sep 26 08:06:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4106f52c

sci-libs/med: drop 4.1.0

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27440
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/med/Manifest |   1 -
 sci-libs/med/med-4.1.0.ebuild | 111 --
 2 files changed, 112 deletions(-)

diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index 1f5c46481418..fa39d9acb1a5 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1,2 +1 @@
-DIST med-4.1.0.tar.gz 50375039 BLAKE2B 
514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4
 SHA512 
94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8
 DIST med-4.1.1.tar.gz 50506725 BLAKE2B 
fb9bc3239c18c53fa42c5dd1101559746e8d38db2a3cb5fb47d1bf0cb578facc4ab95409af8524f5c20251848842cc1a331f6a816ce0754e9a6c95f507174ed1
 SHA512 
8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768

diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild
deleted file mode 100644
index 28173589f16e..
--- a/sci-libs/med/med-4.1.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FORTRAN_NEEDED=fortran
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 )"
-
-#  "${FILESDIR}/${P}-0003-fix-hdf5-version-check.patch"
-PATCHES=(
-   
"${FILESDIR}/${P}-0001-Gentoo-specific-Adjust-install-path-for-build-dir.patch"
-   "${FILESDIR}/${P}-0002-Re-add-option-for-building-Fortran-library.patch"
-   "${FILESDIR}/${P}-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"
-
-   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
-   u

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2022-09-24 Thread Joonas Niilola 
commit: c10c152db290d1ee7085e9ab440a9bda5e8feaef
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Sep 25 06:37:39 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Sep 25 06:39:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10c152d

sci-libs/med: Stabilize 4.1.1 amd64, #872638

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/med/med-4.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/med/med-4.1.1.ebuild b/sci-libs/med/med-4.1.1.ebuild
index ff91fb7b8fd2..cc4913e526ab 100644
--- a/sci-libs/med/med-4.1.1.ebuild
+++ b/sci-libs/med/med-4.1.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="LGPL-3"
 S="${WORKDIR}/${P}_SRC"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fortran mpi python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test ) python? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2022-08-23 Thread Andrew Ammerlaan 
commit: c2ff013eccf3957a6a0980005fb0a3eb6745dfce
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Aug 10 15:37:37 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Aug 23 12:09:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ff013e

sci-libs/med: filter lto flags

Closes: https://bugs.gentoo.org/862900
Bug: 
https://discourse.salome-platform.org/t/build-issue-with-medfile-and-lto-werror-lto-type-mismatch/323/2
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26813
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/med/med-4.1.1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/med/med-4.1.1.ebuild b/sci-libs/med/med-4.1.1.ebuild
index 636cb55f6c71..ff91fb7b8fd2 100644
--- a/sci-libs/med/med-4.1.1.ebuild
+++ b/sci-libs/med/med-4.1.1.ebuild
@@ -7,7 +7,7 @@ FORTRAN_NEEDED=fortran
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit cmake fortran-2 python-single-r1
+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";
@@ -62,6 +62,9 @@ src_prepare() {
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
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2022-07-03 Thread Andrew Ammerlaan 
commit: eee60ddc06b828a650e90eb01ecd6ec5e7de1249
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Jun 22 22:05:24 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jul  3 09:18:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee60ddc

sci-libs/med: add 4.1.1

Closes: https://bugs.gentoo.org/853694
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/26047
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 sci-libs/med/Manifest |   1 +
 sci-libs/med/med-4.1.1.ebuild | 111 ++
 2 files changed, 112 insertions(+)

diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index a9596fd783e7..1f5c46481418 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1 +1,2 @@
 DIST med-4.1.0.tar.gz 50375039 BLAKE2B 
514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4
 SHA512 
94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8
+DIST med-4.1.1.tar.gz 50506725 BLAKE2B 
fb9bc3239c18c53fa42c5dd1101559746e8d38db2a3cb5fb47d1bf0cb578facc4ab95409af8524f5c20251848842cc1a331f6a816ce0754e9a6c95f507174ed1
 SHA512 
8917e7ecfe30e1259b0927c8e1c3d6efd86ed2386813f6d90217bd95589199478e587f0815031ab65cacf7901a30b77a6307414f9073caffe6e7f013e710d768

diff --git a/sci-libs/med/med-4.1.1.ebuild b/sci-libs/med/med-4.1.1.ebuild
new file mode 100644
index ..636cb55f6c71
--- /dev/null
+++ b/sci-libs/med/med-4.1.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+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"
+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.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"
+
+   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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2022-04-03 Thread Agostino Sarubbo 
commit: 24171ea2b68abe1f8180015ec71ef9542ab51944
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr  4 06:37:11 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr  4 06:37:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24171ea2

sci-libs/med: amd64 stable wrt bug #836683

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-libs/med/med-4.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/med/med-4.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild
index ec6eef42dc1e..28173589f16e 100644
--- a/sci-libs/med/med-4.1.0.ebuild
+++ b/sci-libs/med/med-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ 
SRC_URI="https://files.salome-platform.org/Salome/other/${P}.tar.gz";
 LICENSE="LGPL-3"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fortran mpi python test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test ) python? ( test )"

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/

2021-08-24 Thread Andrew Ammerlaan 
commit: 350ea3e89d0e87e35a3a4b5f2ce92b55aae9d226
Author: Bernd Waibel  posteo  net>
AuthorDate: Tue Aug 24 15:45:11 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Wed Aug 25 06:13:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350ea3e8

sci-libs/med: fix build against hdf5-1.12

Thanks to Alexandre Ferreira for providing the patch.

Closes: https://bugs.gentoo.org/809008
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22096
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../med-4.1.0-0003-build-against-hdf5-1.12.patch   | 117 +
 sci-libs/med/med-4.1.0.ebuild  |   6 +-
 2 files changed, 121 insertions(+), 2 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
new file mode 100644
index 000..46d7ed21af8
--- /dev/null
+++ b/sci-libs/med/files/med-4.1.0-0003-build-against-hdf5-1.12.patch
@@ -0,0 +1,117 @@
+From 5c9c1ce9911290283d39e16b1ed4c1d4ea5a5678 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Tue, 24 Aug 2021 08:32:13 +0200
+Subject: [PATCH] build against hdf5-1.12
+
+Signed-off-by: Bernd Waibel 
+---
+ 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 _MEDpar

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2021-02-07 Thread Conrad Kostecki 
commit: 92e09218bf6078f515baa1c200936eb4f260e74b
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Feb  7 16:18:55 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Feb  7 17:07:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e09218

sci-libs/med: fix metadata email

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel  posteo.net>
Signed-off-by: Conrad Kostecki  gentoo.org>

 sci-libs/med/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index bd426681320..8d341808081 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -6,7 +6,7 @@
Matthias Maier


-   wae...@gmail.com
+   waebbl-gen...@posteo.net
Bernd Waibel

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2020-12-27 Thread Jonas Stein 
commit: 02af7830794dc832598b6c5aeb699a1787eacd17
Author: Jonas Stein  gentoo  org>
AuthorDate: Mon Dec 28 02:23:12 2020 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Mon Dec 28 02:23:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02af7830

sci-libs/med: metadata QA Fix

Correct tag.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jonas Stein  gentoo.org>

 sci-libs/med/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 9f49ce730ae..bd426681320 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -15,6 +15,6 @@


proxy-ma...@gentoo.org
-   Gentoo Proxy Maintainers
+   Proxy Maintainers

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/

2020-11-30 Thread Joonas Niilola 
commit: d380deae6f2c8296632406cf6f461d10aab9749a
Author: Bernd Waibel  gmail  com>
AuthorDate: Thu Nov 26 00:03:13 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec  1 07:56:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d380deae

sci-libs/med: drop old

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18408
Signed-off-by: Joonas Niilola  gentoo.org>

 ...html.doc-Makefile.am-install-into-htmldir.patch |  50 -
 sci-libs/med/med-4.0.0-r1.ebuild   | 118 -
 sci-libs/med/metadata.xml  |   5 -
 3 files changed, 173 deletions(-)

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 e9dad6d5feb..000
--- 
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 
-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 

- 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/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
deleted file mode 100644
index 267105d848a..000
--- 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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/files/, sci-libs/med/

2020-11-30 Thread Joonas Niilola 
commit: 682260b51f9e3ae1337c15b5b725f1c50f978a97
Author: Bernd Waibel  gmail  com>
AuthorDate: Wed Nov 25 23:39:58 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec  1 07:56:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682260b5

sci-libs/med: bump to 4.1.0

Closes: https://bugs.gentoo.org/756208
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/med/Manifest  |   1 +
 ...pecific-Adjust-install-path-for-build-dir.patch |  26 +
 ...e-add-option-for-building-Fortran-library.patch |  39 
 sci-libs/med/med-4.1.0.ebuild  | 109 +
 4 files changed, 175 insertions(+)

diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
index cec3ed3d3f8..fc47f435034 100644
--- a/sci-libs/med/Manifest
+++ b/sci-libs/med/Manifest
@@ -1 +1,2 @@
 DIST med-4.0.0.tar.gz 47849098 BLAKE2B 
0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63
 SHA512 
2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7
+DIST med-4.1.0.tar.gz 50375039 BLAKE2B 
514ca19baf15e349ecbce870b318b37c51bfb57ac9b03c2b2c1b28836fec7fcf2dce573b9ea155f358d5e0bcee120c12a31598cd4f1e44837eca787553bb70d4
 SHA512 
94d07663c2f6a3cd497f54b480c3d742476d2a25172feb567980c9e75d49f4661aa2c6aaf570470938265997154e348bc1608065b86d42afda52d4e6361fedf8

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 000..e066385def8
--- /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 
+Date: Wed, 25 Nov 2020 21:08:46 +0100
+Subject: [PATCH] [Gentoo-specific] Adjust install path for build dir
+
+Signed-off-by: Bernd Waibel 
+---
+ 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 000..b5c3364b799
--- /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 
+Date: Sat, 28 Nov 2020 21:52:29 +0100
+Subject: [PATCH] Re-add option for building Fortran library
+
+Signed-off-by: Bernd Waibel 
+---
+ 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.1.0.ebuild b/sci-libs/med/med-4.1.0.ebuild
new file mode 100644
index 000..ab5056e4a4d
--- /dev/null
+++ b/sci-libs/med/med-4.1.0.ebuild
@@ -0,0 +1,109 @@
+# Copyrig

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2020-01-03 Thread Andreas Sturmlechner 
commit: d504f844f33f37825b1943bd22be4377d16222cd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jan  3 18:59:51 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jan  3 18:59:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d504f844

sci-libs/med: Switch to cmake.eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/med/med-4.0.0-r2.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-libs/med/med-4.0.0-r2.ebuild b/sci-libs/med/med-4.0.0-r2.ebuild
index 7f05bac5c3a..2e060a824c7 100644
--- a/sci-libs/med/med-4.0.0-r2.ebuild
+++ b/sci-libs/med/med-4.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ FORTRAN_NEEDED=fortran
 # complicated for the build system
 PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit cmake-utils fortran-2 python-single-r1
+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";
@@ -68,7 +68,7 @@ src_prepare() {
"${cm}" || die "sed on ${cm} failed"
done
 
-   cmake-utils_src_prepare
+   cmake_src_prepare
 }
 
 src_configure() {
@@ -85,11 +85,11 @@ src_configure() {
-DMEDFILE_INSTALL_DOC=$(usex doc)
-DMEDFILE_USE_MPI=$(usex mpi)
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_install() {
-   cmake-utils_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"
@@ -113,5 +113,5 @@ src_install() {
 src_test() {
# override parallel mode only for tests
local myctestargs=( "-j 1" )
-   cmake-utils_src_test
+   cmake_src_test
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2019-12-12 Thread Michał Górny 
commit: 7184435a8f263431edd41a418e1b3f5ad39c5fca
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Dec 12 15:33:29 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Dec 12 16:35:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7184435a

sci-libs/med: [QA] Fix MissingTestRestrict

Signed-off-by: Michał Górny  gentoo.org>

 sci-libs/med/med-4.0.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/med/med-4.0.0-r2.ebuild b/sci-libs/med/med-4.0.0-r2.ebuild
index 837437559bd..7f05bac5c3a 100644
--- a/sci-libs/med/med-4.0.0-r2.ebuild
+++ b/sci-libs/med/med-4.0.0-r2.ebuild
@@ -26,7 +26,7 @@ IUSE="doc fortran mpi python test"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RESTRICT="python? ( test )"
+RESTRICT="!test? ( test ) python? ( test )"
 
 # dev-lang/tk is needed for wish-based xmdump utility
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/

2019-10-13 Thread Joonas Niilola 
commit: 650bfa08aad0ce31430f6a848b6c6631eada41be
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Sep 15 13:06:18 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Oct 13 11:21:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650bfa08

sci-libs/med: switch to cmake based build

The patch moves back to the cmake based build used in sci-libs/libmed.
The issues with sci-libs/gmsh not building with cmake built med have
been resolved. See https://bugs.gentoo.org/693146 comments 19-22

Closes: https://bugs.gentoo.org/694468
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12930
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/med/files/med-3.3.1-cmake-fortran.patch   |  21 
 .../files/med-3.3.1-disable-python-compile.patch   |  17 +++
 sci-libs/med/files/med-4.0.0-cmakelist.patch   |  59 +++
 sci-libs/med/files/med-4.0.0-installdoc.patch  |  15 +++
 sci-libs/med/med-4.0.0-r2.ebuild   | 117 +
 5 files changed, 229 insertions(+)

diff --git a/sci-libs/med/files/med-3.3.1-cmake-fortran.patch 
b/sci-libs/med/files/med-3.3.1-cmake-fortran.patch
new file mode 100644
index 000..1f475d58484
--- /dev/null
+++ b/sci-libs/med/files/med-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/med/files/med-3.3.1-disable-python-compile.patch 
b/sci-libs/med/files/med-3.3.1-disable-python-compile.patch
new file mode 100644
index 000..642b404ba88
--- /dev/null
+++ b/sci-libs/med/files/med-3.3.1-disable-python-compile.patch
@@ -0,0 +1,17 @@
+--- ./config/cmake_files/medMacros.cmake   2016-10-24 09:55:35.0 
+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/med/files/med-4.0.0-cmakelist.patch 
b/sci-libs/med/files/med-4.0.0-cmakelist.patch
new file mode 100644
index 000..4c023cf24b3
--- /dev/null
+++ b/sci-libs/med/files/med-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_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 "E

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2019-09-04 Thread Matthias Maier 
commit: 693fc7ceeb5bb928011abf93460c537fbd8004fe
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu Sep  5 02:57:50 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu Sep  5 03:03:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693fc7ce

sci-libs/med: rename use flag

Bug: https://bugs.gentoo.org/693146
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/med/med-4.0.0-r1.ebuild | 4 ++--
 sci-libs/med/metadata.xml| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
index 703179668a8..3eaa9806e84 100644
--- a/sci-libs/med/med-4.0.0-r1.ebuild
+++ b/sci-libs/med/med-4.0.0-r1.ebuild
@@ -15,7 +15,7 @@ 
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"
+IUSE="doc fortran hdf5-16-api python test"
 
 # fails to run parallel tests
 RESTRICT="test"
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-   if use hdf5_16_api; then
+   if use hdf5-16-api; then
append-cppflags -DH5_USE_16_API
fi
 

diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
index 66143a59248..508afc5ef9c 100644
--- a/sci-libs/med/metadata.xml
+++ b/sci-libs/med/metadata.xml
@@ -18,7 +18,7 @@
Gentoo Proxy Maintainers


-   
+   
Use -DH5_USE_16_API to build the package against old 
1.6 API of HDF5

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2019-09-03 Thread Matthias Maier 
commit: 45fb15026a6de8ce989a9189ccc5f251165bf436
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Sep  3 22:24:24 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Sep  3 22:34:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45fb1502

sci-libs/med: immediately switch to new variant

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/med/med-4.0.0.ebuild | 48 ---
 1 file changed, 48 deletions(-)

diff --git a/sci-libs/med/med-4.0.0.ebuild b/sci-libs/med/med-4.0.0.ebuild
deleted file mode 100644
index 721d2173d35..000
--- a/sci-libs/med/med-4.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic
-
-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-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mpi"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   >=sci-libs/hdf5-1.10.5[mpi=]
-   mpi? ( virtual/mpi )
-"
-
-DEPEND="
-   ${DEPEND}
-"
-
-src_prepare() {
-   default
-   append-cppflags -DH5_USE_16_API
-}
-
-src_configure() {
-   local myconf=(
-   --docdir="/usr/share/doc/${PF}"
-   --disable-python
-   )
-
-   econf "${myconf[@]}"
-}
-
-src_install() {
-   default
-
-   mv "${ED}"/usr/$(get_libdir)/libmed3.settings \
-   "${ED}"/usr/share/doc/${PF}/ || die "mv failed"
-
-   rm -rf "${ED}"/usr/include/2.3.6 || die "rm failed"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/, sci-libs/med/files/

2019-09-03 Thread Matthias Maier 
commit: e9b0b284bd806b5673853cfcfdecabc705702961
Author: Bernd Waibel  gmail  com>
AuthorDate: Tue Sep  3 07:13:06 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Sep  3 22:34:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b0b284

sci-libs/med: merge libmed into med

* Merge sci-libs/libmed into sci-libs/med, to resolve redundancy.
* Changed to use autotools instead of cmake, as sci-libs/gmsh does not
  build against the cmake built variant.
* Remove mpi USE flag, as there's no option to disable mpi support when
  using autotools to build the package.

Closes: https://bugs.gentoo.org/693146
Package-Manager: Portage-2.3.74, Repoman-2.3.17
Signed-off-by: Bernd Waibel  gmail.com>
Signed-off-by: Matthias Maier  gentoo.org>

 ...html.doc-Makefile.am-install-into-htmldir.patch |  50 +
 sci-libs/med/med-4.0.0-r1.ebuild   | 119 +
 sci-libs/med/metadata.xml  |  15 ++-
 3 files changed, 183 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..e9dad6d5feb
--- /dev/null
+++ 
b/sci-libs/med/files/med-4.0.0-0001-doc-html.doc-Makefile.am-install-into-htmldir.patch
@@ -0,0 +1,50 @@
+From 73a776f76043d122438d716d0958489fc67bab8e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+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 
+---
+ 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/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
new file mode 100644
index 000..703179668a8
--- /dev/null
+++ b/sci-libs/med/med-4.0.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,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 o

[gentoo-commits] repo/gentoo:master commit in: sci-libs/med/

2019-08-04 Thread Matthias Maier 
commit: e61609590882ab99a4d82be73fbcce50b296aa91
Author: Matthias Maier  gentoo  org>
AuthorDate: Mon Aug  5 05:40:59 2019 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Mon Aug  5 06:51:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6160959

sci-libs/med: package migration from ::science overlay

 * version bump
 * new upsteam website and repo
 * EAPI=7
 * fixup installation

Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/med/Manifest |  1 +
 sci-libs/med/med-4.0.0.ebuild | 48 +++
 sci-libs/med/metadata.xml | 12 +++
 3 files changed, 61 insertions(+)

diff --git a/sci-libs/med/Manifest b/sci-libs/med/Manifest
new file mode 100644
index 000..cec3ed3d3f8
--- /dev/null
+++ b/sci-libs/med/Manifest
@@ -0,0 +1 @@
+DIST med-4.0.0.tar.gz 47849098 BLAKE2B 
0bc6710f7b5156e09962e3125349573989429e614a203f649843f00dea06217040ebee70e481eed9c0dd304cb7d167efcd216c3600f6954a74f262cc845fff63
 SHA512 
2840437010481fc5f12a56e3282f8ca5e94df541899e2b511756702f86d0f87dbf2f6e086d8e591e2bd370d8f4bab8089e7f7f939fea16354a23e2b5a4d96cd7

diff --git a/sci-libs/med/med-4.0.0.ebuild b/sci-libs/med/med-4.0.0.ebuild
new file mode 100644
index 000..721d2173d35
--- /dev/null
+++ b/sci-libs/med/med-4.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic
+
+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-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mpi"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   >=sci-libs/hdf5-1.10.5[mpi=]
+   mpi? ( virtual/mpi )
+"
+
+DEPEND="
+   ${DEPEND}
+"
+
+src_prepare() {
+   default
+   append-cppflags -DH5_USE_16_API
+}
+
+src_configure() {
+   local myconf=(
+   --docdir="/usr/share/doc/${PF}"
+   --disable-python
+   )
+
+   econf "${myconf[@]}"
+}
+
+src_install() {
+   default
+
+   mv "${ED}"/usr/$(get_libdir)/libmed3.settings \
+   "${ED}"/usr/share/doc/${PF}/ || die "mv failed"
+
+   rm -rf "${ED}"/usr/include/2.3.6 || die "rm failed"
+}

diff --git a/sci-libs/med/metadata.xml b/sci-libs/med/metadata.xml
new file mode 100644
index 000..dd66d18ef4f
--- /dev/null
+++ b/sci-libs/med/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   tam...@gentoo.org
+   Matthias Maier
+   
+   
+   s...@gentoo.org
+   Gentoo Science Project
+   
+