gentoo resync : 14.07.2018

5 files changed, 128 insertions, 0 deletions

diff --git a/app-accessibility/sphinx3/Manifest b/app-accessibility/sphinx3/Manifest
new file mode 100644
index 000000000000..f3b72d10af98
--- /dev/null
+++ b/app-accessibility/sphinx3/Manifest
@@ -0,0 +1,5 @@
+AUX sphinx3-0.8-libutil.patch 390 BLAKE2B 42bf803c7368396150e784ebd5965bebba72338cfcc0591f477f39b596fd5baf21caef374c87ff3c90323e69980c392aa1d84d648976b035efba20893a5d150f SHA512 cddb0e0378129f75f0d453c421a6e94e99cd9f495fb431d5bd1113471e77299c4ee5c42f3400f3998ab398db6cc8d9ae9d10e0c7a6c77610e29c8c1883ebd4b6
+AUX sphinx3-0.8_heap_fix.patch 1475 BLAKE2B 5786ca8b194c24fc1b305b36f4fd4506af2dd5e568aecdea3c86bf635126ebf307029d8ad815ee6bee90f3427caa066b4c8802162c55916ea76e300a0a51b0e0 SHA512 7b709e1f3741fb3403bbb9ffda77feeba7ff8e5373d1b3e8e03247dd5eff5e1b0f90595d579e6216602da376d2f297e9a46aa2d0016dbaeef400781ef9272751
+DIST sphinx3-0.8.tar.gz 25226326 BLAKE2B 0eb2c6474ec32ef1aed277816b0b596ba561c1705b389b19de7dfd969212bc24e5eec0a920aaeb15ed3a90f464552b4e24e964b94380dc292a9299b4651793bc SHA512 85b8e574e2f92a758c8c56ef11b873c49ef8a376e964f30a12d75850d4a0db56e3108eaea25fa5587675ef2ffa4531a13f0f182a85cc8e434c6bcee42058e050
+EBUILD sphinx3-0.8-r1.ebuild 1236 BLAKE2B c7abf6b80dfe393b0b5cd9913cb5368a843ac78fdab0e146ee932ee71f17bf37feddf381df1fa79b27063a208ad4f30fc79b9a60fe9963d264a4a5e3718ace5a SHA512 02200fa47d7d50f6010a7899c1a9564e632e59125efc21edfa6960af684540ea0e46320fefcd192303ec9377445b4be6bd403cfbbfcdcf2ce034c4ca1fa53f11
+MISC metadata.xml 348 BLAKE2B afc4022dc46500e70aba84d0f85d8a1f843e5faef82c6bfbfe494784ed322c4b3e41a1415f4c4d5ff1655791ce805722d638785b985908182f5805ef44e68068 SHA512 34f2af68ffe473a5fc01eafc493532b72e40339ec299960ed5b9b0b45f0a2681497d1adad8c87dfefbdd446825c1eaa8d08a29b900e8e6998a131c20f24ef5c7
diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch b/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
new file mode 100644
index 000000000000..0f7733154a53
--- /dev/null
+++ b/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
@@ -0,0 +1,18 @@
+--- src/libs3decoder/libsearch/fsg_history.c
++++ src/libs3decoder/libsearch/fsg_history.c
+@@ -55,7 +55,6 @@
+ #include <kb.h>
+ /*#include <phone.h>*/
+ #include <search.h>
+-#include "libutil.h"
+ 
+ 
+ #define __FSG_DBG__	0
+--- src/libs3decoder/libcfg/s3_cfg_convert.c
++++ src/libs3decoder/libcfg/s3_cfg_convert.c
+@@ -1,5 +1,4 @@
+ 
+-#include <libutil.h>
+ #include "s3_cfg.h"
+ #include "fsg.h"
+ 
diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
new file mode 100644
index 000000000000..b7b71d974413
--- /dev/null
+++ b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
@@ -0,0 +1,34 @@
+diff -uNr sphinx3-0.8.orig/python/setup.py sphinx3-0.8/python/setup.py
+--- sphinx3-0.8.orig/python/setup.py	2008-12-31 23:20:08.000000000 -0500
++++ sphinx3-0.8/python/setup.py	2011-11-17 09:46:57.000000000 -0500
+@@ -8,15 +8,10 @@
+     define_macros = []
+ 
+ module = Extension('_sphinx3',
+-                   include_dirs = ['../../sphinxbase/include',
+-                                   '../include',
+-                                   '/usr/local/include/sphinxbase/',
+-                                   '/usr/local/include/sphinx3',
+-                                   ],
++                   include_dirs = ['../include',
++                                   '@GENTOO_PORTAGE_EPREFIX@/usr/include/sphinxbase'],
+ 		   define_macros = define_macros,
+-		   library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',
+-				'../src/libs3decoder/.libs',
+-				'../../sphinxbase/lib/debug',
++		   library_dirs = ['../src/libs3decoder/.libs',
+ 				'../lib/debug',
+ 				],
+                    libraries = ['sphinxbase', 's3decoder'],
+diff -uNr sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
+--- sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c	2008-12-31 13:27:56.000000000 -0500
++++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c	2011-11-17 09:46:24.000000000 -0500
+@@ -647,7 +647,7 @@
+ {
+     int32 se, fe, filler_done, th;
+     vithist_entry_t *ve;
+-    heap_t h;
++    heap_t *h;
+     s3wid_t *wid;
+     int32 i;
+ 
diff --git a/app-accessibility/sphinx3/metadata.xml b/app-accessibility/sphinx3/metadata.xml
new file mode 100644
index 000000000000..b41f634a646d
--- /dev/null
+++ b/app-accessibility/sphinx3/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cmusphinx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
new file mode 100644
index 000000000000..42f44dfce588
--- /dev/null
+++ b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# disable automatic phase exports and deps
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils distutils-r1 prefix eutils
+
+DESCRIPTION="CMU Speech Recognition engine"
+HOMEPAGE="http://cmusphinx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc python static-libs"
+
+RDEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?,${PYTHON_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_heap_fix.patch" \
+		"${FILESDIR}/${P}-libutil.patch"
+	eprefixify 'python/setup.py'
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README )
+	autotools-utils_src_install
+
+	if use doc; then
+		cd doc || die
+		dohtml -r -x CVS s3* s3 *.html
+	fi
+
+	if use python; then
+		unset DOCS
+
+		cd "${S}"/python || die
+		distutils-r1_src_install
+	fi
+}