drop support for USE=modules because we always need the modules for espeak to work:wq

Package-Manager: portage-2.2.0_alpha7/cvs/Linux i686

4 files changed, 25 insertions, 18 deletions

diff --git a/app-accessibility/speakup/ChangeLog b/app-accessibility/speakup/ChangeLog
index e441cef57343..c13d5ee60ed6 100644
--- a/app-accessibility/speakup/ChangeLog
+++ b/app-accessibility/speakup/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-accessibility/speakup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/ChangeLog,v 1.50 2010/11/05 19:42:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/ChangeLog,v 1.51 2010/12/09 00:49:13 williamh Exp $
+
+  09 Dec 2010; William Hubbs <williamh@gentoo.org> speakup-3.1.6.ebuild,
+  speakup-9999.ebuild:
+  Speakup is not functional without the modules, and this was causing the
+  minimal live cd not to speak. I just now discovered this because there
+  wasn't a way for me to look at the cd until now to find out what was
+  going on, but they have the modules use flag turned off in the specs.
+  I am removing the modules use flag because the modules are always needed
+  for speakup to work.
 
   05 Nov 2010; William Hubbs <williamh@gentoo.org> -speakup-3.1.4.ebuild,
   -speakup-3.1.5.ebuild:
diff --git a/app-accessibility/speakup/Manifest b/app-accessibility/speakup/Manifest
index 232f606d9fc3..a68e0fa47890 100644
--- a/app-accessibility/speakup/Manifest
+++ b/app-accessibility/speakup/Manifest
@@ -1,5 +1,5 @@
 DIST speakup-3.1.6.tar.bz2 110590 RMD160 8e28b1fb7c09bbe5c0da63ae437782d96578cde5 SHA1 1c79f91a60f5fdf1f1d737068159841fbf234899 SHA256 1030917c4631fa9753098ef4fa4c1b79dd878311626ddc43f0da36956c86e67d
-EBUILD speakup-3.1.6.ebuild 1938 RMD160 204049748664562d69f250ff2a9bd266a8f2ee3c SHA1 ce49d32ab20d780515d68d72b4eb522160513775 SHA256 663bb55f909ca248aeed3d43b9255ceb9efc35d9b3ca4971d73d5acca751c0b8
-EBUILD speakup-9999.ebuild 2475 RMD160 3ad3af967cebfae1c082ec2ee98d29a1641abd52 SHA1 e5707c015c58b2a47fc335437770c71d28854953 SHA256 8ce99595d3372983765e7160c18ea11fe317fc414b14cd8fcd9aae2dc525cf54
-MISC ChangeLog 7212 RMD160 5a423a45690d1f0eeb4a6e82a34ec8a0da95c420 SHA1 4b8dd527dee5461500d57b8bec40a28396379bce SHA256 476778c0f8d55bd2f31f8c2e1c242df9b54f8e72c178c578bc56fe6b2462c509
+EBUILD speakup-3.1.6.ebuild 1848 RMD160 9cf0f299c602cf864ddb3d1f71819fb12a8220c0 SHA1 6bdae9f5f6fa23a0811dffb565026a1fb5d2ef5f SHA256 1e04b2e0b27afbe1907cf36135a4b6ceaedcb433e79f1e86c90ae9ec9a5f15f3
+EBUILD speakup-9999.ebuild 2385 RMD160 02f38985030a48e2fd1cf8eb8e61ec0002757a15 SHA1 44eb538f80b6a64e95e902ef5a1d1a48eea9ad3e SHA256 ab2a7268063f8f00dd74e66b434422e170e57b470a03c1accc7a7768b9f3b6c4
+MISC ChangeLog 7697 RMD160 a3453bb52e2329e4daa4daa4c8530bd3be36d56d SHA1 a4a35ffbf54f186623e03e9390d5ad65febbb7ed SHA256 21a6445bfd584453cb98fff25ebe8d2bd3f0902fdb6f92e9dffb5084bc58f686
 MISC metadata.xml 230 RMD160 2f69bbb1338b564354bb895c23828b25dd6050f1 SHA1 971705d47037906acf05a776c5980e93015ee341 SHA256 2993434ffac605ed23d3a091ed057e21d1c2460d5768ddfda5c38dfb3a6c688c
diff --git a/app-accessibility/speakup/speakup-3.1.6.ebuild b/app-accessibility/speakup/speakup-3.1.6.ebuild
index 5b993ad3b4b3..af294332527e 100644
--- a/app-accessibility/speakup/speakup-3.1.6.ebuild
+++ b/app-accessibility/speakup/speakup-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-3.1.6.ebuild,v 1.3 2010/11/04 02:25:04 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-3.1.6.ebuild,v 1.4 2010/12/09 00:49:13 williamh Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://linux-speakup.org/pub/speakup/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="modules"
+IUSE=""
 
 MODULE_NAMES="speakup(${PN}:\"${S}\"/src)
 	speakup_acntpc(${PN}:\"${S}\"/src)
@@ -35,18 +35,17 @@ BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
 BUILD_TARGETS="clean all"
 
 src_prepare() {
-	use modules && cmd=die || cmd=ewarn
 	if kernel_is lt 2 6 26 || kernel_is gt 2 6 35; then
-		$cmd "Speakup ${PV} requires linux 2.6.26 through 2.6.35"
+		die "Speakup ${PV} requires linux 2.6.26 through 2.6.35"
 	fi
 }
 
 src_compile() {
-	use modules && linux-mod_src_compile
+	linux-mod_src_compile
 }
 
 src_install() {
-	use modules && linux-mod_src_install
+	linux-mod_src_install
 	dobin tools/speakupconf
 	dosbin tools/talkwith
 	dodoc Bugs.txt README To-Do doc/DefaultKeyAssignments doc/spkguide.txt
@@ -54,7 +53,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
+	linux-mod_pkg_postinst
 
 	elog "You must set up the speech synthesizer driver to be loaded"
 	elog "automatically in order for your system to start speaking"
diff --git a/app-accessibility/speakup/speakup-9999.ebuild b/app-accessibility/speakup/speakup-9999.ebuild
index 063c92f10fe7..8ecc310b2506 100644
--- a/app-accessibility/speakup/speakup-9999.ebuild
+++ b/app-accessibility/speakup/speakup-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-9999.ebuild,v 1.5 2010/10/21 19:12:16 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-9999.ebuild,v 1.6 2010/12/09 00:49:13 williamh Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="modules"
+IUSE=""
 
 MODULE_NAMES="speakup(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
 	speakup_acntpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
@@ -36,25 +36,24 @@ BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
 BUILD_TARGETS="clean all"
 
 src_prepare() {
-	use modules && cmd=die || cmd=ewarn
 	if kernel_is lt 2 6 36; then
-		$cmd "Speakup requires at least kernel version 2.6.36"
+		die "Speakup requires at least kernel version 2.6.36"
 	fi
 }
 
 src_compile() {
-	use modules && linux-mod_src_compile
+	linux-mod_src_compile
 }
 
 src_install() {
-	use modules && linux-mod_src_install
+	linux-mod_src_install
 	dodoc Bugs.txt README To-Do
 	dodoc drivers/staging/speakup/DefaultKeyAssignments
 	dodoc drivers/staging/speakup/spkguide.txt
 }
 
 pkg_postinst() {
-	use modules && linux-mod_pkg_postinst
+	linux-mod_pkg_postinst
 
 	elog "You must set up the speech synthesizer driver to be loaded"
 	elog "automatically in order for your system to start speaking"