6 files changed, 134 insertions, 2 deletions
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 7e99f226f91e..59a8d3908f1e 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/freetts/Manifest b/app-accessibility/freetts/Manifest
index 9c3fd5b4de0a..194bc8605456 100644
--- a/app-accessibility/freetts/Manifest
+++ b/app-accessibility/freetts/Manifest
@@ -1,4 +1,6 @@
+AUX freetts-1.2.2-source-target.patch 1243 BLAKE2B 7d840d67ecdab9aa25ac323d28395919b5bb59594722631d2d2346ead8706d5e27aaf3d06258b1fb688ce6b5af120fd256dbd0ab805434f2751d17ceb8718a7a SHA512 e7f485d3ca5eab047cf03b56708abca646b13b64183b28bd58c1f9fb38eb518f82a0b9548524ac58a703622903fc17e360975949269a4550a3879e15aeec9da1
 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-r2.ebuild 1912 BLAKE2B 6a6991cfa8fe2501bb42c24900c1d2428fc5c03870f71882c16e985118be03b74a2848b3f31acc18356b6836bd32dca0d5249fbdc947bdcd01c276d3627b0b0d SHA512 3c7cffa08290d6a022b23c0606e61aa7949ab4c81b41e21f83e74b7104b291e36cd2374b82f66c2ce15e99e3bcddb4e18ed3b6db8de79acf3cad439c9942df10
+EBUILD freetts-1.2.2-r3.ebuild 2142 BLAKE2B 60fa356d6ebb94a4d469c05b2679cf635be77749aaddebdc3d705dc6eb2c187a0c90e58d376b6209dc6564f4f0d3d277365a7d7df4d98e3a58abe5e1c6b9f892 SHA512 e2079ced82cbed9554e235af1bb0183cbd4d15a30542de202a8e44246f30fffd23f1b816ed42556903d2690f776d6ee64d6b1a625f9de59a02ade97ac58d33b8
 MISC metadata.xml 577 BLAKE2B f7cfecae90f4d576518ffdfeefadfe143bd292cdf0dbc7742fdc3ff02b829e3625de02c6e88eca1e93cbfd4266f0bd64a787a609c939cfc22e37627542374bdb SHA512 75d441047de45d4747911f2a2c09dd52599b84805e79ce540df206bda354aec9da3005328f379a49562ff107afd02ed72555522c556410dc92d69a3e9408689d
diff --git a/app-accessibility/freetts/files/freetts-1.2.2-source-target.patch b/app-accessibility/freetts/files/freetts-1.2.2-source-target.patch
new file mode 100644
index 000000000000..0d7f6afe134b
--- /dev/null
+++ b/app-accessibility/freetts/files/freetts-1.2.2-source-target.patch
@@ -0,0 +1,34 @@
+We want to get rid of rewrite-xml provided by javatoolkit.
+
+--- a/build.xml
++++ b/build.xml
+@@ -124,7 +124,8 @@ jsapi.exe from the lib directory.
+             description="Build just the srcs">
+         <mkdir dir="${classes_dir}" />
+         <javac debug="true"
+-               source="1.4"
++               source="8"
++               target="8"
+                deprecation="true"
+                srcdir="${src_dir}"
+                excludes="tests/**"
+@@ -145,7 +146,8 @@ jsapi.exe from the lib directory.
+             description="Build just the tests">
+         <mkdir dir="${classes_dir}" />
+         <javac debug="true"
+-               source="1.4"
++               source="8"
++               target="8"
+                deprecation="true"
+                srcdir="${src_dir}"
+                includes="tests/**"
+@@ -904,7 +906,8 @@ jsapi.exe from the lib directory.
+     <target name="javadoc" description="Generate javadoc">
+         <mkdir dir="${javadoc_dir}" />
+         <javadoc sourcepath="${src_dir}"
+-                 source="1.4"
++                 source="8"
++                 target="8"
+                  additionalparam="-breakiterator"
+                  destdir="${javadoc_dir}"
+                  packagenames="${javadoc_pkgs}"
diff --git a/app-accessibility/freetts/freetts-1.2.2-r3.ebuild b/app-accessibility/freetts/freetts-1.2.2-r3.ebuild
new file mode 100644
index 000000000000..b0585d04836c
--- /dev/null
+++ b/app-accessibility/freetts/freetts-1.2.2-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="A speech synthesis system written entirely in Java"
+HOMEPAGE="https://freetts.sourceforge.io/"
+SRC_URI="https://downloads.sourceforge.net/project/freetts/FreeTTS/FreeTTS%20${PV}/${P}-src.zip"
+
+LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="jsapi mbrola"
+
+BDEPEND="app-arch/unzip"
+
+DEPEND="virtual/jdk:1.8
+	>=dev-java/ant-1.10.14-r3:0
+	jsapi? ( app-arch/sharutils )
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
+
+# Exception in thread "main" java.lang.ClassCastException
+RDEPEND="virtual/jre:1.8
+	mbrola? ( >=app-accessibility/mbrola-3.0.1h-r6 ) "
+
+# Tests aren't present.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/jsapi-gentoo.diff
+	"${FILESDIR}/freetts-1.2.2-source-target.patch"
+)
+
+DOCS=( ANNOUNCE.txt README.txt RELEASE_NOTES )
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+
+	# Prepare source directory.
+	mkdir src || die "Failed to create source directory."
+	mv com de src/ || die "Failed to move files to source directory."
+
+	# Prepare library directory.
+	cd lib || die "Lib directory not present."
+	chmod 0755 jsapi.sh || die "jsapi.sh not present or can't change permissions."
+
+	use mbrola && echo "mbrola.base=/usr/share/mbrola/" >> "${S}"/speech.properties
+}
+
+src_compile() {
+	if use jsapi; then
+		pushd lib
+		./jsapi.sh || die "jsapi.sh failed"
+		popd
+	fi
+
+	eant jars
+}
+
+# Tests aren't present.
+# http://freetts.sourceforge.net/docs/index.php#how_test
+#src_test() {
+#	ANT_TASKS="ant-junit" eant junit
+#}
+
+src_install() {
+	default
+	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
+	doins -r tools
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	if use examples ; then
+		java-pkg_doexamples demo
+	fi
+
+	if use source ; then
+		java-pkg_dosrc src/*
+	fi
+}
diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest
index b2016a37e11f..63a12f5b7f81 100644
--- a/app-accessibility/kontrast/Manifest
+++ b/app-accessibility/kontrast/Manifest
@@ -1,5 +1,5 @@
 DIST kontrast-23.08.5.tar.xz 211984 BLAKE2B f1c50f90031615bc9a3ddd00155f40fed2244994de309385e386fae7e21dddb7bd1dfa5a722050dcf67c7ad3def6d1979efc8623a18bcc21b6438178d15fc116 SHA512 e70d5bdc5a7363358f8d09c6a2bafda9645bcb5f9acc0fa4e51ed836e87baa92b3f9e6c4a81bd3d1050de152100426e714c6dd8d46459aa0d81949776880f9ae
 DIST kontrast-24.05.2.tar.xz 214620 BLAKE2B ad61b0902fd1b95b4bef1eb5c7671a1ee8a3e1808e87bdfa39ac7f9a02f3ebd8d133522b0335b001e0713e0b1497aa0db5c3b239af1b2a9184d4ed2c4c48282a SHA512 aa2681b1b8a84852aaa180fb787ace87f9469731f7018a2e445b331f8598f8b1dd9d9b6ce9747a98518dd9286897c0521fb2a7951d8d56c1414012c4cfa0fffa
 EBUILD kontrast-23.08.5.ebuild 825 BLAKE2B 63c0d56a8cd604a3a37ef865d64928132ed18a38aefc953860622932d12eb91c9f0c451fb488517b0cc08e38d505938a843ce6950badcef8af6fe89b8d0888c9 SHA512 3077f08bfeea3f450ee98cd610358f1dbf5f099511af94ce5a2b1df21c438c5a60d6e86f06640d8f0f1575ff57a820f47c69541ac16ab335d684e8c30b864998
-EBUILD kontrast-24.05.2.ebuild 712 BLAKE2B f1c60681fe3668830200ceb92f14e5f919b3c61e370f1b7b2a9c5a5725e7f92fe858268de3b07ecded26c73184901f29a3846cd7ba0b091b5e4bd0f1f726802a SHA512 f233617b3474daa06d1b6fc692f9da8e3f3644424d120ecd3f351f335c0043825b4bb5d29edab3a0d57f33c56423f4187b7c0eda31e8585056ece3abf4b1780b
+EBUILD kontrast-24.05.2.ebuild 719 BLAKE2B 68debd1f9e60a559e4fb101719b2465938272af7a4b46ac5c30cb44971c21114bc698876cdb090eb213a47e3f540085e0fe1a4a57efcc8c8a58c8a28aeb9f1b4 SHA512 f178296b0f17b12bf58ac1fbd9388ecb4bf8be6b9ef6f44fcc7bdf3786ecdda639d767b0601415043f891a2da45ee58ebb54df995cc7c9669139c23304620a8f
 MISC metadata.xml 384 BLAKE2B 769505c8a869e842511bb7202a31c4ac5d89dbf378199f669bfe7038d27aa63febbf2eedf8ea767545e1ab99be1718c9d67ff506842e2b624f512a98efcb0de4 SHA512 52a7f09822301efe07ad292d16d6625a22da14febe2236e69dfe7e7088750d2d2095d765a65466d80285d3b87ef8979ed0e75956f3cb9cd52127994b23de3c75
diff --git a/app-accessibility/kontrast/kontrast-24.05.2.ebuild b/app-accessibility/kontrast/kontrast-24.05.2.ebuild
index fc542c5578b9..2a6990728bd8 100644
--- a/app-accessibility/kontrast/kontrast-24.05.2.ebuild
+++ b/app-accessibility/kontrast/kontrast-24.05.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/"
 
 LICENSE="GPL-3+"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~riscv"
 IUSE=""
 
 DEPEND="