commit: 65741df3a0d1826173e0e258699ee03665aab646
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 17:49:01 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 17:53:03 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=65741df3
sci-physics/tauola: Bump to EAPI=6
drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../tauola/files/tauola-1.1.3-makefile.patch | 12 ----
.../files/tauola-1.1.3-tau-spinner-makefile.patch | 4 +-
.../tauola/files/tauola-1.1.4-makefile.patch | 4 +-
sci-physics/tauola/files/tauola-1.1.5-doc.patch | 4 +-
sci-physics/tauola/tauola-1.1.3.ebuild | 71 ----------------------
sci-physics/tauola/tauola-1.1.4.ebuild | 71 ----------------------
sci-physics/tauola/tauola-1.1.5.ebuild | 20 +++---
sci-physics/tauola/tauola-9999.ebuild | 18 +++---
8 files changed, 25 insertions(+), 179 deletions(-)
diff --git a/sci-physics/tauola/files/tauola-1.1.3-makefile.patch
b/sci-physics/tauola/files/tauola-1.1.3-makefile.patch
deleted file mode 100644
index 5d4195253..000000000
--- a/sci-physics/tauola/files/tauola-1.1.3-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -36,8 +36,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.3-tau-spinner-makefile.patch
b/sci-physics/tauola/files/tauola-1.1.3-tau-spinner-makefile.patch
index 8b3474c5d..902531b2b 100644
--- a/sci-physics/tauola/files/tauola-1.1.3-tau-spinner-makefile.patch
+++ b/sci-physics/tauola/files/tauola-1.1.3-tau-spinner-makefile.patch
@@ -1,5 +1,5 @@
---- TauSpinner/Makefile
-+++ TauSpinner/Makefile
+--- a/TauSpinner/Makefile
++++ b/TauSpinner/Makefile
@@ -30,7 +30,7 @@
%.o: %.cxx
diff --git a/sci-physics/tauola/files/tauola-1.1.4-makefile.patch
b/sci-physics/tauola/files/tauola-1.1.4-makefile.patch
index e62d7687d..00be27f59 100644
--- a/sci-physics/tauola/files/tauola-1.1.4-makefile.patch
+++ b/sci-physics/tauola/files/tauola-1.1.4-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -38,8 +38,7 @@
install:
diff --git a/sci-physics/tauola/files/tauola-1.1.5-doc.patch
b/sci-physics/tauola/files/tauola-1.1.5-doc.patch
index 7dd4960bf..b33fe1b06 100644
--- a/sci-physics/tauola/files/tauola-1.1.5-doc.patch
+++ b/sci-physics/tauola/files/tauola-1.1.5-doc.patch
@@ -1,5 +1,5 @@
---- documentation/latex_documentation/Tauola_interface_design.tex
-+++ documentation/latex_documentation/Tauola_interface_design.tex
+--- 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,
diff --git a/sci-physics/tauola/tauola-1.1.3.ebuild
b/sci-physics/tauola/tauola-1.1.3.ebuild
deleted file mode 100644
index 6c115a204..000000000
--- a/sci-physics/tauola/tauola-1.1.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-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";
-
-#HepMC interface is licensed under GPL, other code under CPC
-LICENSE="CPC GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples hepmc tau-spinner"
-
-RDEPEND="
- hepmc? ( sci-physics/hepmc )
- tau-spinner? ( sci-physics/lhapdf )
-"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- app-text/ghostscript-gpl
- app-text/texlive )
-"
-
-S="${WORKDIR}/${MYPN}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-makefile.patch \
- "${FILESDIR}"/${P}-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() {
- default
- 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
-}
diff --git a/sci-physics/tauola/tauola-1.1.4.ebuild
b/sci-physics/tauola/tauola-1.1.4.ebuild
deleted file mode 100644
index 67a62f334..000000000
--- a/sci-physics/tauola/tauola-1.1.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-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";
-
-#HepMC interface is licensed under GPL, other code under CPC
-LICENSE="CPC GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples hepmc tau-spinner"
-
-RDEPEND="
- hepmc? ( sci-physics/hepmc )
- tau-spinner? ( sci-physics/lhapdf )
-"
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- app-text/ghostscript-gpl
- app-text/texlive )
-"
-
-S="${WORKDIR}/${MYPN}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-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
-}
diff --git a/sci-physics/tauola/tauola-1.1.5.ebuild
b/sci-physics/tauola/tauola-1.1.5.ebuild
index 48a249100..d51ec0b4a 100644
--- a/sci-physics/tauola/tauola-1.1.5.ebuild
+++ b/sci-physics/tauola/tauola-1.1.5.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils
MYPN=TAUOLA
-DESCRIPTION="tau decay Monte Carlo generator"
+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";
@@ -26,17 +26,17 @@ DEPEND="${RDEPEND}
doc? (
app-doc/doxygen
app-text/ghostscript-gpl
- app-text/texlive )
+ app-text/texlive
+ )
"
S="${WORKDIR}/${MYPN}"
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-doc.patch \
- "${FILESDIR}"/${PN}-1.1.4-makefile.patch \
- "${FILESDIR}"/${PN}-1.1.3-tau-spinner-makefile.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-doc.patch
+ "${FILESDIR}"/${PN}-1.1.4-makefile.patch
+ "${FILESDIR}"/${PN}-1.1.3-tau-spinner-makefile.patch
+)
src_configure() {
econf \
diff --git a/sci-physics/tauola/tauola-9999.ebuild
b/sci-physics/tauola/tauola-9999.ebuild
index 4785126b3..4ad23e407 100644
--- a/sci-physics/tauola/tauola-9999.ebuild
+++ b/sci-physics/tauola/tauola-9999.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-
-inherit eutils
+EAPI=6
MYPN=TAUOLA
-DESCRIPTION="tau decay Monte Carlo generator"
+DESCRIPTION="Tau decay Monte Carlo generator"
HOMEPAGE="http://tauolapp.web.cern.ch/tauolapp/";
SRC_URI=""
@@ -27,7 +25,8 @@ DEPEND="${RDEPEND}
doc? (
app-doc/doxygen
app-text/ghostscript-gpl
- app-text/texlive )
+ app-text/texlive
+)
"
S="${WORKDIR}/${MYPN}"
@@ -38,9 +37,10 @@ src_unpack() {
unpack "./${MYPN}.development.version.tar.gz"
}
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.1.3-makefile.patch"
"${FILESDIR}/${PN}-1.1.3-tau-spinner-makefile.patch"
-}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.4-makefile.patch
+ "${FILESDIR}"/${PN}-1.1.3-tau-spinner-makefile.patch
+)
src_configure() {
econf \
