commit: f582ca64c1dff0d61b9b012515f84887cc227959 Author: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de> AuthorDate: Tue Mar 12 22:05:26 2024 +0000 Commit: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik <DOT> de> CommitDate: Thu Mar 14 12:29:46 2024 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f582ca64
sci-physics/spheno: add 4.0.5 Closes: https://github.com/gentoo/sci/pull/1254 Signed-off-by: Alexander Puck Neuwirth <alexander <AT> neuwirth-informatik.de> .../spheno/files/spheno-4.0.5-gfortran.patch | 29 ++++++++++++++++++++++ ...{spheno-3.3.8.ebuild => spheno-3.3.8-r1.ebuild} | 14 ++++------- .../{spheno-3.3.8.ebuild => spheno-4.0.5.ebuild} | 14 ++++------- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/sci-physics/spheno/files/spheno-4.0.5-gfortran.patch b/sci-physics/spheno/files/spheno-4.0.5-gfortran.patch new file mode 100644 index 000000000..1abf36367 --- /dev/null +++ b/sci-physics/spheno/files/spheno-4.0.5-gfortran.patch @@ -0,0 +1,29 @@ +--- a/src/Makefile 2023-05-04 12:33:44.804394098 +0200 ++++ b/src/Makefile 2023-05-04 12:34:37.023776033 +0200 +@@ -21,9 +21,9 @@ + # + + # Intels ifort, default in optimized mode +-F90 = ifort +-comp = -c -O -module ${Mdir} -I${InDir} +-LFlagsB = -O ++F90 = ${F90} ++comp = -c -O -J${Mdir} -I${InDir} ${FFLAGS} ${FCFLAGS} ${CFLAGS} ++LFlagsB = -O ${LDFLAGS} + + # Intels ifort, debug modus + ifeq (${F90},ifortg) +@@ -81,11 +81,11 @@ + # + .f90.a: + ${F90} ${comp} $< +- ar ${linker} $@ $*.o ++ $(AR) ${linker} $@ $*.o + rm -f $*.o + .F90.a: + ${F90} ${comp} ${PreDef} $< +- ar ${linker} $@ $*.o ++ $(AR) ${linker} $@ $*.o + rm -f $*.o + .f90.o: + ${F90} ${comp} $< diff --git a/sci-physics/spheno/spheno-3.3.8.ebuild b/sci-physics/spheno/spheno-3.3.8-r1.ebuild similarity index 84% copy from sci-physics/spheno/spheno-3.3.8.ebuild copy to sci-physics/spheno/spheno-3.3.8-r1.ebuild index 9a740b89e..7ed53c4c7 100644 --- a/sci-physics/spheno/spheno-3.3.8.ebuild +++ b/sci-physics/spheno/spheno-3.3.8-r1.ebuild @@ -3,14 +3,14 @@ EAPI=8 -inherit toolchain-funcs +inherit fortran-2 MY_PN=SPheno MY_P=${MY_PN}-${PV} DESCRIPTION="SPheno stands for S(upersymmetric) Pheno(menology)" HOMEPAGE="https://spheno.hepforge.org/"; -SRC_URI="https://spheno.hepforge.org/downloads/?f=${MY_P}.tar.gz"; +SRC_URI="https://spheno.hepforge.org/downloads/?f=${MY_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="all-rights-reserved" @@ -18,16 +18,11 @@ RESTRICT="bindist mirror" SLOT="0" KEYWORDS="~amd64" -DEPEND="virtual/fortran" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}"/${P}-gfortran.patch ) src_compile() { # single thread force needed since fortan mods depend on each other - export MAKEOPTS=-j1 - tc-export FC AR - emake AR="${AR}" F90="${FC}" + emake -j1 F90="${FC}" } src_install() { @@ -35,7 +30,8 @@ src_install() { # convenience symlink since the package is lowercase but the default produced binary is uppercase dosym ${MY_PN} /usr/bin/${PN} dolib.a lib/lib${MY_PN}.a - doheader include/* + mv include ${PN} + doheader -r ${PN} dodoc doc/* docinto examples dodoc input/* diff --git a/sci-physics/spheno/spheno-3.3.8.ebuild b/sci-physics/spheno/spheno-4.0.5.ebuild similarity index 84% rename from sci-physics/spheno/spheno-3.3.8.ebuild rename to sci-physics/spheno/spheno-4.0.5.ebuild index 9a740b89e..7ed53c4c7 100644 --- a/sci-physics/spheno/spheno-3.3.8.ebuild +++ b/sci-physics/spheno/spheno-4.0.5.ebuild @@ -3,14 +3,14 @@ EAPI=8 -inherit toolchain-funcs +inherit fortran-2 MY_PN=SPheno MY_P=${MY_PN}-${PV} DESCRIPTION="SPheno stands for S(upersymmetric) Pheno(menology)" HOMEPAGE="https://spheno.hepforge.org/"; -SRC_URI="https://spheno.hepforge.org/downloads/?f=${MY_P}.tar.gz"; +SRC_URI="https://spheno.hepforge.org/downloads/?f=${MY_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${MY_P}" LICENSE="all-rights-reserved" @@ -18,16 +18,11 @@ RESTRICT="bindist mirror" SLOT="0" KEYWORDS="~amd64" -DEPEND="virtual/fortran" -RDEPEND="${DEPEND}" - PATCHES=( "${FILESDIR}"/${P}-gfortran.patch ) src_compile() { # single thread force needed since fortan mods depend on each other - export MAKEOPTS=-j1 - tc-export FC AR - emake AR="${AR}" F90="${FC}" + emake -j1 F90="${FC}" } src_install() { @@ -35,7 +30,8 @@ src_install() { # convenience symlink since the package is lowercase but the default produced binary is uppercase dosym ${MY_PN} /usr/bin/${PN} dolib.a lib/lib${MY_PN}.a - doheader include/* + mv include ${PN} + doheader -r ${PN} dodoc doc/* docinto examples dodoc input/*
