Bump to eapi 5 to allow use dependencies can be added for espeak.

This is important enough that I am making this change directly to a
stable ebuild as well. Otherwise, it is possible to have espeakup be
unable to speak which breaks accessibility.

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 40 insertions, 14 deletions

diff --git a/app-accessibility/espeakup/ChangeLog b/app-accessibility/espeakup/ChangeLog
index e90558f99a74..410a5a703001 100644
--- a/app-accessibility/espeakup/ChangeLog
+++ b/app-accessibility/espeakup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/espeakup
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.22 2011/06/25 13:54:08 williamh Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.23 2013/10/10 22:39:12 williamh Exp $
+
+  10 Oct 2013; William Hubbs <williamh@gentoo.org> espeakup-0.71.ebuild,
+  espeakup-9999.ebuild:
+  Bump to eapi 5 to allow use dependencies can be added for espeak. This is
+  important enough that I am making this change directly to a stable ebuild as
+  well. Otherwise, it is possible to have espeakup be unable to speak which
+  breaks accessibility.
 
   25 Jun 2011; William Hubbs <williamh@gentoo.org> espeakup-9999.ebuild:
   migrate to git-2 eclass.
@@ -83,4 +90,3 @@
   02 Sep 2008; William Hubbs <williamh@gentoo.org> +files/espeakup.rc,
   +metadata.xml, +espeakup-0.2.ebuild:
   Initial commit.
-
diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
index 723a9ca7f819..6796b4e1a1b2 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX espeakup.confd 256 SHA256 32e6de11417ebb199a7bf46eb8cf77054b1af1c9f4bcc80b856b34758830eb9f SHA512 aebd97c63dbeae5025bf54f39bb3e7d97822a2b1b369e40b013c5c7da2eba968adf48800f62ef14541ca22ed3f3dfcbdb63b2a3d7f45975ae8bddfea0a42d931 WHIRLPOOL 73e26981dab24619f4d2155b975c364c8f0be539f28b83d04287a27f9b149b6e53945e9fce06a1e9d2a5c7c46d3795ea163af58fbebbe8a3f46f7aee214231f0
 AUX espeakup.rc 594 SHA256 17bd6cdc7850d0c6ea19783080cf2c3e751179e1b1776e6b8de736d80504db6f SHA512 a145cb550248f04dbb63a8dcaa825e769f289dd58d85a0395aab6f80968b846f92fa6e03a645f288d9b854ba60a41a7ced6b8f2ea2396a4d0449ba58f5d6a52d WHIRLPOOL b935ef7122cd5bf5d528390b5bc810e4b1330da0930c01d2ba938bb5e6b8554826773238ecfd6f5f3594b09ef6b67419df46f9e64bb472adb384ed3fe0c50617
 DIST espeakup-0.71.tar.bz2 24663 SHA256 8307986998256db21e615c4edc1befedde28a6995971da258e9d513dd79bd3ab SHA512 01091560cd4843897fa6925a54b4c856fe57ed5728ddc0c091c93b1ae14eb2f4d07ab2247e40bd5a5968cc22ee3696abfe1b28f67b95aa7ab61e33667c51135d WHIRLPOOL 8cc6d335e40a560c14ed17fddc475473722606c7e98148f2f3aa786443b49bdee343cfa0c85e845ce79e8c0bdd330825232512e67869bf8aed6fac81d5e3f4b8
-EBUILD espeakup-0.71.ebuild 1670 SHA256 2113e5fcf5c06f47dad34bda5733f3cf837bc2a9c7925db19826d158a5909c78 SHA512 b9d3d09a781345954b912e1912ef923394ee7906923106b1f76919d990df299f814f1c098a8c05a75019924c6bbe1f5430bb82a7fc7159942ba0d42e0c4a3046 WHIRLPOOL f8274b7c2cc7e7050e3b5b2a62d219a8c57107405a9dd852135cebbb2c114111c88f2d062422614865a65121eebf5360f9bd9a3f7ca69b784e52ed678f32d666
-EBUILD espeakup-9999.ebuild 1771 SHA256 313f4d3e3891ae3cc4654cf6ac92abc63896cf84c725eb87a421ae1e248d4fbb SHA512 55d0a87d9dfa075a9bdaa399ffa668856e557060fed2de000409a3be6cc4981d0524a88356580ceb3cbf6da02e343daef5296264f148400d7e5b8acf69010e67 WHIRLPOOL 4145117dcc7deaa7b7613d5906a0060963e288ae6376379a29cda9a6a2a52af772194cff2aeb94ef5610cf563c63ee81962012889e18d1ee46e5c911c15a92bb
-MISC ChangeLog 2894 SHA256 e5bbbbfc7803730cd9acc5b9b7a5507cd8ae3c6e3a3d3404fa3c82989c1bcfd7 SHA512 34bd673265c46969c959c5e30d007a98543ffcc5f20689f6b0123d17da9b26aa294802995cf814edff4b9341f1f2894b390fa03be70c3dfc9f459bc0e2efe70f WHIRLPOOL 59e3c26dbf53a148e39e5c05373ac101406ef28b966f3340bb5d84c30949451653b7353337b02405463ed741c20cdd7bf55e7eadd04715c38769309e5e337721
+EBUILD espeakup-0.71.ebuild 1775 SHA256 fea13530352d933ed6f17e147baaa0ec551dbabee48982920d11b643e4c3043a SHA512 8f865bb1685d11d62edefe05a9227390b8774ca3c9a2bb57f6be9cc9d40592c336deab21bd2930276ac40d1c35f3c3d21544d50e58397897080c22cb9e3f49f4 WHIRLPOOL 321e7bf91bd1873283afe154b00d7daaa5bb3540a271d219a07b6f9951ec64137b35c89f419a766d77da6657c378e151e379d749b753d50d63f8f402adcb8c86
+EBUILD espeakup-9999.ebuild 1877 SHA256 e5fcfb72a533b39bf0573f72f281d0448220c48c0e8239c827c9f17236f3c65c SHA512 8c6e90cad0d499bd9c8abdc66eb0dd4d920abf9b4075c73384c34d28d8a8e192473b95828ae82cc8d02db9b9773582b765a2a352b808c6c48990b652d99e5459 WHIRLPOOL 5377b7ca0aba742a4c43726c781488897a2ac45412454b55fda17506a7bca9370c0ff384b700361437ec745c14e78a461a3e05250eb1fe52e114c6de517b5e53
+MISC ChangeLog 3246 SHA256 3e0f80d594c3bd46f052746b007eafae2c6be9d2f253a38d17721a6a9279dcac SHA512 cc45b49535c42a396ac029d5ab23f4f3900a4600918ff6c716363f2170b512b91689ef8f785bf626abd9a84bc12f643ebdfe39dba96c69e89545c0acf1f3de0f WHIRLPOOL 2dfad82e420c63a3688b83f3994f895252ce8458abf02bda9ef0a483a7d40aef6ffc0af7a3847bc63d602713a696c29ec9916c13ecc0e8bd36e6962da0ae415c
 MISC metadata.xml 379 SHA256 730c8985450ad52a4d2f4f57884dc8973705daf107fb3bcdf433e0039f4f20d9 SHA512 87afd49d0ad13000cb616446e63400a7436c8095ba38238604004729487619becfe177188e8dfe49ce7b5274879ecc3325760a67748a6cab22cd6a7a90577bb1 WHIRLPOOL eba1c65ded5b51c6d1592cdb19eedc3ef09e52e2758cbc35ad4a8c274e3af9122bb0af77614356ce7fb2da74ec4262ca6f505f28413e5ba7dc0bdb3009634bbc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlJXLJEACgkQblQW9DDEZTh4kACfRfAOP1P9d5S6+/iKZ31NFovJ
+KqkAn3UVFofFFqT4wNvhkPB0mM4cQwEh
+=Lhlo
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/espeakup/espeakup-0.71.ebuild b/app-accessibility/espeakup/espeakup-0.71.ebuild
index 113599b54183..559fec17b07f 100644
--- a/app-accessibility/espeakup/espeakup-0.71.ebuild
+++ b/app-accessibility/espeakup/espeakup-0.71.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.71.ebuild,v 1.9 2011/05/16 23:25:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.71.ebuild,v 1.10 2013/10/10 22:39:11 williamh Exp $
+
+EAPI=5
 
 inherit linux-info
 
@@ -13,8 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="app-accessibility/espeak"
-RDEPEND="${DEPEND}"
+COMMON_DEPEND="|| (
+	app-accessibility/espeak[portaudio]
+	app-accessibility/espeak[pulseaudio] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 
 CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
 ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild
index 89b0c4a2e4b1..0f533d50518a 100644
--- a/app-accessibility/espeakup/espeakup-9999.ebuild
+++ b/app-accessibility/espeakup/espeakup-9999.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-9999.ebuild,v 1.9 2011/06/25 13:54:08 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-9999.ebuild,v 1.10 2013/10/10 22:39:11 williamh Exp $
+
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://github.com/williamh/espeakup.git"
@@ -19,8 +21,11 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 
-DEPEND="app-accessibility/espeak"
-RDEPEND="${DEPEND}"
+COMMON_DEPEND="|| (
+	app-accessibility/espeak[portaudio]
+	app-accessibility/espeak[pulseaudio] )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 
 CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
 ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"