Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/sphinxbase/, app-accessibility/sphinxbase/files/, profiles/
Date: Wed, 02 Sep 2020 08:06:32
Message-Id: 1599033865.7346fbcbd7aae5e45bb19948e51e23fe0f4fb48d.mgorny@gentoo
1 commit: 7346fbcbd7aae5e45bb19948e51e23fe0f4fb48d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 08:04:25 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 08:04:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7346fbcb
7
8 app-accessibility/sphinxbase: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-accessibility/sphinxbase/Manifest | 1 -
13 .../files/sphinxbase-0.8-automake113.patch | 25 -------
14 .../files/sphinxbase-0.8-unbundle-lapack.patch | 85 ----------------------
15 app-accessibility/sphinxbase/metadata.xml | 11 ---
16 app-accessibility/sphinxbase/sphinxbase-0.8.ebuild | 79 --------------------
17 profiles/package.mask | 7 --
18 6 files changed, 208 deletions(-)
19
20 diff --git a/app-accessibility/sphinxbase/Manifest b/app-accessibility/sphinxbase/Manifest
21 deleted file mode 100644
22 index fc2a99658eb..00000000000
23 --- a/app-accessibility/sphinxbase/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST sphinxbase-0.8.tar.gz 3313197 BLAKE2B ec2dcd232194d32d851924099ffb64fa9da6bdccb973fe1311d2b4b0506073cfd35b548ba8d8f64c2ee757f3b5ba87ae23c95d0f67c95be1110b7e2a995c9be2 SHA512 fdb13c07e591e868c395d5f8209ec389fb9d5a93d99104a00cb82382e84d320091ae7e74d53225706331d4959ab5e248fa622582a148bfdb6ab5c38470d1963c
27
28 diff --git a/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch b/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
29 deleted file mode 100644
30 index 11031918ee6..00000000000
31 --- a/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
32 +++ /dev/null
33 @@ -1,25 +0,0 @@
34 -diff -Naur sphinxbase-0.8/test/regression/Makefile.am sphinxbase-0.8.new/test/regression/Makefile.am
35 ---- sphinxbase-0.8/test/regression/Makefile.am 2012-12-05 06:05:39.000000000 -0800
36 -+++ sphinxbase-0.8.new/test/regression/Makefile.am 2013-10-08 13:05:15.498853962 -0700
37 -@@ -33,9 +33,19 @@
38 -
39 - # Disable sphinx_fe tests for now if fixed-point due to imprecision
40 - if FIXED_POINT
41 --TESTS = $(srcdir)/test-cepview.sh $(srcdir)/test-sphinx_pitch.sh
42 -+TESTS = test-cepview.sh test-sphinx_pitch.sh
43 - else
44 --TESTS = $(srcdir)/test-*.sh
45 -+TESTS = \
46 -+ test-cepview.sh \
47 -+ test-sphinx_fe-ctl.sh \
48 -+ test-sphinx_fe-dct.sh \
49 -+ test-sphinx_fe-dither-seed.sh \
50 -+ test-sphinx_fe-logspec2cep.sh \
51 -+ test-sphinx_fe-logspec.sh \
52 -+ test-sphinx_fe.sh \
53 -+ test-sphinx_fe-smoothspec.sh \
54 -+ test-sphinx_jsgf2fsg.sh \
55 -+ test-sphinx_pitch.sh
56 - endif
57 -
58 - EXTRA_DIST += $(TESTS)
59
60 diff --git a/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch b/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch
61 deleted file mode 100644
62 index 70beae05de7..00000000000
63 --- a/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch
64 +++ /dev/null
65 @@ -1,85 +0,0 @@
66 - configure.in | 40 +++++++++++++++++++++-------------------
67 - src/libsphinxbase/Makefile.am | 1 +
68 - 2 files changed, 22 insertions(+), 19 deletions(-)
69 -
70 -diff --git a/configure.in b/configure.in
71 -index e10629c..b5d6ea9 100644
72 ---- a/configure.in
73 -+++ b/configure.in
74 -@@ -62,13 +62,15 @@ if test x$withval = xno; then
75 - use_lapack=false
76 - fi
77 - ])
78 --if test x$use_lapack = xtrue; then
79 -- AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true)
80 -- if test x$use_internal_lapack != xtrue; then
81 -- AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true)
82 -- fi
83 -+AS_IF([test "x$with_lapack" = "xyes"], [
84 -+ PKG_CHECK_MODULES([LAPACK], [lapack],,
85 -+ AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true))
86 -+ AS_IF([test "x$use_internal_lapack" != "xtrue"], [
87 -+ PKG_CHECK_MODULES([BLAS], [blas],,
88 -+ AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true))
89 -+ ])
90 - AC_DEFINE(WITH_LAPACK, [], [Enable matrix algebra with LAPACK])
91 --fi
92 -+])
93 - AM_CONDITIONAL(LAPACK_LITE, test x$use_internal_lapack = xtrue)
94 - AM_CONDITIONAL(USE_LAPACK, test x$use_lapack = xtrue)
95 -
96 -@@ -208,9 +210,15 @@ AM_PROG_LIBTOOL
97 - dnl
98 - dnl Check for Doxygen, and build dox if present
99 - dnl
100 --AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
101 -+AC_ARG_ENABLE([doc],
102 -+ AS_HELP_STRING([--enable-doc], [Build docs using doxygen]))
103 -+AS_IF([test "x$enable_doc" = "xyes"], [
104 -+ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
105 -+ AS_IF([test "x$HAVE_DOXYGEN" != "xyes"], [
106 -+ AC_MSG_ERROR([--enable-doc given, but doxygen not found.]); exit 1
107 -+ ])
108 -+])
109 - AM_CONDITIONAL(BUILD_DOXYGEN, test "x$HAVE_DOXYGEN" = "xyes")
110 --
111 - dnl
112 - dnl Check for Python, and build python module if present
113 - dnl
114 -@@ -260,19 +268,13 @@ fi
115 - AM_CONDITIONAL(BUILD_CYTHON, test "x$HAVE_CYTHON" = "xyes")
116 -
117 - dnl
118 --dnl Check for pkgconfig
119 --dnl
120 --AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
121 --
122 --dnl
123 - dnl Check for libsndfile
124 - dnl
125 --if test "x$HAVE_PKGCONFIG" = "xyes"; then
126 -- PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
127 -- AC_CHECK_HEADERS([sndfile.h])
128 -- PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
129 -- AC_CHECK_HEADERS([samplerate.h])
130 --fi
131 -+PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
132 -+AC_CHECK_HEADERS([sndfile.h])
133 -+PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
134 -+AC_CHECK_HEADERS([samplerate.h])
135 -+
136 - AC_SUBST(SNDFILE_LIBS)
137 - AC_SUBST(SNDFILE_CFLAGS)
138 - AC_SUBST(SAMPLERATE_LIBS)
139 -diff --git a/src/libsphinxbase/Makefile.am b/src/libsphinxbase/Makefile.am
140 -index 52ee3e1..f4efd8a 100644
141 ---- a/src/libsphinxbase/Makefile.am
142 -+++ b/src/libsphinxbase/Makefile.am
143 -@@ -8,6 +8,7 @@ libsphinxbase_la_SOURCES =
144 - # This is API version 2, software release 1, which also supports API version 1
145 - libsphinxbase_la_LDFLAGS = -version-info 2:1:1
146 - libsphinxbase_la_LIBADD = $(LTLIBICONV) \
147 -+ @LAPACK_LIBS@ \
148 - util/libsphinxutil.la \
149 - fe/libsphinxfe.la \
150 - feat/libsphinxfeat.la \
151
152 diff --git a/app-accessibility/sphinxbase/metadata.xml b/app-accessibility/sphinxbase/metadata.xml
153 deleted file mode 100644
154 index c381beacd5f..00000000000
155 --- a/app-accessibility/sphinxbase/metadata.xml
156 +++ /dev/null
157 @@ -1,11 +0,0 @@
158 -<?xml version="1.0" encoding="UTF-8"?>
159 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
160 -<pkgmetadata>
161 - <maintainer type="project">
162 - <email>accessibility@g.o</email>
163 - <name>Gentoo Accessibility Project</name>
164 - </maintainer>
165 - <upstream>
166 - <remote-id type="sourceforge">cmusphinx</remote-id>
167 - </upstream>
168 -</pkgmetadata>
169
170 diff --git a/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild b/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
171 deleted file mode 100644
172 index b52de17feda..00000000000
173 --- a/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
174 +++ /dev/null
175 @@ -1,79 +0,0 @@
176 -# Copyright 1999-2017 Gentoo Foundation
177 -# Distributed under the terms of the GNU General Public License v2
178 -
179 -EAPI=5
180 -
181 -PYTHON_COMPAT=( python2_7 )
182 -DISTUTILS_OPTIONAL=1
183 -AUTOTOOLS_AUTORECONF=1
184 -
185 -inherit autotools-utils distutils-r1
186 -
187 -DESCRIPTION="Support library required by the Sphinx Speech Recognition Engine"
188 -HOMEPAGE="http://cmusphinx.sourceforge.net/"
189 -SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
190 -
191 -LICENSE="BSD-2 HPND MIT"
192 -SLOT="0"
193 -KEYWORDS="amd64 x86"
194 -IUSE="doc lapack python static-libs"
195 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
196 -
197 -# automagic dep on pulseaudio
198 -RDEPEND="
199 - media-sound/pulseaudio
200 - lapack? ( virtual/lapack )
201 - python? ( ${PYTHON_DEPS} )"
202 -DEPEND="${RDEPEND}
203 - doc? ( >=app-doc/doxygen-1.4.7 )"
204 -
205 -# Due to generated Python setup.py.
206 -AUTOTOOLS_IN_SOURCE_BUILD=1
207 -
208 -PATCHES=(
209 - "${FILESDIR}"/${P}-unbundle-lapack.patch
210 - "${FILESDIR}"/${P}-automake113.patch
211 -)
212 -
213 -src_configure() {
214 - local myeconfargs=(
215 - $(use_with lapack)
216 - $(use_enable doc)
217 - # python modules are built through distutils
218 - # so disable the ugly wrapper
219 - --without-python
220 - )
221 - autotools-utils_src_configure
222 -}
223 -
224 -run_distutils() {
225 - if use python; then
226 - pushd python > /dev/null || die
227 - distutils-r1_"${@}"
228 - popd > /dev/null || die
229 - fi
230 -}
231 -
232 -src_compile() {
233 - autotools-utils_src_compile
234 -
235 - run_distutils ${FUNCNAME}
236 -}
237 -
238 -python_test() {
239 - LD_LIBRARY_PATH="${S}"/src/lib${PN}/.libs \
240 - "${PYTHON}" sb_test.py || die "Tests fail with ${EPYTHON}"
241 -}
242 -
243 -src_test() {
244 - autotools-utils_src_test
245 -
246 - run_distutils ${FUNCNAME}
247 -}
248 -
249 -src_install() {
250 - run_distutils ${FUNCNAME}
251 -
252 - use doc && local HTML_DOCS=( doc/html/. )
253 - autotools-utils_src_install
254 -}
255
256 diff --git a/profiles/package.mask b/profiles/package.mask
257 index 0339d0ae713..989873395da 100644
258 --- a/profiles/package.mask
259 +++ b/profiles/package.mask
260 @@ -725,13 +725,6 @@ dev-python/cloudlib
261 app-arch/cfv
262 app-arch/ipkg-utils
263
264 -# Aaron Bauman <bman@g.o> (2020-08-01)
265 -# Py2 only. Dead upstream.
266 -# Removal in 30 days
267 -# Bug #568602,#340164,#560840,#716420,#560254
268 -# #476424,#643982
269 -app-accessibility/sphinxbase
270 -
271 # Aaron Bauman <bman@g.o> (2020-08-01)
272 # Py2 only. Last upstream release 2013.
273 # Removal in 30 days. Last 2 have deps on cddb.