From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C0CFB158015 for ; Mon, 18 Dec 2023 08:21:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD0A12BC01D; Mon, 18 Dec 2023 08:21:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFDE32BC01D for ; Mon, 18 Dec 2023 08:21:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE423335D72 for ; Mon, 18 Dec 2023 08:21:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47C881257 for ; Mon, 18 Dec 2023 08:21:16 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1702887661.0c573513414f30ca44e76fa6aa0ed34897c41257.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/hdf5/hdf5-1.14.3-r1.ebuild sci-libs/hdf5/hdf5-1.14.3.ebuild X-VCS-Directories: sci-libs/hdf5/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 0c573513414f30ca44e76fa6aa0ed34897c41257 X-VCS-Branch: master Date: Mon, 18 Dec 2023 08:21:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 10131c33-d511-43c9-b3a1-30e3c70258a6 X-Archives-Hash: 7fbcee6d7ed896ca320039a96d8c890f commit: 0c573513414f30ca44e76fa6aa0ed34897c41257 Author: Eli Schwartz gmail com> AuthorDate: Sun Dec 17 21:58:19 2023 +0000 Commit: Andrew Ammerlaan gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/34335 Signed-off-by: Andrew Ammerlaan 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)