version bump

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 230 insertions, 16 deletions

diff --git a/app-accessibility/simon/ChangeLog b/app-accessibility/simon/ChangeLog
index dda3c446a26c..c90e41c8ebd6 100644
--- a/app-accessibility/simon/ChangeLog
+++ b/app-accessibility/simon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/simon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/simon/ChangeLog,v 1.6 2013/06/27 18:20:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/simon/ChangeLog,v 1.7 2013/06/30 18:39:52 hasufell Exp $
+
+*simon-0.4.1 (30 Jun 2013)
+
+  30 Jun 2013; Julian Ospald <hasufell@gentoo.org> +simon-0.4.1.ebuild,
+  +files/simon-0.4.1-libdir.patch, +files/simon-0.4.1-linguas.patch,
+  +files/simon-0.4.1-sphinx.patch:
+  version bump
 
   27 Jun 2013; Agostino Sarubbo <ago@gentoo.org> simon-0.4.0.ebuild:
   Stable for x86, wrt bug #474436
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index 8e7d7f7217ab..b5d22b92179d 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,28 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX simon-0.4.0-libdir.patch 524 SHA256 4d0ad4f0d0c9c12bf91b231f91d942628fe78647df2333f1d353da5c64fec619 SHA512 9c2198362aea92e322ba607b0d5a2f05894e2fd3e6d2cce9e04a3d8b949163d71fbf0d8d98697fb036b2afb2fd05d2e8c2812aa58f6ce16c3ae8128cd673791a WHIRLPOOL ab7db5d381fbfa23efd4883727c8f171fd4d552888bb1250f16c2fad2b9c7349969230191b4d8cb39926adf5a012b0d3fe2d3b5f38e068ea50fa6dd69665fe60
 AUX simon-0.4.0-linguas.patch 2285 SHA256 d4a7f040e15c9f7992c9342081703ee40eec8cc20e0a4a8774a405093c318fe5 SHA512 cb34eb756774721db564de83793b8d66a7dcd6fa6c92341f01b2e251faaa6b56f1ed25ddeeaefabfee4d787aca47f014600e6b8978430c1ba1f25bce0e0049a4 WHIRLPOOL 9a6923dbf3e0e98a457e7861214db9883d69fbf10810baf2c94edd5f8ede5f09b40741791521c231ec2af89683a3de8daf89b989b017ac581003ee9845c493ed
 AUX simon-0.4.0-opencv.patch 543 SHA256 c0140d88c16347614aa9fe0417de78852805ee56ea5880c873a3a2737940c448 SHA512 95454169081099148ae2c1f9a5b57d06ab5fad8cb89a8a7e5dbfed2e0d2c4e10c6be178ab1ac7546dd04f1b9a0d20739ebd5b353378d3765cb35aac14029245e WHIRLPOOL 203db5bda8957bebfd45acb815360d2576accb8092e2668377df07acbea449c0cf8f640c2566451bd7e295dda85e23a95a5ecce236ac6c1cdfbc945c5600fd22
 AUX simon-0.4.0-sphinx.patch 881 SHA256 89de32fd922f335c97b0bfb2e679ef928fac7aa3da64fa6f0d53549c52aba287 SHA512 395a29f9facdc944afc957ec89300e341caf0de1843a18ac0e53c22f611206fd128689983f89747c343682f9c75da6614be07aa7e5905a05e35daeabd7fd131e WHIRLPOOL ac80e9eb33a1838213dd3a3d773827e043011bef475e1b5e02c6befd42327e898ec12a54bd983a92ba99aa523f16ba43754a50dccfe096c5b9b18d3f70ada6e1
+AUX simon-0.4.1-libdir.patch 524 SHA256 324a1a928ccce19148232b4209a3aac6a239ac865855d78ed49d515d4668003f SHA512 94f87c62646967b2b1c6f58cf25a522f0f810cd1441d85ad138ad124e2dbeeb5ed216aee89bb802ebdebd4f883569bae35c99c5f863431c6f992d0944ad42e0e WHIRLPOOL a59bdfa8d2d52b0d08a431aef52c662e679598d17a9563d12aae4c5f8a18d959a1856d5003b256746b8a452e3f69bfc5afe30415644c435a37e790fab93da946
+AUX simon-0.4.1-linguas.patch 2359 SHA256 fb579c507af1d34ea4d429f0b77b9fa880ac9cae5cbbe006a8c8140e532ef92f SHA512 b58939987238655e03f292fb15222ef87e1078c6375a2a8b45caabe83f92daa9d6c02658825a80f105c355ade316dd69b56cc5dd3320f37c6c4c5f4735e071f8 WHIRLPOOL 7fa6eff0a13dbc9f7274ba8ce7644cdccdc4fe40b611c846e910d55d528e70b8295aa30e0fb3af8b6670012941ec91feba66f69de38a97a7f93693b9cd7f40bf
+AUX simon-0.4.1-sphinx.patch 881 SHA256 10afe6ebfa671d689e1eea9721d885c6092888c13390ca237d681eb960559df3 SHA512 93b0ff4ee18a51b868a89a4baa93a0b4f19ade6e0b3b7ed876f128eb3de480e8df8625abfb31d586cb0159092cac4e3e911cfcef47c5242c138019ddfb87f6d8 WHIRLPOOL a6c1663a946d27c904ac0456c3427039c3526447ddd69670bde5bffb45feb200b19d37ad51d444a7f188490f30299df279cacbdea0038d80b184fd479502052d
 DIST simon-0.4.0.tar.bz2 22139378 SHA256 c7ef35cd28ecf294ceae63f4b0c53384bcf89fc2a6e67916dc9d4116decabc12 SHA512 541c22e09bb4234871707cd73e038a5ab0c68a6cb2a28993571c434edff639e4826554f922a4a188b5c2a70ff9a0d627f53af0954431b561adeedccf9c170c85 WHIRLPOOL c2e0cc8632bf089ed14ef53cae02c51166780692222b7f3c7a3583356e9669cbbcd3222507128b35f282b49de2f10a73c42f63e28596c6e8412ff766bb3febfb
+DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
 EBUILD simon-0.4.0.ebuild 2255 SHA256 92f2ccf3560aff42d69130dc8feff920c0d0ff500d079c56cc37a2f888e752f4 SHA512 7113d4e280b46a3c256ee1b2fe8cfddede1f6e58be86f4ee338b1ef3c8b60d5ebea2900af9b533f0c19f03d76fae347fecf0a35dd03cda6ee412c163aee6705d WHIRLPOOL 71c397fae47854fc360c1acfd8b70416cea1ef7686d096c72f72c3394a5bd8758bbc7154f0ff90beff8a793f66c4853e373abeaa7a32f19cf36dfed3154b4e83
-MISC ChangeLog 994 SHA256 446fdd857c28b9b295208b0b317b8cf8a6cc23958d3f8acb23804a6608670859 SHA512 715d533cbaeb0f7181f774d34192c02a843963bf5dd30429e515d1648aa7330b50e67bd0498ab1323b2eb7b7da3085ded7c0d9e23a73ce1cf9405e08e2f4c6f1 WHIRLPOOL f529f8fc33c839f4f99960a6bb2d1e1a2a1b6b86a94ebc71d5a427b69e752c8f4f33ec8aa4eb483231c40836acfbb7b24d37cb06960a906a718cb0a976921977
+EBUILD simon-0.4.1.ebuild 2226 SHA256 497b2968babb5fc65f6c119b8ce106eaeaa524b57408cfefe9a89e047a2dd329 SHA512 fc64dc4c6db00a9f487e611338448493282e80049d94ec26dbe6664f851219fea50c2ac423b719e8e980bbc3829b540327ff6b8ec31815d12986f8a506e3d582 WHIRLPOOL 263e9d5102612793e7fa574d5e45607dfd2996881060e6cb4dffe8e2a9dd2714295ac142caf47583fad4411c7e7e289e986cdfe683b58000ca98bbb476b220d9
+MISC ChangeLog 1219 SHA256 4a48e9a47e4d8269d77cb58d302cc1d01be47afc16ededb6ffdbe9b7507d85f7 SHA512 215eece3c0a05f12568bcbecf6f91ef3a8ff06dc7f6f7304fbff65ac70fab1de04fc6ec3479a149446520b68519c0be24c5cef3f1bb78a3b65b2ef3e649d64c0 WHIRLPOOL 9634c78917cfbf3f7a5181c4ae21f80002fce15dab5c10c52c5cb76dd70616eb7a05c7dbee503bdd4e87c6af46e7e7775153d0c80ca5cf3d850451026ae5d312
 MISC metadata.xml 509 SHA256 6bed832a5fa1265ec606b84609ec82d732f212dd190526bc7cbf744322ce068c SHA512 3599d7640371ef882359368be8c8eae421fd92a1eb9891c7ddf6dfc5d5e119ae3bd5beab1a6d9f234135ca4096d22ab12576ef595ef58c9d5a4d8d321d8d3f23 WHIRLPOOL a8bd563eaeccaf0a4f41038e098ebcfedf88559c361ceea6b3dc280eee5aacab854e09e355bebebb2225a1d843255477d9b0acbb78857545fa6e082bc0847864
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRzIJwAAoJELp701BxlEWfJ/sQAMONc9nc2GyETdSQCGIWsiCz
-y4INtIXxYhvr8M97M68aBb7aXN40orAwMkxg5sOlD/RTyiLyA7TgLTdAxl53teQf
-8FwMFvhVoyeXOrPhv3h5O9dLk+g0gxz+LlTJXF4pbay4d61kyUFmu4XHI6qE318a
-1RPjAnzjJN1HRMEMdB3nAIs6WKocnkEhnK8qEflKQF4un/iEou+/yF87gOROX9kd
-7LR5Y4Fa50J8DI0X9rdlD8KhbEIrP65qfvNteO8KljOxllKhAcGbit/Z7iPFRGy0
-CC0VknbsKXAdN2yBJtX+SqMHmItHxI5pJU/ud+EEpAs/oocVjo4uADA2UPzfVU9m
-qHKsKxPt0r1RgXT6JU5pQX3+tCzGbNj45TE7LIdF3OJqccgr5sJFVxZztOYQUbcK
-dfHe43m0WwH9zD7DuLQMxrzgDsCBFgqj/Ewp8EjOkUXo4vlOzHN0VRGu+VlFXO84
-exQAK9rsFGgzcXLCfbB7yeZ6+brdoC8YjYZCZ7nM9SK/iQcKQTSRzoVueJVR4idd
-eNFB5jRFjMmxvvmwHXxPPDGlj0lSXS9q++pSmLitcU7F/NwAF3e+uBkD4DhCFpPg
-UdiLV+I3TDplPv5uJK4pAlMfSoi29Ls/aNTH3Xhb1vBaYmu/d9oQwbVbHYPgoD0K
-FINXO3rRH24vVeAAUx6X
-=CEQb
+iQEcBAEBCAAGBQJR0Ht7AAoJEFpvPKfnPDWzzEsH/AvqpcA9rrTX3KVj+A+0oYx8
+Wp/G0l4bn+pX0J7IDQNk5459BTBqN35n2POTX55MnrWgq8ed/9h3PosKZ7M/JoBv
+7ongq4F8CbBivAO/IYZss1esj80KnP+9QoZ8AGk6tz3srJS5cu6lWHFBkTnExxo0
+ekRHbHTzwqizHOro4TjGm90W8naQJmBWmEIBdgTsYAbT4OScfMROG4iCpwoaM3xK
+OJoi6OuUeFluIPG5K+bpIKKsadqDZjDP5fs6+WeG+nh9cbdymfyusnU59xI4iKxb
+oeFRuE4nPQ+8KVQNvaPvpTo2H0orfFgMBqUN/1EklDxZUnezdbzoMrcZlV3BoAA=
+=OTp2
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/simon/files/simon-0.4.1-libdir.patch b/app-accessibility/simon/files/simon-0.4.1-libdir.patch
new file mode 100644
index 000000000000..b65e4fcb1438
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-libdir.patch
@@ -0,0 +1,16 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Mar 29 22:00:19 UTC 2013
+Subject: build system
+
+make libdir modifiable
+
+--- simon-0.4.1/cmake/SimonDirs.cmake
++++ simon-0.4.1/cmake/SimonDirs.cmake
+@@ -29,6 +29,6 @@
+   #IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+     #set(SIMON_LIB_INSTALL_DIR lib64)
+   #ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-    set(SIMON_LIB_INSTALL_DIR lib)
++  set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir")
+   #ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+ ENDIF(WIN32)
diff --git a/app-accessibility/simon/files/simon-0.4.1-linguas.patch b/app-accessibility/simon/files/simon-0.4.1-linguas.patch
new file mode 100644
index 000000000000..01f25d6550c0
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-linguas.patch
@@ -0,0 +1,87 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,6 +14,9 @@
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ 
++# NLS
++option(ENABLE_NLS "Enable native language support" 1)
++
+ find_package(KDE4 "4.4" REQUIRED)
+ find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
+ find_package(Qwt6 REQUIRED)
+@@ -143,4 +146,6 @@
+ macro_display_feature_log()
+ 
+ include(MacroOptionalAddSubdirectory)
+-macro_optional_add_subdirectory( po )
++if(ENABLE_NLS)
++	macro_optional_add_subdirectory( po )
++endif(ENABLE_NLS)
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,11 +1,15 @@
++if(ENABLE_NLS)
++	# gettext behavior
++	execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
++	OUTPUT_VARIABLE UNSETLINGUAS)
++set(langs pt_BR ca nl et de it pt es sv uk)
++
++	foreach(mylang ${langs})
++		if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
++			add_subdirectory(${mylang})
++		endif()
++	endforeach()
++endif(ENABLE_NLS)
++
++# default doc
+ add_subdirectory(en_US)
+-add_subdirectory(pt_BR)
+-add_subdirectory(ca)
+-add_subdirectory(nl)
+-add_subdirectory(et)
+-add_subdirectory(de)
+-add_subdirectory(it)
+-add_subdirectory(pt)
+-add_subdirectory(es)
+-add_subdirectory(sv)
+-add_subdirectory(uk)
+--- a/po/CMakeLists.txt
++++ b/po/CMakeLists.txt
+@@ -11,25 +11,14 @@ endif (NOT GETTEXT_MSGMERGE_EXECUTABLE)
+ if (NOT GETTEXT_MSGFMT_EXECUTABLE)
+ MESSAGE(FATAL_ERROR "Please install msgmerge binary")
+ endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
+-add_subdirectory(de)
+-add_subdirectory(da)
+-add_subdirectory(fr)
+-add_subdirectory(nl)
+-add_subdirectory(uk)
+-add_subdirectory(pt_BR)
+-add_subdirectory(pl)
+-add_subdirectory(es)
+-add_subdirectory(cs)
+-add_subdirectory(ro)
+-add_subdirectory(ca)
+-add_subdirectory(sk)
+-add_subdirectory(sl)
+-add_subdirectory(pt)
+-add_subdirectory(gl)
+-add_subdirectory(ca@valencia)
+-add_subdirectory(sv)
+-add_subdirectory(el)
+-add_subdirectory(fi)
+-add_subdirectory(it)
+-add_subdirectory(zh_TW)
+-add_subdirectory(et)
++
++# gettext behavior
++execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
++	OUTPUT_VARIABLE UNSETLINGUAS)
++set(langs ca@valencia cs de da fr nl uk pt_BR pl es ro ca sl pt gl sk sv el fi it zh_TW et)
++
++foreach(mylang ${langs})
++	if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
++		add_subdirectory(${mylang})
++	endif()
++endforeach()
diff --git a/app-accessibility/simon/files/simon-0.4.1-sphinx.patch b/app-accessibility/simon/files/simon-0.4.1-sphinx.patch
new file mode 100644
index 000000000000..498475c81d05
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-sphinx.patch
@@ -0,0 +1,16 @@
+--- simon-0.4.1/CMakeLists.txt
++++ simon-0.4.1/CMakeLists.txt
+@@ -59,11 +59,11 @@
+ macro_optional_find_package(QAccessibilityClient)
+ macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.")
+ 
+-find_package(Sphinxbase)
++macro_optional_find_package(Sphinxbase)
+ macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
+   "Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
+   FALSE "" "Required to build Sphinx backend")
+-find_package(Pocketsphinx)
++macro_optional_find_package(Pocketsphinx)
+ macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
+   "PocketSphinx is a small-footprint continuous speech recognition system"
+   "http://cmusphinx.sourceforge.net/" FALSE "" 
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
new file mode 100644
index 000000000000..3e7d2b79b5a0
--- /dev/null
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/simon/simon-0.4.1.ebuild,v 1.1 2013/06/30 18:39:52 hasufell Exp $
+
+# KEEP KDE ECLASSES OUT OF HERE
+
+# TODO: qaccessibilityclient support (not in portage)
+# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
+# TODO: julius
+
+EAPI=5
+
+inherit eutils multilib gnome2-utils cmake-utils
+
+DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
+HOMEPAGE="http://simon-listens.org/"
+SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kdepim libsamplerate nls opencv sphinx"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	kde-base/kdelibs:4
+	media-libs/alsa-lib
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/qwt:6
+	kdepim? ( kde-base/kdepimlibs:4 )
+	libsamplerate? ( media-libs/libsamplerate )
+	nls? (
+		kde-base/kde-l10n
+		virtual/libintl
+	)
+	opencv? ( media-libs/opencv )
+	sphinx? (
+		>=app-accessibility/pocketsphinx-0.8
+		>=app-accessibility/sphinxbase-0.8
+		>=app-accessibility/SphinxTrain-1
+	)
+	!sphinx? ( app-accessibility/julius )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libdir.patch \
+		"${FILESDIR}"/${P}-linguas.patch \
+		"${FILESDIR}"/${P}-sphinx.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
+		-DBackendType=$(usex sphinx "both" "jhtk")
+		$(cmake-utils_use_with sphinx Sphinxbase)
+		$(cmake-utils_use_with sphinx Pocketsphinx)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with libsamplerate LibSampleRate)
+		$(cmake-utils_use_with opencv OpenCV)
+		$(cmake-utils_use_enable nls NLS)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "optional dependencies:"
+	elog "  kde-base/jovie (support for Jovie TTS system)"
+	use sphinx && elog "  app-accessibility/julius (alternative backend)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}