| 1 |
commit: d6ba21c23c6d5fd742a9962919e5af62aa643ee7 |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
| 3 |
AuthorDate: Thu Mar 22 13:27:15 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 26 20:19:46 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ba21c2 |
| 7 |
|
| 8 |
app-accessibility/julius: EAPI bump and patch updates |
| 9 |
|
| 10 |
Bump EAPI to 6 and clean up the patches a bit. turn the LINGUAS check |
| 11 |
into a proper l10n_ja USE check. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/7587 |
| 15 |
|
| 16 |
.../julius/files/julius-4.2.2-install.patch | 88 +++++++++++----------- |
| 17 |
.../julius/files/julius-4.2.2-ldflags.patch | 4 +- |
| 18 |
app-accessibility/julius/julius-4.2.2.ebuild | 20 ++--- |
| 19 |
3 files changed, 56 insertions(+), 56 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-accessibility/julius/files/julius-4.2.2-install.patch b/app-accessibility/julius/files/julius-4.2.2-install.patch |
| 22 |
index d40b6c69fdc..e8260d9ef0c 100644 |
| 23 |
--- a/app-accessibility/julius/files/julius-4.2.2-install.patch |
| 24 |
+++ b/app-accessibility/julius/files/julius-4.2.2-install.patch |
| 25 |
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@g.o> |
| 26 |
Date: Sun Mar 31 20:38:49 UTC 2013 |
| 27 |
Subject: respect DESTDIR |
| 28 |
|
| 29 |
---- julius-4.2.2/libsent/Makefile.in |
| 30 |
-+++ julius-4.2.2/libsent/Makefile.in |
| 31 |
+--- a/libsent/Makefile.in |
| 32 |
++++ b/libsent/Makefile.in |
| 33 |
@@ -144,16 +144,16 @@ |
| 34 |
install: install.lib install.include install.bin |
| 35 |
|
| 36 |
@@ -27,8 +27,8 @@ Subject: respect DESTDIR |
| 37 |
|
| 38 |
clean: |
| 39 |
$(RM) *~ src/*/*~ src/*/*.o src/*/*/*.o src/*/*/*/*.o src/*/*/*/*/*.o include/sent/*~ |
| 40 |
---- julius-4.2.2/libjulius/Makefile.in |
| 41 |
-+++ julius-4.2.2/libjulius/Makefile.in |
| 42 |
+--- a/libjulius/Makefile.in |
| 43 |
++++ b/libjulius/Makefile.in |
| 44 |
@@ -90,16 +90,16 @@ |
| 45 |
install: install.lib install.include install.bin |
| 46 |
|
| 47 |
@@ -52,8 +52,8 @@ Subject: respect DESTDIR |
| 48 |
|
| 49 |
depend: |
| 50 |
makedepend -- $(CFLAGS) -- $(OBJSENT) |
| 51 |
---- julius-4.2.2/julius/Makefile.in |
| 52 |
-+++ julius-4.2.2/julius/Makefile.in |
| 53 |
+--- a/julius/Makefile.in |
| 54 |
++++ b/julius/Makefile.in |
| 55 |
@@ -61,8 +61,8 @@ |
| 56 |
install: install.bin |
| 57 |
|
| 58 |
@@ -65,8 +65,8 @@ Subject: respect DESTDIR |
| 59 |
|
| 60 |
depend: |
| 61 |
makedepend -- $(CFLAGS) -- $(OBJSENT) |
| 62 |
---- julius-4.2.2/mkbingram/Makefile.in |
| 63 |
-+++ julius-4.2.2/mkbingram/Makefile.in |
| 64 |
+--- a/mkbingram/Makefile.in |
| 65 |
++++ b/mkbingram/Makefile.in |
| 66 |
@@ -32,8 +32,8 @@ |
| 67 |
install: install.bin |
| 68 |
|
| 69 |
@@ -78,8 +78,8 @@ Subject: respect DESTDIR |
| 70 |
|
| 71 |
clean: |
| 72 |
$(RM) $(OBJ) |
| 73 |
---- julius-4.2.2/mkbinhmm/Makefile.in |
| 74 |
-+++ julius-4.2.2/mkbinhmm/Makefile.in |
| 75 |
+--- a/mkbinhmm/Makefile.in |
| 76 |
++++ b/mkbinhmm/Makefile.in |
| 77 |
@@ -32,8 +32,8 @@ |
| 78 |
install: install.bin |
| 79 |
|
| 80 |
@@ -91,8 +91,8 @@ Subject: respect DESTDIR |
| 81 |
|
| 82 |
clean: |
| 83 |
$(RM) mkbinhmm.o mkbinhmmlist.o |
| 84 |
---- julius-4.2.2/adinrec/Makefile.in |
| 85 |
-+++ julius-4.2.2/adinrec/Makefile.in |
| 86 |
+--- a/adinrec/Makefile.in |
| 87 |
++++ b/adinrec/Makefile.in |
| 88 |
@@ -36,8 +36,8 @@ |
| 89 |
install: install.bin |
| 90 |
|
| 91 |
@@ -104,8 +104,8 @@ Subject: respect DESTDIR |
| 92 |
|
| 93 |
############################################################ |
| 94 |
|
| 95 |
---- julius-4.2.2/adintool/Makefile.in |
| 96 |
-+++ julius-4.2.2/adintool/Makefile.in |
| 97 |
+--- a/adintool/Makefile.in |
| 98 |
++++ b/adintool/Makefile.in |
| 99 |
@@ -36,8 +36,8 @@ |
| 100 |
install: install.bin |
| 101 |
|
| 102 |
@@ -117,8 +117,8 @@ Subject: respect DESTDIR |
| 103 |
|
| 104 |
############################################################ |
| 105 |
|
| 106 |
---- julius-4.2.2/mkgshmm/Makefile.in |
| 107 |
-+++ julius-4.2.2/mkgshmm/Makefile.in |
| 108 |
+--- a/mkgshmm/Makefile.in |
| 109 |
++++ b/mkgshmm/Makefile.in |
| 110 |
@@ -23,8 +23,8 @@ |
| 111 |
install: install.bin |
| 112 |
|
| 113 |
@@ -130,8 +130,8 @@ Subject: respect DESTDIR |
| 114 |
|
| 115 |
############################################################ |
| 116 |
|
| 117 |
---- julius-4.2.2/mkss/Makefile.in |
| 118 |
-+++ julius-4.2.2/mkss/Makefile.in |
| 119 |
+--- a/mkss/Makefile.in |
| 120 |
++++ b/mkss/Makefile.in |
| 121 |
@@ -36,8 +36,8 @@ |
| 122 |
install: install.bin |
| 123 |
|
| 124 |
@@ -143,8 +143,8 @@ Subject: respect DESTDIR |
| 125 |
|
| 126 |
############################################################ |
| 127 |
|
| 128 |
---- julius-4.2.2/jcontrol/Makefile.in |
| 129 |
-+++ julius-4.2.2/jcontrol/Makefile.in |
| 130 |
+--- a/jcontrol/Makefile.in |
| 131 |
++++ b/jcontrol/Makefile.in |
| 132 |
@@ -31,19 +31,19 @@ |
| 133 |
install: install.bin |
| 134 |
|
| 135 |
@@ -169,8 +169,8 @@ Subject: respect DESTDIR |
| 136 |
+ $(RM) $(TARGET) $(TARGET).exe jucontrol |
| 137 |
$(RM) config.status |
| 138 |
$(RM) Makefile |
| 139 |
---- julius-4.2.2/gramtools/accept_check/Makefile.in |
| 140 |
-+++ julius-4.2.2/gramtools/accept_check/Makefile.in |
| 141 |
+--- a/gramtools/accept_check/Makefile.in |
| 142 |
++++ b/gramtools/accept_check/Makefile.in |
| 143 |
@@ -36,8 +36,8 @@ |
| 144 |
install: install.bin |
| 145 |
|
| 146 |
@@ -182,8 +182,8 @@ Subject: respect DESTDIR |
| 147 |
|
| 148 |
############################################################ |
| 149 |
|
| 150 |
---- julius-4.2.2/gramtools/dfa_determinize/Makefile.in |
| 151 |
-+++ julius-4.2.2/gramtools/dfa_determinize/Makefile.in |
| 152 |
+--- a/gramtools/dfa_determinize/Makefile.in |
| 153 |
++++ b/gramtools/dfa_determinize/Makefile.in |
| 154 |
@@ -35,8 +35,8 @@ |
| 155 |
install: install.bin |
| 156 |
|
| 157 |
@@ -195,8 +195,8 @@ Subject: respect DESTDIR |
| 158 |
|
| 159 |
############################################################ |
| 160 |
|
| 161 |
---- julius-4.2.2/gramtools/dfa_minimize/Makefile.in |
| 162 |
-+++ julius-4.2.2/gramtools/dfa_minimize/Makefile.in |
| 163 |
+--- a/gramtools/dfa_minimize/Makefile.in |
| 164 |
++++ b/gramtools/dfa_minimize/Makefile.in |
| 165 |
@@ -34,8 +34,8 @@ |
| 166 |
install: install.bin |
| 167 |
|
| 168 |
@@ -208,8 +208,8 @@ Subject: respect DESTDIR |
| 169 |
|
| 170 |
############################################################ |
| 171 |
|
| 172 |
---- julius-4.2.2/gramtools/generate/Makefile.in |
| 173 |
-+++ julius-4.2.2/gramtools/generate/Makefile.in |
| 174 |
+--- a/gramtools/generate/Makefile.in |
| 175 |
++++ b/gramtools/generate/Makefile.in |
| 176 |
@@ -35,8 +35,8 @@ |
| 177 |
install: install.bin |
| 178 |
|
| 179 |
@@ -221,8 +221,8 @@ Subject: respect DESTDIR |
| 180 |
|
| 181 |
############################################################ |
| 182 |
|
| 183 |
---- julius-4.2.2/gramtools/gram2sapixml/Makefile.in |
| 184 |
-+++ julius-4.2.2/gramtools/gram2sapixml/Makefile.in |
| 185 |
+--- a/gramtools/gram2sapixml/Makefile.in |
| 186 |
++++ b/gramtools/gram2sapixml/Makefile.in |
| 187 |
@@ -17,8 +17,8 @@ |
| 188 |
install: install.bin |
| 189 |
|
| 190 |
@@ -234,8 +234,8 @@ Subject: respect DESTDIR |
| 191 |
|
| 192 |
clean: |
| 193 |
echo nothing to do |
| 194 |
---- julius-4.2.2/gramtools/mkdfa/Makefile.in |
| 195 |
-+++ julius-4.2.2/gramtools/mkdfa/Makefile.in |
| 196 |
+--- a/gramtools/mkdfa/Makefile.in |
| 197 |
++++ b/gramtools/mkdfa/Makefile.in |
| 198 |
@@ -18,13 +18,13 @@ |
| 199 |
|
| 200 |
install: |
| 201 |
@@ -254,8 +254,8 @@ Subject: respect DESTDIR |
| 202 |
|
| 203 |
clean: |
| 204 |
(cd $(SUBDIR); $(MAKE) clean) |
| 205 |
---- julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in |
| 206 |
-+++ julius-4.2.2/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in |
| 207 |
+--- a/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in |
| 208 |
++++ b/gramtools/mkdfa/mkfa-1.44-flex/Makefile.in |
| 209 |
@@ -43,8 +43,8 @@ |
| 210 |
install: install.bin |
| 211 |
|
| 212 |
@@ -267,8 +267,8 @@ Subject: respect DESTDIR |
| 213 |
|
| 214 |
clean: |
| 215 |
$(RM) *.o *~ core |
| 216 |
---- julius-4.2.2/gramtools/nextword/Makefile.in |
| 217 |
-+++ julius-4.2.2/gramtools/nextword/Makefile.in |
| 218 |
+--- a/gramtools/nextword/Makefile.in |
| 219 |
++++ b/gramtools/nextword/Makefile.in |
| 220 |
@@ -36,8 +36,8 @@ |
| 221 |
install: install.bin |
| 222 |
|
| 223 |
@@ -280,8 +280,8 @@ Subject: respect DESTDIR |
| 224 |
|
| 225 |
############################################################ |
| 226 |
|
| 227 |
---- julius-4.2.2/gramtools/yomi2voca/Makefile.in |
| 228 |
-+++ julius-4.2.2/gramtools/yomi2voca/Makefile.in |
| 229 |
+--- a/gramtools/yomi2voca/Makefile.in |
| 230 |
++++ b/gramtools/yomi2voca/Makefile.in |
| 231 |
@@ -17,8 +17,8 @@ |
| 232 |
install: install.bin |
| 233 |
|
| 234 |
@@ -293,8 +293,8 @@ Subject: respect DESTDIR |
| 235 |
|
| 236 |
clean: |
| 237 |
echo nothing to do |
| 238 |
---- julius-4.2.2/generate-ngram/Makefile.in |
| 239 |
-+++ julius-4.2.2/generate-ngram/Makefile.in |
| 240 |
+--- a/generate-ngram/Makefile.in |
| 241 |
++++ b/generate-ngram/Makefile.in |
| 242 |
@@ -33,8 +33,8 @@ |
| 243 |
install: install.bin |
| 244 |
|
| 245 |
@@ -306,8 +306,8 @@ Subject: respect DESTDIR |
| 246 |
|
| 247 |
clean: |
| 248 |
$(RM) $(OBJ) *~ core |
| 249 |
---- julius-4.2.2/jclient-perl/Makefile.in |
| 250 |
-+++ julius-4.2.2/jclient-perl/Makefile.in |
| 251 |
+--- a/jclient-perl/Makefile.in |
| 252 |
++++ b/jclient-perl/Makefile.in |
| 253 |
@@ -17,8 +17,8 @@ |
| 254 |
install: install.bin |
| 255 |
|
| 256 |
@@ -319,8 +319,8 @@ Subject: respect DESTDIR |
| 257 |
|
| 258 |
clean: |
| 259 |
echo nothing to do |
| 260 |
---- julius-4.2.2/man/Makefile.in |
| 261 |
-+++ julius-4.2.2/man/Makefile.in |
| 262 |
+--- a/man/Makefile.in |
| 263 |
++++ b/man/Makefile.in |
| 264 |
@@ -19,16 +19,16 @@ |
| 265 |
install: install.man install.man.ja |
| 266 |
|
| 267 |
|
| 268 |
diff --git a/app-accessibility/julius/files/julius-4.2.2-ldflags.patch b/app-accessibility/julius/files/julius-4.2.2-ldflags.patch |
| 269 |
index a5c3645a52f..716b7bbfb02 100644 |
| 270 |
--- a/app-accessibility/julius/files/julius-4.2.2-ldflags.patch |
| 271 |
+++ b/app-accessibility/julius/files/julius-4.2.2-ldflags.patch |
| 272 |
@@ -1,5 +1,5 @@ |
| 273 |
---- julius-4.2.2/jcontrol/Makefile.in |
| 274 |
-+++ julius-4.2.2/jcontrol/Makefile.in |
| 275 |
+--- a/jcontrol/Makefile.in |
| 276 |
++++ b/jcontrol/Makefile.in |
| 277 |
@@ -14,7 +14,7 @@ |
| 278 |
CC=@CC@ |
| 279 |
CFLAGS=@CFLAGS@ |
| 280 |
|
| 281 |
diff --git a/app-accessibility/julius/julius-4.2.2.ebuild b/app-accessibility/julius/julius-4.2.2.ebuild |
| 282 |
index 7cf68ebb5a7..6c41e4be617 100644 |
| 283 |
--- a/app-accessibility/julius/julius-4.2.2.ebuild |
| 284 |
+++ b/app-accessibility/julius/julius-4.2.2.ebuild |
| 285 |
@@ -1,9 +1,9 @@ |
| 286 |
-# Copyright 1999-2013 Gentoo Foundation |
| 287 |
+# Copyright 1999-2018 Gentoo Foundation |
| 288 |
# Distributed under the terms of the GNU General Public License v2 |
| 289 |
|
| 290 |
-EAPI=5 |
| 291 |
+EAPI=6 |
| 292 |
|
| 293 |
-inherit eutils toolchain-funcs |
| 294 |
+inherit toolchain-funcs |
| 295 |
|
| 296 |
DESCRIPTION="Large Vocabulary Continuous Speech Recognition Engine" |
| 297 |
HOMEPAGE="http://julius.sourceforge.jp/" |
| 298 |
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/julius/56549/${P}.tar.gz" |
| 299 |
LICENSE="julius" |
| 300 |
SLOT="0" |
| 301 |
KEYWORDS="amd64 x86" |
| 302 |
-IUSE="+alsa oss portaudio pulseaudio sndfile" |
| 303 |
+IUSE="+alsa l10n_ja oss portaudio pulseaudio sndfile" |
| 304 |
REQUIRED_USE="^^ ( alsa oss portaudio pulseaudio )" |
| 305 |
|
| 306 |
RDEPEND=" |
| 307 |
@@ -27,15 +27,15 @@ RDEPEND=" |
| 308 |
DEPEND="${RDEPEND} |
| 309 |
sys-devel/flex" |
| 310 |
|
| 311 |
+PATCHES=( |
| 312 |
+ "${FILESDIR}"/${PN}-4.2.2-install.patch |
| 313 |
+ "${FILESDIR}"/${PN}-4.2.2-ldflags.patch |
| 314 |
+) |
| 315 |
+ |
| 316 |
pkg_setup() { |
| 317 |
tc-export CC CXX |
| 318 |
} |
| 319 |
|
| 320 |
-src_prepare() { |
| 321 |
- epatch "${FILESDIR}"/${P}-install.patch \ |
| 322 |
- "${FILESDIR}"/${P}-ldflags.patch |
| 323 |
-} |
| 324 |
- |
| 325 |
src_configure() { |
| 326 |
local mymic i |
| 327 |
for i in alsa oss portaudio pulseaudio ; do |
| 328 |
@@ -49,7 +49,7 @@ src_configure() { |
| 329 |
|
| 330 |
src_install() { |
| 331 |
default |
| 332 |
- if ! has ja ${LINGUAS} ; then |
| 333 |
+ if ! use l10n_ja ; then |
| 334 |
rm -r "${ED}"/usr/share/man/ja || die |
| 335 |
fi |
| 336 |
} |
Archives