Migrate to EAPI=2. Removed old version.

(Portage version: 2.2_rc23/cvs/Linux i686)

2 files changed, 13 insertions, 18 deletions

diff --git a/app-accessibility/festival-it/ChangeLog b/app-accessibility/festival-it/ChangeLog
index 17a60fd0b909..21d0436112cf 100644
--- a/app-accessibility/festival-it/ChangeLog
+++ b/app-accessibility/festival-it/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/festival-it
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-it/ChangeLog,v 1.1 2009/05/07 14:43:40 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-it/ChangeLog,v 1.2 2009/05/08 05:16:36 neurogeek Exp $
+
+*festival-it-1.0-r1 (08 May 2009)
+
+  08 May 2009; Jesus Rivero <neurogeek@gentoo.org> -festival-it-1.0.ebuild,
+  +festival-it-1.0-r1.ebuild:
+  Migrate to EAPI=2. Removed old version.
 
 *festival-it-1.0 (07 May 2009)
 
diff --git a/app-accessibility/festival-it/festival-it-1.0.ebuild b/app-accessibility/festival-it/festival-it-1.0-r1.ebuild
index 2f423339e88c..cbed655fdc9c 100644
--- a/app-accessibility/festival-it/festival-it-1.0.ebuild
+++ b/app-accessibility/festival-it/festival-it-1.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-it/festival-it-1.0.ebuild,v 1.2 2009/05/07 23:26:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival-it/festival-it-1.0-r1.ebuild,v 1.1 2009/05/08 05:16:36 neurogeek Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -8,28 +10,15 @@ DESCRIPTION="A collection of italian voices for Festival TTS."
 HOMEPAGE="http://www.pd.istc.cnr.it/TTS/It-FESTIVAL.htm"
 SRC_URI="mirror://sourceforge/it-festival/Italian-FESTIVAL.zip"
 
-RDEPEND=">=app-accessibility/festival-1.4.3-r4
-		mbrola? ( >=app-accessibility/mbrola-3.0.1h-r4 )"
-
-DEPEND="${RDEPEND} app-arch/unzip"
+RDEPEND=">=app-accessibility/festival-1.96_beta[mbrola?]
+		mbrola? ( >=app-accessibility/mbrola-3.0.1h-r4[linguas_it] )"
+DEPEND="app-arch/unzip"
 IUSE="mbrola"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-pkg_setup () {
-
-	if use mbrola && ! built_with_use app-accessibility/mbrola linguas_it; then
-	  einfo "You should emerge app_accessibility/mbrola with italian support"
-	  einfo "in order to enable mbrola-based italian voices in festival."
-	  einfo
-	  einfo "Try to add \"it\" to your LINGUAS string in /etc/make.conf"
-	  einfo "and re-emerge app_accessibility/mbrola"
-	  die   "mbrola has no italian support please remerge it with LINGUAS=it"
-	fi
-}
-
 pkg_postinst () {
 	einfo "Italian voices installed:"
 	for VOICE in `ls "${ROOT}/usr/share/festival/voices/italian/"`; do