1 |
commit: 3deb978bc9d01023b1acddc300c71ab09a6a35bb |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 29 21:41:29 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 29 22:32:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3deb978b |
7 |
|
8 |
app-accessibility/sphinx2: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
.../sphinx2/files/sphinx2-0.6-as-needed.patch | 35 +++++++++++++--------- |
13 |
app-accessibility/sphinx2/sphinx2-0.6.ebuild | 29 ++++++++++++------ |
14 |
2 files changed, 41 insertions(+), 23 deletions(-) |
15 |
|
16 |
diff --git a/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch b/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch |
17 |
index 0520d4d987e..f647ab35142 100644 |
18 |
--- a/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch |
19 |
+++ b/app-accessibility/sphinx2/files/sphinx2-0.6-as-needed.patch |
20 |
@@ -1,20 +1,17 @@ |
21 |
-diff --git a/src/Makefile.am b/src/Makefile.am |
22 |
-index 05a4f8a..23d0309 100644 |
23 |
---- a/src/Makefile.am |
24 |
-+++ b/src/Makefile.am |
25 |
-@@ -1,5 +1,5 @@ |
26 |
--SUBDIRS = libsphinx2 \ |
27 |
-- libsphinx2fe \ |
28 |
-+SUBDIRS = libsphinx2fe \ |
29 |
- libsphinx2ad \ |
30 |
-+ libsphinx2 \ |
31 |
- examples |
32 |
+--- a/configure.in |
33 |
++++ b/configure.in |
34 |
+@@ -1,7 +1,7 @@ |
35 |
+ dnl Welcome to the Sphinx-2 automated build system. |
36 |
+ dnl try not to hurt yourself ;) |
37 |
+ |
38 |
+-AC_INIT(configure.in) |
39 |
++AC_INIT(configure.ac) |
40 |
+ AM_INIT_AUTOMAKE(sphinx2,0.6) |
41 |
|
42 |
-diff --git a/src/libsphinx2/Makefile.am b/src/libsphinx2/Makefile.am |
43 |
-index 66f0ac3..537381c 100644 |
44 |
+ CFLAGS=${CFLAGS:--g -O2 -Wall} |
45 |
--- a/src/libsphinx2/Makefile.am |
46 |
+++ b/src/libsphinx2/Makefile.am |
47 |
-@@ -88,7 +88,7 @@ libsphinx2_la_SOURCES = \ |
48 |
+@@ -88,7 +88,7 @@ |
49 |
word_fsg.c |
50 |
|
51 |
|
52 |
@@ -23,3 +20,13 @@ index 66f0ac3..537381c 100644 |
53 |
|
54 |
# hjf@××××××××.edu - Added for Solaris build |
55 |
# LDADD = -L/usr/demo/SOUND/lib/ -laudio |
56 |
+--- a/src/Makefile.am |
57 |
++++ b/src/Makefile.am |
58 |
+@@ -1,5 +1,5 @@ |
59 |
+-SUBDIRS = libsphinx2 \ |
60 |
+- libsphinx2fe \ |
61 |
++SUBDIRS = libsphinx2fe \ |
62 |
+ libsphinx2ad \ |
63 |
++ libsphinx2 \ |
64 |
+ examples |
65 |
+ |
66 |
|
67 |
diff --git a/app-accessibility/sphinx2/sphinx2-0.6.ebuild b/app-accessibility/sphinx2/sphinx2-0.6.ebuild |
68 |
index d2fda0b62ae..0ca32c0a217 100644 |
69 |
--- a/app-accessibility/sphinx2/sphinx2-0.6.ebuild |
70 |
+++ b/app-accessibility/sphinx2/sphinx2-0.6.ebuild |
71 |
@@ -1,12 +1,11 @@ |
72 |
-# Copyright 1999-2012 Gentoo Foundation |
73 |
+# Copyright 1999-2017 Gentoo Foundation |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
|
76 |
-EAPI="2" |
77 |
+EAPI=6 |
78 |
|
79 |
-inherit autotools eutils |
80 |
+inherit autotools |
81 |
|
82 |
MY_P=${P/_/} |
83 |
-S=${WORKDIR}/${MY_P} |
84 |
|
85 |
DESCRIPTION="CMU Speech Recognition-engine" |
86 |
HOMEPAGE="http://fife.speech.cs.cmu.edu/sphinx/" |
87 |
@@ -15,15 +14,27 @@ SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz" |
88 |
LICENSE="BSD-2" |
89 |
SLOT="0" |
90 |
KEYWORDS="amd64 ppc x86" |
91 |
-IUSE="" |
92 |
+IUSE="static-libs" |
93 |
+ |
94 |
+S=${WORKDIR}/${MY_P} |
95 |
+PATCHES=( "${FILESDIR}"/${P}-as-needed.patch ) |
96 |
|
97 |
src_prepare() { |
98 |
- epatch "${FILESDIR}"/${P}-as-needed.patch |
99 |
+ default |
100 |
+ mv configure.{in,ac} || die |
101 |
eautoreconf |
102 |
} |
103 |
|
104 |
+src_configure() { |
105 |
+ econf $(use_enable static-libs static) |
106 |
+} |
107 |
+ |
108 |
src_install() { |
109 |
- emake DESTDIR="${D}" install || die "emake install failed" |
110 |
- dodoc AUTHORS ChangeLog NEWS README doc/README.bin doc/README.lib doc/SCHMM_format doc/filler.dict doc/phoneset doc/phoneset-old |
111 |
- dohtml doc/phoneset_s2.html doc/sphinx2.html |
112 |
+ HTML_DOCS=( doc/{phoneset_s2,sphinx2}.html ) |
113 |
+ default |
114 |
+ dodoc doc/{README.{bin,lib},SCHMM_format,filler.dict,phoneset{,-old}} |
115 |
+ |
116 |
+ if ! use static-libs; then |
117 |
+ find "${D}" -name '*.la' -delete || die |
118 |
+ fi |
119 |
} |