gentoo resync : 13.10.2019

3 files changed, 3 insertions, 72 deletions

diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index 09b04055a3b0..13be5b2b80d9 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,6 +1,4 @@
 AUX jsapi-gentoo.diff 10444 BLAKE2B 0f829738e11f9cf3e852aac0483c891f4c140639e0c7037abf9117a9301f85632bfe11409191d8c137a9b2c4f9dc4251618f16c376fb6c35c9b0848f06072465 SHA512 43e53a55afb973821a7997f7989e7330e263a55eb4c1fdd4bbc6b7269ae428582f21f59b05e258f618c9f2ce88d047797e24dfdaab7465c6feca995fcbcb8ca1
-DIST freetts-1.2.1-src.zip 14100414 BLAKE2B 8feb4d6405e605f75a4e5223fcd3ddea9b4a5b719fb91e8224a63b3ad5ddb451ff8513b991737fc3ca1b87559448d777225fb3f09e4ee83f8de9bf3dc2c4132a SHA512 927d881263f561df8e8ee919ea6019ed44d6ecad7d434c618e333063e992f938d50161a281094b27a4dd8312ac3eedc34040ede947df91e94bbca06c25ba45d3
 DIST freetts-1.2.2-src.zip 14111416 BLAKE2B fd3ac79ffe3ca031d40a6523a4ae900200c1b1eea0369fd1eec3233f852af8edffd81ca6c0bba628132221346d283d2138794e1f9697074fc1044944ad852e5b SHA512 a2cce0b1fd2267cc8dbd3e2ad3ec1f99526de3988443c0937405cc7b2eab9ef517001ef0b4b387e8721d3c33610cd642c6b7cf83217996a83481830de9713de7
-EBUILD freetts-1.2.1-r2.ebuild 1554 BLAKE2B 4f22bc7d4107a3e694d035a38c0567a3ddba491a47b8ca753efaebefd85cf59baf36a344d2736645e6ab1b10b221e95a331d9aaf3f55227e7b00fbc3e7904dc1 SHA512 a3504c3114f77914e747c88bb3a24bf8ab3cf3595907a3cae8e580ce872d66ca8d0d7bc4ea12512d37459805327a93b8fa79204c01186a43d58c9e5fc94c83a2
-EBUILD freetts-1.2.2.ebuild 1894 BLAKE2B a85572c75c5facf42b2226e9736fec070286549bee2560f6290ccb462dfc709272f3ee94f02566d87b9e5a547245c4e01399ab486f70cc1d4efdabbae718b4dc SHA512 abca6c28b6311e592cbd3bf986e9e097649b6446629b287ea695327ff946d7240b0178d3f0c5368ebceb185c889ddf02eef75306e460c31be503d2731f2d99d2
+EBUILD freetts-1.2.2.ebuild 1888 BLAKE2B 8787e38904cc079aa3ff1d4fbe058ecc119a6c4fd0682066313ed9b1f502f55e6e569077cf00a73446491d0fda9aaa20ae2d0bba04c7ce905eb223663cb6bd07 SHA512 fdc7501c66356cc7c9fa8098d462b95aa6454e09480186ce0980b19aaaffd31babc229de7fb7ddd7a376cfbefb10087bce0ecda31e59f409373e3b5acc7b3d2d
 MISC metadata.xml 576 BLAKE2B dda15cfed056b8e34ebd707ac45b632b2ba322b85109a77fd8cdb3c9f2e485ec6495cee5773ec7a092e553dc51f2e1534b9778b1e35ec1f6719ce8ac56fb3406 SHA512 f4541826693d1e4b6c943c269d2702f27d60c70727f19ac6511696c723d9e56e5d4673ebb8a219a974bd1b1cfdeba9164b8084017c09fba28429b795308b25a8
diff --git a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
deleted file mode 100644
index 379cc12449fb..000000000000
--- a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A speech synthesis system written entirely in Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-HOMEPAGE="http://freetts.sourceforge.net/"
-
-RDEPEND=">=virtual/jre-1.4
-	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	jsapi? ( app-arch/sharutils )
-	app-arch/unzip"
-
-LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc jsapi mbrola"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/lib"
-
-	chmod 0755 jsapi.sh
-	epatch "${FILESDIR}/jsapi-gentoo.diff"
-
-	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}/speech.properties"
-}
-
-src_compile() {
-	cd "${S}/lib"
-	if use jsapi; then
-		./jsapi.sh || die "jsapi.sh failed"
-	fi
-	cd "${S}"
-	eant jars
-}
-
-# Tests dont' seem included
-# http://freetts.sourceforge.net/docs/index.php#how_test
-#src_test() {
-#	ANT_TASKS="ant-junit" eant junit
-#}
-
-src_install() {
-	java-pkg_dojar lib/*.jar mbrola/*.jar
-
-	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
-	java-pkg_dolauncher ${PN} --main com.sun.speech.freetts.FreeTTS ${jflags}
-
-	insinto /usr/share/${PN}
-	doins speech.properties
-
-	cp -R "${S}/demo" "${D}/usr/share/${PN}"
-	cp -R "${S}/tools" "${D}/usr/share/${PN}"
-
-	dodoc README.txt RELEASE_NOTES acknowledgments.txt || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/docs/*
-		java-pkg_dojavadoc "${S}/javadoc"
-	fi
-}
diff --git a/app-accessibility/freetts/freetts-1.2.2.ebuild b/app-accessibility/freetts/freetts-1.2.2.ebuild
index fba0a2a231d2..3e352ae6f055 100644
--- a/app-accessibility/freetts/freetts-1.2.2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ DEPEND=">=virtual/jdk-1.4
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE="jsapi mbrola"