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/sphinx3/, profiles/, app-accessibility/sphinx3/files/
Date: Wed, 02 Sep 2020 08:06:33
Message-Id: 1599033850.814099f6c24ac7827efaec7dadbcb12d849cb5be.mgorny@gentoo
1 commit: 814099f6c24ac7827efaec7dadbcb12d849cb5be
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 08:04:10 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 08:04:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=814099f6
7
8 app-accessibility/sphinx3: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-accessibility/sphinx3/Manifest | 1 -
13 .../sphinx3/files/sphinx3-0.8-libutil.patch | 18 -------
14 .../sphinx3/files/sphinx3-0.8_heap_fix.patch | 34 ------------
15 app-accessibility/sphinx3/metadata.xml | 11 ----
16 app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild | 60 ----------------------
17 profiles/package.mask | 2 -
18 6 files changed, 126 deletions(-)
19
20 diff --git a/app-accessibility/sphinx3/Manifest b/app-accessibility/sphinx3/Manifest
21 deleted file mode 100644
22 index 8740e318829..00000000000
23 --- a/app-accessibility/sphinx3/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST sphinx3-0.8.tar.gz 25226326 BLAKE2B 0eb2c6474ec32ef1aed277816b0b596ba561c1705b389b19de7dfd969212bc24e5eec0a920aaeb15ed3a90f464552b4e24e964b94380dc292a9299b4651793bc SHA512 85b8e574e2f92a758c8c56ef11b873c49ef8a376e964f30a12d75850d4a0db56e3108eaea25fa5587675ef2ffa4531a13f0f182a85cc8e434c6bcee42058e050
27
28 diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch b/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
29 deleted file mode 100644
30 index 0f7733154a5..00000000000
31 --- a/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
32 +++ /dev/null
33 @@ -1,18 +0,0 @@
34 ---- src/libs3decoder/libsearch/fsg_history.c
35 -+++ src/libs3decoder/libsearch/fsg_history.c
36 -@@ -55,7 +55,6 @@
37 - #include <kb.h>
38 - /*#include <phone.h>*/
39 - #include <search.h>
40 --#include "libutil.h"
41 -
42 -
43 - #define __FSG_DBG__ 0
44 ---- src/libs3decoder/libcfg/s3_cfg_convert.c
45 -+++ src/libs3decoder/libcfg/s3_cfg_convert.c
46 -@@ -1,5 +1,4 @@
47 -
48 --#include <libutil.h>
49 - #include "s3_cfg.h"
50 - #include "fsg.h"
51 -
52
53 diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
54 deleted file mode 100644
55 index b7b71d97441..00000000000
56 --- a/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
57 +++ /dev/null
58 @@ -1,34 +0,0 @@
59 -diff -uNr sphinx3-0.8.orig/python/setup.py sphinx3-0.8/python/setup.py
60 ---- sphinx3-0.8.orig/python/setup.py 2008-12-31 23:20:08.000000000 -0500
61 -+++ sphinx3-0.8/python/setup.py 2011-11-17 09:46:57.000000000 -0500
62 -@@ -8,15 +8,10 @@
63 - define_macros = []
64 -
65 - module = Extension('_sphinx3',
66 -- include_dirs = ['../../sphinxbase/include',
67 -- '../include',
68 -- '/usr/local/include/sphinxbase/',
69 -- '/usr/local/include/sphinx3',
70 -- ],
71 -+ include_dirs = ['../include',
72 -+ '@GENTOO_PORTAGE_EPREFIX@/usr/include/sphinxbase'],
73 - define_macros = define_macros,
74 -- library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',
75 -- '../src/libs3decoder/.libs',
76 -- '../../sphinxbase/lib/debug',
77 -+ library_dirs = ['../src/libs3decoder/.libs',
78 - '../lib/debug',
79 - ],
80 - libraries = ['sphinxbase', 's3decoder'],
81 -diff -uNr sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
82 ---- sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c 2008-12-31 13:27:56.000000000 -0500
83 -+++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c 2011-11-17 09:46:24.000000000 -0500
84 -@@ -647,7 +647,7 @@
85 - {
86 - int32 se, fe, filler_done, th;
87 - vithist_entry_t *ve;
88 -- heap_t h;
89 -+ heap_t *h;
90 - s3wid_t *wid;
91 - int32 i;
92 -
93
94 diff --git a/app-accessibility/sphinx3/metadata.xml b/app-accessibility/sphinx3/metadata.xml
95 deleted file mode 100644
96 index b41f634a646..00000000000
97 --- a/app-accessibility/sphinx3/metadata.xml
98 +++ /dev/null
99 @@ -1,11 +0,0 @@
100 -<?xml version="1.0" encoding="UTF-8"?>
101 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
102 -<pkgmetadata>
103 - <maintainer type="project">
104 - <email>accessibility@g.o</email>
105 - <name>Gentoo Accessibility Project</name>
106 - </maintainer>
107 - <upstream>
108 - <remote-id type="sourceforge">cmusphinx</remote-id>
109 - </upstream>
110 -</pkgmetadata>
111
112 diff --git a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
113 deleted file mode 100644
114 index 42f44dfce58..00000000000
115 --- a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
116 +++ /dev/null
117 @@ -1,60 +0,0 @@
118 -# Copyright 1999-2014 Gentoo Foundation
119 -# Distributed under the terms of the GNU General Public License v2
120 -
121 -EAPI=5
122 -
123 -# disable automatic phase exports and deps
124 -DISTUTILS_OPTIONAL=1
125 -PYTHON_COMPAT=( python2_7 )
126 -
127 -inherit autotools-utils distutils-r1 prefix eutils
128 -
129 -DESCRIPTION="CMU Speech Recognition engine"
130 -HOMEPAGE="http://cmusphinx.sourceforge.net/"
131 -SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
132 -
133 -LICENSE="BSD-2"
134 -SLOT="0"
135 -KEYWORDS="amd64 x86"
136 -IUSE="doc python static-libs"
137 -
138 -RDEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?,${PYTHON_USEDEP}]
139 - python? ( ${PYTHON_DEPS} )"
140 -DEPEND="${RDEPEND}"
141 -
142 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
143 -
144 -# Due to generated Python setup.py.
145 -AUTOTOOLS_IN_SOURCE_BUILD=1
146 -
147 -src_prepare() {
148 - epatch "${FILESDIR}/${P}_heap_fix.patch" \
149 - "${FILESDIR}/${P}-libutil.patch"
150 - eprefixify 'python/setup.py'
151 -}
152 -
153 -src_compile() {
154 - autotools-utils_src_compile
155 -
156 - if use python; then
157 - cd python || die
158 - distutils-r1_src_compile
159 - fi
160 -}
161 -
162 -src_install() {
163 - local DOCS=( AUTHORS ChangeLog NEWS README )
164 - autotools-utils_src_install
165 -
166 - if use doc; then
167 - cd doc || die
168 - dohtml -r -x CVS s3* s3 *.html
169 - fi
170 -
171 - if use python; then
172 - unset DOCS
173 -
174 - cd "${S}"/python || die
175 - distutils-r1_src_install
176 - fi
177 -}
178
179 diff --git a/profiles/package.mask b/profiles/package.mask
180 index 100928116c0..0339d0ae713 100644
181 --- a/profiles/package.mask
182 +++ b/profiles/package.mask
183 @@ -730,8 +730,6 @@ app-arch/ipkg-utils
184 # Removal in 30 days
185 # Bug #568602,#340164,#560840,#716420,#560254
186 # #476424,#643982
187 -app-accessibility/SphinxTrain
188 -app-accessibility/sphinx3
189 app-accessibility/sphinxbase
190
191 # Aaron Bauman <bman@g.o> (2020-08-01)