Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-accessibility/simon: metadata.xml ChangeLog simon-0.4.0.ebuild
Date: Sun, 31 Mar 2013 23:08:00
Message-Id: 20130331230757.63FE02171D@flycatcher.gentoo.org
1 hasufell 13/03/31 23:07:57
2
3 Modified: metadata.xml ChangeLog simon-0.4.0.ebuild
4 Log:
5 add sphinx useflag, add julius fallback
6
7 (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
8
9 Revision Changes Path
10 1.2 app-accessibility/simon/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/metadata.xml?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/metadata.xml?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/metadata.xml?r1=1.1&r2=1.2
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-accessibility/simon/metadata.xml,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- metadata.xml 31 Mar 2013 18:28:32 -0000 1.1
23 +++ metadata.xml 31 Mar 2013 23:07:57 -0000 1.2
24 @@ -9,6 +9,7 @@
25 <use>
26 <flag name='kdepim'>Use <pkg>kde-base/kdepimlibs</pkg></flag>
27 <flag name='opencv'>Use <pkg>media-libs/opencv</pkg></flag>
28 + <flag name='sphinx'>Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
29 </use>
30 </pkgmetadata>
31
32
33
34
35 1.3 app-accessibility/simon/ChangeLog
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/ChangeLog?rev=1.3&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/ChangeLog?rev=1.3&content-type=text/plain
39 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/ChangeLog?r1=1.2&r2=1.3
40
41 Index: ChangeLog
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/app-accessibility/simon/ChangeLog,v
44 retrieving revision 1.2
45 retrieving revision 1.3
46 diff -u -r1.2 -r1.3
47 --- ChangeLog 31 Mar 2013 22:20:15 -0000 1.2
48 +++ ChangeLog 31 Mar 2013 23:07:57 -0000 1.3
49 @@ -1,6 +1,10 @@
50 # ChangeLog for app-accessibility/simon
51 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
52 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/simon/ChangeLog,v 1.2 2013/03/31 22:20:15 hasufell Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/simon/ChangeLog,v 1.3 2013/03/31 23:07:57 hasufell Exp $
54 +
55 + 31 Mar 2013; Julian Ospald <hasufell@g.o> simon-0.4.0.ebuild,
56 + metadata.xml:
57 + add sphinx useflag, add julius fallback
58
59 31 Mar 2013; Julian Ospald <hasufell@g.o> simon-0.4.0.ebuild:
60 fix deps
61
62
63
64 1.3 app-accessibility/simon/simon-0.4.0.ebuild
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/simon-0.4.0.ebuild?rev=1.3&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/simon-0.4.0.ebuild?rev=1.3&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/simon/simon-0.4.0.ebuild?r1=1.2&r2=1.3
69
70 Index: simon-0.4.0.ebuild
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/app-accessibility/simon/simon-0.4.0.ebuild,v
73 retrieving revision 1.2
74 retrieving revision 1.3
75 diff -u -r1.2 -r1.3
76 --- simon-0.4.0.ebuild 31 Mar 2013 22:20:15 -0000 1.2
77 +++ simon-0.4.0.ebuild 31 Mar 2013 23:07:57 -0000 1.3
78 @@ -1,6 +1,6 @@
79 # Copyright 1999-2013 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/simon/simon-0.4.0.ebuild,v 1.2 2013/03/31 22:20:15 hasufell Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/simon/simon-0.4.0.ebuild,v 1.3 2013/03/31 23:07:57 hasufell Exp $
83
84 # KEEP KDE ECLASSES OUT OF HERE
85
86 @@ -19,12 +19,9 @@
87 LICENSE="GPL-2"
88 SLOT="0"
89 KEYWORDS="~amd64 ~x86"
90 -IUSE="kdepim libsamplerate nls opencv"
91 +IUSE="kdepim libsamplerate nls opencv sphinx"
92
93 RDEPEND="
94 - >=app-accessibility/pocketsphinx-0.8
95 - >=app-accessibility/sphinxbase-0.8
96 - >=app-accessibility/SphinxTrain-1
97 dev-qt/qtcore:4
98 dev-qt/qtdbus:4
99 dev-qt/qtgui:4
100 @@ -41,7 +38,13 @@
101 kde-base/kde-l10n
102 virtual/libintl
103 )
104 - opencv? ( media-libs/opencv )"
105 + opencv? ( media-libs/opencv )
106 + sphinx? (
107 + >=app-accessibility/pocketsphinx-0.8
108 + >=app-accessibility/sphinxbase-0.8
109 + >=app-accessibility/SphinxTrain-1
110 + )
111 + !sphinx? ( app-accessibility/julius )"
112 DEPEND="${RDEPEND}
113 sys-devel/bison
114 sys-devel/flex
115 @@ -51,17 +54,20 @@
116 src_prepare() {
117 epatch "${FILESDIR}"/${P}-libdir.patch \
118 "${FILESDIR}"/${P}-linguas.patch \
119 - "${FILESDIR}"/${P}-opencv.patch
120 + "${FILESDIR}"/${P}-opencv.patch \
121 + "${FILESDIR}"/${P}-sphinx.patch
122 }
123
124 src_configure() {
125 local mycmakeargs=(
126 -DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
127 - -DBackendType=both
128 - $(cmake-utils_use_enable nls NLS)
129 + -DBackendType=$(usex sphinx "both" "jhtk")
130 + $(cmake-utils_use_with sphinx Sphinxbase)
131 + $(cmake-utils_use_with sphinx Pocketsphinx)
132 $(cmake-utils_use_with kdepim KdepimLibs)
133 $(cmake-utils_use_with libsamplerate LibSampleRate)
134 $(cmake-utils_use_with opencv OpenCV)
135 + $(cmake-utils_use_enable nls NLS)
136 )
137
138 cmake-utils_src_configure
139 @@ -76,6 +82,7 @@
140
141 elog "optional dependencies:"
142 elog " kde-base/jovie (support for Jovie TTS system)"
143 + use sphinx && elog " app-accessibility/julius (alternative backend)"
144 }
145
146 pkg_postrm() {