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@gentoo.org>

9 files changed, 25 insertions, 181 deletions

diff --git a/sci-physics/tauola/Manifest b/sci-physics/tauola/Manifest
index a797d16ef..b8a918568 100644
--- a/sci-physics/tauola/Manifest
+++ b/sci-physics/tauola/Manifest
@@ -1,3 +1 @@
-DIST TAUOLA.1.1.3.tar.gz 7152535 SHA256 9b9141a6460477e6cb3c53845f384740539e54540130f69373268b7c2995defc SHA512 ca0c67d61d8476715788ebd7f145bea86ffce2d2a6f5590d66dfd14551fe817d97b1527f6d160b2ea2dc195f1af478f80a5644408e4c1da5ac0ecdbaccc20624 WHIRLPOOL 1ec2b22da2e12ecc400f174ba2fe40bc2bc24e0495f0ae793b2211a5f1dcdc600f31543056a9c9900fe4d049222046604e789ec2eb809a927b26c66ff7d636da
-DIST TAUOLA.1.1.4.tar.gz 8643019 SHA256 224c0faa113f91bca62002cb7e405a8eeccfa938e49a62c146441af0ec5f6f30 SHA512 a03873925b35b16a10d8728b42ad0460d2424d879925da6b1d45dd8f88a86ac9729538e2d3a06faa0a7f70b7b0a80fa7b87bed14a82b2aae74663008c1ce5025 WHIRLPOOL 1562e99f364ae614e79c9f52042fedf89fae3edf1e25111de2e7f37ca48fd39a9d22990aae917d7477f203aa090a87930482560a76271935688bfcd5f4ed1c99
 DIST TAUOLA.1.1.5.tar.gz 11986900 SHA256 c6b026ce1b85ac72537882155aa0a5e5be6ee81e37bd469cc176bc55454541cb SHA512 1eb6e4b9b649cdd62b77d65899ae3e74cfdd0e8015d115690c020a06f0ff27c22a745db7c7acb12eeffacb9140b069c57c4135037eaf8feb26f8be32aced182a WHIRLPOOL 6f02400efe92f9730fe9b1b9ea4c519c6f06351588a6ad1266d456314564c410583315f418935c8b2252fa22169c569b5334759732dd2027911dbd9699890311
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 \