fix live ebuild to match upstream repository

Package-Manager: portage-2.2_rc98/cvs/Linux i686

3 files changed, 28 insertions, 36 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/Manifest b/app-accessibility/speakup/Manifest
index 4624892b081a..282377f5b99c 100644
--- a/app-accessibility/speakup/Manifest
+++ b/app-accessibility/speakup/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST speakup-3.1.4.tar.bz2 113711 RMD160 b494af7f4e77b72cdd2503a9436862570f2b8771 SHA1 ad79b493e5cec2e7404c35167b441eb1da2e55c9 SHA256 bcaaea1c650850d7b08c0a35184bf8724e04e8781da9692b6479233bf8c860c2
 DIST speakup-3.1.5.tar.bz2 113539 RMD160 8d0d49403bea42e32fa08cd93c5a20e9b9350d40 SHA1 f95125e7a2f02007cdfea16b1bdc62420e85e8cc SHA256 b2d9c4d2932478fea9ac308e7ce25049eed4c0ab166c0f5191db659f81c8cba4
 DIST speakup-3.1.6.tar.bz2 110590 RMD160 8e28b1fb7c09bbe5c0da63ae437782d96578cde5 SHA1 1c79f91a60f5fdf1f1d737068159841fbf234899 SHA256 1030917c4631fa9753098ef4fa4c1b79dd878311626ddc43f0da36956c86e67d
 EBUILD speakup-3.1.4.ebuild 2070 RMD160 c28a02311caec74573e0a077ef9728ed569dcf3e SHA1 57cbcca11bdc8a673fe7ea5ecc4636d1f9fccd35 SHA256 6ab5b8ce0509239cf81fa3fd77cf8cdf05a754ce8eb8f9c0770df2ee70d6bd8e
 EBUILD speakup-3.1.5.ebuild 2070 RMD160 67abd35465f905a40616a0c8a5e439d04faaa573 SHA1 02bba10db97ba3d5c20cd26f6b2b21f79212cb2f SHA256 f398452c9e4d86f3d12d04ce33ba5945b058225ba059fffe6a2f232840913abd
 EBUILD speakup-3.1.6.ebuild 1941 RMD160 5a7c7d2b934c9f6c297f9c0aca7438af86ac4aa3 SHA1 9241a44fa21ed7c61b2124d915bc3c52ddedab79 SHA256 c8b16ad2ccee49c5a284ef3a00ed47341f61bd2c5b81d75ce7af5c3c25ac7fa8
-EBUILD speakup-9999.ebuild 1911 RMD160 870aa6c4112f3e0df6c6495fa5ce3faf3677570f SHA1 f5ee1e6b33f71f56547178bb1802b1a204201bd5 SHA256 b691853b03c754601b6d9ef88cac43eb5df65cfc4881536eea3bb61c01b62d3e
-MISC ChangeLog 6871 RMD160 9bc37a8acb8500f726aa9663c3fdccf68814817c SHA1 256c3667378021bb5ad02821a6fa48cf27f3ac08 SHA256 5215b16b381a019af55a159e8ffef8965b3615758c337b9d3db08ee84e4885b8
+EBUILD speakup-9999.ebuild 2475 RMD160 3ad3af967cebfae1c082ec2ee98d29a1641abd52 SHA1 e5707c015c58b2a47fc335437770c71d28854953 SHA256 8ce99595d3372983765e7160c18ea11fe317fc414b14cd8fcd9aae2dc525cf54
+MISC ChangeLog 6990 RMD160 d34699336c8655bca80a6cab186c950012e47c04 SHA1 e6f8713b2d9e4630e4cf1ce7116ed6dd5f4ae7f5 SHA256 c8144b58995cd75d6fda1eab0e45019559e89b41b0b4995e8342def523c8f71d
 MISC metadata.xml 230 RMD160 2f69bbb1338b564354bb895c23828b25dd6050f1 SHA1 971705d47037906acf05a776c5980e93015ee341 SHA256 2993434ffac605ed23d3a091ed057e21d1c2460d5768ddfda5c38dfb3a6c688c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky3WKEACgkQAiZjviIA2XgK9gCfTHgq4KjilEAzEaXm8pOZo49I
-4vYAnRTdeqBSE1/W0Ilj6xc0O705V7SZ
-=kvRd
------END PGP SIGNATURE-----
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() {