gentoo resync : 17.10.2017

3 files changed, 142 insertions, 0 deletions

diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 31942706cbb1..4c72ee24044c 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,8 +1,10 @@
+AUX speech-tools-2.1-gcc7.patch 612 SHA256 89061d36d559cec3d3e287318cfcd1b4148fd2fbeb8707aa01fe8f55d7312a34 SHA512 6d4c9c43821f571b5fa8f476f740ee276b9a05dcb8a39cfc32f5b3a87548acf051a1abf75f3be5a8563b03c5302b9208ce894a5065899b0f43ba9d2ffe7a65db WHIRLPOOL 2469ecce17000d976c7c1a89ba0cd8c60c88a328bc27d2d46b629993d1636a9e149528361f672598f28052d18b6c0a9a5ded92da3c5a7a439cc4bb50724d8c04
 AUX speech-tools-2.1-underlinking.patch 565 SHA256 2f0b8781c03362cf0a6c67e842778c44566db6b0089e980ec84779245b77468d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47 WHIRLPOOL 93464e4fa43cefcdce6599ab5cdfef741a5ec90909a78019c3e56485b9d3f47df09f39316679ca7ee61a84bbabad0cd072dc9ffdaeeb844db1a923cbd101b794
 DIST speech_tools-2.1-r3-patches.tar.gz 6876 SHA256 c37357211aa88ca6038932222f664ee332d58c553960d13ef93c489d2bb41e11 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 WHIRLPOOL a038534ab83819e5c36e74026ee510bfc279e41b6eea62e6fcb54df599a888d51e7398bd91db615e8e6cdc140b52bc99d8d7c7e52c158ce161d2a74e5909cb2c
 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644
 EBUILD speech-tools-2.1-r2.ebuild 2699 SHA256 0ef9b709ac458b2d627446c1bbf77467fc26c391d9d517a299d33bd7bfd0d61c SHA512 1e684dcb5cf9503c5654424f777457f1e808c530fce6d07590a6e129314d67d7f78057ed9103abcae4b2e228e522c66f4d6ed8eadcdbbbedb29401a6b0cc762d WHIRLPOOL 11561d5bebf67879a45c37aa9fac702431d68f2c355e7fc696495df46e77cb79ffde7d9416161ce93dd7ebb3cee417aa669f3c58877095c7f65ea8dd2ca5e2a7
 EBUILD speech-tools-2.1-r3.ebuild 2982 SHA256 d2d4eaca2333f66a661c3cbb1b66c9155196daf9fc5d40e2264ac985168e967c SHA512 96d32a1b59baa8beb564583a56db7328f3d31c7f20c5537d993e3e43d68ac5ae01d6ed3306b111f482f2c68adb9d86628e8664ee0b3c4ef1a2bc44b75da908f8 WHIRLPOOL f64bf2b203db70e8aca68b46a669d4d7c7863d755c3ac5ffea887be03b526910ab5c934fcfcd3a210e3b7fad323e959722b5d18253593a6a6c0c0739d85c873d
+EBUILD speech-tools-2.1-r4.ebuild 3065 SHA256 c4c7a0b6a15f1a3c94b8c210b9c1945bb188c909c444703d18dc702fbb3e5d8d SHA512 09f4ccfcbfe87fe62d78395febddb934b5a423409ff716a7814c32c7cbebc4732e9c5211b9277529e934275b924822a4897bedbf2fcb6e5e527a49fbdece3727 WHIRLPOOL 1f3ef0f4453f196a776a19848cb9c84f3a5f83eae2b8357d3339df62791829adca0c1ed69ee27ce2e78ac115bd5771536c2d91663eec2c3c4e83324dec5fdabe
 MISC ChangeLog 2742 SHA256 f5c77d83dc12db3ae35fcc3ac3a421802c220600af5f03e072ed696e3dde0ad9 SHA512 c1f0cb702b99825404ea09b217ea16eee5960798cdca8dd6a425cdf01646624f70a94a8a21cfcddbf34bf5188cf98d0ac9cb205b63869ed9ead949514c4989db WHIRLPOOL 67e1b82e2cd7ceb827b8467723dc9656e3768bb1c236ade7281c2e2d13a8b5e043f8b25a723f2042a6052ddda8a20c65de4f7e84279ea4573b9624cbf85d4f82
 MISC ChangeLog-2015 15635 SHA256 d9a8112a3aa116be7810d4287fe7524f963838289d5ce090a33d0d68e6b40de2 SHA512 908fcd4bc35763cb05fdc1dfdddbe17e48c45f3ba4936e7b735a3d2c79a834c3d69fedf13ad8c35db54c59fc3c8b4061e3251583ed87784df3b55c90f042a273 WHIRLPOOL 045de4c3d731d674049b8331dd4128bb87b2f94edce9592a297102f8fa79038e2c1e40d8605c2a3b4b950cfb907f2d68784f0c9dcba674b1bb30a55cf96155e0
 MISC metadata.xml 375 SHA256 2d266a45b4fb056159839f940687765d7e13a01d0748fac50bbbcbb4a19d2483 SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224 WHIRLPOOL 4509576afbf26fe58f3dbac4b99d56b01588c69ee22f65bb50694d214ec6c06c5eaf7136cacb2da1259486d499d643b73726744e3d942bdfd5a3849630612644
diff --git a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
new file mode 100644
index 000000000000..9e1067fa1dc1
--- /dev/null
+++ b/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch
@@ -0,0 +1,20 @@
+--- a/siod/siod.cc
++++ b/siod/siod.cc
+@@ -459,7 +459,7 @@ char **siod_variable_generator(char *text,int length)
+     matches = walloc(char *,siod_llength(lmatches)+1);
+     for (l=lmatches,i=0; l; l=cdr(l),i++)
+ 	matches[i] = wstrdup(PNAME(car(l)));
+-    matches[i] = '\0';
++    *matches[i] = '\0';
+ 
+     return matches;
+ }
+@@ -498,7 +498,7 @@ char **siod_command_generator (char *text,int length)
+     matches = walloc(char *,siod_llength(lmatches)+1);
+     for (l=lmatches,i=0; l; l=cdr(l),i++)
+ 	matches[i] = wstrdup(PNAME(car(l)));
+-    matches[i] = '\0';
++    *matches[i] = '\0';
+ 
+     return matches;
+ }
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
new file mode 100644
index 000000000000..254a17f15447
--- /dev/null
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+PATCHSET="r3"
+
+DESCRIPTION="Speech tools for Festival Text to Speech engine"
+HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
+SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
+		 https://dev.gentoo.org/~neurogeek/${PN}/${MY_P}-${PATCHSET}-patches.tar.gz"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nas X"
+
+RDEPEND="
+	nas? ( media-libs/nas )
+	X? ( x11-libs/libX11
+		x11-libs/libXt )
+	>=media-libs/alsa-lib-1.0.20-r1
+	!<app-accessibility/festival-1.96_beta
+	!sys-power/powerman
+	>=sys-libs/ncurses-5.6-r2
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/speech_tools"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch"
+	epatch
+
+	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
+		main/siod_main.cc || die
+
+	#WRT bug #309983
+	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
+		"${S}"/config/systems/sparc_SunOS5.mak || die
+
+	# Fix underlinking, bug #493204
+	epatch "${FILESDIR}"/${PN}-2.1-underlinking.patch
+
+	# Fix gcc7 build failure, bug #634224
+	epatch "${FILESDIR}"/${PN}-2.1-gcc7.patch
+}
+
+src_configure() {
+	local CONFIG=config/config.in
+	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
+	if use nas; then
+		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
+			${CONFIG} || die
+	fi
+	if ! use X; then
+		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
+	fi
+	econf
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dolib.so lib/libest*.so*
+
+	dodoc "${S}"/README
+	dodoc "${S}"/lib/cstrutt.dtd
+
+	insinto /usr/share/doc/${PF}
+	doins -r lib/example_data
+
+	insinto /usr/share/speech-tools
+	doins -r config base_class
+
+	insinto /usr/share/speech-tools/lib
+	doins -r lib/siod
+
+	cd include || die
+	insinto /usr/include/speech-tools
+	doins -r *
+	dosym ../../include/speech-tools /usr/share/speech-tools/include
+
+	cd ../bin || die
+	for file in *; do
+		[ "${file}" = "Makefile" ] && continue
+		dobin ${file}
+		dstfile="${D}/usr/bin/${file}"
+		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+
+		# This just changes LD_LIBRARY_PATH
+		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
+	done
+
+	cd "${S}" || die
+	exeinto /usr/$(get_libdir)/speech-tools
+	for file in `find main -perm /111 -type f`; do
+		doexe ${file}
+	done
+
+	#Remove /usr/bin/resynth as it is broken. See bug #253556
+	rm "${D}/usr/bin/resynth" || die
+
+	# Remove bcat (only useful for testing on windows, see bug #418301).
+	rm "${D}/usr/bin/bcat" || die
+	rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die
+}