Fix error message setting.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

4 files changed, 21 insertions, 17 deletions

diff --git a/app-accessibility/espeakup/ChangeLog b/app-accessibility/espeakup/ChangeLog
index 488b513b5730..c780175b2976 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.20 2011/04/27 18:30:32 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/ChangeLog,v 1.21 2011/05/16 23:25:49 flameeyes Exp $
+
+  16 May 2011; Diego E. Pettenò <flameeyes@gentoo.org> espeakup-0.71.ebuild,
+  espeakup-9999.ebuild:
+  Fix error message setting.
 
   27 Apr 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 3449e4589110..75d8c33da405 100644
--- a/app-accessibility/espeakup/Manifest
+++ b/app-accessibility/espeakup/Manifest
@@ -4,14 +4,14 @@ 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 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
+EBUILD espeakup-0.71.ebuild 1670 RMD160 87a3277d637c707ca875ecf6904b5b92c2bf7063 SHA1 868f7d5778304a7519bd113a0888ecf6a6181349 SHA256 2113e5fcf5c06f47dad34bda5733f3cf837bc2a9c7925db19826d158a5909c78
+EBUILD espeakup-9999.ebuild 1705 RMD160 5a37dcc8c978818d0f573b47e319a00a198d9681 SHA1 60fd5fbdc4394cfb8d6261b12aeaa792a916c9b1 SHA256 be7febcb55a32f63d8e57703615ab742682443d779bdc216bdd5d5c0750c1fa6
+MISC ChangeLog 2794 RMD160 e7b6ab0ed476c0463cea8332852438b0879fe76e SHA1 e3c1789aa7b7569a5b5b74bcf7e30e0efa190c87 SHA256 3ee44f29a56ddb82c834541156ad290144a0cf5a1ae1238325c1f83d5e37e702
 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
+iEYEARECAAYFAk3RsnkACgkQAiZjviIA2XgBsgCfSXqP9uSiZ53jQhpvsG/TPvsq
+LSgAn1Z8mw+Z/Z5oKVknNjT3yGBQsY9N
+=aGce
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/espeakup/espeakup-0.71.ebuild b/app-accessibility/espeakup/espeakup-0.71.ebuild
index 147e67976aad..113599b54183 100644
--- a/app-accessibility/espeakup/espeakup-0.71.ebuild
+++ b/app-accessibility/espeakup/espeakup-0.71.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2011/04/27 18:30:32 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-0.71.ebuild,v 1.9 2011/05/16 23:25:49 flameeyes Exp $
 
 inherit linux-info
 
@@ -16,12 +16,12 @@ IUSE=""
 DEPEND="app-accessibility/espeak"
 RDEPEND="${DEPEND}"
 
+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!"
+
 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."
diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild
index d346a5a97119..32e42f98a07e 100644
--- a/app-accessibility/espeakup/espeakup-9999.ebuild
+++ b/app-accessibility/espeakup/espeakup-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2011/04/27 18:30:32 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/espeakup/espeakup-9999.ebuild,v 1.8 2011/05/16 23:25:49 flameeyes Exp $
 
 EGIT_REPO_URI="git://github.com/williamh/espeakup.git"
 inherit git linux-info
@@ -17,12 +17,12 @@ IUSE=""
 DEPEND="app-accessibility/espeak"
 RDEPEND="${DEPEND}"
 
+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!"
+
 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."