Fix RDEPEND since speakup is part of linux-2.6.37 or later.

  We want to favor the speakup built into the kernel for
  virtual/linux-sources >= 2.6.37 and still work with older kernels.

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

4 files changed, 17 insertions, 21 deletions

diff --git a/app-accessibility/espeakup/ChangeLog b/app-accessibility/espeakup/ChangeLog
index 218f303c6978..97fa5f8e0e39 100644
--- a/app-accessibility/espeakup/ChangeLog
+++ b/app-accessibility/espeakup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/espeakup
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.18 2009/11/01 18:50:30 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.19 2011/01/12 23:56:02 williamh Exp $
+
+  12 Jan 2011; William Hubbs <williamh@gentoo.org> espeakup-0.71.ebuild,
+  espeakup-9999.ebuild:
+  Fix RDEPEND since speakup is part of linux-2.6.37 or later.
+  We want to favor the speakup built into the kernel for
+  virtual/linux-sources >= 2.6.37 and still work with older kernels.
 
   09 Oct 2009; William Hubbs <williamh@gentoo.org> espeakup-0.71.ebuild,
   espeakup-9999.ebuild:
diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest
index a94c27c51295..ea576366ce4c 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX espeakup.confd 256 RMD160 847e6073bb90041f5bd48e4ad1f08cbaebec1458 SHA1 4cf358285346265eef4a3c46bc8fa6f7ed8ab4b5 SHA256 32e6de11417ebb199a7bf46eb8cf77054b1af1c9f4bcc80b856b34758830eb9f
 AUX espeakup.rc 594 RMD160 1c836a9dbaaa2bf1df5ecd83e50e3579943c856a SHA1 371400f86b27b0fda79152046810035dce2eee9a SHA256 17bd6cdc7850d0c6ea19783080cf2c3e751179e1b1776e6b8de736d80504db6f
 DIST espeakup-0.71.tar.bz2 24663 RMD160 8ed676256b31249af634ed2480f5e37cbf86e764 SHA1 a5ef926d1d2f8ad47d7cac1e154cedf73399746c SHA256 8307986998256db21e615c4edc1befedde28a6995971da258e9d513dd79bd3ab
-EBUILD espeakup-0.71.ebuild 1127 RMD160 f9579916151b526182ec2b50c6a611056a5d33f5 SHA1 7ebee4ad7e68ef068f77a0e1e43bf78c0c28a188 SHA256 e8f2fc31aaf9b8d12583428e91308e4850541ec4d955a45a16bc54a86b729d97
-EBUILD espeakup-9999.ebuild 1171 RMD160 fee0f6c7036609a95e9fc2b864396fbc163d6abd SHA1 5b64f60c04021df389c0c17c7dfe867671a7ae2b SHA256 0c1b5ab9a58dde259455fc5e821afb08f8b05a4956fa66f0f6b130fa5d01d038
-MISC ChangeLog 2198 RMD160 990025cbf9d46afbbffb123b79d5e1da9657dfd5 SHA1 7b75519967c60fa15948eaff10519b99b26d439d SHA256 c6f2a14df9e0d2bf1cf6810ff04e557491fb8f4a83ce71c28db3939f378b7d87
+EBUILD espeakup-0.71.ebuild 1170 RMD160 e11aa281723fa7c8e80f5caf70af897dc746988c SHA1 46e7f61fbb07375e901c204037b1fe07ff052d14 SHA256 1b9785a0ceb1905d7c3688ce896cfb07eafdd9b811bbe432405457f8ee7fbc7d
+EBUILD espeakup-9999.ebuild 1214 RMD160 2e2199549e6d49bef2ab8ef5c2239fa3a2961f3c SHA1 89b38460c69a57becc6cffbd424797213a21c6bd SHA256 5931de1db19fcfb4b52837ba58e818c3b09e1cfc795ff719743e42ceb3e2d0b3
+MISC ChangeLog 2489 RMD160 b8568852196ec7357ea449f2a77c54f0e6775bf5 SHA1 aa3de6f894ce8e6a63f15db306d8a437e456aecd SHA256 a55407e119f6f606854bd4b960eb35b5b2309c4fb4fd25099ceee56206371623
 MISC metadata.xml 379 RMD160 da030cc3f768bd3756b9f602ac8f694d392eb84c SHA1 1f772643fe71cd3d2c01fdaef115fcc76bd8fe3c SHA256 730c8985450ad52a4d2f4f57884dc8973705daf107fb3bcdf433e0039f4f20d9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrt90oACgkQCRZPokWLroTQ2QCgmHW24TDt2ADkZey74XppGo97
-O1gAoJ/b0YdRRPkveN15CEQ3dVcjeStM
-=dVcQ
------END PGP SIGNATURE-----
diff --git a/app-accessibility/espeakup/espeakup-0.71.ebuild b/app-accessibility/espeakup/espeakup-0.71.ebuild
index 566eec2fbb66..14f7ea8e58a7 100644
--- a/app-accessibility/espeakup/espeakup-0.71.ebuild
+++ b/app-accessibility/espeakup/espeakup-0.71.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.71.ebuild,v 1.6 2009/11/01 18:50:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.71.ebuild,v 1.7 2011/01/12 23:56:02 williamh Exp $
 
 DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
 HOMEPAGE="http://www.linux-speakup.org"
@@ -13,7 +13,7 @@ IUSE=""
 
 DEPEND="app-accessibility/espeak"
 RDEPEND="${DEPEND}
-	app-accessibility/speakup"
+	|| ( >=virtual/linux-sources-2.6.37 app-accessibility/speakup )"
 
 src_compile() {
 	emake || die "Compile failed."
diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild
index 131bb46bdcad..717bf6cc33b2 100644
--- a/app-accessibility/espeakup/espeakup-9999.ebuild
+++ b/app-accessibility/espeakup/espeakup-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-9999.ebuild,v 1.5 2009/11/01 18:50:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-9999.ebuild,v 1.6 2011/01/12 23:56:02 williamh Exp $
 
 EGIT_REPO_URI="git://github.com/williamh/espeakup.git"
 inherit git
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="app-accessibility/espeak"
 RDEPEND="${DEPEND}
-	app-accessibility/speakup"
+	|| ( >=virtual/linux-sources-2.6.37 app-accessibility/speakup )"
 
 src_compile() {
 	emake || die "Compile failed."