fix live ebuild to match upstream repository

(Portage version: 2.2_rc98/cvs/Linux i686)

2 files changed, 26 insertions, 24 deletions

diff --git a/app-accessibility/speakup/ChangeLog b/app-accessibility/speakup/ChangeLog
index 4a857188c38a..b98ad8f3bb6a 100644
--- a/app-accessibility/speakup/ChangeLog
+++ b/app-accessibility/speakup/ChangeLog
@@ -1,6 +1,9 @@
 # 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.47 2010/10/14 19:23:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/ChangeLog,v 1.48 2010/10/21 19:12:16 williamh Exp $
+
+  21 Oct 2010; William Hubbs <williamh@gentoo.org> speakup-9999.ebuild:
+  fix live ebuild to match upstream repository
 
   14 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   speakup-3.1.6.ebuild:
diff --git a/app-accessibility/speakup/speakup-9999.ebuild b/app-accessibility/speakup/speakup-9999.ebuild
index 411a4878909b..063c92f10fe7 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.4 2010/06/29 14:26:42 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speakup/speakup-9999.ebuild,v 1.5 2010/10/21 19:12:16 williamh Exp $
 
 EAPI="2"
 
@@ -16,29 +16,29 @@ SLOT="0"
 KEYWORDS=""
 IUSE="modules"
 
-MODULE_NAMES="speakup(${PN}:\"${S}\"/src)
-	speakup_acntpc(${PN}:\"${S}\"/src)
-	speakup_acntsa(${PN}:\"${S}\"/src)
-	speakup_apollo(${PN}:\"${S}\"/src)
-	speakup_audptr(${PN}:\"${S}\"/src)
-	speakup_bns(${PN}:\"${S}\"/src)
-	speakup_decext(${PN}:\"${S}\"/src)
-	speakup_decpc(${PN}:\"${S}\"/src)
-	speakup_dectlk(${PN}:\"${S}\"/src)
-	speakup_dtlk(${PN}:\"${S}\"/src)
-	speakup_dummy(${PN}:\"${S}\"/src)
-	speakup_keypc(${PN}:\"${S}\"/src)
-	speakup_ltlk(${PN}:\"${S}\"/src)
-	speakup_soft(${PN}:\"${S}\"/src)
-	speakup_spkout(${PN}:\"${S}\"/src)
-	speakup_txprt(${PN}:\"${S}\"/src)"
+MODULE_NAMES="speakup(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_acntpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_acntsa(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_apollo(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_audptr(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_bns(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_decext(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_decpc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_dectlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_dtlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_dummy(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_keypc(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_ltlk(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_soft(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_spkout(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)
+	speakup_txprt(${PN}:\"${S}\"/modules:\"${S}\"/drivers/staging/speakup)"
 BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
 BUILD_TARGETS="clean all"
 
 src_prepare() {
 	use modules && cmd=die || cmd=ewarn
-	if kernel_is lt 2 6 26; then
-		$cmd "Speakup requires at least kernel version 2.6.26"
+	if kernel_is lt 2 6 36; then
+		$cmd "Speakup requires at least kernel version 2.6.36"
 	fi
 }
 
@@ -48,10 +48,9 @@ src_compile() {
 
 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
-	newdoc tools/README README.tools
+	dodoc Bugs.txt README To-Do
+	dodoc drivers/staging/speakup/DefaultKeyAssignments
+	dodoc drivers/staging/speakup/spkguide.txt
 }
 
 pkg_postinst() {