[gentoo-commits] repo/gentoo:master commit in: app-accessibility/festival-fi/files/, app-accessibility/festival-fi/

[David Seifert]

commit:     e00353ab120bf887b58e09a813029a3ad79c35d6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 21:21:24 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 22:32:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00353ab

app-accessibility/festival-fi: Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../festival-fi/festival-fi-20041119.ebuild        | 29 ++++++++++------------
 .../files/festival-fi-20041119_lavennin_path.patch |  4 +--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app-accessibility/festival-fi/festival-fi-20041119.ebuild b/app-accessibility/festival-fi/festival-fi-20041119.ebuild
index 7ed4851d8ed..baff3ed1170 100644
--- a/app-accessibility/festival-fi/festival-fi-20041119.ebuild
+++ b/app-accessibility/festival-fi/festival-fi-20041119.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Finnish diphones and text to speech script for festival"
 HOMEPAGE="http://www.ling.helsinki.fi/suopuhe"
@@ -15,29 +14,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="perl"
 
-RDEPEND=">=app-accessibility/festival-1.96_beta"
+RDEPEND="
+	>=app-accessibility/festival-1.96_beta
+	dev-lang/perl"
 DEPEND=""
 
-src_prepare(){
-	cd "${WORKDIR}/lavennin/bin"
-	epatch "${FILESDIR}/${P}_lavennin_path.patch"
-}
+S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${P}_lavennin_path.patch )
 
 src_install() {
-	cd "${WORKDIR}"
 	dodoc festival/lib/voices/finnish/hy_fi_mv_diphone/README.mv
-	rm festival/lib/voices/finnish/hy_fi_mv_diphone/{README.mv,LICENSE}
-	insinto /usr/share/festival/
-	cd festival/lib/
-	doins -r voices/
-	cd "${WORKDIR}/lavennin/"
+	rm festival/lib/voices/finnish/hy_fi_mv_diphone/{README.mv,LICENSE} || die
+
+	insinto /usr/share/festival
+	doins -r festival/lib/voices
+	cd "${WORKDIR}"/lavennin/ || die
 	newdoc README.txt README.lavennin
 	dodoc man/*.shtml
 
 	if use perl; then
-
 		newbin bin/lavennin suopuhe-lavennin
-		dodir /usr/share/suopuhe/data/
+
 		insinto /usr/share/suopuhe
 		doins -r data
 

diff --git a/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch b/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch
index 7084641a669..833b633e324 100644
--- a/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch
+++ b/app-accessibility/festival-fi/files/festival-fi-20041119_lavennin_path.patch
@@ -3,8 +3,8 @@
 # Not sending this to upstrem.
 # neurogeek@g.o
 
---- bin/lavennin.orig	2009-05-08 01:05:48.000000000 -0430
-+++ bin/lavennin	2009-05-08 01:07:07.000000000 -0430
+--- a/lavennin/bin/lavennin
++++ b/lavennin/bin/lavennin
 @@ -164,8 +164,8 @@
      $HOME = get_home_directory();
  }