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

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

4 files changed, 23 insertions, 16 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/Manifest b/app-accessibility/speakup/Manifest
index a68e0fa47890..86e58b1f4380 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 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
+EBUILD speakup-3.1.6.ebuild 1938 RMD160 ce6acc5641534b446d4f1fb8dab8bb7dd4f5f41a SHA1 2afd3998e33e5a5808eae3dcbbb73c90c8cad1e6 SHA256 ecdc9ba2d450d5828d0100236426a777d38d3745d9aecca50ee47e5136edfbcf
+EBUILD speakup-9999.ebuild 2475 RMD160 601f568c0a6d3414afe75235790aa0d4008d686c SHA1 fae6039a9e71a5f9666fa0f41303ea83864409cf SHA256 f19c5bd6b85c9f54e347279a3007dd4e17bf83c84be498bdbb4d95e0416191b0
+MISC ChangeLog 7875 RMD160 c04a52421d2ebabdfa38bc30a586964c32593b5d SHA1 d8f50578f1b7225b62fb13474d6225adf85dc407 SHA256 35471d5943d29ce9eb7349f9ea41a6029c7dbb2b3c9d395874c8872779027986
 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 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"