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 08067158041 for ; Tue, 9 Apr 2024 13:06:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 459E7E2A10; Tue, 9 Apr 2024 13:06:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 1E365E2A10 for ; Tue, 9 Apr 2024 13:06:35 +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 591023432F6 for ; Tue, 9 Apr 2024 13:06:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7715135F for ; Tue, 9 Apr 2024 13:06:32 +0000 (UTC) From: "Alexander Puck Neuwirth" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexander Puck Neuwirth" Message-ID: <1712667935.d92a65a7066fd6bc6467e88a26c33e9e5a152a8e.alexander@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/cernlib/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/cernlib/cernlib-2023.10.31.0-r1.ebuild sci-physics/cernlib/cernlib-2023.10.31.0.ebuild sci-physics/cernlib/metadata.xml X-VCS-Directories: sci-physics/cernlib/ X-VCS-Committer: alexander X-VCS-Committer-Name: Alexander Puck Neuwirth X-VCS-Revision: d92a65a7066fd6bc6467e88a26c33e9e5a152a8e X-VCS-Branch: master Date: Tue, 9 Apr 2024 13:06:32 +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: d953b3ac-acdd-4603-8ada-4e79a58629b4 X-Archives-Hash: a960e79a82c23018431faae90e9b7a81 commit: d92a65a7066fd6bc6467e88a26c33e9e5a152a8e Author: Alexander Puck Neuwirth neuwirth-informatik de> AuthorDate: Mon Apr 8 11:32:34 2024 +0000 Commit: Alexander Puck Neuwirth neuwirth-informatik de> CommitDate: Tue Apr 9 13:05:35 2024 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d92a65a7 sci-physics/cernlib: split free and non-free Closes: https://github.com/gentoo/sci/pull/1265 Co-authored-by: Andrew Nowa Ammerlaan gentoo.org> Signed-off-by: Alexander Puck Neuwirth neuwirth-informatik.de> ....31.0.ebuild => cernlib-2023.10.31.0-r1.ebuild} | 28 +++++++++++++++++----- sci-physics/cernlib/metadata.xml | 3 +++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sci-physics/cernlib/cernlib-2023.10.31.0.ebuild b/sci-physics/cernlib/cernlib-2023.10.31.0-r1.ebuild similarity index 70% rename from sci-physics/cernlib/cernlib-2023.10.31.0.ebuild rename to sci-physics/cernlib/cernlib-2023.10.31.0-r1.ebuild index 697a25ef0..326fadde3 100644 --- a/sci-physics/cernlib/cernlib-2023.10.31.0.ebuild +++ b/sci-physics/cernlib/cernlib-2023.10.31.0-r1.ebuild @@ -3,14 +3,22 @@ EAPI=8 CMAKE_MAKEFILE_GENERATOR="emake" inherit cmake fortran-2 +MY_P="${P}" DESCRIPTION="CERN program library for High Energy Physics" HOMEPAGE="https://cernlib.web.cern.ch/cernlib/" -SRC_URI="https://cernlib.web.cern.ch/download/2023_source/tar/${P}-free.tar.gz" -S="${WORKDIR}/${P}-free" +SRC_URI=" + free? ( https://cernlib.web.cern.ch/download/2023_source/tar/${P}-free.tar.gz ) + !free? ( https://cernlib.web.cern.ch/download/2023_source/tar/${P}.tar.gz ) +" -LICENSE="GPL-3" +LICENSE=" + free? ( BSD LGPL-2+ GPL-1+ ) + !free? ( all-rights-reserved ) +" SLOT="0" KEYWORDS="~amd64" +IUSE="+free" +RESTRICT="mirror" RDEPEND=" x11-libs/motif:0 @@ -28,10 +36,18 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/$P-cfortran.patch - "${FILESDIR}"/$P-ctest.patch - "${FILESDIR}"/$P-man.patch + "${FILESDIR}"/${P}-cfortran.patch + "${FILESDIR}"/${P}-ctest.patch + "${FILESDIR}"/${P}-man.patch ) + +src_unpack() { + default + if use free; then + mv ${P}-free ${P} || die + fi +} + src_prepare() { cmake_src_prepare # cfortran.patch diff --git a/sci-physics/cernlib/metadata.xml b/sci-physics/cernlib/metadata.xml index 887c950bc..dcbfb9b47 100644 --- a/sci-physics/cernlib/metadata.xml +++ b/sci-physics/cernlib/metadata.xml @@ -18,4 +18,7 @@ mathematics, data analysis, detectors simulation, data-handling etc... applicable to a wide range of problems. + + Use free sources +