commit: 0c573513414f30ca44e76fa6aa0ed34897c41257 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Sun Dec 17 21:58:19 2023 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Mon Dec 18 08:21:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c573513
sci-libs/hdf5: fix broken examplesdir support Since at least upstream version 1.12.2, upstream added a configure option to choose the examples directory. It was no longer hardcoded in Makefile.am, which means the sed fixup did not work, but also the option wasn't passed. Upstream commit: https://github.com/HDFGroup/hdf5/commit/b8a93a7224114739e42f32aaf62ae64fd1aad33e iwdevtools: ``` * SED: the following did not cause any changes * sed -e "s:hdf5_examples:doc/${PF}/examples:g" -i $(find . -name Makefile.am) $(find . -name "run*.sh.in") || die; * no-op: -e s:hdf5_examples:doc/hdf5-1.12.2-r4/examples:g ``` Make sure the option is correctly passed. Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34335 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> sci-libs/hdf5/{hdf5-1.14.3.ebuild => hdf5-1.14.3-r1.ebuild} | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sci-libs/hdf5/hdf5-1.14.3.ebuild b/sci-libs/hdf5/hdf5-1.14.3-r1.ebuild similarity index 95% rename from sci-libs/hdf5/hdf5-1.14.3.ebuild rename to sci-libs/hdf5/hdf5-1.14.3-r1.ebuild index 47b70efe199b..750f17457476 100644 --- a/sci-libs/hdf5/hdf5-1.14.3.ebuild +++ b/sci-libs/hdf5/hdf5-1.14.3-r1.ebuild @@ -65,10 +65,6 @@ pkg_setup() { 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 @@ -96,6 +92,7 @@ src_configure() { --enable-deprecated-symbols --enable-build-mode=$(usex debug debug production) --with-default-plugindir="${EPREFIX}/usr/$(get_libdir)/${PN}/plugin" + --with-examplesdir="\${datarootdir}/doc/${PF}/examples" \ $(use_enable cxx) $(use_enable debug codestack) $(use_enable fortran)
