Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/simon/files/, app-accessibility/simon/
Date: Sun, 27 Dec 2015 16:48:06
Message-Id: 1451234870.09682387c1cb882175245e8497ede2b30b45dfd9.kensington@gentoo
1 commit: 09682387c1cb882175245e8497ede2b30b45dfd9
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 27 16:42:29 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 27 16:47:50 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09682387
7
8 app-accessibility/simon: remove old
9
10 Package-Manager: portage-2.2.26
11
12 app-accessibility/simon/Manifest | 1 -
13 .../simon/files/simon-0.4.0-libdir.patch | 16 ----
14 .../simon/files/simon-0.4.0-linguas.patch | 84 --------------------
15 .../simon/files/simon-0.4.0-opencv.patch | 11 ---
16 .../simon/files/simon-0.4.0-sphinx.patch | 16 ----
17 app-accessibility/simon/simon-0.4.0.ebuild | 90 ----------------------
18 6 files changed, 218 deletions(-)
19
20 diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
21 index d6f5403..72ab878 100644
22 --- a/app-accessibility/simon/Manifest
23 +++ b/app-accessibility/simon/Manifest
24 @@ -1,2 +1 @@
25 -DIST simon-0.4.0.tar.bz2 22139378 SHA256 c7ef35cd28ecf294ceae63f4b0c53384bcf89fc2a6e67916dc9d4116decabc12 SHA512 541c22e09bb4234871707cd73e038a5ab0c68a6cb2a28993571c434edff639e4826554f922a4a188b5c2a70ff9a0d627f53af0954431b561adeedccf9c170c85 WHIRLPOOL c2e0cc8632bf089ed14ef53cae02c51166780692222b7f3c7a3583356e9669cbbcd3222507128b35f282b49de2f10a73c42f63e28596c6e8412ff766bb3febfb
26 DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
27
28 diff --git a/app-accessibility/simon/files/simon-0.4.0-libdir.patch b/app-accessibility/simon/files/simon-0.4.0-libdir.patch
29 deleted file mode 100644
30 index 18e12fc..0000000
31 --- a/app-accessibility/simon/files/simon-0.4.0-libdir.patch
32 +++ /dev/null
33 @@ -1,16 +0,0 @@
34 -From: Julian Ospald <hasufell@g.o>
35 -Date: Fri Mar 29 22:00:19 UTC 2013
36 -Subject: build system
37 -
38 -make libdir modifiable
39 -
40 ---- simon-0.4.0/cmake/SimonDirs.cmake
41 -+++ simon-0.4.0/cmake/SimonDirs.cmake
42 -@@ -29,6 +29,6 @@
43 - #IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
44 - #set(SIMON_LIB_INSTALL_DIR lib64)
45 - #ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
46 -- set(SIMON_LIB_INSTALL_DIR lib)
47 -+ set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir")
48 - #ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
49 - ENDIF(WIN32)
50
51 diff --git a/app-accessibility/simon/files/simon-0.4.0-linguas.patch b/app-accessibility/simon/files/simon-0.4.0-linguas.patch
52 deleted file mode 100644
53 index bf60f16..0000000
54 --- a/app-accessibility/simon/files/simon-0.4.0-linguas.patch
55 +++ /dev/null
56 @@ -1,84 +0,0 @@
57 ---- simon-0.4.0/CMakeLists.txt
58 -+++ simon-0.4.0/CMakeLists.txt
59 -@@ -14,6 +14,9 @@
60 -
61 - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
62 -
63 -+# NLS
64 -+option(ENABLE_NLS "Enable native language support" 1)
65 -+
66 - find_package(KDE4 "4.4" REQUIRED)
67 - find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
68 - find_package(Qwt6 REQUIRED)
69 -@@ -143,4 +146,6 @@
70 - macro_display_feature_log()
71 -
72 - include(MacroOptionalAddSubdirectory)
73 --macro_optional_add_subdirectory( po )
74 -+if(ENABLE_NLS)
75 -+ macro_optional_add_subdirectory( po )
76 -+endif(ENABLE_NLS)
77 ---- simon-0.4.0/po/CMakeLists.txt
78 -+++ simon-0.4.0/po/CMakeLists.txt
79 -@@ -11,24 +11,14 @@
80 - if (NOT GETTEXT_MSGFMT_EXECUTABLE)
81 - MESSAGE(FATAL_ERROR "Please install msgmerge binary")
82 - endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
83 --add_subdirectory(cs)
84 --add_subdirectory(de)
85 --add_subdirectory(da)
86 --add_subdirectory(fr)
87 --add_subdirectory(nl)
88 --add_subdirectory(uk)
89 --add_subdirectory(pt_BR)
90 --add_subdirectory(pl)
91 --add_subdirectory(es)
92 --add_subdirectory(ro)
93 --add_subdirectory(ca)
94 --add_subdirectory(sl)
95 --add_subdirectory(pt)
96 --add_subdirectory(hu)
97 --add_subdirectory(gl)
98 --add_subdirectory(sv)
99 --add_subdirectory(el)
100 --add_subdirectory(fi)
101 --add_subdirectory(it)
102 --add_subdirectory(zh_TW)
103 --add_subdirectory(et)
104 -+
105 -+# gettext behavior
106 -+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
107 -+ OUTPUT_VARIABLE UNSETLINGUAS)
108 -+set(langs cs de da fr nl uk pt_BR pl es ro ca sl pt hu gl sv el fi it zh_TW et)
109 -+
110 -+foreach(mylang ${langs})
111 -+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
112 -+ add_subdirectory(${mylang})
113 -+ endif()
114 -+endforeach()
115 ---- simon-0.4.0/doc/CMakeLists.txt
116 -+++ simon-0.4.0/doc/CMakeLists.txt
117 -@@ -1,9 +1,15 @@
118 -+if(ENABLE_NLS)
119 -+ # gettext behavior
120 -+ execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
121 -+ OUTPUT_VARIABLE UNSETLINGUAS)
122 -+set(langs pt_BR ca nl de it pt sv uk)
123 -+
124 -+ foreach(mylang ${langs})
125 -+ if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
126 -+ add_subdirectory(${mylang})
127 -+ endif()
128 -+ endforeach()
129 -+endif(ENABLE_NLS)
130 -+
131 -+# default doc
132 - add_subdirectory(en_US)
133 --add_subdirectory(pt_BR)
134 --add_subdirectory(ca)
135 --add_subdirectory(nl)
136 --add_subdirectory(de)
137 --add_subdirectory(it)
138 --add_subdirectory(pt)
139 --add_subdirectory(sv)
140 --add_subdirectory(uk)
141
142 diff --git a/app-accessibility/simon/files/simon-0.4.0-opencv.patch b/app-accessibility/simon/files/simon-0.4.0-opencv.patch
143 deleted file mode 100644
144 index bdd4581..0000000
145 --- a/app-accessibility/simon/files/simon-0.4.0-opencv.patch
146 +++ /dev/null
147 @@ -1,11 +0,0 @@
148 ---- simon-0.4.0/CMakeLists.txt
149 -+++ simon-0.4.0/CMakeLists.txt
150 -@@ -68,7 +68,7 @@
151 - "PocketSphinx is a small-footprint continuous speech recognition system"
152 - "http://cmusphinx.sourceforge.net/" FALSE ""
153 - "Required to build Pocket Sphinx backend")
154 --find_package(OpenCV)
155 -+macro_optional_find_package(OpenCV)
156 - macro_log_feature(OpenCV_FOUND "OpenCV"
157 - "OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision" "http://http://opencv.willowgarage.com/"
158 - FALSE "" "Required for Simon Vision")
159
160 diff --git a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch b/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
161 deleted file mode 100644
162 index 0fe8aa2..0000000
163 --- a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
164 +++ /dev/null
165 @@ -1,16 +0,0 @@
166 ---- simon-0.4.0/CMakeLists.txt
167 -+++ simon-0.4.0/CMakeLists.txt
168 -@@ -59,11 +59,11 @@
169 - macro_optional_find_package(QAccessibilityClient)
170 - 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.")
171 -
172 --find_package(Sphinxbase)
173 -+macro_optional_find_package(Sphinxbase)
174 - macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
175 - "Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
176 - FALSE "" "Required to build Sphinx backend")
177 --find_package(Pocketsphinx)
178 -+macro_optional_find_package(Pocketsphinx)
179 - macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
180 - "PocketSphinx is a small-footprint continuous speech recognition system"
181 - "http://cmusphinx.sourceforge.net/" FALSE ""
182
183 diff --git a/app-accessibility/simon/simon-0.4.0.ebuild b/app-accessibility/simon/simon-0.4.0.ebuild
184 deleted file mode 100644
185 index 3a9ecad..0000000
186 --- a/app-accessibility/simon/simon-0.4.0.ebuild
187 +++ /dev/null
188 @@ -1,90 +0,0 @@
189 -# Copyright 1999-2015 Gentoo Foundation
190 -# Distributed under the terms of the GNU General Public License v2
191 -# $Id$
192 -
193 -# KEEP KDE ECLASSES OUT OF HERE
194 -
195 -# TODO: qaccessibilityclient support (not in portage)
196 -# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
197 -# TODO: julius
198 -
199 -EAPI=5
200 -
201 -inherit eutils multilib gnome2-utils cmake-utils
202 -
203 -DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
204 -HOMEPAGE="http://simon-listens.org/"
205 -SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
206 -
207 -LICENSE="GPL-2"
208 -SLOT="0"
209 -KEYWORDS="amd64 x86"
210 -IUSE="kdepim libsamplerate nls opencv sphinx"
211 -
212 -RDEPEND="
213 - dev-qt/qtcore:4
214 - dev-qt/qtdbus:4
215 - dev-qt/qtgui:4
216 - dev-qt/qtscript:4
217 - dev-qt/qtsql:4
218 - kde-base/kdelibs:4
219 - media-libs/alsa-lib
220 - x11-libs/libX11
221 - x11-libs/libXtst
222 - x11-libs/qwt:6
223 - kdepim? ( kde-base/kdepimlibs:4 )
224 - libsamplerate? ( media-libs/libsamplerate )
225 - nls? (
226 - kde-apps/kde4-l10n
227 - virtual/libintl
228 - )
229 - opencv? ( media-libs/opencv )
230 - sphinx? (
231 - >=app-accessibility/pocketsphinx-0.8
232 - >=app-accessibility/sphinxbase-0.8
233 - >=app-accessibility/SphinxTrain-1
234 - )
235 - !sphinx? ( app-accessibility/julius )"
236 -DEPEND="${RDEPEND}
237 - sys-devel/bison
238 - sys-devel/flex
239 - virtual/pkgconfig
240 - nls? ( sys-devel/gettext )"
241 -
242 -src_prepare() {
243 - epatch "${FILESDIR}"/${P}-libdir.patch \
244 - "${FILESDIR}"/${P}-linguas.patch \
245 - "${FILESDIR}"/${P}-opencv.patch \
246 - "${FILESDIR}"/${P}-sphinx.patch
247 -}
248 -
249 -src_configure() {
250 - local mycmakeargs=(
251 - -DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
252 - -DBackendType=$(usex sphinx "both" "jhtk")
253 - $(cmake-utils_use_with sphinx Sphinxbase)
254 - $(cmake-utils_use_with sphinx Pocketsphinx)
255 - $(cmake-utils_use_with kdepim KdepimLibs)
256 - $(cmake-utils_use_with libsamplerate LibSampleRate)
257 - $(cmake-utils_use_with opencv OpenCV)
258 - $(cmake-utils_use_enable nls NLS)
259 - )
260 -
261 - cmake-utils_src_configure
262 -}
263 -
264 -pkg_preinst() {
265 - gnome2_icon_savelist
266 -}
267 -
268 -pkg_postinst() {
269 - gnome2_icon_cache_update
270 -
271 - elog "optional dependencies:"
272 - elog " kde-apps/jovie (support for Jovie TTS system)"
273 - use sphinx && elog " app-accessibility/julius (alternative backend)"
274 -}
275 -
276 -pkg_postrm() {
277 - gnome2_icon_cache_update
278 -}