add back support for USE=modules; this will be handled by the minimal specs.

(Portage version: 2.2.0_alpha7/cvs/Linux i686)

3 files changed, 20 insertions, 13 deletions

diff --git a/app-accessibility/speakup/ChangeLog b/app-accessibility/speakup/ChangeLog
index c13d5ee60ed6..00e83450505c 100644
--- a/app-accessibility/speakup/ChangeLog
+++ b/app-accessibility/speakup/ChangeLog
@@ -1,6 +1,11 @@
 # 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.51 2010/12/09 00:49:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/ChangeLog,v 1.52 2010/12/09 04:08:50 williamh Exp $
+
+  09 Dec 2010; William Hubbs <williamh@gentoo.org> speakup-3.1.6.ebuild,
+  speakup-9999.ebuild:
+  Add back support for USE=modules; this will be handled in the minimal
+  specs.
 
   09 Dec 2010; William Hubbs <williamh@gentoo.org> speakup-3.1.6.ebuild,
   speakup-9999.ebuild:
diff --git a/app-accessibility/speakup/speakup-3.1.6.ebuild b/app-accessibility/speakup/speakup-3.1.6.ebuild
index af294332527e..c6d08cf82601 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.4 2010/12/09 00:49:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-3.1.6.ebuild,v 1.5 2010/12/09 04:08:50 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=""
+IUSE="modules"
 
 MODULE_NAMES="speakup(${PN}:\"${S}\"/src)
 	speakup_acntpc(${PN}:\"${S}\"/src)
@@ -35,17 +35,18 @@ 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
-		die "Speakup ${PV} requires linux 2.6.26 through 2.6.35"
+		$cmd "Speakup ${PV} requires linux 2.6.26 through 2.6.35"
 	fi
 }
 
 src_compile() {
-	linux-mod_src_compile
+	use modules && linux-mod_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+	use modules && linux-mod_src_install
 	dobin tools/speakupconf
 	dosbin tools/talkwith
 	dodoc Bugs.txt README To-Do doc/DefaultKeyAssignments doc/spkguide.txt
@@ -53,7 +54,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	linux-mod_pkg_postinst
+	use modules && 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 8ecc310b2506..37fcd4430905 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.6 2010/12/09 00:49:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-9999.ebuild,v 1.7 2010/12/09 04:08:50 williamh Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="modules"
 
 MODULE_NAMES="speakup(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
 	speakup_acntpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
@@ -36,24 +36,25 @@ 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
-		die "Speakup requires at least kernel version 2.6.36"
+		$cmd "Speakup requires at least kernel version 2.6.36"
 	fi
 }
 
 src_compile() {
-	linux-mod_src_compile
+	use modules && linux-mod_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+	use modules && linux-mod_src_install
 	dodoc Bugs.txt README To-Do
 	dodoc drivers/staging/speakup/DefaultKeyAssignments
 	dodoc drivers/staging/speakup/spkguide.txt
 }
 
 pkg_postinst() {
-	linux-mod_pkg_postinst
+	use modules && 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"