diff options
author | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2021-02-04 11:06:20 +0100 |
---|---|---|
committer | Andrew Ammerlaan <andrewammerlaan@riseup.net> | 2021-02-04 11:06:20 +0100 |
commit | 637d3aa60f41076748b9cf8e307a544388029b6c (patch) | |
tree | ad6dbf64f90bb898d1c6b6ae6ff5b966f292577b /sci-physics | |
parent | sci-mathematics/open-axiom: some steps towards fixing compilation (diff) | |
download | sci-637d3aa60f41076748b9cf8e307a544388029b6c.tar.gz sci-637d3aa60f41076748b9cf8e307a544388029b6c.tar.bz2 sci-637d3aa60f41076748b9cf8e307a544388029b6c.zip |
sci-physics/tauola: version bump, EAPI bump
removed 9999, it is not doing anything, not
inheriting git or defining SRC_URI
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Diffstat (limited to 'sci-physics')
-rw-r--r-- | sci-physics/tauola/Manifest | 2 | ||||
-rw-r--r-- | sci-physics/tauola/files/tauola-1.1.4-makefile.patch | 12 | ||||
-rw-r--r-- | sci-physics/tauola/files/tauola-1.1.5-doc.patch | 11 | ||||
-rw-r--r-- | sci-physics/tauola/tauola-1.1.8.ebuild (renamed from sci-physics/tauola/tauola-1.1.5.ebuild) | 19 | ||||
-rw-r--r-- | sci-physics/tauola/tauola-9999.ebuild | 75 |
5 files changed, 9 insertions, 110 deletions
diff --git a/sci-physics/tauola/Manifest b/sci-physics/tauola/Manifest index 5f335bd72..37adec18a 100644 --- a/sci-physics/tauola/Manifest +++ b/sci-physics/tauola/Manifest @@ -1 +1 @@ -DIST TAUOLA.1.1.5.tar.gz 11986900 BLAKE2B 11198bfddddfbd7b7d93acea2a96fe06209dbadb3af95b24ad47a6bf7e5eb028c4c05b6597f15bb33bef16a6b5a9a6505b38e2abff7229cfc5f99a73b0326066 SHA512 1eb6e4b9b649cdd62b77d65899ae3e74cfdd0e8015d115690c020a06f0ff27c22a745db7c7acb12eeffacb9140b069c57c4135037eaf8feb26f8be32aced182a +DIST TAUOLA.1.1.8.tar.gz 14434046 BLAKE2B b8d37001b445b6433f7eae61a0a90d5ddc51eb7955f93c0dade3dfcfa50a75721346fff1506d9d5b699a254250557a53cc4b3b7b878e4a0760f7d02891ee7fbd SHA512 633b61fc6f0068f1de0329db77197cdcd1869cc224f81e8e102067c02d8db555305fc30d38af8c1d54fdc594644ca202651e3a5055ef54c17ea8678ccefb5612 diff --git a/sci-physics/tauola/files/tauola-1.1.4-makefile.patch b/sci-physics/tauola/files/tauola-1.1.4-makefile.patch deleted file mode 100644 index 00be27f59..000000000 --- a/sci-physics/tauola/files/tauola-1.1.4-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -38,8 +38,7 @@ - - install: - mkdir -p $(PREFIX)/include -- mkdir -p $(PREFIX)/include/Tauola -- cp include/Tauola/* $(PREFIX)/include/Tauola/. -+ cp -r include/* $(PREFIX)/include - mkdir -p $(PREFIX)/lib - cp lib/* $(PREFIX)/lib/. - diff --git a/sci-physics/tauola/files/tauola-1.1.5-doc.patch b/sci-physics/tauola/files/tauola-1.1.5-doc.patch deleted file mode 100644 index b33fe1b06..000000000 --- a/sci-physics/tauola/files/tauola-1.1.5-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/documentation/latex_documentation/Tauola_interface_design.tex -+++ b/documentation/latex_documentation/Tauola_interface_design.tex -@@ -2652,6 +2652,7 @@ - there is a mismatch in the {\tt TAUOLA} version number given, - but otherwise all information on the generated sample, - as explained eg. in \cite{Jadach:1990mz,Jezabek:1991qp,Jadach:1993hs}, is printed correctly. -+ } - \end{itemize} - - - diff --git a/sci-physics/tauola/tauola-1.1.5.ebuild b/sci-physics/tauola/tauola-1.1.8.ebuild index 1ee8b98ea..61ec51d9f 100644 --- a/sci-physics/tauola/tauola-1.1.5.ebuild +++ b/sci-physics/tauola/tauola-1.1.8.ebuild @@ -1,15 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit eutils +EAPI=7 MYPN=TAUOLA DESCRIPTION="Tau decay Monte Carlo generator" -HOMEPAGE="http://tauolapp.web.cern.ch/tauolapp/" -SRC_URI="http://tauolapp.web.cern.ch/tauolapp/resources/${MYPN}.${PV}/${MYPN}.${PV}.tar.gz" +HOMEPAGE="https://tauolapp.web.cern.ch/tauolapp/" +SRC_URI="https://tauolapp.web.cern.ch/tauolapp/resources/${MYPN}.${PV}/${MYPN}.${PV}.tar.gz" #HepMC interface is licensed under GPL, other code under CPC LICENSE="CPC GPL-2+" @@ -23,7 +21,7 @@ RDEPEND=" " DEPEND="${RDEPEND} doc? ( - app-doc/doxygen + app-doc/doxygen[dot] app-text/ghostscript-gpl app-text/texlive ) @@ -32,8 +30,6 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MYPN}" PATCHES=( - "${FILESDIR}"/${P}-doc.patch - "${FILESDIR}"/${PN}-1.1.4-makefile.patch "${FILESDIR}"/${PN}-1.1.3-tau-spinner-makefile.patch ) @@ -42,6 +38,7 @@ src_configure() { --without-mc-tester \ --without-pythia8 \ $(use_with hepmc hepmc "${EPREFIX}/usr") \ + --without-hepmc3 \ $(use_with tau-spinner) \ $(use_with tau-spinner lhapdf "${EPREFIX}/usr") } @@ -57,10 +54,10 @@ src_compile() { } src_install() { - emake PREFIX="${D}/usr" install + emake DESTDIR="${ED}" install if use doc; then - dohtml documentation/doxy_documentation/html/* + dodoc documentation/doxy_documentation/html/* dodoc documentation/latex_documentation/Tauola_interface_design.pdf fi diff --git a/sci-physics/tauola/tauola-9999.ebuild b/sci-physics/tauola/tauola-9999.ebuild deleted file mode 100644 index 8e968923c..000000000 --- a/sci-physics/tauola/tauola-9999.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MYPN=TAUOLA - -DESCRIPTION="Tau decay Monte Carlo generator" -HOMEPAGE="http://tauolapp.web.cern.ch/tauolapp/" -SRC_URI="" - -#HepMC interface is licensed under GPL, other code under CPC -LICENSE="CPC GPL-2+" -SLOT="0" -KEYWORDS="" -IUSE="doc examples hepmc tau-spinner" - -RDEPEND=" - hepmc? ( sci-physics/hepmc ) - tau-spinner? ( sci-physics/lhapdf ) -" -DEPEND="${RDEPEND} - net-misc/wget - doc? ( - app-doc/doxygen - app-text/ghostscript-gpl - app-text/texlive -) -" - -S="${WORKDIR}/${MYPN}" - -src_unpack() { - #there is no public svn, just generated tarball, so fetch it - wget "http://tauolapp.web.cern.ch/tauolapp/resources/${MYPN}.development.version/${MYPN}.development.version.tar.gz" || die - unpack "./${MYPN}.development.version.tar.gz" -} - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.4-makefile.patch - "${FILESDIR}"/${PN}-1.1.3-tau-spinner-makefile.patch -) - -src_configure() { - econf \ - --without-mc-tester \ - --without-pythia8 \ - $(use_with hepmc hepmc "${EPREFIX}/usr") \ - $(use_with tau-spinner) \ - $(use_with tau-spinner lhapdf "${EPREFIX}/usr") -} - -src_compile() { - emake -j1 - if use doc; then - cd "${S}/documentation/doxy_documentation" || die - default - cd "${S}/documentation/latex_documentation" || die - default - fi -} - -src_install() { - emake PREFIX="${D}/usr" install - - if use doc; then - dohtml documentation/doxy_documentation/html/* - dodoc documentation/latex_documentation/Tauola_interface_design.pdf - fi - - if use examples; then - dodoc -r examples - use tau-spinner && docinto tau-spinner && dodoc -r TauSpinner/examples - fi -} |