Migrate to EAPI=2. Removed old version.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 25 insertions, 20 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/Manifest b/app-accessibility/festival-it/Manifest
index 843928342082..bd47ad416ede 100644
--- a/app-accessibility/festival-it/Manifest
+++ b/app-accessibility/festival-it/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST Italian-FESTIVAL.zip 20715806 RMD160 eb46e48e245e72c21dc45d1a0d4a7b2667347da2 SHA1 6dc98075826523d8a2924d22143887a3bde69f33 SHA256 747ef3a31571896d7d772ea46d4ee68cf0fbc57af21e8c5220fced731695f496
-EBUILD festival-it-1.0.ebuild 2458 RMD160 d24edfd596d24df09225fa4a7d523ced2405e6ef SHA1 373e8bbb520836a0590edce1b6a50ce940fd30f7 SHA256 39a784510d7faf55e0f1cac0b7fe6c2c538ddbf76b15b1861501555e416cb72e
-MISC ChangeLog 428 RMD160 a6dbf296fededb75cdb3ee6f53eae69cb267ff5a SHA1 6e832043cd7e3094263338a21193220f7d55db59 SHA256 ea6f91bdabd5b40758e151957c5fab60c95d68fd021b4aa5fcc4bfeac89329c7
+EBUILD festival-it-1.0-r1.ebuild 2031 RMD160 9ea92e9fdd530704d6ea03d544460092a58b540a SHA1 f9e57195f791c278cc4f96d7b40773e63b7063b6 SHA256 c2c985a2ab4e7c66d87b4460eab4440405356632460a22ce8d4b67c84eade36d
+MISC ChangeLog 612 RMD160 ba3bb2e33117d4299ee51c6fa12ade540af4e47b SHA1 6abf8ee29984adcc17a5a0bd5003f5f0e400af72 SHA256 8c78ad4dc31e6aad3c462c0b0c437bee7df5a6129e04ef5d042512aebef8abdf
 MISC metadata.xml 329 RMD160 bc39f695e0c54cc36a184c3893b457293f7709d5 SHA1 103fe562281aa4dbb66161a8e806d223329a1e06 SHA256 8bd5716491f0e176a5debbf0c717eae70cd41377b78d211b26db8064623477cd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkoDwEIACgkQdIssYB9vBoNIOQCfcuJAY8I7WGpubOSRbVKtzlqe
+uREAn3RX+vOnLheagJrzehRvc82CXQo4
+=EiEi
+-----END PGP SIGNATURE-----
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