From d33b3cf6cff9fdbfc8362bf854c3c34b2c28d518 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Apr 2023 00:01:06 +0100 Subject: gentoo auto-resync : 21:04:2023 - 00:01:05 --- sci-libs/Manifest.gz | Bin 44123 -> 44125 bytes sci-libs/cgnslib/Manifest | 2 +- sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild | 91 ---------------- sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild | 91 ++++++++++++++++ sci-libs/hdf5/Manifest | 3 +- .../hdf5/files/hdf5-1.14.0-fix-include-path.patch | 34 ++++++ sci-libs/hdf5/hdf5-1.14.0-r1.ebuild | 120 +++++++++++++++++++++ sci-libs/hdf5/hdf5-1.14.0.ebuild | 119 -------------------- 8 files changed, 248 insertions(+), 212 deletions(-) delete mode 100644 sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild create mode 100644 sci-libs/cgnslib/cgnslib-4.3.0-r2.ebuild create mode 100644 sci-libs/hdf5/files/hdf5-1.14.0-fix-include-path.patch create mode 100644 sci-libs/hdf5/hdf5-1.14.0-r1.ebuild delete mode 100644 sci-libs/hdf5/hdf5-1.14.0.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index db9f0f8d8c3c..2e156c71c5f1 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest index 83d94c07ce0c..1d5a89ec3f6a 100644 --- a/sci-libs/cgnslib/Manifest +++ b/sci-libs/cgnslib/Manifest @@ -1,3 +1,3 @@ DIST cgnslib-4.3.0.tar.gz 1472044 BLAKE2B 8fa59eb2c13b163553c03991af1886d2162295367094937c3b7bbbc687f098e736a927fb6835fabb43ecfbe59edcf0e58e8977e89eeb1ef12b26568fbdc78e2c SHA512 5db97b8df8cb5b108a65513e20774881c1dfa790dd96bec46119883d934db18e3f88450d287690cb785e0875af87a3ec32b6c4665c54edb623161122ee85aa93 -EBUILD cgnslib-4.3.0-r1.ebuild 1942 BLAKE2B fe3b51bd3e7302e9b61385d655bace0385f936ae60089f66f597a2064d8516289a6a3ec3000769ce25140c040e5d2c23a67d3f9dfca94acbab47b46b63028450 SHA512 5e4a5e3fc0615284695dfdfbe0454f4a7422acc0d8baf5070eeff8f57ade25d19339bdd5778e57217093f3587cd8f033bd85fc78f648c15678358f48cc93ff10 +EBUILD cgnslib-4.3.0-r2.ebuild 1934 BLAKE2B 8f917cedc499a64913e6ddb216c5caa2487540a5d3532853753e1da45f087ac5663f38d9e0a4d7fbc6e9762bb279dcf63c909ab66cfbff41c313f1c6ed044d86 SHA512 5d87190074cc9914d8e70bc43b82d385c838aa0fe60faf052ca4c3e96e30a86808bba0b14a3f7e65f3ced4e1a604e5930df07ecf8fea9c66a6e330b5c76ce671 MISC metadata.xml 1273 BLAKE2B 05b98760182f6ab2586a969e7cd49a56b077f3c0f208460967b5b240cde12c3b62655223947646d48c743cb706b81e59693c693fbcdf703c75642958491d5902 SHA512 af36842f7cefc358474fd6b3646dda0974c0ee443d56babc48955340be64719b1c4548e952c93898265d6950f32bfb7db87472ca196b290ca13a8c20ed2244c2 diff --git a/sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild deleted file mode 100644 index 192837148b5b..000000000000 --- a/sci-libs/cgnslib/cgnslib-4.3.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED="fortran" -FORTRAN_STANDARD="90 2003" - -inherit cmake fortran-2 - -DESCRIPTION="CFD General Notation System standard library" -HOMEPAGE=" - https://cgns.github.io/ - https://github.com/CGNS/CGNS -" -SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CGNS-${PV}" - -LICENSE="ZLIB" -SLOT="0/4" -KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools" - -RDEPEND=" - hdf5? ( +Date: Tue, 11 Apr 2023 14:31:25 -0500 +Subject: [PATCH] Fix improper include of build directory (#2422, #2621) + (#2667) + +--- a/configure.ac ++++ b/configure.ac +@@ -3012,8 +3012,7 @@ SUBFILING_VFD=no + HAVE_MERCURY="no" + + ## Always include subfiling directory so public header files are available +-CPPFLAGS="$CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling" +-AM_CPPFLAGS="$AM_CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling" ++H5_CPPFLAGS="$H5_CPPFLAGS -I$ac_abs_confdir/src/H5FDsubfiling" + + AC_MSG_CHECKING([if the subfiling I/O virtual file driver (VFD) is enabled]) + +@@ -3061,8 +3060,7 @@ if test "X$SUBFILING_VFD" = "Xyes"; then + mercury_dir="$ac_abs_confdir/src/H5FDsubfiling/mercury" + mercury_inc="$mercury_dir/src/util" + +- CPPFLAGS="$CPPFLAGS -I$mercury_inc" +- AM_CPPFLAGS="$AM_CPPFLAGS -I$mercury_inc" ++ H5_CPPFLAGS="$H5_CPPFLAGS -I$mercury_inc" + + HAVE_STDATOMIC_H="yes" + AC_CHECK_HEADERS([stdatomic.h],,[HAVE_STDATOMIC_H="no"]) diff --git a/sci-libs/hdf5/hdf5-1.14.0-r1.ebuild b/sci-libs/hdf5/hdf5-1.14.0-r1.ebuild new file mode 100644 index 000000000000..8d4d4bf40680 --- /dev/null +++ b/sci-libs/hdf5/hdf5-1.14.0-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED=fortran + +# We've reverted *back* to autotools from CMake because of +# https://github.com/HDFGroup/hdf5/issues/1814. +inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix + +MY_P=${PN}-${PV/_p/-patch} +MAJOR_P=${PN}-$(ver_cut 1-2) + +DESCRIPTION="General purpose library and file format for storing scientific data" +HOMEPAGE="https://www.hdfgroup.org/HDF5/" +SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="NCSA-HDF" +SLOT="0/${PV%%_p*}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + !unsupported? ( + cxx? ( !mpi ) mpi? ( !cxx ) + threads? ( !cxx !mpi !fortran !hl ) + ) +" + +RDEPEND=" + mpi? ( virtual/mpi[romio] ) + szip? ( virtual/szip ) + zlib? ( sys-libs/zlib:0= )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch + "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch + "${FILESDIR}"/${PN}-1.14.0-fix-include-path.patch +) + +pkg_setup() { + # Workaround for bug 285148 + tc-export CXX CC AR + + use fortran && fortran-2_pkg_setup + + if use mpi; then + if has_version 'sci-libs/hdf5[-mpi]'; then + ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." + ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." + fi + + export CC=mpicc + use fortran && export FC=mpif90 + elif has_version 'sci-libs/hdf5[mpi]'; then + ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." + ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." + fi +} + +src_prepare() { + default + + # Respect Gentoo examples directory + sed \ + -e "s:hdf5_examples:doc/${PF}/examples:g" \ + -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die + sed \ + -e '/docdir/d' \ + -i config/commence.am || die + + if ! use examples; then + # bug #409091 + sed -e '/^install:/ s/install-examples//' \ + -i Makefile.am || die + fi + + # Enable shared libs by default for h5cc config utility + sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die + hprefixify m4/libtool.m4 + + eautoreconf +} + +src_configure() { + # bug #686620 + use sparc && tc-is-gcc && append-flags -fno-tree-ccp + + econf \ + --disable-static \ + --enable-deprecated-symbols \ + --enable-build-mode=$(usex debug debug production) \ + --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \ + $(use_enable cxx) \ + $(use_enable debug codestack) \ + $(use_enable fortran) \ + $(use_enable hl) \ + $(use_enable mpi parallel) \ + $(use_enable test tests) \ + $(use_enable threads threadsafe) \ + $(use_enable unsupported) \ + $(use_with szip szlib) \ + $(use_with threads pthread) \ + $(use_with zlib) +} + +src_install() { + emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install + + # No static archives + find "${ED}" -name '*.la' -delete || die + + # Remove "perf" executable due to file collisions with dev-util/perf. + # Previously with the CMake build system we only installed h5perf, so + # let's simply remove the file for now. + use mpi && { rm "${ED}"/usr/bin/perf || die "rm failed" ; } +} diff --git a/sci-libs/hdf5/hdf5-1.14.0.ebuild b/sci-libs/hdf5/hdf5-1.14.0.ebuild deleted file mode 100644 index d69a56ff0f16..000000000000 --- a/sci-libs/hdf5/hdf5-1.14.0.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED=fortran - -# We've reverted *back* to autotools from CMake because of -# https://github.com/HDFGroup/hdf5/issues/1814. -inherit autotools fortran-2 flag-o-matic toolchain-funcs prefix - -MY_P=${PN}-${PV/_p/-patch} -MAJOR_P=${PN}-$(ver_cut 1-2) - -DESCRIPTION="General purpose library and file format for storing scientific data" -HOMEPAGE="https://www.hdfgroup.org/HDF5/" -SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="NCSA-HDF" -SLOT="0/${PV%%_p*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cxx debug examples fortran +hl mpi szip test threads unsupported zlib" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - !unsupported? ( - cxx? ( !mpi ) mpi? ( !cxx ) - threads? ( !cxx !mpi !fortran !hl ) - ) -" - -RDEPEND=" - mpi? ( virtual/mpi[romio] ) - szip? ( virtual/szip ) - zlib? ( sys-libs/zlib:0= )" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.9-static_libgfortran.patch - "${FILESDIR}"/${PN}-1.12.2-no-strip-symbols.patch -) - -pkg_setup() { - # Workaround for bug 285148 - tc-export CXX CC AR - - use fortran && fortran-2_pkg_setup - - if use mpi; then - if has_version 'sci-libs/hdf5[-mpi]'; then - ewarn "Installing hdf5 with mpi enabled with a previous hdf5 with mpi disabled may fail." - ewarn "Try to uninstall the current hdf5 prior to enabling mpi support." - fi - - export CC=mpicc - use fortran && export FC=mpif90 - elif has_version 'sci-libs/hdf5[mpi]'; then - ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." - ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." - fi -} - -src_prepare() { - default - - # Respect Gentoo examples directory - sed \ - -e "s:hdf5_examples:doc/${PF}/examples:g" \ - -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die - sed \ - -e '/docdir/d' \ - -i config/commence.am || die - - if ! use examples; then - # bug #409091 - sed -e '/^install:/ s/install-examples//' \ - -i Makefile.am || die - fi - - # Enable shared libs by default for h5cc config utility - sed -i -e "s/SHLIB:-no/SHLIB:-yes/g" bin/h5cc.in || die - hprefixify m4/libtool.m4 - - eautoreconf -} - -src_configure() { - # bug #686620 - use sparc && tc-is-gcc && append-flags -fno-tree-ccp - - econf \ - --disable-static \ - --enable-deprecated-symbols \ - --enable-build-mode=$(usex debug debug production) \ - --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" \ - $(use_enable cxx) \ - $(use_enable debug codestack) \ - $(use_enable fortran) \ - $(use_enable hl) \ - $(use_enable mpi parallel) \ - $(use_enable test tests) \ - $(use_enable threads threadsafe) \ - $(use_enable unsupported) \ - $(use_with szip szlib) \ - $(use_with threads pthread) \ - $(use_with zlib) -} - -src_install() { - emake DESTDIR="${D}" EPREFIX="${EPREFIX}" install - - # No static archives - find "${ED}" -name '*.la' -delete || die - - # Remove "perf" executable due to file collisions with dev-util/perf. - # Previously with the CMake build system we only installed h5perf, so - # let's simply remove the file for now. - use mpi && { rm "${ED}"/usr/bin/perf || die "rm failed" ; } -} -- cgit v1.2.3