gentoo resync : 15.06.2021

3 files changed, 24 insertions, 22 deletions

diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index 2591ee4933f7..14e35d41a508 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,4 +1,4 @@
-AUX jsapi-gentoo.diff 10444 BLAKE2B 0f829738e11f9cf3e852aac0483c891f4c140639e0c7037abf9117a9301f85632bfe11409191d8c137a9b2c4f9dc4251618f16c376fb6c35c9b0848f06072465 SHA512 43e53a55afb973821a7997f7989e7330e263a55eb4c1fdd4bbc6b7269ae428582f21f59b05e258f618c9f2ce88d047797e24dfdaab7465c6feca995fcbcb8ca1
+AUX jsapi-gentoo.diff 10456 BLAKE2B c0de49a34fe6e5240f4a1c895b99593a169a3a14fe7c3b98cc62723d34b31935735e9632f599b90748a760a448860ae81d2a1e48de6f1074633d33e19c5158d3 SHA512 62acd90cb064db176ee7a0950857c173f2ace4de6a6319fce3273bcbb222f8fd309bc6939eaba00a00cd7217871dca60cfa33d5ee1396b86333b9dedbf8f3034
 DIST freetts-1.2.2-src.zip 14111416 BLAKE2B fd3ac79ffe3ca031d40a6523a4ae900200c1b1eea0369fd1eec3233f852af8edffd81ca6c0bba628132221346d283d2138794e1f9697074fc1044944ad852e5b SHA512 a2cce0b1fd2267cc8dbd3e2ad3ec1f99526de3988443c0937405cc7b2eab9ef517001ef0b4b387e8721d3c33610cd642c6b7cf83217996a83481830de9713de7
-EBUILD freetts-1.2.2.ebuild 1891 BLAKE2B 166113be9418f3adbd08d72864765e41673a7eb9fc4605730acbeb2d4cbc6f4c4f69faad5b881e688564049135092df123a2446dc06da4e0d0711f289d1859e0 SHA512 86b7a960527ec03d1fdb5696685ba715de17c84487140d0607579e1187678890adcbffd757850ccb52167227c9feffd1c178df5a1df5be08f27f0a99a2bb4e27
+EBUILD freetts-1.2.2-r1.ebuild 1914 BLAKE2B 1e0be38b586cbbe84ddb212b1046e1386097bcf57af706d41f382ce0a62b1fb7dde3e2df0d173545314da22c52e6a2affd9b085b0d12a92673e847143aa2c983 SHA512 74ab139b264f65d67f2eecd9725c2332d8a7774f4907c5ca638555de6760642d43f873b8d12b2510b0c16f0de964a17dd6a1f99bc1fe4634b55bd4b86b192c29
 MISC metadata.xml 576 BLAKE2B dda15cfed056b8e34ebd707ac45b632b2ba322b85109a77fd8cdb3c9f2e485ec6495cee5773ec7a092e553dc51f2e1534b9778b1e35ec1f6719ce8ac56fb3406 SHA512 f4541826693d1e4b6c943c269d2702f27d60c70727f19ac6511696c723d9e56e5d4673ebb8a219a974bd1b1cfdeba9164b8084017c09fba28429b795308b25a8
diff --git a/app-accessibility/freetts/files/jsapi-gentoo.diff b/app-accessibility/freetts/files/jsapi-gentoo.diff
index 016263e24d0d..5230c41476a5 100644
--- a/app-accessibility/freetts/files/jsapi-gentoo.diff
+++ b/app-accessibility/freetts/files/jsapi-gentoo.diff
@@ -1,5 +1,5 @@
---- jsapi.sh	2001-12-20 09:51:28.000000000 -0500
-+++ jsapi-gentoo.sh	2004-03-20 01:36:10.021810888 -0500
+--- a/lib/jsapi.sh	2001-12-20 09:51:28.000000000 -0500
++++ b/lib/jsapi-gentoo.sh	2004-03-20 01:36:10.021810888 -0500
 @@ -10,191 +10,6 @@
  # ------ ---------- ------------------------------------------
  #  51811 -rw-rw-r-- jsapi.jar
diff --git a/app-accessibility/freetts/freetts-1.2.2.ebuild b/app-accessibility/freetts/freetts-1.2.2-r1.ebuild
index 31b68c3c7b28..bca36b634869 100644
--- a/app-accessibility/freetts/freetts-1.2.2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2-r1.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc examples source"
-inherit eutils epatch java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A speech synthesis system written entirely in Java"
+HOMEPAGE="https://freetts.sourceforge.net/"
 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="jsapi mbrola"
 
+DEPEND=">=virtual/jdk-1.8:*
+	${RDEPEND}
+	jsapi? ( app-arch/sharutils )"
+RDEPEND=">=virtual/jre-1.8:*
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
+BDEPEND="app-arch/unzip"
+
 # Tests aren't present.
 RESTRICT="test"
 
-java_prepare() {
+PATCHES=( "${FILESDIR}"/jsapi-gentoo.diff )
+
+DOCS=( ANNOUNCE.txt README.txt RELEASE_NOTES )
+
+src_prepare() {
+	default
 	# Prepare source directory.
 	mkdir src || die "Failed to create source directory."
 	mv com de src/ || die "Failed to move files to source directory."
@@ -34,7 +38,6 @@ java_prepare() {
 	# Prepare library directory.
 	cd lib || die "Lib directory not present."
 	chmod 0755 jsapi.sh || die "jsapi.sh not present or can't change permissions."
-	epatch "${FILESDIR}"/jsapi-gentoo.diff
 
 	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}"/speech.properties
 }
@@ -56,6 +59,7 @@ src_compile() {
 #}
 
 src_install() {
+	default
 	java-pkg_dojar lib/*.jar mbrola/*.jar
 
 	use mbrola && local jflags="--java_args -Dmbrola.base=/usr/share/mbrola"
@@ -66,11 +70,9 @@ src_install() {
 	doins speech.properties
 	doins -r tools
 
-	dodoc ANNOUNCE.txt README.txt RELEASE_NOTES
-
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r docs/*
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docs/*
 		java-pkg_dojavadoc javadoc
 	fi
 
@@ -79,6 +81,6 @@ src_install() {
 	fi
 
 	if use source ; then
-		java-pkg-dosrc src/*
+		java-pkg_dosrc src/*
 	fi
 }