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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27E471581F3 for ; Tue, 3 Dec 2024 08:54:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35876E07D7; Tue, 3 Dec 2024 08:54:15 +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 17C73E07D7 for ; Tue, 3 Dec 2024 08:54:13 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0204F335D75 for ; Tue, 3 Dec 2024 08:54:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 313A0F96 for ; Tue, 3 Dec 2024 08:54:10 +0000 (UTC) From: "Nowa 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, "Nowa Ammerlaan" Message-ID: <1733214839.1a00632e3ab01fa20c783354e0f1eb76fd58b4d8.nowa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/hepmc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/hepmc/hepmc-3.3.0-r1.ebuild sci-physics/hepmc/hepmc-9999.ebuild X-VCS-Directories: sci-physics/hepmc/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: 1a00632e3ab01fa20c783354e0f1eb76fd58b4d8 X-VCS-Branch: master Date: Tue, 3 Dec 2024 08:54:10 +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: 307b12fe-4185-4b86-ae8e-a3e23f48fa4d X-Archives-Hash: 2962fccd4c2d6d32a0f2473d533b1768 commit: 1a00632e3ab01fa20c783354e0f1eb76fd58b4d8 Author: Alexander Puck Neuwirth neuwirth-informatik de> AuthorDate: Fri Nov 29 16:31:47 2024 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Tue Dec 3 08:33:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a00632e sci-physics/hepmc: Fix python and add static-libs flag Signed-off-by: Alexander Puck Neuwirth neuwirth-informatik.de> Closes: https://github.com/gentoo/gentoo/pull/39524 Signed-off-by: Nowa Ammerlaan gentoo.org> .../{hepmc-9999.ebuild => hepmc-3.3.0-r1.ebuild} | 19 ++++++++++++++++++- sci-physics/hepmc/hepmc-9999.ebuild | 19 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/sci-physics/hepmc/hepmc-9999.ebuild b/sci-physics/hepmc/hepmc-3.3.0-r1.ebuild similarity index 75% copy from sci-physics/hepmc/hepmc-9999.ebuild copy to sci-physics/hepmc/hepmc-3.3.0-r1.ebuild index c5cb24ef7a3f..0f34ec376a72 100644 --- a/sci-physics/hepmc/hepmc-9999.ebuild +++ b/sci-physics/hepmc/hepmc-3.3.0-r1.ebuild @@ -22,7 +22,7 @@ fi LICENSE="GPL-3+" SLOT="3" -IUSE="doc test examples python root" +IUSE="doc test examples python root static-libs" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -35,6 +35,9 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" +# Automagic compression dependencies in test and example. +# https://gitlab.cern.ch/hepmc/HepMC3/-/issues/99 +# For now we install all of them... BDEPEND=" root? ( sci-physics/root:= ) doc? ( @@ -43,16 +46,30 @@ BDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended ) + test? ( + sys-libs/zlib + app-arch/xz-utils + app-arch/bzip2 + app-arch/zstd + ) + examples? ( + sys-libs/zlib + app-arch/xz-utils + app-arch/bzip2 + app-arch/zstd + ) " src_configure() { filter-lto # 941937 941936 local mycmakeargs=( + -DHEPMC3_PYTHON_VERSIONS="${EPYTHON/python/}" -DHEPMC3_ENABLE_ROOTIO=$(usex root ON OFF) -DHEPMC3_ENABLE_PYTHON=$(usex python ON OFF) -DHEPMC3_ENABLE_TEST=$(usex test ON OFF) -DHEPMC3_BUILD_DOCS=$(usex doc ON OFF) -DHEPMC3_BUILD_EXAMPLES=$(usex examples ON OFF) + -DHEPMC3_BUILD_STATIC_LIBS=$(usex static-libs ON OFF) ) cmake_src_configure } diff --git a/sci-physics/hepmc/hepmc-9999.ebuild b/sci-physics/hepmc/hepmc-9999.ebuild index c5cb24ef7a3f..0f34ec376a72 100644 --- a/sci-physics/hepmc/hepmc-9999.ebuild +++ b/sci-physics/hepmc/hepmc-9999.ebuild @@ -22,7 +22,7 @@ fi LICENSE="GPL-3+" SLOT="3" -IUSE="doc test examples python root" +IUSE="doc test examples python root static-libs" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -35,6 +35,9 @@ RDEPEND=" ) " DEPEND="${RDEPEND}" +# Automagic compression dependencies in test and example. +# https://gitlab.cern.ch/hepmc/HepMC3/-/issues/99 +# For now we install all of them... BDEPEND=" root? ( sci-physics/root:= ) doc? ( @@ -43,16 +46,30 @@ BDEPEND=" dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended ) + test? ( + sys-libs/zlib + app-arch/xz-utils + app-arch/bzip2 + app-arch/zstd + ) + examples? ( + sys-libs/zlib + app-arch/xz-utils + app-arch/bzip2 + app-arch/zstd + ) " src_configure() { filter-lto # 941937 941936 local mycmakeargs=( + -DHEPMC3_PYTHON_VERSIONS="${EPYTHON/python/}" -DHEPMC3_ENABLE_ROOTIO=$(usex root ON OFF) -DHEPMC3_ENABLE_PYTHON=$(usex python ON OFF) -DHEPMC3_ENABLE_TEST=$(usex test ON OFF) -DHEPMC3_BUILD_DOCS=$(usex doc ON OFF) -DHEPMC3_BUILD_EXAMPLES=$(usex examples ON OFF) + -DHEPMC3_BUILD_STATIC_LIBS=$(usex static-libs ON OFF) ) cmake_src_configure }