Check for CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT for bug #365105.

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

4 files changed, 55 insertions, 11 deletions

diff --git a/app-accessibility/espeakup/ChangeLog b/app-accessibility/espeakup/ChangeLog
index 97fa5f8e0e39..488b513b5730 100644
--- a/app-accessibility/espeakup/ChangeLog
+++ b/app-accessibility/espeakup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/espeakup
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.20 2011/04/27 18:30:32 williamh Exp $
+
+  27 Apr 2011; William Hubbs <williamh@gentoo.org> espeakup-0.71.ebuild,
+  espeakup-9999.ebuild:
+  Check for CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT for bug #365105.
 
   12 Jan 2011; 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 ea576366ce4c..3449e4589110 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -1,7 +1,17 @@
+-----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 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
+EBUILD espeakup-0.71.ebuild 1679 RMD160 6e7535fedf92bc39ab0994d8e41018591ebacbeb SHA1 769f37c58e1822c34f9dcc573d1c2203db93c78f SHA256 6e7beef42b45ae180535e024f125dbf6fa9161d93d86cbb6c03b14d4c7a765c1
+EBUILD espeakup-9999.ebuild 1714 RMD160 f386d9d05d20411735be6a6b2fc5d3fd5341da52 SHA1 5793ce2917169620c7d2827f5559bb955b070a39 SHA256 0180ee0164eb71237d4fc01564c96eae8253593505fdcf945451278b60a6b287
+MISC ChangeLog 2661 RMD160 5ba16aaacb9db467c342bcc1f83bc06bc2e58904 SHA1 5409e4ea566b03dac51666c45745d9dd149e5ca8 SHA256 27d17b928e769c8c8a550df6b7ce2880c091cc079160b2c391093f5fb37e8638
 MISC metadata.xml 379 RMD160 da030cc3f768bd3756b9f602ac8f694d392eb84c SHA1 1f772643fe71cd3d2c01fdaef115fcc76bd8fe3c SHA256 730c8985450ad52a4d2f4f57884dc8973705daf107fb3bcdf433e0039f4f20d9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk24YNsACgkQblQW9DDEZThYcACggSgFtcqwH3rOFo73TPZJcUJv
+elMAoLmDRpgVgkM+rPjRdKKVmROSF+TS
+=acWR
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/espeakup/espeakup-0.71.ebuild b/app-accessibility/espeakup/espeakup-0.71.ebuild
index 14f7ea8e58a7..147e67976aad 100644
--- a/app-accessibility/espeakup/espeakup-0.71.ebuild
+++ b/app-accessibility/espeakup/espeakup-0.71.ebuild
@@ -1,6 +1,8 @@
 # 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.7 2011/01/12 23:56:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.71.ebuild,v 1.8 2011/04/27 18:30:32 williamh Exp $
+
+inherit linux-info
 
 DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
 HOMEPAGE="http://www.linux-speakup.org"
@@ -12,8 +14,22 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-accessibility/espeak"
-RDEPEND="${DEPEND}
-	|| ( >=virtual/linux-sources-2.6.37 app-accessibility/speakup )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if kernel_is -ge 2 6 37; then
+		CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
+		ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
+		ERROR_SPEAKUP_SYNTH_SOFT=\
+			"CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
+		check_extra_config
+	elif ! has_version app-accessibility/speakup; then
+		ewarn "Cannot find speakup on your system."
+		ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
+		ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
+		ewarn "or install app-accessibility/speakup."
+	fi
+}
 
 src_compile() {
 	emake || die "Compile failed."
diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild
index 717bf6cc33b2..d346a5a97119 100644
--- a/app-accessibility/espeakup/espeakup-9999.ebuild
+++ b/app-accessibility/espeakup/espeakup-9999.ebuild
@@ -1,9 +1,9 @@
 # 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.6 2011/01/12 23:56:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-9999.ebuild,v 1.7 2011/04/27 18:30:32 williamh Exp $
 
 EGIT_REPO_URI="git://github.com/williamh/espeakup.git"
-inherit git
+inherit git linux-info
 
 DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup"
 HOMEPAGE="http://www.github.com/williamh/espeakup"
@@ -15,8 +15,22 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="app-accessibility/espeak"
-RDEPEND="${DEPEND}
-	|| ( >=virtual/linux-sources-2.6.37 app-accessibility/speakup )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if kernel_is -ge 2 6 37; then
+		CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT"
+		ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!"
+		ERROR_SPEAKUP_SYNTH_SOFT=\
+			"CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!"
+		check_extra_config
+	elif ! has_version app-accessibility/speakup; then
+		ewarn "Cannot find speakup on your system."
+		ewarn "Please upgrade your kernel to 2.6.37 or later and enable the"
+		ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options"
+		ewarn "or install app-accessibility/speakup."
+	fi
+}
 
 src_compile() {
 	emake || die "Compile failed."