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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1C0D1581F0 for ; Thu, 12 Dec 2024 15:20:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DF85E0977; Thu, 12 Dec 2024 15:20:12 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7D78E0978 for ; Thu, 12 Dec 2024 15:20:11 +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 8E26F341C4B for ; Thu, 12 Dec 2024 15:20:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACAE2E96 for ; Thu, 12 Dec 2024 15:20:07 +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: <1734016765.d180ae1fc1c0fbd40b45f9576dfa8adba563d7b8.alexander@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/openloops/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/openloops/metadata.xml sci-physics/openloops/openloops-2.1.3-r1.ebuild sci-physics/openloops/openloops-2.1.3.ebuild X-VCS-Directories: sci-physics/openloops/ X-VCS-Committer: alexander X-VCS-Committer-Name: Alexander Puck Neuwirth X-VCS-Revision: d180ae1fc1c0fbd40b45f9576dfa8adba563d7b8 X-VCS-Branch: master Date: Thu, 12 Dec 2024 15:20:07 +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: 50199636-affc-4064-94ed-7ada66b69ddf X-Archives-Hash: 21d98fb8826927eaed1bb862bdf81090 commit: d180ae1fc1c0fbd40b45f9576dfa8adba563d7b8 Author: Alexander Puck Neuwirth neuwirth-informatik de> AuthorDate: Thu Dec 12 13:34:51 2024 +0000 Commit: Alexander Puck Neuwirth neuwirth-informatik de> CommitDate: Thu Dec 12 15:19:25 2024 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=d180ae1f sci-physics/openloops: offer processes Signed-off-by: Alexander Puck Neuwirth neuwirth-informatik.de> sci-physics/openloops/metadata.xml | 4 ++ ...oops-2.1.3.ebuild => openloops-2.1.3-r1.ebuild} | 56 ++++++++++++++++------ 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/sci-physics/openloops/metadata.xml b/sci-physics/openloops/metadata.xml index 5bec6ac4c..a32ce734b 100644 --- a/sci-physics/openloops/metadata.xml +++ b/sci-physics/openloops/metadata.xml @@ -19,5 +19,9 @@ Build with collier Build libs with extra Build with cuttools + Build pp to llj process + Build pp to lljj process + Build pp to lnj process with ckm matrix + Build pp to lljj process with ckm matrix diff --git a/sci-physics/openloops/openloops-2.1.3.ebuild b/sci-physics/openloops/openloops-2.1.3-r1.ebuild similarity index 62% rename from sci-physics/openloops/openloops-2.1.3.ebuild rename to sci-physics/openloops/openloops-2.1.3-r1.ebuild index a53eb1f9e..876bbdaa3 100644 --- a/sci-physics/openloops/openloops-2.1.3.ebuild +++ b/sci-physics/openloops/openloops-2.1.3-r1.ebuild @@ -14,13 +14,23 @@ DESCRIPTION="Evaluation of tree and one-loop matrix elements for any Standard Mo HOMEPAGE="https://openloops.hepforge.org/index.html" #SRC_URI="https://openloops.hepforge.org/downloads?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz" #S="${WORKDIR}/${MY_P}" -SRC_URI="https://gitlab.com/openloops/OpenLoops/-/archive/${MY_P}/${MY_PN}-${MY_P}.tar.bz2" +# since the files are not publicly versioned we mirror them from +# https://www.physik.uzh.ch/data/openloops/repositories/public/processes/2 +COMMON_URI="https://gitlab.com/openloopsmirror/" + +SRC_URI=" + https://gitlab.com/openloops/OpenLoops/-/archive/${MY_P}/${MY_PN}-${MY_P}.tar.bz2 + ppllj? ( ${COMMON_URI}/ppllj/-/archive/a3a36918/ppllj-a3a36918.tar.bz2 ) + pplljj? ( ${COMMON_URI}/pplljj/-/archive/93a6e3f7/pplljj-93a6e3f7.tar.bz2 ) + pplnj-ckm? ( ${COMMON_URI}/pplnj_ckm/-/archive/4d8743c/pplnj_ckm-4d8743c.tar.bz2 ) + pplnjj-ckm? ( ${COMMON_URI}/pplnjj_ckm/-/archive/d3d5302/pplnjj_ckm-d3d5302.tar.bz2 ) +" S="${WORKDIR}/${MY_PN}-${MY_P}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" -IUSE="+collier +cuttools +extra" +IUSE="+collier +cuttools +extra ppllj pplljj pplnj-ckm pplnjj-ckm" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" @@ -39,7 +49,7 @@ PATCHES=( src_prepare() { default mv openloops.cfg.tmpl openloops.cfg || die - sed -i "s|scons -Q|scons -Q -C /opt/${MY_P}/|g" openloops || die + sed -i "s|\\\$BASEDIR/scons -Q|scons -Q -C /opt/${MY_P}/|g" openloops || die if use extra ; then sed -i "s|#compile_extra.*|compile_extra = 1|" openloops.cfg || die fi @@ -54,9 +64,7 @@ src_prepare() { cc = $(tc-getCC) cxx = $(tc-getCXX) fortran_compiler = $(tc-getFC) - process_src_dir = ${EPREFIX}/opt/${MY_P}/process_src/ - process_obj_dir = ${EPREFIX}/opt/${MY_P}/process_obj/ - process_lib_dir = ${EPREFIX}/opt/${MY_P}/proclib/ + release = $PV import_env = @all EOF @@ -70,6 +78,22 @@ src_prepare() { src_compile() { escons --cache-disable + for OLPROC in ppllj pplljj pplnj_ckm pplnjj_ckm; do + if use ${OLPROC//_/-}; then + # move downloaded files to src + mkdir -p "${S}/process_src/${OLPROC}" || die + mv "${WORKDIR}/${OLPROC}-"*/* "${S}/process_src/${OLPROC}" || die + # compile it + escons auto=${OLPROC} generator=0 + fi + done + + # insert these later since we are done with compiling in ${S} now + cat <<-EOF >> openloops.cfg || die + process_src_dir = ${EPREFIX}/opt/${MY_P}/process_src/ + process_obj_dir = ${EPREFIX}/opt/${MY_P}/process_obj/ + process_lib_dir = ${EPREFIX}/usr/$(get_libdir)/ + EOF } src_install() { @@ -77,9 +101,17 @@ src_install() { dobin openloops cd include || die doheader openloops.h - cd ../lib || die + # Also install so.version links + cd ../lib || die dolib.so libolcommon.so* libopenloops.so* librambo.so* libtrred.so* + # install processes + cd ../proclib || die + dolib.so *.so + # also install the process info files + insinto /usr/$(get_libdir)/ + doins *.info + cd ../lib_src/olcommon/mod || die doheader *.mod cd ../../openloops/mod || die @@ -94,15 +126,11 @@ src_install() { doins openloops.cfg SConstruct doins -r pyol - # Previous method of allowing everyone everything - # maybe better to use a group for that - # for now like lhapdf just let root install - #fperms -R a=u /opt/${MY_P} - #fperms a=u /opt/${MY_P} - + # no need to also install the source code + #doins -r process_src } pkg_postinst() { elog "Install processes with openloops libinstall." - elog "They are installed in /opt/${MY_P}/proclib." + elog "They are installed in ${EPREFIX}/usr/$(get_libdir)/." }