diff options
Diffstat (limited to 'app-accessibility')
160 files changed, 2935 insertions, 3385 deletions
diff --git a/app-accessibility/SphinxTrain/Manifest b/app-accessibility/SphinxTrain/Manifest deleted file mode 100644 index 331da4adcb74..000000000000 --- a/app-accessibility/SphinxTrain/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sphinxtrain-1.0.8.tar.gz 8925803 BLAKE2B e268c00843445cb69ae2a88f93fb4aa640556179417d44f6297d87f7e509418778b4808885bb19ab163efbd71565a3b6d75d269b420e9e366c0c6553a04b3053 SHA512 465d2c4ade9acc7b49c1d975449c38ac01d5a3ff332f9841be66cd8ca9d2f0b68fd36cc8a46384c8b510042efa91c3887a080481e84f2d0deb9775a598835f2b diff --git a/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild b/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild deleted file mode 100644 index 6b11a50e8c74..000000000000 --- a/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit multilib python-single-r1 - -DESCRIPTION="Speech Recognition (Training Module)" -HOMEPAGE="http://cmusphinx.sourceforge.net/html/cmusphinx.php" -SRC_URI="mirror://sourceforge/cmusphinx/sphinxtrain-${PV}.tar.gz" - -LICENSE="BSD-with-attribution" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="app-accessibility/sphinxbase - dev-lang/perl - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/sphinxtrain-${PV} - -src_install() { - default - dodoc README etc/*cfg - - python_fix_shebang "${D}"/usr/bin/sphinxtrain - python_optimize "${D}"/usr/$(get_libdir)/sphinxtrain/python/cmusphinx -} - -pkg_postinst() { - elog "Detailed usage and training instructions can be found at" - elog "http://cmusphinx.sourceforge.net/wiki/" -} diff --git a/app-accessibility/SphinxTrain/metadata.xml b/app-accessibility/SphinxTrain/metadata.xml deleted file mode 100644 index fa02e6314d59..000000000000 --- a/app-accessibility/SphinxTrain/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <maintainer type="project"> - <email>sound@gentoo.org</email> - <name>Gentoo Sound project</name> - </maintainer> - <longdescription lang="en"> - SphinxTrain is CMU Sphinx's training package. -</longdescription> - <longdescription lang="ja"> - SphinxTrainはCMU Sphinxの調教パッケージです。 -</longdescription> - <upstream> - <remote-id type="sourceforge">cmusphinx</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest index 9388c6185a69..b3f4b577c1ef 100644 --- a/app-accessibility/accerciser/Manifest +++ b/app-accessibility/accerciser/Manifest @@ -1 +1 @@ -DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268 +DIST accerciser-3.42.0.tar.xz 1999644 BLAKE2B 190f37ab94aba2dd1f16594242426a33bac366b89eb284c739c02a96cf0330ccb562237079d79ade5b729c5e38facbb542af2ace195a5d9b6d1c68a5005ba653 SHA512 65c3819c80c9ec3c8728963572a2c7bb4575782abde8ee34e3b7fa31217ef0e8106a7702c5b5a32b123ccb84b357984844a6d4aee75bf7e6157f3d63588224da diff --git a/app-accessibility/accerciser/accerciser-3.36.2.ebuild b/app-accessibility/accerciser/accerciser-3.42.0.ebuild index b0b41bfafe3e..2a58c7a94afb 100644 --- a/app-accessibility/accerciser/accerciser-3.36.2.ebuild +++ b/app-accessibility/accerciser/accerciser-3.42.0.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="xml" +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="xml(+)" inherit gnome2 python-single-r1 DESCRIPTION="Interactive Python accessibility explorer" -HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser" +HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser https://gitlab.gnome.org/GNOME/accerciser" LICENSE="BSD CC-BY-SA-3.0" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" >=app-accessibility/at-spi2-core-2.5.2:2 - >=x11-libs/gtk+-3.1.13:3[introspection] + >=x11-libs/gtk+-3.24.0:3[introspection] $(python_gen_cond_dep ' >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] >=dev-python/ipython-0.11[${PYTHON_USEDEP}] @@ -36,7 +36,8 @@ RDEPEND=" gnome-base/librsvg[introspection] ${PYTHON_DEPS} " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig diff --git a/app-accessibility/accerciser/metadata.xml b/app-accessibility/accerciser/metadata.xml index b361a7a06606..3d77751efc4b 100644 --- a/app-accessibility/accerciser/metadata.xml +++ b/app-accessibility/accerciser/metadata.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> <longdescription lang="en"> -Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information. + Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information. -In essence, Accerciser is a next generation at-poke tool. -</longdescription> + In essence, Accerciser is a next generation at-poke tool. + </longdescription> + <upstream> + <remote-id type="gnome-gitlab">GNOME/accerciser</remote-id> + </upstream> </pkgmetadata> diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest deleted file mode 100644 index 6fb976fe4f78..000000000000 --- a/app-accessibility/at-spi2-atk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST at-spi2-atk-2.34.2.tar.xz 96608 BLAKE2B 4a3ef71580f4eaf3ea0846c8a6909b686f7ae0c7202918f3e11de019fa7290dada5a2eb3f495ce476bb56a28787967fa87fe74d422d4144e7555541ef99911da SHA512 59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4 diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild deleted file mode 100644 index ad9aefc468a2..000000000000 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org meson multilib-minimal virtualx xdg - -DESCRIPTION="Gtk module for bridging AT-SPI to Atk" -HOMEPAGE="https://wiki.gnome.org/Accessibility" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] - >=dev-libs/atk-2.33.3[${MULTILIB_USEDEP}] - >=app-accessibility/at-spi2-core-2.33.2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( >=dev-libs/libxml2-2.9.1 ) -" - -multilib_src_configure() { - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} - -multilib_src_install() { - meson_src_install -} diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild new file mode 100644 index 000000000000..2e2b07fde27f --- /dev/null +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.46.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib-build + +DESCRIPTION="Gtk module for bridging AT-SPI to Atk" +HOMEPAGE="https://wiki.gnome.org/Accessibility" + +LICENSE="metapackage" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + +DEPEND="" +RDEPEND=">=app-accessibility/at-spi2-core-2.46.0[${MULTILIB_USEDEP}]" diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml index 07f7a0b39d71..2df23ac8ea0d 100644 --- a/app-accessibility/at-spi2-atk/metadata.xml +++ b/app-accessibility/at-spi2-atk/metadata.xml @@ -1,13 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<longdescription lang="en">at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications -exposing information via ATK to interface with clients that use AT-SPI. This -module provides the necessary inter-process communication to allow -accessibility-oriented software to operate. -</longdescription> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription lang="en"> + at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications + exposing information via ATK to interface with clients that use AT-SPI. This + module provides the necessary inter-process communication to allow + accessibility-oriented software to operate. + </longdescription> + <upstream> + <remote-id type="gnome-gitlab">GNOME/at-spi2-atk</remote-id> + </upstream> </pkgmetadata> diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest index 9a79ee5c54ca..a089d62360c6 100644 --- a/app-accessibility/at-spi2-core/Manifest +++ b/app-accessibility/at-spi2-core/Manifest @@ -1,2 +1,2 @@ -DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8 -DIST at-spi2-core-2.36.0.tar.xz 186824 BLAKE2B a713d413c1ff291bf82107f6bedccd24d5e9e5312145ac7c4783fcf8366238c2d5cc4ba442fb0c71286abcd695b516861387f76c22ff9e427bd19b99bb7d5d3c SHA512 f45d7e68bfcd9b93cebc47e30febce1ae6a4d9df2fbc9d5bdc25babb123c922d0f9a229485770b2f6ed386178144c20486fa3e46195041ea65a54ab019b1cbb6 +DIST at-spi2-core-2.50.1.tar.xz 567836 BLAKE2B 88916f322efa547be2249388a5f7b698ff7fb9464bc98fa929524616d0d25237328c10678df800b9ce325a3050804e9b0044a43024d06b71381dfc32917700a3 SHA512 d0b342a1ff2a3dd91aa87663412289d1616906c14a37e81b8514882d44981092356dc8a5d5c66b6d980d2cdf22128fff74651a4af6cad73cb62fd3154c5bbeae +DIST at-spi2-core-2.50.2.tar.xz 569124 BLAKE2B 7a69dbeb68b674d5b4e458dc10ba0e266583216f6a45f1924dee28e848bc124802f5181b0b1cc969eae2dfbb13df56b0c87bb1f347f6e323f6474d02a3543664 SHA512 a1c9ca77d34801b421c13f66d72e6101b23896dd210efbd7931ac0778e30c51a20759796a8c121946f57c1683626fd3ef34f88e5ad6495c20f6ac79fd0a96aa4 diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild deleted file mode 100644 index f5923810c5ec..000000000000 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org meson multilib-minimal systemd virtualx xdg - -DESCRIPTION="D-Bus accessibility specifications and registration daemon" -HOMEPAGE="https://wiki.gnome.org/Accessibility" - -LICENSE="LGPL-2.1+" -SLOT="2" -IUSE="X gtk-doc +introspection" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" - -RDEPEND=" - >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-util/meson-0.50.0 - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.25 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # disable teamspaces test since that requires Novell.ICEDesktop.Daemon - "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch" -) - -multilib_src_configure() { - local emesonargs=( - -Dsystemd_user_dir="$(systemd_get_userunitdir)" - -Ddocs=$(multilib_native_usex gtk-doc true false) - -Dintrospection=$(multilib_native_usex introspection) - -Dx11=$(usex X) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - virtx meson_src_test -} - -multilib_src_install() { - meson_src_install -} diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild deleted file mode 100644 index df9407c883a0..000000000000 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.36.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org meson multilib-minimal systemd virtualx xdg - -DESCRIPTION="D-Bus accessibility specifications and registration daemon" -HOMEPAGE="https://wiki.gnome.org/Accessibility" - -LICENSE="LGPL-2.1+" -SLOT="2" -IUSE="X gtk-doc +introspection" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" - -RDEPEND=" - >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-util/meson-0.50.0 - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.25 - app-text/docbook-xml-dtd:4.3 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -PATCHES=( - # disable teamspaces test since that requires Novell.ICEDesktop.Daemon - "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch" -) - -multilib_src_configure() { - local emesonargs=( - -Dsystemd_user_dir="$(systemd_get_userunitdir)" - -Ddocs=$(multilib_native_usex gtk-doc true false) - -Dintrospection=$(multilib_native_usex introspection) - -Dx11=$(usex X) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} - -multilib_src_install() { - meson_src_install -} diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.50.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.50.1.ebuild new file mode 100644 index 000000000000..c9b6e0cf8240 --- /dev/null +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.50.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson-multilib systemd virtualx xdg + +DESCRIPTION="D-Bus accessibility specifications and registration daemon" +HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="X dbus-broker gtk-doc +introspection systemd" +REQUIRED_USE=" + dbus-broker? ( systemd ) + gtk-doc? ( X ) +" + +DEPEND=" + >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) + systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + ) + + !<dev-libs/atk-2.46.0 + !<app-accessibility/at-spi2-atk-2.46.0 +" +RDEPEND="${DEPEND} + dbus-broker? ( sys-apps/dbus-broker ) +" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( + dev-python/sphinx + dev-util/gdbus-codegen + >=dev-util/gi-docgen-2021.1 + ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +multilib_src_configure() { + local emesonargs=( + -Ddefault_bus=$(usex dbus-broker dbus-broker dbus-daemon) + $(meson_use systemd use_systemd) + -Dgtk2_atk_adaptor=true + -Dsystemd_user_dir="$(systemd_get_userunitdir)" + $(meson_native_use_bool gtk-doc docs) + $(meson_native_use_feature introspection) + $(meson_feature X x11) + -Ddisable_p2p=false + -Datk_only=false + ) + meson_src_configure +} + +multilib_src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" || die +} + +multilib_src_install_all() { + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/{libatspi,atk} || die + mv "${ED}"/usr/share/doc/libatspi "${ED}"/usr/share/gtk-doc/libatspi/html || die + mv "${ED}"/usr/share/doc/atk "${ED}"/usr/share/gtk-doc/atk/html || die + fi +} diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.50.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.50.2.ebuild new file mode 100644 index 000000000000..047d31f55875 --- /dev/null +++ b/app-accessibility/at-spi2-core/at-spi2-core-2.50.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson-multilib systemd virtualx xdg + +DESCRIPTION="D-Bus accessibility specifications and registration daemon" +HOMEPAGE="https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="X dbus-broker gtk-doc +introspection systemd" +REQUIRED_USE=" + dbus-broker? ( systemd ) + gtk-doc? ( X ) +" + +DEPEND=" + >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.67.4:2[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) + systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXtst[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + ) + + !<dev-libs/atk-2.46.0 + !<app-accessibility/at-spi2-atk-2.46.0 +" +RDEPEND="${DEPEND} + dbus-broker? ( sys-apps/dbus-broker ) +" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( + dev-python/sphinx + dev-util/gdbus-codegen + >=dev-util/gi-docgen-2021.1 + ) + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +multilib_src_configure() { + local emesonargs=( + -Ddefault_bus=$(usex dbus-broker dbus-broker dbus-daemon) + $(meson_use systemd use_systemd) + -Dgtk2_atk_adaptor=true + -Dsystemd_user_dir="$(systemd_get_userunitdir)" + $(meson_native_use_bool gtk-doc docs) + $(meson_native_use_feature introspection) + $(meson_feature X x11) + -Ddisable_p2p=false + -Datk_only=false + ) + meson_src_configure +} + +multilib_src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" || die +} + +multilib_src_install_all() { + einstalldocs + + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/{libatspi,atk} || die + mv "${ED}"/usr/share/doc/libatspi "${ED}"/usr/share/gtk-doc/libatspi/html || die + mv "${ED}"/usr/share/doc/atk "${ED}"/usr/share/gtk-doc/atk/html || die + fi +} diff --git a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch b/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch deleted file mode 100644 index 269236d177e7..000000000000 --- a/app-accessibility/at-spi2-core/files/at-spi2-core-2.0.2-disable-teamspaces-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dbind/dbtest.c b/dbind/dbtest.c -index e8bbb63..9843c3d 100644 ---- a/dbind/dbtest.c -+++ b/dbind/dbtest.c -@@ -417,7 +417,7 @@ int main (int argc, char **argv) - - test_helpers (); - test_marshalling (); -- test_teamspaces (bus); -+ /* test_teamspaces (bus); */ - - return 0; - } diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml index 39980802b1da..82e71a3a93ce 100644 --- a/app-accessibility/at-spi2-core/metadata.xml +++ b/app-accessibility/at-spi2-core/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/at-spi2-core</remote-id> + </upstream> + <use> + <flag name="dbus-broker">Use DBus broker implementation instead of default DBus daemon</flag> + </use> </pkgmetadata> diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest index 2618e8dd7d86..9e2ffde0db45 100644 --- a/app-accessibility/brltty/Manifest +++ b/app-accessibility/brltty/Manifest @@ -1,2 +1 @@ -DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f -DIST brltty-6.0.tar.xz 2879976 BLAKE2B 31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265 SHA512 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06 +DIST brltty-6.6.tar.xz 3684592 BLAKE2B c1ae05b925384f3869d3c90ccc06197da2a592691830504ff01a530da87319d463e25cd7b387805c199562be815ca4e79f3679f592f3a1107025e3aba17ec159 SHA512 852bfd9179570be7b0da8b1279f84bdfedc14a319988d9c2eac5a20a9ce8977f31fdee167e8e96bb411184a1d72f4cdc633944c7b3f55bddae411fc71a9e6898 diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild deleted file mode 100644 index 64b28132085c..000000000000 --- a/app-accessibility/brltty/brltty-5.2-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -FINDLIB_USE="ocaml" - -inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript \ - autotools udev systemd python-r1 - -DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" -HOMEPAGE="https://brltty.app/" -SRC_URI="https://brltty.app/archive/${P}.tar.xz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86" -IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu - java +midi ncurses nls ocaml +pcm python usb +speech - tcl X" -REQUIRED_USE="doc? ( api ) - java? ( api ) - ocaml? ( api ) - python? ( api ${PYTHON_REQUIRED_USE} ) - tcl? ( api )" - -COMMON_DEP="bluetooth? ( net-wireless/bluez ) - gpm? ( >=sys-libs/gpm-1.20 ) - iconv? ( virtual/libiconv ) - icu? ( dev-libs/icu:= ) - python? ( ${PYTHON_DEPS} ) - ncurses? ( sys-libs/ncurses:0= ) - nls? ( virtual/libintl ) - tcl? ( >=dev-lang/tcl-8.4.15:0= ) - usb? ( virtual/libusb:0 ) - X? ( x11-libs/libXaw )" -DEPEND="virtual/pkgconfig - java? ( >=virtual/jdk-1.4 ) - python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] ) - ${COMMON_DEP}" -RDEPEND="java? ( >=virtual/jre-1.4 ) - ${COMMON_DEP}" - -HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) - -PATCHES=( - "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch - "${FILESDIR}"/${PN}-5.2-udev.patch - "${FILESDIR}"/${PN}-5.2-respect-AR.patch - "${FILESDIR}"/${PN}-5.2-sysmacros.patch -) - -src_prepare() { - default - - java-pkg-opt-2_src_prepare - - # The code runs `pkg-config` directly instead of locating a suitable - # pkg-config wrapper (or respecting $PKG_CONFIG). - sed -i \ - -e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \ - aclocal.m4 configure.ac || die - - # We run eautoconf instead of using eautoreconf because brltty uses - # a custom build system that uses autoconf without the rest of the - # autotools. - eautoconf - python_copy_sources -} - -src_configure() { - append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)" - append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)" - - tc-export AR LD PKG_CONFIG - # override prefix in order to install into / - # braille terminal needs to be available as soon in the boot process as - # possible - # Also override localstatedir so that the lib/brltty directory is installed - # correctly. - # Disable stripping since we do that ourselves. - local myconf=( - --prefix=/ - --localedir=/usr/share/locale - --includedir=/usr/include - --localstatedir=/var - --disable-stripping - --with-install-root="${D}" - --with-writable-directory="/run/brltty" - $(use_enable api) - $(use_with beeper beep-package) - $(use_enable contracted-braille) - $(use_with fm fm-package) - $(use_enable gpm) - $(use_enable iconv) - $(use_enable icu) - $(use_enable java java-bindings) - $(use_with midi midi-package) - $(use_enable nls i18n) - $(use_enable ocaml ocaml-bindings) - $(use_with pcm pcm-package) - $(use_enable speech speech-support) - $(use_enable tcl tcl-bindings) - $(use_enable X x) - $(use_with bluetooth bluetooth-package) - $(use_with ncurses curses) - $(use_with usb usb-package) ) - - econf "${myconf[@]}" - - if use python; then - myconf+=( $(use_enable python python-bindings ) ) - - python_configure() { - econf "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure - fi -} - -src_compile() { - local JAVAC_CONF="" - local OUR_JNI_FLAGS="" - if use java; then - OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)" - JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)" - fi - - emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}" - - if use python; then - python_build() { - cd "Bindings/Python" || die - emake - } - python_foreach_impl run_in_build_dir python_build - fi -} - -src_install() { - if use ocaml; then - findlib_src_preinst - fi - - emake OCAML_LDCONF= install - - if use python; then - python_install() { - cd "Bindings/Python" || die - emake install - } - python_foreach_impl run_in_build_dir python_install - fi - - if use java; then - # make install puts the _java.so there, and no it's not $(get_libdir) - rm -rf "${D}/usr/lib/java" - java-pkg_doso Bindings/Java/libbrlapi_java.so - java-pkg_dojar Bindings/Java/brlapi.jar - fi - - insinto /etc - doins Documents/brltty.conf - udev_newrules Autostart/Udev/udev.rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - systemd_dounit Autostart/Systemd/brltty.service - systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" - - libdir="$(get_libdir)" - mkdir -p "${D}"/usr/${libdir}/ - mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ - gen_usr_ldscript libbrlapi.so - - cd Documents || die - mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die - mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die - mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die - dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt - if use doc; then - dodoc BrlAPI-*.txt - HTML_DOCS="Manual-BRLTTY" einstalldocs - fi - - keepdir /var/lib/BrlAPI - rmdir "${D}/run/brltty" || die - rmdir "${D}/run" || die -} - -pkg_postinst() { - elog - elog "please be sure ${ROOT}etc/brltty.conf is correct for your system." - elog - elog "To make brltty start on boot, type this command as root:" - elog - elog "rc-update add brltty boot" -} diff --git a/app-accessibility/brltty/brltty-6.0-r1.ebuild b/app-accessibility/brltty/brltty-6.6-r1.ebuild index 1983c84f60b1..1c4193844a37 100644 --- a/app-accessibility/brltty/brltty-6.0-r1.ebuild +++ b/app-accessibility/brltty/brltty-6.6-r1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{10..11} ) FINDLIB_USE="ocaml" JAVA_PKG_WANT_SOURCE="1.8" JAVA_PKG_WANT_TARGET="1.8" -inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript \ - autotools udev systemd python-r1 +inherit findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" HOMEPAGE="https://brltty.app/" @@ -17,8 +16,8 @@ SRC_URI="https://brltty.app/archive/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86" -IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" +IUSE="+api +beeper bluetooth doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X" REQUIRED_USE="doc? ( api ) @@ -27,11 +26,14 @@ REQUIRED_USE="doc? ( api ) python? ( api ${PYTHON_REQUIRED_USE} ) tcl? ( api )" -COMMON_DEP=" - app-accessibility/at-spi2-core:2 +DEPEND=" + acct-group/brltty + acct-user/brltty dev-libs/libpcre2[pcre32] - sys-apps/dbus - bluetooth? ( net-wireless/bluez ) + bluetooth? ( + sys-apps/dbus + net-wireless/bluez + ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) @@ -40,37 +42,44 @@ COMMON_DEP=" ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) - python? ( ${PYTHON_DEPS} ) + python? ( + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] + ) speech? ( - app-accessibility/espeak + app-accessibility/espeak-ng app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) - tcl? ( >=dev-lang/tcl-8.4.15:0= ) - usb? ( virtual/libusb:0 ) + tcl? ( >=dev-lang/tcl-8.6.13-r1:= ) + usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( + app-accessibility/at-spi2-core:2 + sys-apps/dbus x11-libs/libX11 x11-libs/libXaw + x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst )" -DEPEND="${COMMON_DEP}" +RDEPEND="${DEPEND} + java? ( >=virtual/jre-1.8:* ) +" BDEPEND=" + >=dev-lang/tcl-8.6.13-r1 virtual/pkgconfig - java? ( >=virtual/jdk-1.4 ) + java? ( >=virtual/jdk-1.8:* ) nls? ( virtual/libintl ) - python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] ) + python? ( dev-python/cython[${PYTHON_USEDEP}] ) " -RDEPEND="java? ( >=virtual/jre-1.4 ) - ${COMMON_DEP}" HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) PATCHES=( - "${FILESDIR}"/${PN}-6.0-udev.patch - "${FILESDIR}"/${PN}-5.2-respect-AR.patch + "${FILESDIR}"/${PN}-6.4-respect-AR.patch + "${FILESDIR}"/${P}-cython3.patch ) src_prepare() { @@ -97,35 +106,39 @@ src_configure() { export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 $(java-pkg_javac-args)" fi - # override prefix in order to install into / - # braille terminal needs to be available as soon in the boot process as - # possible + # Override bindir for backward compatibility. # Also override localstatedir so that the lib/brltty directory is installed # correctly. # Disable stripping since we do that ourselves. local myconf=( - --prefix="${EPREFIX}"/ - --localedir="${EPREFIX}"/usr/share/locale - --includedir="${EPREFIX}"/usr/include + --bindir="${EPREFIX}"/bin + --htmldir="${EPREFIX}"/usr/share/doc/"${P}"/html --localstatedir="${EPREFIX}"/var + --runstatedir="${EPREFIX}"/run + # the next two lines should be removed once support is added. + --disable-emacs-bindings + --disable-lua-bindings + # Python bindings are built separately per-impl + --disable-python-bindings --disable-stripping - --with-install-root="${D}" + --with-updatable-directory="${EPREFIX}"/var/lib/brltty --with-writable-directory="${EPREFIX}"/run/brltty + --with-privilege-parameters=lx:user=brltty $(use_enable api) $(use_with beeper beep-package) - $(use_enable contracted-braille) +# $(use_enable emacs emacs-bindings) $(use_with fm fm-package) $(use_enable gpm) $(use_enable iconv) $(use_enable icu) $(use_enable java java-bindings) $(use_enable louis liblouis) +# $(use_enable lua lua-bindings) $(use_with midi midi-package) $(use_enable nls i18n) $(use_enable ocaml ocaml-bindings) $(use_with pcm pcm-package) $(use_enable policykit polkit) - $(use_enable python python-bindings) $(use_enable speech speech-support) $(use_with systemd service-package) $(use_enable tcl tcl-bindings) @@ -133,25 +146,27 @@ src_configure() { $(use_enable X x) $(use_with bluetooth bluetooth-package) $(use_with ncurses curses) - $(use_with usb usb-package) ) + $(use_with usb usb-package) + ) + # disable espeak since we use espeak-ng + use speech && myconf+=( --with-speech-driver=-es ) econf "${myconf[@]}" if use python; then python_configure() { - econf "${myconf[@]}" + econf "${myconf[@]}" --enable-python-bindings PYTHON="${PYTHON}" } python_foreach_impl run_in_build_dir python_configure fi } src_compile() { - emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" + emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" if use python; then python_build() { - cd "Bindings/Python" || die - emake + emake -C "${BUILD_DIR}"/Bindings/Python -j1 } python_foreach_impl run_in_build_dir python_build fi @@ -162,12 +177,11 @@ src_install() { findlib_src_preinst fi - emake OCAML_LDCONF= install + emake -j1 INSTALL_ROOT="${D}" OCAML_LDCONF= install if use python; then python_install() { - cd "Bindings/Python" || die - emake install + emake -C "${BUILD_DIR}"/Bindings/Python -j1 INSTALL_ROOT="${D}" install } python_foreach_impl run_in_build_dir python_install fi @@ -179,38 +193,31 @@ src_install() { insinto /etc doins Documents/brltty.conf - udev_newrules Autostart/Udev/rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - systemd_dounit Autostart/Systemd/brltty@.service - systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" - - if use api ; then - local libdir="$(get_libdir)" - mkdir -p "${ED}"/usr/${libdir}/ || die - mv "${ED}"/${libdir}/*.a "${ED}"/usr/${libdir}/ || die - gen_usr_ldscript libbrlapi.so - fi + newinitd "${FILESDIR}"/brltty.initd brltty + emake -C Autostart/Systemd -j1 INSTALL_ROOT="${ED}" install + emake -C Autostart/Udev -j1 INSTALL_ROOT="${ED}" install - cd Documents || die - mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die - mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die - mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die - dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt + dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO} if use doc; then - dodoc BrlAPI-*.txt - HTML_DOCS="Manual-BRLTTY" einstalldocs + HTML_DOCS="doc/Manual-BRLTTY" einstalldocs fi keepdir /var/lib/BrlAPI - rmdir "${ED}/run/brltty" || die - rmdir "${ED}/run" || die + rm -fr "${ED}/run" || die + find "${ED}" -name '*.a' -delete || die } pkg_postinst() { + tmpfiles_process ${PN}.conf + + elog "please be sure ${EROOT}/etc/brltty.conf is correct for your system." elog - elog "please be sure ${ROOT}/etc/brltty.conf is correct for your system." + elog "To make brltty start on boot on an OpenRC system, type this command:" + elog "# rc-update add brltty boot" elog - elog "To make brltty start on boot, type this command as root:" + elog "If you are using systemd, type this command:" + elog "# systemctl daemon-reload" elog - elog "rc-update add brltty boot" + elog "Please reload udev by typing:" + elog "# udevadm control --reload" } diff --git a/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch deleted file mode 100644 index e60ea9a4e509..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -377,7 +377,7 @@ - case "${host_os}" - in - linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*) -- brltty_mkmod_ld_make="-shared" -+ brltty_mkmod_ld_make="-shared ${LDFLAGS}" - ;; - solaris*) - brltty_mkmod_ld_make="-G" -@@ -404,7 +404,7 @@ - esac - if test "${GCC}" = "yes" - then -- brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o" -+ brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o" - else - brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o" - fi]) -@@ -414,7 +414,7 @@ - case "${host_os}" - in - linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|elf*) -- brltty_mklib_ld_make="-shared" -+ brltty_mklib_ld_make="-shared ${LDFLAGS}" - brltty_mklib_ld_options="-soname" - ;; - solaris*) -@@ -449,7 +449,7 @@ - esac - if test "${GCC}" = "yes" - then -- brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o" -+ brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o" - else - brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o" - fi]) ---- a/Bindings/OCaml/Makefile.in -+++ b/Bindings/OCaml/Makefile.in -@@ -55,13 +55,13 @@ - all : $(OCAML_FILES) - - $(OCAML_CLIBS) : brlapi_stubs.$O brlapi -- $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O -+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O - - $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo - $(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo - - $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx -- $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx -+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx - - brlapi.cmi: brlapi.mli - $(OCAMLC) -o $@ -c brlapi.mli diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch deleted file mode 100644 index f33e46a1890c..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Programs/system_linux.c -+++ b/Programs/system_linux.c -@@ -24,6 +24,7 @@ - #include <fcntl.h> - #include <sys/ioctl.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - - #include "log.h" - #include "file.h" ---- a/Programs/brlapi_client.c -+++ b/Programs/brlapi_client.c -@@ -73,6 +73,7 @@ - #include <linux/tty.h> - #include <linux/vt.h> - #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES -+#include <sys/sysmacros.h> - #endif /* linux */ - - #ifdef __OpenBSD__ diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch b/app-accessibility/brltty/files/brltty-5.2-udev.patch deleted file mode 100644 index e6d56603b013..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-udev.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Autostart/Udev/udev.rules -+++ b/Autostart/Udev/udev.rules -@@ -182,20 +182,22 @@ - # FreedomScientific [Focus Blue] - ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" - -+# Seika rules are commented out, because they conflict with USB-to-serial -+# converters. - # Device: 10C4:EA60 - # Generic Identifier - # Vendor: Cygnal Integrated Products, Inc. - # Product: CP210x UART Bridge / myAVR mySmartUSB light - # BrailleMemo [Pocket] - # Seika [Braille Display] --ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run" -+#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run" - - # Device: 10C4:EA80 - # Generic Identifier - # Vendor: Cygnal Integrated Products, Inc. - # Product: CP210x UART Bridge - # Seika [Note Taker] --ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run" -+#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run" - - # Device: 1148:0301 - # BrailleMemo [Smart] diff --git a/app-accessibility/brltty/files/brltty-6.0-udev.patch b/app-accessibility/brltty/files/brltty-6.0-udev.patch deleted file mode 100644 index e53b7a6aa664..000000000000 --- a/app-accessibility/brltty/files/brltty-6.0-udev.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- brltty-6.0/Autostart/Udev/rules -+++ brltty-6.0/Autostart/Udev/rules -@@ -276,20 +276,22 @@ - # FreedomScientific [Focus Blue] - ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" - -+# Seika rules are commented out, because they conflict with USB-to-serial -+# converters. - # Device: 10C4:EA60 - # Generic Identifier - # Vendor: Cygnal Integrated Products, Inc. - # Product: CP210x UART Bridge / myAVR mySmartUSB light - # BrailleMemo [Pocket] - # Seika [Braille Display] --ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run" -+#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run" - - # Device: 10C4:EA80 - # Generic Identifier - # Vendor: Cygnal Integrated Products, Inc. - # Product: CP210x UART Bridge - # Seika [Note Taker] --ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run" -+#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run" - - # Device: 1148:0301 - # BrailleMemo [Smart] diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch b/app-accessibility/brltty/files/brltty-6.4-respect-AR.patch index c5698a2b9399..1c647cfad53b 100644 --- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch +++ b/app-accessibility/brltty/files/brltty-6.4-respect-AR.patch @@ -1,6 +1,8 @@ +diff --git a/Programs/Makefile.in b/Programs/Makefile.in +index f1dc9aeb5..811a73a11 100644 --- a/Programs/Makefile.in +++ b/Programs/Makefile.in -@@ -434,7 +434,7 @@ +@@ -687,7 +687,7 @@ $(API_DLL): $(API_CLIENT_OBJECTS) [ ! -f lib.def ] || mv lib.def $(API_DEF) $(API_ARC): $(API_CLIENT_OBJECTS) diff --git a/app-accessibility/brltty/files/brltty-6.6-cython3.patch b/app-accessibility/brltty/files/brltty-6.6-cython3.patch new file mode 100644 index 000000000000..01a860a4d646 --- /dev/null +++ b/app-accessibility/brltty/files/brltty-6.6-cython3.patch @@ -0,0 +1,41 @@ +https://bugs.gentoo.org/913019 +https://github.com/brltty/brltty/commit/e6707d5e094dc36db4319ce4d052a6ad568a5d26 + +From e6707d5e094dc36db4319ce4d052a6ad568a5d26 Mon Sep 17 00:00:00 2001 +From: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Tue, 15 Aug 2023 16:29:13 +0200 +Subject: [PATCH] brlapi: Fix python crash on connection error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From Lukáš Tyrychtr: +“ +Cython 3.0 started using the new Python object finalization APIs from PEP 442 +” + +This means that __del__ gets called even when raising an exception from +__init__, while it was not before. To cope with both behaviors, we can +set self.h to NULL to determine whether it still exists or not. + +Thanks Lukáš Tyrychtr for the investigation and patch draft! +--- a/Bindings/Python/brlapi.pyx ++++ b/Bindings/Python/brlapi.pyx +@@ -453,6 +453,7 @@ cdef class Connection: + c_brlapi.brlapi_protocolExceptionInit(self.h) + if self.fd == -1: + c_brlapi.free(self.h) ++ self.h = NULL + raise ConnectionError(self.settings.host, self.settings.auth) + + def closeConnection(self): +@@ -465,7 +466,8 @@ cdef class Connection: + """Release resources used by the connection""" + if self.fd != -1: + c_brlapi.brlapi__closeConnection(self.h) +- c_brlapi.free(self.h) ++ if self.h != NULL: ++ c_brlapi.free(self.h) + + property host: + """To get authorized to connect, libbrlapi has to tell the BrlAPI server a secret key, for security reasons. This is the path to the file which holds it; it will hence have to be readable by the application.""" diff --git a/app-accessibility/brltty/files/brltty.rc b/app-accessibility/brltty/files/brltty.initd index 100dd29b778a..1d93e1e533c6 100644 --- a/app-accessibility/brltty/files/brltty.rc +++ b/app-accessibility/brltty/files/brltty.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/bin/brltty @@ -7,6 +7,5 @@ pidfile=/var/run/brltty.pid command_args="-P ${pidfile} -q" depend() { - before * - after clock + after dbus localmount } diff --git a/app-accessibility/brltty/files/brltty.tmpfiles.conf b/app-accessibility/brltty/files/brltty.tmpfiles.conf deleted file mode 100644 index 18cc4021e33b..000000000000 --- a/app-accessibility/brltty/files/brltty.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/brltty 0755 root root - diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml index 8f4dd156f0cf..7a6c5b4307bf 100644 --- a/app-accessibility/brltty/metadata.xml +++ b/app-accessibility/brltty/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> @@ -8,15 +8,14 @@ <use> <flag name="api">build brltty's application program interface</flag> <flag name="beeper">support the console tone generator</flag> - <flag name="contracted-braille">support in-line contracted braille</flag> <flag name="fm">support for the sound card synthesizer</flag> - <flag name="louis">Use braille tranlator <pkg>dev-libs/liblouis</pkg></flag> + <flag name="louis">Use braille translator <pkg>dev-libs/liblouis</pkg></flag> <flag name="midi">support the musical instrument digital interface</flag> <flag name="pcm">support for sound card digital audio</flag> - <flag name="speech">speech support</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:mielke:brltty</remote-id> + <remote-id type="github">brltty/brltty</remote-id> </upstream> <longdescription lang="en"> BRLTTY is a background process (daemon) which provides access to the Linux/Unix diff --git a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild deleted file mode 100644 index 9b674667c82a..000000000000 --- a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="xml" - -inherit gnome2 python-r1 - -DESCRIPTION="Input assistive technology intended for switch and pointer users" -HOMEPAGE="https://wiki.gnome.org/Projects/Caribou" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND=" - app-accessibility/at-spi2-core - >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] - >=x11-libs/gtk+-3:3[introspection] - x11-libs/gtk+:2 - >=dev-libs/gobject-introspection-0.10.7:= - dev-libs/libgee:0.8 - dev-libs/libxml2 - >=media-libs/clutter-1.5.11:1.0[introspection] - x11-libs/libX11 - x11-libs/libxklavier - x11-libs/libXtst - ${PYTHON_DEPS} -" -# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key -# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed -# librsvg needed to load svg images in css styles -RDEPEND="${COMMON_DEPEND} - dev-libs/glib[dbus] - >=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}] - >=gnome-base/gsettings-desktop-schemas-3 - gnome-base/librsvg:2 - sys-apps/dbus -" -DEPEND="${COMMON_DEPEND} - dev-libs/libxslt - >=dev-util/intltool-0.35.5 - virtual/pkgconfig -" - -src_prepare() { - # FIXME: Now this supports python3 too... - # delete custom PYTHONPATH, useless on Gentoo and potential bug source - # + caribou is python2 only so fix the shell scripts -# sed -e '/export PYTHONPATH=.*python/ d' \ -# -e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \ -# -i bin/{antler-keyboard,caribou-preferences}.in || -# die "sed failed" - - gnome2_src_prepare - - prepare_caribou() { - mkdir -p "${BUILD_DIR}" || die - } - python_foreach_impl prepare_caribou -} - -src_configure() { - ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \ - gnome2_src_configure \ - --disable-docs \ - --disable-static \ - --enable-gtk3-module \ - --enable-gtk2-module \ - VALAC=$(type -P true) - # vala is not needed for tarball builds, but configure checks for it... -} - -src_compile() { - python_foreach_impl run_in_build_dir gnome2_src_compile -} - -src_test() { - python_foreach_impl run_in_build_dir default -} - -src_install() { - python_foreach_impl run_in_build_dir gnome2_src_install - - # https://bugzilla.gnome.org/show_bug.cgi?id=769323 - dodoc AUTHORS NEWS README # ChangeLog simply points to git log -} diff --git a/app-accessibility/caribou/caribou-0.4.21-r6.ebuild b/app-accessibility/caribou/caribou-0.4.21-r6.ebuild new file mode 100644 index 000000000000..ce220ef1b49a --- /dev/null +++ b/app-accessibility/caribou/caribou-0.4.21-r6.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" + +inherit autotools gnome.org gnome2-utils python-single-r1 vala + +DESCRIPTION="Input assistive technology intended for switch and pointer users" +HOMEPAGE="https://wiki.gnome.org/Projects/Caribou" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + app-accessibility/at-spi2-core + $(python_gen_cond_dep ' + >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] + ') + >=dev-libs/gobject-introspection-0.10.7:= + dev-libs/libgee:0.8 + dev-libs/libxml2 + >=media-libs/clutter-1.5.11:1.0[introspection] + >=x11-libs/gtk+-3:3[introspection] + x11-libs/libX11 + x11-libs/libxklavier + x11-libs/libXtst +" +# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key +# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed +# librsvg needed to load svg images in css styles +RDEPEND=" + ${COMMON_DEPEND} + dev-libs/glib[dbus] + $(python_gen_cond_dep ' + >=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}] + ') + >=gnome-base/gsettings-desktop-schemas-3 + gnome-base/librsvg:2 + sys-apps/dbus + !<x11-base/xorg-server-1.20.10 +" +DEPEND=" + ${COMMON_DEPEND} + dev-libs/libxslt +" +BDEPEND=" + $(vala_depend) + >=dev-util/intltool-0.35.5 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-fix-compilation-error.patch" + "${FILESDIR}/${PN}-fix-subkey-popmenu.patch" + "${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch" + "${FILESDIR}/${PN}-fix-antler-style-css.patch" + "${FILESDIR}/${PN}-fix-python-env.patch" + "${FILESDIR}/${PN}-change_autostart_cinnamon.patch" + "${FILESDIR}/${PN}-drop_gir_patch.patch" +) + +src_prepare() { + default + vala_src_prepare + gnome2_disable_deprecation_warning + eautoreconf +} + +src_configure() { + econf \ + --disable-maintainer-mode \ + --disable-schemas-compile \ + --disable-docs \ + --disable-static \ + --disable-gtk2-module \ + --enable-gtk3-module +} + +src_install() { + DOCS="AUTHORS NEWS README" + default + find "${D}" -name '*.la' -delete || die + python_optimize +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/app-accessibility/caribou/caribou-0.4.21-r7.ebuild b/app-accessibility/caribou/caribou-0.4.21-r7.ebuild new file mode 100644 index 000000000000..2154750619c3 --- /dev/null +++ b/app-accessibility/caribou/caribou-0.4.21-r7.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" + +inherit autotools gnome.org gnome2-utils python-single-r1 vala + +DESCRIPTION="Input assistive technology intended for switch and pointer users" +HOMEPAGE="https://wiki.gnome.org/Projects/Caribou" + +LICENSE="LGPL-2.1" +SLOT="0" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + app-accessibility/at-spi2-core + $(python_gen_cond_dep ' + >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] + ') + >=dev-libs/gobject-introspection-0.10.7:= + dev-libs/libgee:0.8 + dev-libs/libxml2 + >=media-libs/clutter-1.5.11:1.0[introspection] + >=x11-libs/gtk+-3:3[introspection] + x11-libs/libX11 + x11-libs/libxklavier + x11-libs/libXtst +" +# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key +# librsvg needed to load svg images in css styles +RDEPEND=" + ${COMMON_DEPEND} + dev-libs/glib[dbus] + >=gnome-base/gsettings-desktop-schemas-3 + gnome-base/librsvg:2 + sys-apps/dbus + !<x11-base/xorg-server-1.20.10 +" +DEPEND=" + ${COMMON_DEPEND} + dev-libs/libxslt +" +BDEPEND=" + $(vala_depend) + >=dev-util/intltool-0.35.5 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-fix-compilation-error.patch" + "${FILESDIR}/${PN}-fix-subkey-popmenu.patch" + "${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch" + "${FILESDIR}/${PN}-fix-antler-style-css.patch" + "${FILESDIR}/${PN}-fix-python-env.patch" + "${FILESDIR}/${PN}-change_autostart_cinnamon.patch" + "${FILESDIR}/${PN}-drop_gir_patch.patch" +) + +src_prepare() { + default + vala_src_prepare + gnome2_disable_deprecation_warning + eautoreconf +} + +src_configure() { + econf \ + --disable-maintainer-mode \ + --disable-schemas-compile \ + --disable-docs \ + --disable-static \ + --disable-gtk2-module \ + --enable-gtk3-module +} + +src_install() { + DOCS="AUTHORS NEWS README" + default + find "${D}" -name '*.la' -delete || die + python_optimize +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/app-accessibility/caribou/files/caribou-change_autostart_cinnamon.patch b/app-accessibility/caribou/files/caribou-change_autostart_cinnamon.patch new file mode 100644 index 000000000000..f55ddd276e7d --- /dev/null +++ b/app-accessibility/caribou/files/caribou-change_autostart_cinnamon.patch @@ -0,0 +1,13 @@ +--- a/data/caribou-autostart.desktop.in.in ++++ b/data/caribou-autostart.desktop.in.in +@@ -2,7 +2,7 @@ + Type=Application + Name=Caribou + Exec=@libexecdir@/caribou +-AutostartCondition=GSettings org.gnome.desktop.a11y.applications screen-keyboard-enabled ++AutostartCondition=GSettings org.cinnamon.desktop.a11y.applications screen-keyboard-enabled + X-GNOME-AutoRestart=true + #X-GNOME-Autostart-Phase=Initialization +-OnlyShowIn=GNOME;Unity; ++OnlyShowIn=X-Cinnamon; + diff --git a/app-accessibility/caribou/files/caribou-drop_gir_patch.patch b/app-accessibility/caribou/files/caribou-drop_gir_patch.patch new file mode 100644 index 000000000000..bbcf1ddee9e5 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-drop_gir_patch.patch @@ -0,0 +1,117 @@ +From c52ce71c49dc8d6109a58d16cc8d491d7bd1d781 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Wed, 20 Jan 2021 22:59:49 +0100 +Subject: [PATCH] Stop patching the generated GIR + +--- + libcaribou/Makefile.am | 8 ++----- + tools/Makefile.am | 1 - + tools/fix_gir.py | 53 ------------------------------------------ + 3 files changed, 2 insertions(+), 60 deletions(-) + delete mode 100755 tools/fix_gir.py + +diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am +index 05f2774..0634374 100644 +--- a/libcaribou/Makefile.am ++++ b/libcaribou/Makefile.am +@@ -7,7 +7,7 @@ libcaribou_la_VALAFLAGS = \ + --pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \ + --pkg libxklavier --pkg external-libs \ + --internal-vapi caribou-internals-1.0.vapi \ +- --library caribou-1.0 --gir _Caribou-1.0.gir \ ++ --library caribou-1.0 --gir Caribou-1.0.gir \ + --symbols libcaribou.symbols \ + $(VALAFLAGS) + +@@ -63,9 +63,6 @@ gir_DATA = Caribou-1.0.gir + typelibdir = $(libdir)/girepository-1.0 + typelib_DATA = Caribou-1.0.typelib + +-Caribou-1.0.gir: _Caribou-1.0.gir +- $(AM_V_GEN)$(PYTHON) -B $(top_srcdir)/tools/fix_gir.py $< > $@ +- + Caribou-1.0.typelib: Caribou-1.0.gir + @INTROSPECTION_COMPILER@ --shared-library=libcaribou.so.0 -o $@ $^ + +@@ -81,8 +78,7 @@ CLEANFILES = \ + caribou-1.0.vapi \ + caribou-internals-1.0.vapi \ + Caribou-1.0.typelib \ +- Caribou-1.0.gir \ +- _Caribou-1.0.gir ++ Caribou-1.0.gir + + DISTCLEANFILES = \ + caribou-1.0.pc +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 3a9bcdb..89f753d 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -1,5 +1,4 @@ + EXTRA_DIST = \ +- fix_gir.py \ + make_schema.py \ + convert_cldr.py \ + basic.xsl +diff --git a/tools/fix_gir.py b/tools/fix_gir.py +deleted file mode 100755 +index 182d108..0000000 +--- a/tools/fix_gir.py ++++ /dev/null +@@ -1,53 +0,0 @@ +-#!/usr/bin/python +- +-from xml.dom import minidom +- +-def purge_white_space_and_fix_namespace(node, indent=0): +- if getattr(node, "tagName", None) == "namespace": +- name = node.getAttribute("name") +- node.setAttribute("name", name.lstrip('_')) +- for child in [c for c in node.childNodes]: +- if child.nodeType == node.TEXT_NODE or \ +- getattr(child, "tagName", None) == "annotation": +- node.removeChild(child) +- continue +- purge_white_space_and_fix_namespace(child, indent+1) +- +-def find_ancestor(node, name): +- if getattr(node, "tagName", None) == name: +- return node +- parent = getattr(node, "parentNode", None) +- if not parent: +- return None +- return find_ancestor(parent, name) +- +-def fix_vfuncs(dom): +- for f in dom.getElementsByTagName("field"): +- callbacks = f.getElementsByTagName("callback") +- +- record = find_ancestor(f, "record") +- if not record: +- continue +- +- name = record.getAttribute("name") +- cname = record.getAttribute("c:type") +- +- assert(name.endswith("Class") or name.endswith("Iface")) +- assert(cname.endswith("Class") or name.endswith("Iface")) +- +- if len(callbacks) == 2: +- callbacks[-1].parentNode.removeChild(callbacks[-1]) +- +-if __name__ == "__main__": +- import sys +- +- if len(sys.argv) != 2: +- print("supply a gir file") +- sys.exit(1) +- +- dom = minidom.parse(sys.argv[-1]) +- +- purge_white_space_and_fix_namespace(dom) +- fix_vfuncs(dom) +- +- print(dom.toprettyxml(indent=" ", newl="\n")) +-- +GitLab + diff --git a/app-accessibility/caribou/files/caribou-fix-antler-style-css.patch b/app-accessibility/caribou/files/caribou-fix-antler-style-css.patch new file mode 100644 index 000000000000..4c4486bb7889 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-antler-style-css.patch @@ -0,0 +1,26 @@ +From 13df8b92ae89c796238e669ee6ef4447a42d6355 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha <jbicha@ubuntu.com> +Date: Fri, 1 Dec 2017 12:11:35 -0500 +Subject: [PATCH] style.css: Fix failure to start in GNOME Flashback + +The order for 'font' properties matters +https://developer.gnome.org/gtk3/stable/chap-css-properties.html + +https://bugzilla.gnome.org/show_bug.cgi?id=791001 +--- + data/antler/style.css | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/antler/style.css b/data/antler/style.css +index 5ab6f71..4d84904 100644 +--- a/data/antler/style.css ++++ b/data/antler/style.css +@@ -13,7 +13,7 @@ + border-width: 0px; + border-radius: 2px; + border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch; +- font: Sans 14px; ++ font: 14px Sans; + background-image: -gtk-gradient (linear, + left top, + left bottom, diff --git a/app-accessibility/caribou/files/caribou-fix-compilation-error.patch b/app-accessibility/caribou/files/caribou-fix-compilation-error.patch new file mode 100644 index 000000000000..d427cd35a111 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-compilation-error.patch @@ -0,0 +1,25 @@ +From bc6f3e7ca0921b50a3ff836d08ce264a4f114224 Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre <clement.lefebvre@linuxmint.com> +Date: Tue, 12 Jan 2021 17:29:16 +0000 +Subject: [PATCH 1/4] Fix compilation error + +--- + libcaribou/key-model.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala +index 89015bc..e88342e 100644 +--- a/libcaribou/key-model.vala ++++ b/libcaribou/key-model.vala +@@ -101,7 +101,7 @@ namespace Caribou { + unichar uc; + while (text.get_next_char (ref index, out uc)) { + uint keyval = Gdk.unicode_to_keyval (uc); +- if (keyval != uc | 0x01000000) ++ if (keyval != (uc | 0x01000000)) + _keyvals += keyval; + } + } else { +-- +2.29.2 + diff --git a/app-accessibility/caribou/files/caribou-fix-python-env.patch b/app-accessibility/caribou/files/caribou-fix-python-env.patch new file mode 100644 index 000000000000..3a0b26698fa3 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-python-env.patch @@ -0,0 +1,58 @@ +--- a/bin/antler-keyboard.in ++++ b/bin/antler-keyboard.in +@@ -18,24 +18,4 @@ + # along with this program; if not, write to the Free Software Foundation, + # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +-script_dir="$(dirname "$(readlink -f ${0})")" +- +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-datarootdir=@datarootdir@ +- +-if [ $script_dir = "@libexecdir@" ] +-then +- datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")" +- export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" +- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +- export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" +-else +- export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" +- export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +- export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +- export ANTLER_THEME_PATH="$(dirname $script_dir)/data" +-fi +- +-@PYTHON@ -m caribou.antler.main "$@" ++exec @PYTHON@ -m caribou.antler.main "$@" +--- a/bin/caribou-preferences.in ++++ b/bin/caribou-preferences.in +@@ -18,26 +18,7 @@ + # along with this program; if not, write to the Free Software Foundation, + # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +-script_dir="$(dirname "$(readlink -f ${0})")" +- +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-datarootdir=@datarootdir@ +- +-if [ $script_dir = "@bindir@" ] +-then +- datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")" +- export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" +- export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +- export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +- export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}" +-else +- export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}" +- export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" +- export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" +-fi +- +-@PYTHON@ -c " ++exec @PYTHON@ -c " + import signal + signal.signal(signal.SIGINT, signal.SIG_DFL) + diff --git a/app-accessibility/caribou/files/caribou-fix-subkey-popmenu.patch b/app-accessibility/caribou/files/caribou-fix-subkey-popmenu.patch new file mode 100644 index 000000000000..ffd4423c2986 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-subkey-popmenu.patch @@ -0,0 +1,32 @@ +From 85ac8f9e210243d95163cf8b1013470a6d9c7eaa Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre <clement.lefebvre@linuxmint.com> +Date: Tue, 12 Jan 2021 17:30:25 +0000 +Subject: [PATCH 2/4] Fix subkey popmenu not showing after being dismissed + +To reproduce the issue: + +- long-press the "e" button +- don't select any sub button.. just select "e" again to close the menu + +After this the menu no long appears when long-pressing "e". + +This commit fixes that. +--- + libcaribou/key-model.vala | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala +index e88342e..2f640f2 100644 +--- a/libcaribou/key-model.vala ++++ b/libcaribou/key-model.vala +@@ -179,6 +179,7 @@ namespace Caribou { + hold_tid = GLib.Timeout.add (1000, on_key_held); + + key_pressed(this); ++ show_subkeys = false; + } + + public void release () { +-- +2.29.2 + diff --git a/app-accessibility/caribou/files/caribou-fix-xadapter-xkb-calls.patch b/app-accessibility/caribou/files/caribou-fix-xadapter-xkb-calls.patch new file mode 100644 index 000000000000..bcb2a19c3d07 --- /dev/null +++ b/app-accessibility/caribou/files/caribou-fix-xadapter-xkb-calls.patch @@ -0,0 +1,46 @@ +From 00653c5dcc4be5e983b670d00d5724fc21da2e82 Mon Sep 17 00:00:00 2001 +From: Clement Lefebvre <clement.lefebvre@linuxmint.com> +Date: Tue, 12 Jan 2021 18:01:47 +0000 +Subject: [PATCH 3/4] [mtwebster] xadapter.vala: Remove XkbKeyTypesMask and + fields from XKbChangeMap call. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was originally a workaround for xFree86 4.3 - see: +https://bugzilla.gnome.org/show_bug.cgi?id=673547 + +As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this +causes a BadLength error when attempting to use shifted characters. + +Ref: +https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server +--- + libcaribou/xadapter.vala | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala +index 22858b7..1da5a78 100644 +--- a/libcaribou/xadapter.vala ++++ b/libcaribou/xadapter.vala +@@ -195,15 +195,10 @@ namespace Caribou { + + Xkb.MapChanges changes = Xkb.MapChanges (); + +- // We don't touch key types here but include the +- // information in XkbSetMap request to the server, because +- // some X servers need the information to check the sanity +- // of the keysyms change. +- changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask); ++ changes.changed = (ushort) Xkb.KeySymsMask; + changes.first_key_sym = (char) this.reserved_keycode; + changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width; +- changes.first_type = 0; +- changes.num_types = this.xkbdesc.map.num_types; ++ + Xkb.change_map (this.xdisplay, this.xkbdesc, changes); + + this.xdisplay.flush (); +-- +2.29.2 + diff --git a/app-accessibility/caribou/metadata.xml b/app-accessibility/caribou/metadata.xml index 3a82b0ba211a..0ce9ad92c493 100644 --- a/app-accessibility/caribou/metadata.xml +++ b/app-accessibility/caribou/metadata.xml @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<longdescription lang="en"> + <maintainer type="person" proxied="yes"> + <email>sparky@bluefang-logic.com</email> + <name>Matthew Turnbull</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> Caribou is a text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou is to create a usable solution for people whose primary way of accessing a computer is a switch device. The initial goal is to make an in-place on-screen keyboard suitable for people who can use a mouse but not a hardware keyboard. -</longdescription> + </longdescription> </pkgmetadata> diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest index 383cdd368c26..d44dfe55ad02 100644 --- a/app-accessibility/edbrowse/Manifest +++ b/app-accessibility/edbrowse/Manifest @@ -1 +1,2 @@ -DIST edbrowse-3.7.5.1.tar.gz 790742 BLAKE2B 7047cc2b1c7bc51aaa88f7a6aa981020ae80b6498bcb97f670646267dab94bab565b9ecc23c36f75d2653175917720dbb9e40a0f9bfd44251716669155e8de9e SHA512 ec217bf98334e8b493a1a80082cebfb11da9fa84d20d8b5f3f3286a78ae1dc6a2731c578d000f9f0f19d3dcbec9aa2c3e2a6b5b35f7ea7672840b9bcd1c5c67a +DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b SHA512 b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927 +DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879 SHA512 4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0 diff --git a/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild b/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild deleted file mode 100644 index f2a61e23958c..000000000000 --- a/app-accessibility/edbrowse/edbrowse-3.7.5.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake-utils - -DESCRIPTION="Combination editor, browser, and mail client that is 100% text based" -HOMEPAGE="http://edbrowse.org" -SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="odbc" - -RDEPEND=" - app-text/tidy-html5 - >=net-misc/curl-7.36.0 - >=dev-libs/libpcre-7.8 - >=sys-libs/readline-6.0 - dev-lang/duktape - odbc? ( dev-db/unixODBC )" -DEPEND="${RDEPEND}" -BDEPEND="${RDEPEND} - dev-lang/perl - virtual/pkgconfig" - -src_prepare() { - sed -i -e "s:/usr/share/doc/edbrowse:/usr/share/doc/${P}:" CMakeLists.txt - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_EDBR_ODBC=$(usex odbc) - ) - cmake-utils_src_configure -} diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild new file mode 100644 index 000000000000..49a249f77266 --- /dev/null +++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d +QUICKJS_SHORT=2788d71 +QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}" +QUICKJS_P="quickjs-${QUICKJS_SHORT}" + +DESCRIPTION="Combination editor, browser, and mail client that is 100% text based" +HOMEPAGE="https://edbrowse.org" +SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/bellard/quickjs/archive/${QUICKJS_HASH}.tar.gz -> ${QUICKJS_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +RDEPEND=" + >=app-text/htmltidy-5.0.0:= + dev-db/unixODBC + dev-libs/libpcre2:= + net-misc/curl + sys-libs/readline:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + sys-apps/ed + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${P}"-respect-ldflags.patch +) + +src_prepare() { + default + + cd "${QUICKJS_S}" || die + eapply "${FILESDIR}/${P}"-quickjs-respect-flags.patch +} + +src_compile() { + # First build quickjs so we can link to its static library. + # Also, quickjs doesn't appear to tag releases. + edo tools/quickjobfixup "${QUICKJS_S}" + emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a + + tc-export CC + emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP= +} + +src_install() { + dobin src/edbrowse + newman doc/man-edbrowse-debian.1 edbrowse.1 + DOCS="doc/sample*" + HTML_DOCS="doc/*.html" + einstalldocs +} diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch new file mode 100644 index 000000000000..f0af474427f0 --- /dev/null +++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch @@ -0,0 +1,41 @@ +* Don't overwrite CFLAGS +* Respect CPPFLAGS + +--- a/Makefile ++++ b/Makefile +@@ -66,7 +66,7 @@ + ifdef CONFIG_CLANG + HOST_CC=clang + CC=$(CROSS_PREFIX)clang +- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d ++ CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d + CFLAGS += -Wextra + CFLAGS += -Wno-sign-compare + CFLAGS += -Wno-missing-field-initializers +@@ -87,7 +87,7 @@ + else + HOST_CC=gcc + CC=$(CROSS_PREFIX)gcc +- CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d ++ CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d + CFLAGS += -Wno-array-bounds -Wno-format-truncation + ifdef CONFIG_LTO + AR=$(CROSS_PREFIX)gcc-ar +@@ -110,7 +110,7 @@ + CFLAGS+=$(DEFINES) + CFLAGS_DEBUG=$(CFLAGS) -O0 + CFLAGS_SMALL=$(CFLAGS) -Os +-CFLAGS_OPT=$(CFLAGS) -O2 ++CFLAGS_OPT=$(CFLAGS) + CFLAGS_NOLTO:=$(CFLAGS_OPT) + LDFLAGS=-g + ifdef CONFIG_LTO +@@ -269,7 +269,7 @@ + $(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $< + + $(OBJDIR)/%.nolto.o: %.c | $(OBJDIR) +- $(CC) $(CFLAGS_NOLTO) -c -o $@ $< ++ $(CC) $(CFLAGS_NOLTO) $(CPPFLAGS) -c -o $@ $< + + $(OBJDIR)/%.m32.o: %.c | $(OBJDIR) + $(CC) -m32 $(CFLAGS_OPT) -c -o $@ $< diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch new file mode 100644 index 000000000000..3b511e1d2b38 --- /dev/null +++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-respect-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/src/makefile b/src/makefile +index d65369a3..410d3e9d 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -31,7 +31,7 @@ endif + CFLAGS += $(DEBUGFLAGS) + + # Libraries and linker flags for edbrowse. +-LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm ++LDFLAGS += $(STRIP) $(LINKER_LIBS) -lpthread -lm + + # LDFLAGS for quickjs loading. + QUICKJS_LDFLAGS = $(QUICKJS_DIR)/libquickjs.a -ldl diff --git a/app-accessibility/edbrowse/metadata.xml b/app-accessibility/edbrowse/metadata.xml index 53850bf1c4d0..98abcd56c4be 100644 --- a/app-accessibility/edbrowse/metadata.xml +++ b/app-accessibility/edbrowse/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> <name>Gentoo Accessibility Project</name> </maintainer> -<longdescription> - edbrowse is a line editor, web browser and email client using the /bin/ed - user interface. -</longdescription> +<upstream> + <remote-id type="github">CMB/edbrowse</remote-id> +</upstream> </pkgmetadata> diff --git a/app-accessibility/eflite/Manifest b/app-accessibility/eflite/Manifest deleted file mode 100644 index ef12510aac5d..000000000000 --- a/app-accessibility/eflite/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST eflite-0.4.1.tar.gz 63192 BLAKE2B 4bdd8bf689732ac56918cefc42d9443ce09d27db052f218c34d7e6b2734e12835482b5c3e3e99f9e2cfe9d1645f683e67aec1ecdbc00c8967637d65d59fd14e3 SHA512 0060980fd5bb65ad94f1609f6d87cb89b91e680228b603fa590e6ba70b51e894493dda4271dca4d8c97f38cdefbd456c3be0447e5f88a0be7ae39324baa2c796 diff --git a/app-accessibility/eflite/eflite-0.4.1-r3.ebuild b/app-accessibility/eflite/eflite-0.4.1-r3.ebuild deleted file mode 100644 index f839bdb9d4f2..000000000000 --- a/app-accessibility/eflite/eflite-0.4.1-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit autotools eutils user - -DESCRIPTION="A speech server that allows screen readers to interact with festival lite" -HOMEPAGE="http://eflite.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -IUSE="+16k_voice" - -DEPEND=">=app-accessibility/flite-1.4" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' * - epatch "${FILESDIR}"/${PN}-0.4.1-flite14.patch - eautoreconf -} - -src_configure() { - local myconf - if use 16k_voice; then - myconf='--with-vox=cmu_us_kal16' - fi - econf ${myconf} -} - -src_install() { - einstall - dodoc ChangeLog README INSTALL eflite_test.txt - - insinto /etc/eflite - doins "${FILESDIR}"/es.conf - - newinitd "${FILESDIR}"/eflite.rc eflite -} - -pkg_postinst() { - enewgroup speech -} diff --git a/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch deleted file mode 100644 index cb3096d88a43..000000000000 --- a/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur eflite-0.4.1/Makefile.in eflite-0.4.1-new/Makefile.in ---- eflite-0.4.1/Makefile.in 2007-01-18 18:01:09.000000000 -0600 -+++ eflite-0.4.1-new/Makefile.in 2010-07-23 20:06:45.000000000 -0500 -@@ -34,7 +34,7 @@ - $(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS) - - fs.o: fs.c -- $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $< -+ $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $< - - tone.o: tone.c - $(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $< -diff -Naur eflite-0.4.1/fs.c eflite-0.4.1.new/fs.c ---- eflite-0.4.1/fs.c 2007-01-18 16:01:09.000000000 -0800 -+++ eflite-0.4.1.new/fs.c 2013-09-08 09:31:57.417262688 -0700 -@@ -523,7 +523,7 @@ - int playlen, skip; - if (type == SPEECH) - { -- skip = (187 * wptr->sample_rate) / speed; -+ skip = 0; - playlen = wptr->num_samples - (skip * 2); - if (playlen > 0 && playlen < 500) playlen += (skip * 2) / 3; - } diff --git a/app-accessibility/eflite/files/eflite.rc b/app-accessibility/eflite/files/eflite.rc deleted file mode 100644 index 2a65b04d0a8a..000000000000 --- a/app-accessibility/eflite/files/eflite.rc +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - use alsasound - use modules - use hotplug -} - -start() { - ebegin "Starting eflite" - start-stop-daemon --start --exec /usr/bin/eflite --background \ - --quiet --pidfile /var/run/eflite.pid --make-pidfile -- -D || eend 1 - - SOCKET=`egrep '^sockname=' /etc/eflite/es.conf | sed 's/^sockname=//'` - [ ! -S ${SOCKET} ] && SOCKET=/tmp/es.socket - - chown root:speech ${SOCKET} - chmod 660 ${SOCKET} - eend $? -} - -stop() { - ebegin "Stopping eflite" - start-stop-daemon --stop --quiet --pidfile /var/run/eflite.pid - eend $? -} diff --git a/app-accessibility/eflite/files/es.conf b/app-accessibility/eflite/files/es.conf deleted file mode 100644 index 17443d3e42ba..000000000000 --- a/app-accessibility/eflite/files/es.conf +++ /dev/null @@ -1,11 +0,0 @@ -# What socket do we listen on -sockname=/tmp/es.socket - -# What volume do we set? -tone_volume=8192 - -# Do we use the PC Speaker? (0/1) -speaker_tones=0 - -# Do we use the sound card (via flite)? (0/1) -soundcard_tones=1 diff --git a/app-accessibility/eflite/metadata.xml b/app-accessibility/eflite/metadata.xml deleted file mode 100644 index 9c8a9fdaf58f..000000000000 --- a/app-accessibility/eflite/metadata.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - </maintainer> - <maintainer type="project"> - <email>accessibility@gentoo.org</email> - <name>Gentoo Accessibility Project</name> - </maintainer> - <maintainer type="project"> - <email>sound@gentoo.org</email> - <name>Gentoo Sound project</name> - </maintainer> - <use> - <flag name="16k_voice">Use a higher-quality voice.</flag> - </use> - <longdescription lang="en"> - EFlite is a speech server for Emacspeak and other screen readers - that allows them to interface with Festival Lite, a free - text-to-speech engine developed at the CMU Speech Center as an - off-shoot of Festival. -</longdescription> - <longdescription lang="ja"> - EFliteはEmacspeakと他のスクリーン読取り装置のスピーチサーバ。この - サーバーで前のプログラムはFestival Lite(CMU Speech Centerで開発した - Festivalのようにスピーチにテキストを変わるエンジン。)と - インタフェスすることが出来る。 -</longdescription> - <upstream> - <remote-id type="sourceforge">eflite</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild b/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1-r1.ebuild index 7eb873e8bb76..f18c1f6f8863 100644 --- a/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild +++ b/app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1-r1.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs -DESCRIPTION="adds support for several speech synthesizers to emacspeak" +DESCRIPTION="Adds support for several speech synthesizers to emacspeak" HOMEPAGE="http://leb.net/blinux/" SRC_URI="http://leb.net/pub/blinux/emacspeak/blinux/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND="" RDEPEND=">=app-accessibility/emacspeak-18" PATCHES=( @@ -28,8 +26,8 @@ src_prepare() { src_install() { emake \ - prefix="${D}"/usr \ - man1dir="${D}"/usr/share/man/man1 \ + prefix="${ED}"/usr \ + man1dir="${ED}"/usr/share/man/man1 \ install dodoc CREDITS ChangeLog OtherSynthesizers TODO TROUBLESHOOTING README* } diff --git a/app-accessibility/emacspeak-ss/metadata.xml b/app-accessibility/emacspeak-ss/metadata.xml index 02a513c4c55c..d98c397c82b2 100644 --- a/app-accessibility/emacspeak-ss/metadata.xml +++ b/app-accessibility/emacspeak-ss/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/app-accessibility/emacspeak/Manifest b/app-accessibility/emacspeak/Manifest index 1a147ca5f1d9..b01f904e548b 100644 --- a/app-accessibility/emacspeak/Manifest +++ b/app-accessibility/emacspeak/Manifest @@ -1 +1 @@ -DIST emacspeak-39.0.tar.bz2 4989631 BLAKE2B ea58436fd3d7450938de04b74dcefdd9b9c5bee5c8c3bf48dbd2ca5bd5ce5c795a0d4c60ec05ca83c0020ca650b717e378717dc2d68eb56e80653b5045d5b132 SHA512 c0a0c503d6ccc2abb53a8be580997b44e0449c2225e8a64cee73c24d69a28c3f47c0e660a95a6e77dd4d660272ad562ff747ce3c0a989f8fe7c8171f60349173 +DIST emacspeak-56.0.tar.bz2 7158646 BLAKE2B 484b98e5fac51d30bd9b2705308042ed9e0a49a4684ca777cbc60368fdadd8206ef212af514a5940509c84fee3fdcad12486a31a47cac658c912d7573a484fb7 SHA512 9b18fada991b914ddd3ed30950e685c1c164434536c3dd119b9ed52db80e7e31b7399c72a584938bfb63daa7e1aa76a1f377d664cc1118ffa7f0a4cbdddf0818 diff --git a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild b/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild deleted file mode 100644 index daa09b1d5317..000000000000 --- a/app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -NEED_EMACS=24 -FORCE_PRINT_ELOG=1 -DISABLE_AUTOFORMATTING=1 -inherit elisp readme.gentoo-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" - inherit git-r3 -else - SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" - KEYWORDS="amd64 ppc x86" -fi - -DESCRIPTION="the emacspeak audio desktop" -HOMEPAGE="http://emacspeak.sourceforge.net/" -LICENSE="BSD GPL-2" -SLOT="0" -IUSE="+espeak" - -DEPEND="espeak? ( app-accessibility/espeak )" - -RDEPEND="${DEPEND} - >=dev-tcltk/tclx-8.4" - -DOC_CONTENTS=' -As of version 39.0 and later, the /usr/bin/emacspeak -shell script has been removed downstream in Gentoo. -You should launch emacspeak by another method, for instance -by adding the following to your ~/.emacs file: -(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") -' - -HTML_DOCS=( install-guide user-guide ) - -src_configure() { - emake config -} - -src_compile() { - emake emacspeak - if use espeak; then - local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)" - if [[ -z $tcl_version ]]; then - die 'Unable to detect the installed version of dev-lang/tcl.' - fi - cd servers/linux-espeak || die - emake TCL_VERSION="${tcl_version}" - fi -} - -src_install() { - emake DESTDIR="${D}" install - rm "${D}/usr/bin/emacspeak" - if use espeak; then - pushd servers/linux-espeak > /dev/null || die - emake DESTDIR="${D}" install - local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak" - local serverfile="${D}${orig_serverdir}/tclespeak.so" - install -Dm755 "$serverfile" \ - "${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die - rm -f "$serverfile" || die - dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ - "$orig_serverdir/tclespeak.so" - popd > /dev/null || die - fi - dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT - einstalldocs - cd "${D}/usr/share/emacs/site-lisp/${PN}" || die - rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \ - user-guide || die - readme.gentoo_create_doc -} diff --git a/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild new file mode 100644 index 000000000000..2fb27f565d08 --- /dev/null +++ b/app-accessibility/emacspeak/emacspeak-56.0-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +NEED_EMACS=26.1 +FORCE_PRINT_ELOG=1 +DISABLE_AUTOFORMATTING=1 +inherit elisp toolchain-funcs readme.gentoo-r1 + +DESCRIPTION="The emacspeak audio desktop" +HOMEPAGE="http://emacspeak.sourceforge.net/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" + inherit git-r3 +else + SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2" + KEYWORDS="amd64 ppc x86" +fi + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +IUSE="+espeak" + +# Usually need := dep with tcl anyway but in particular, it's needed +# here as we do a version check in src_compile and bake in the results. +DEPEND=" + dev-lang/tcl:= + espeak? ( app-accessibility/espeak-ng ) +" +RDEPEND=" + ${DEPEND} + >=dev-tcltk/tclx-8.4 +" + +DOC_CONTENTS=' +As of version 39.0 and later, the /usr/bin/emacspeak +shell script has been removed downstream in Gentoo. +You should launch emacspeak by another method, for instance +by adding the following to your ~/.emacs file: +(load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") +' + +HTML_DOCS=( etc/ info/ ) + +src_configure() { + MAKEOPTS+=" -j1" + + tc-export CXX + + emake config +} + +src_compile() { + emake emacspeak + if use espeak; then + local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)" + if [[ -z ${tcl_version} ]]; then + die 'Unable to detect the installed version of dev-lang/tcl.' + fi + + cd servers/native-espeak || die + emake TCL_VERSION="${tcl_version}" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + if use espeak; then + pushd servers/native-espeak > /dev/null || die + + emake DESTDIR="${D}" install + local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak" + local serverfile="${ED}${orig_serverdir}/tclespeak.so" + + install -Dm755 "${serverfile}" \ + "${ED}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die + rm -f "${serverfile}" || die + + dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ + "${orig_serverdir}/tclespeak.so" + popd > /dev/null || die + fi + + dodoc README etc/NEWS* etc/COPYRIGHT + einstalldocs + + cd "${ED}"/usr/share/emacs/site-lisp/${PN} || die + rm -rf README etc/NEWS* etc/COPYRIGHT install-guide \ + user-guide || die + readme.gentoo_create_doc +} diff --git a/app-accessibility/emacspeak/emacspeak-9999.ebuild b/app-accessibility/emacspeak/emacspeak-9999.ebuild index 67a6062698b4..9c9472dcc6bf 100644 --- a/app-accessibility/emacspeak/emacspeak-9999.ebuild +++ b/app-accessibility/emacspeak/emacspeak-9999.ebuild @@ -1,31 +1,38 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -NEED_EMACS=24 +NEED_EMACS=26.1 FORCE_PRINT_ELOG=1 DISABLE_AUTOFORMATTING=1 -inherit elisp readme.gentoo-r1 +inherit elisp toolchain-funcs readme.gentoo-r1 -if [[ ${PV} == "9999" ]] ; then +DESCRIPTION="The emacspeak audio desktop" +HOMEPAGE="http://emacspeak.sourceforge.net/" + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/tvraman/emacspeak.git" inherit git-r3 else - SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" + SRC_URI="https://github.com/tvraman/emacspeak/releases/download/${PV}/${P}.tar.bz2" KEYWORDS="~amd64 ~ppc ~x86" fi -DESCRIPTION="the emacspeak audio desktop" -HOMEPAGE="http://emacspeak.sourceforge.net/" -LICENSE="BSD GPL-2" +LICENSE="GPL-2+ GPL-3+" SLOT="0" IUSE="+espeak" -DEPEND="espeak? ( app-accessibility/espeak )" - -RDEPEND="${DEPEND} - >=dev-tcltk/tclx-8.4" +# Usually need := dep with tcl anyway but in particular, it's needed +# here as we do a version check in src_compile and bake in the results. +DEPEND=" + dev-lang/tcl:= + espeak? ( app-accessibility/espeak-ng ) +" +RDEPEND=" + ${DEPEND} + >=dev-tcltk/tclx-8.4 +" DOC_CONTENTS=' As of version 39.0 and later, the /usr/bin/emacspeak @@ -35,9 +42,13 @@ by adding the following to your ~/.emacs file: (load "/usr/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.el") ' -HTML_DOCS=( install-guide user-guide ) +HTML_DOCS=( etc/ info/ ) src_configure() { + MAKEOPTS+=" -j1" + + tc-export CXX + emake config } @@ -45,33 +56,39 @@ src_compile() { emake emacspeak if use espeak; then local tcl_version="$(echo 'puts $tcl_version;exit 0' |tclsh)" - if [[ -z $tcl_version ]]; then + if [[ -z ${tcl_version} ]]; then die 'Unable to detect the installed version of dev-lang/tcl.' fi - cd servers/linux-espeak || die + + cd servers/native-espeak || die emake TCL_VERSION="${tcl_version}" fi } src_install() { emake DESTDIR="${D}" install - rm "${D}/usr/bin/emacspeak" + if use espeak; then - pushd servers/linux-espeak > /dev/null || die + pushd servers/native-espeak > /dev/null || die + emake DESTDIR="${D}" install - local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/linux-espeak" - local serverfile="${D}${orig_serverdir}/tclespeak.so" - install -Dm755 "$serverfile" \ - "${D}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die - rm -f "$serverfile" || die - dosym "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ - "$orig_serverdir/tclespeak.so" + local orig_serverdir="/usr/share/emacs/site-lisp/emacspeak/servers/native-espeak" + local serverfile="${ED}${orig_serverdir}/tclespeak.so" + + install -Dm755 "${serverfile}" \ + "${ED}/usr/$(get_libdir)/emacspeak/tclespeak.so" || die + rm -f "${serverfile}" || die + + dosym -r "/usr/$(get_libdir)/emacspeak/tclespeak.so" \ + "${orig_serverdir}/tclespeak.so" popd > /dev/null || die fi - dodoc README etc/NEWS* etc/FAQ etc/COPYRIGHT + + dodoc README etc/NEWS* etc/COPYRIGHT einstalldocs - cd "${D}/usr/share/emacs/site-lisp/${PN}" || die - rm -rf README etc/NEWS* etc/FAQ etc/COPYRIGHT install-guide \ + + cd "${ED}"/usr/share/emacs/site-lisp/${PN} || die + rm -rf README etc/NEWS* etc/COPYRIGHT install-guide \ user-guide || die readme.gentoo_create_doc } diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml index 2d3e20711d7a..b4f85db5b90c 100644 --- a/app-accessibility/emacspeak/metadata.xml +++ b/app-accessibility/emacspeak/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> @@ -17,6 +17,7 @@ <flag name="espeak">Adds support for the espeak tts engine</flag> </use> <upstream> + <remote-id type="github">tvraman/emacspeak</remote-id> <remote-id type="google-code">emacspeak</remote-id> <remote-id type="sourceforge">emacspeak</remote-id> </upstream> diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild index 89a3e1ef5923..bb198daa9877 100644 --- a/app-accessibility/epos/epos-2.5.37-r2.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools +inherit autotools flag-o-matic -DESCRIPTION="language independent text-to-speech system" +DESCRIPTION="Language independent text-to-speech system" HOMEPAGE="http://epos.ufe.cz/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 x86" -IUSE="" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86" +RESTRICT="test" # needs running eposd -DEPEND=">=app-text/sgmltools-lite-3.0.3-r9 - dev-util/byacc" -RDEPEND="" +BDEPEND="dev-util/byacc" PATCHES=( "${FILESDIR}"/${PN}-2.5.37-gcc43.patch @@ -24,6 +22,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.5.37-gcc47.patch "${FILESDIR}"/${PN}-2.5.37-disable-tests.patch "${FILESDIR}"/${PN}-2.5.37-gcc7.patch + "${FILESDIR}"/${PN}-2.5.37-gcc-11.patch ) src_prepare() { @@ -34,6 +33,9 @@ src_prepare() { } src_configure() { + # Uses removed 'register' keyword, bug #894178 + append-cxxflags -std=c++03 + econf \ --enable-charsets \ --disable-portaudio \ diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch new file mode 100644 index 000000000000..a14488b7d34a --- /dev/null +++ b/app-accessibility/epos/files/epos-2.5.37-gcc-11.patch @@ -0,0 +1,81 @@ +Avoid `container` namespace clash with gcc-11's libstdc++ headers. + +https://bugs.gentoo.org/786264 +--- a/src/nnet/xmltempl.cc ++++ b/src/nnet/xmltempl.cc +@@ -22,10 +22,10 @@ CXml * x ::print () const { \ + #define RP(x) x + + #define child(x,tag) retval->AddChild (*xml_print (x,tag)); +-#define container(x,tag) retval->AddChild (*xml_print_container (x,tag)); ++#define epos_container(x,tag) retval->AddChild (*xml_print_container (x,tag)); + #define child_opt(x,tag) if(x) child(x,tag) + #define child_enum(x,tag,enumS) retval->AddChild (*xml_print (enumS[x],tag)); +-#define container_opt(x,tag) if(x.size()) container(x,tag) ++#define container_opt(x,tag) if(x.size()) epos_container(x,tag) + #define structure(x,tag) retval->AddChild (*xml_print_str (x,tag)); + #define structure_opt(x,tag,write_cond) if (write_cond) structure(x,tag) + +@@ -40,7 +40,7 @@ CXml * x ::print () const { \ + #define CHILD(x) child(x,#x) + #define CHILD_OPT(x) child_opt(x,#x) + #define CHILD_ENUM(x,enumS) child_enum(x,#x,enumS) +-#define CONTAINER(x) container(x,#x) ++#define CONTAINER(x) epos_container(x,#x) + #define CONTAINER_OPT(x) container_opt (x,#x) + #define STRUCTURE(x) structure(x,#x) + #define STRUCTURE_OPT(x,cond) structure_opt(x,#x,cond) +@@ -60,7 +60,7 @@ return retval; } + #undef child + #undef child_opt + #undef child_enum +-#undef container ++#undef epos_container + #undef container_opt + #undef structure + #undef structure_opt +@@ -82,7 +82,7 @@ CString x ::read (CRox *xml) { \ + #define child(x,tag) err += xml_read (xml,x,tag); + #define child_opt(x,tag) err += xml_read(xml,x,tag,false); + #define child_enum(x,tag,enumS) err += xml_read_enum(xml,x,enumS,tag); +-#define container(x,tag) err += xml_read_container (xml,x,tag); ++#define epos_container(x,tag) err += xml_read_container (xml,x,tag); + #define container_opt(x,tag) err += xml_read_container (xml,x,tag,false); + #define structure(x,tag) err += xml_read_str (xml,x,tag); + #define structure_opt(x,tag,write_cond) err += xml_read_str (xml,x,tag,false); +@@ -105,7 +105,7 @@ else return ""; } + #undef child + #undef child_opt + #undef child_enum +-#undef container ++#undef epos_container + #undef container_opt + #undef structure + #undef structure_opt +@@ -119,7 +119,7 @@ else return ""; } + + #define XMLIZE(x,tag) x tmp##tag; retval->AddChild (*tmp##tag.printTemplate ()); + #define child(x,tag) +-#define container(x,tag) ++#define epos_container(x,tag) + #define child_opt(x,tag) + #define child_enum(x,tag,enumS) + #define container_opt(x,tag) +@@ -145,7 +145,7 @@ CRox *xmltempl () + #undef child + #undef child_opt + #undef child_enum +-#undef container ++#undef epos_container + #undef container_opt + #undef structure + #undef structure_opt +@@ -171,7 +171,7 @@ CXml * x ::printTemplate () const { \ + CXml *retval = new CXml (#tag,1,0,"comment","structure " #x); \ + retval->SetFF(DODELETE); + #define child(x,tag) retval->AddChild (*(new CXml(tag,1,0,"comment",#x))->SetFF(DODELETE)); +-#define container(x,tag) ++#define epos_container(x,tag) + #define child_opt(x,tag) + #define child_enum(x,tag,enumS) + #define container_opt(x,tag) diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml index ff924802b4d4..234f6ef87e9d 100644 --- a/app-accessibility/epos/metadata.xml +++ b/app-accessibility/epos/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> diff --git a/app-accessibility/espeak-ng/Manifest b/app-accessibility/espeak-ng/Manifest new file mode 100644 index 000000000000..174291e7849e --- /dev/null +++ b/app-accessibility/espeak-ng/Manifest @@ -0,0 +1 @@ +DIST espeak-ng-1.51.tar.gz 14260788 BLAKE2B 230e8860247bdd44a26ba7281fadb7486e7fff90de229c71fb883693badfc141d5ad883769d6cead150f43560a5c47152cada4fcb5a28c0b0384dacaad2c9d09 SHA512 6c29275706d21de2d5fa393702d2f173fc05d2ce4e2f46f3bf9a2742b0a8f294177663df0d079188e31cc2541f2c21a64e09e8afffe95befab667a4d00429fd2 diff --git a/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild new file mode 100644 index 000000000000..19d3e39695fa --- /dev/null +++ b/app-accessibility/espeak-ng/espeak-ng-1.51.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Software speech synthesizer for English, and some other languages" +HOMEPAGE="https://github.com/espeak-ng/espeak-ng" +SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+ unicode" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound" + +DEPEND=" + mbrola? ( app-accessibility/mbrola ) + sound? ( media-libs/pcaudiolib ) +" +RDEPEND="${DEPEND} + !app-accessibility/espeak + sound? ( media-sound/sox ) +" +BDEPEND=" + virtual/pkgconfig + man? ( app-text/ronn-ng ) +" + +DOCS=( CHANGELOG.md README.md docs ) + +src_prepare() { + default + + # disable failing tests + rm tests/{language-pronunciation,translate}.test || die + sed -i \ + -e "/language-pronunciation.check/d" \ + -e "/translate.check/d" \ + Makefile.am || die + + eautoreconf +} + +src_configure() { + local econf_args + + # https://bugs.gentoo.org/836646 + export PULSE_SERVER="" + + econf_args=( + $(use_with async) + $(use_with klatt) + $(use_with l10n_ru extdict-ru) + $(use_with l10n_zh extdict-cmn) + $(use_with l10n_zh extdict-yue) + $(use_with mbrola) + $(use_with sound pcaudiolib) + --without-libfuzzer + --without-speechplayer + --without-sonic + --disable-rpath + --disable-static + ) + econf "${econf_args[@]}" +} + +src_compile() { + emake +} + +src_test() { + emake check +} + +src_install() { + emake DESTDIR="${D}" VIMDIR=/usr/share/vim/vimfiles install -j1 + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild new file mode 100644 index 000000000000..791939bee5a1 --- /dev/null +++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Software speech synthesizer for English, and some other languages" +HOMEPAGE="https://github.com/espeak-ng/espeak-ng" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/espeak-ng/espeak-ng.git" + inherit git-r3 +else + SRC_URI="https://github.com/espeak-ng/espeak-ng/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-3+ unicode" +SLOT="0" +IUSE="+async +klatt l10n_ru l10n_zh man mbrola +sound" + +DEPEND=" + mbrola? ( app-accessibility/mbrola ) + sound? ( media-libs/pcaudiolib ) +" +RDEPEND="${DEPEND} + !app-accessibility/espeak + sound? ( media-sound/sox ) +" +BDEPEND=" + virtual/pkgconfig + man? ( app-text/ronn-ng ) +" + +DOCS=( CHANGELOG.md README.md docs ) + +src_prepare() { + default + + # disable failing tests + rm tests/{language-pronunciation,translate}.test || die + sed -i \ + -e "/language-pronunciation.check/d" \ + -e "/translate.check/d" \ + Makefile.am || die + + eautoreconf +} + +src_configure() { + local econf_args + + # https://bugs.gentoo.org/836646 + export PULSE_SERVER="" + + econf_args=( + $(use_with async) + $(use_with klatt) + $(use_with l10n_ru extdict-ru) + $(use_with l10n_zh extdict-cmn) + $(use_with l10n_zh extdict-yue) + $(use_with mbrola) + $(use_with sound pcaudiolib) + --without-libfuzzer + --without-sonic + --disable-rpath + ) + econf "${econf_args[@]}" +} + +src_test() { + emake check +} + +src_install() { + emake DESTDIR="${D}" VIMDIR=/usr/share/vim/vimfiles install + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-accessibility/espeak-ng/metadata.xml b/app-accessibility/espeak-ng/metadata.xml new file mode 100644 index 000000000000..4901fb4be0a0 --- /dev/null +++ b/app-accessibility/espeak-ng/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <upstream> + <maintainer> + <name>Reece H. Dunn</name> + <email>msclrhd@gmail.com</email> + </maintainer> + <remote-id type="github">espeak-ng/espeak-ng</remote-id> + <changelog>https://github.com/espeak-ng/espeak-ng/releases.atom</changelog> + </upstream> + <maintainer type="person"> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <use> + <flag name="async">Enables asynchronous commands</flag> + <flag name="klatt">Enables Klatt formant synthesis and implementation</flag> + <flag name="l10n_ru">Builds extended Russian Dictionary file</flag> + <flag name="l10n_zh">Builds extended Chinese (Mandarin and Cantonese) Dictionary files</flag> + <flag name="man">Builds and installs manpage with <pkg>app-text/ronn-ng</pkg></flag> + <flag name="mbrola">Adds support for mbrola voices</flag> + </use> +</pkgmetadata> diff --git a/app-accessibility/espeak/Manifest b/app-accessibility/espeak/Manifest deleted file mode 100644 index 67bec782cc52..000000000000 --- a/app-accessibility/espeak/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST espeak-1.47.11-source.zip 2813649 BLAKE2B 0ebeabcfd8193dd0d37c43974616f5fc4d769bde7b0a730b37456cd1ab580ab84b5bc141804f4c25d7bff6f4b401fe46764e0117cd9c4a55e2216de6965c17b7 SHA512 77c3989fbd0e4aadae0da2d7f1c587854895ae103633704ee5b4042b0618897d01edffa80b1f13e6cbf356f2f31beaf4fdb7e90e4ab641d5286d559aaefe932b -DIST espeak-1.48.04-source.zip 3019245 BLAKE2B a29da5eab832fa76b180049765f7fa671ebf47c0a68ee2cdfb0f4466846d97b2bf7b8f07dba747e236a27c9b077000bfd471e35b9744ffac7c9014679f5c04fd SHA512 f0759e6ace2604c8cbb19e8c3fd4b106edf4dcece247a6677f6b734af7746c35a367126edfbe585396c98f6c54f07e25d64bfab35e258e64f09bd2c0833247fa diff --git a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild b/app-accessibility/espeak/espeak-1.47.11-r1.ebuild deleted file mode 100644 index 1682a370839d..000000000000 --- a/app-accessibility/espeak/espeak-1.47.11-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -MY_P="${P}-source" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" -DESCRIPTION="Speech synthesizer for English and other languages" -HOMEPAGE="http://espeak.sourceforge.net/" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="portaudio pulseaudio" - -COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 ) - pulseaudio? ( media-sound/pulseaudio )" - -DEPEND="${COMMON_DEPEND} - app-arch/unzip" - -RDEPEND="${COMMON_DEPEND} - media-sound/sox" - -S=${WORKDIR}/${MY_P}/src - -get_audio() { - if use portaudio && use pulseaudio; then - echo runtime - elif use portaudio; then - echo portaudio - elif use pulseaudio; then - echo pulseaudio - else - echo none - fi -} - -src_prepare() { - # gentoo uses portaudio 19. - mv -f portaudio19.h portaudio.h -} - -src_compile() { - emake \ - PREFIX="${EPREFIX}/usr" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" \ - AR="$(tc-getAR)" \ - AUDIO="$(get_audio)" \ - all - - einfo "Fixing byte order of phoneme data files" - pushd ../platforms/big_endian > /dev/null - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" - ./espeak-phoneme-data \ - ../../espeak-data \ - . \ - ../../espeak-data/phondata-manifest - cp -f phondata phonindex phontab "../../espeak-data" -} - -src_install() { - emake \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - DESTDIR="${D}" \ - AUDIO="$(get_audio)" \ - install - - cd .. - insinto /usr/share/espeak-data - doins -r dictsource - dodoc ChangeLog.txt ReadMe - dohtml -r docs/* -} - -pkg_preinst() { - local voicedir="${ROOT}/usr/share/${PN}-data/voices/en" - if [ -d "${voicedir}" ]; then - rm -rf "${voicedir}" - fi -} - -pkg_postinst() { - if ! use portaudio && ! use pulseaudio; then - ewarn "Since portaudio and pulseaudio are not in your use flags," - ewarn "espeak will only be able to create wav files." - ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}" - ewarn "with either portaudio or pulseaudio USE flag enabled." - fi -} diff --git a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild deleted file mode 100644 index ffc6b42f28eb..000000000000 --- a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -MY_P="${P}-source" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" -DESCRIPTION="Speech synthesizer for English and other languages" -HOMEPAGE="http://espeak.sourceforge.net/" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="portaudio pulseaudio" - -COMMON_DEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 ) - pulseaudio? ( media-sound/pulseaudio )" - -DEPEND="${COMMON_DEPEND} - app-arch/unzip" - -RDEPEND="${COMMON_DEPEND} - media-sound/sox" - -PATCHES=( "${FILESDIR}"/${P}-gcc-6-fix.patch ) - -S="${WORKDIR}/${MY_P}/src" - -get_audio() { - if use portaudio && use pulseaudio; then - echo runtime - elif use portaudio; then - echo portaudio - elif use pulseaudio; then - echo pulseaudio - else - echo none - fi -} - -src_prepare() { - default - # gentoo uses portaudio 19. - mv -f portaudio19.h portaudio.h -} - -src_compile() { - emake \ - PREFIX="${EPREFIX}/usr" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" \ - AR="$(tc-getAR)" \ - AUDIO="$(get_audio)" \ - all - - einfo "Fixing byte order of phoneme data files" - pushd ../platforms/big_endian > /dev/null - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" - ./espeak-phoneme-data \ - ../../espeak-data \ - . \ - ../../espeak-data/phondata-manifest - cp -f phondata phonindex phontab "../../espeak-data" -} - -src_install() { - emake \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - DESTDIR="${D}" \ - AUDIO="$(get_audio)" \ - install - - cd .. - insinto /usr/share/espeak-data - doins -r dictsource - dodoc ChangeLog.txt ReadMe - HTML_DOCS="docs/*" einstalldocs -} - -pkg_preinst() { - local voicedir="${ROOT}/usr/share/${PN}-data/voices/en" - if [ -d "${voicedir}" ]; then - rm -rf "${voicedir}" - fi -} - -pkg_postinst() { - if ! use portaudio && ! use pulseaudio; then - ewarn "Since portaudio and pulseaudio are not in your use flags," - ewarn "espeak will only be able to create wav files." - ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}" - ewarn "with either portaudio or pulseaudio USE flag enabled." - fi -} diff --git a/app-accessibility/espeak/espeak-1.48.04.ebuild b/app-accessibility/espeak/espeak-1.48.04.ebuild deleted file mode 100644 index 0ab3acc0376a..000000000000 --- a/app-accessibility/espeak/espeak-1.48.04.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -MY_P="${P}-source" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" -DESCRIPTION="Speech synthesizer for English and other languages" -HOMEPAGE="http://espeak.sourceforge.net/" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="portaudio pulseaudio" - -COMMON_DEPEND=" portaudio? ( >=media-libs/portaudio-19_pre20071207 ) - pulseaudio? ( media-sound/pulseaudio )" - -DEPEND="${COMMON_DEPEND} - app-arch/unzip" - -RDEPEND="${COMMON_DEPEND} - media-sound/sox" - -S=${WORKDIR}/${MY_P}/src - -get_audio() { - if use portaudio && use pulseaudio; then - echo runtime - elif use portaudio; then - echo portaudio - elif use pulseaudio; then - echo pulseaudio - else - echo none - fi -} - -src_prepare() { - # gentoo uses portaudio 19. - mv -f portaudio19.h portaudio.h -} - -src_compile() { - emake \ - PREFIX="${EPREFIX}/usr" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="${CXXFLAGS}" \ - AR="$(tc-getAR)" \ - AUDIO="$(get_audio)" \ - all - - einfo "Fixing byte order of phoneme data files" - pushd ../platforms/big_endian > /dev/null - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" - ./espeak-phoneme-data \ - ../../espeak-data \ - . \ - ../../espeak-data/phondata-manifest - cp -f phondata phonindex phontab "../../espeak-data" -} - -src_install() { - emake \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - DESTDIR="${D}" \ - AUDIO="$(get_audio)" \ - install - - cd .. - insinto /usr/share/espeak-data - doins -r dictsource - dodoc ChangeLog.txt ReadMe - dohtml -r docs/* -} - -pkg_preinst() { - local voicedir="${ROOT}/usr/share/${PN}-data/voices/en" - if [ -d "${voicedir}" ]; then - rm -rf "${voicedir}" - fi -} - -pkg_postinst() { - if ! use portaudio && ! use pulseaudio; then - ewarn "Since portaudio and pulseaudio are not in your use flags," - ewarn "espeak will only be able to create wav files." - ewarn "If this is not what you want, please reemerge ${CATEGORY}/${PN}" - ewarn "with either portaudio or pulseaudio USE flag enabled." - fi -} diff --git a/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch b/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch deleted file mode 100644 index f28de7338b37..000000000000 --- a/app-accessibility/espeak/files/espeak-1.48.04-gcc-6-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://src.fedoraproject.org/cgit/rpms/espeak.git/tree/espeak-1.48-gcc-6-fix.patch -diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp ---- a/tr_languages.cpp -+++ b/tr_languages.cpp -@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { - 0x200d, 1, // zero width joiner - 0, 0 }; - --const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 -+const char string_ordinal[] = {'\xc2','\xba',0}; // masculine ordinal character, UTF-8 - - - static Translator* NewTranslator(void) diff --git a/app-accessibility/espeak/metadata.xml b/app-accessibility/espeak/metadata.xml deleted file mode 100644 index 368b975990cf..000000000000 --- a/app-accessibility/espeak/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - </maintainer> - <maintainer type="project"> - <email>accessibility@gentoo.org</email> - <name>Gentoo Accessibility Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">espeak</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-accessibility/espeakup/Manifest b/app-accessibility/espeakup/Manifest index fb8ddde47316..59dfb0bf15fe 100644 --- a/app-accessibility/espeakup/Manifest +++ b/app-accessibility/espeakup/Manifest @@ -1,2 +1 @@ -DIST espeakup-0.71.tar.bz2 24663 BLAKE2B b5cae80e7a6d45e599dd03680da398cc9db8eb98d0140d8e71aa5047607484401c3906386627810e3ff78a244c9c0e16383675fdd845802225fdb32c8b2a3dbd SHA512 01091560cd4843897fa6925a54b4c856fe57ed5728ddc0c091c93b1ae14eb2f4d07ab2247e40bd5a5968cc22ee3696abfe1b28f67b95aa7ab61e33667c51135d -DIST espeakup-0.80.tar.gz 39626 BLAKE2B f36d9776b954e73fd2bc33c7ba97dd323184480549b667ac2afc4dc40a8b98089b8ced16e8b1cb33e6b4c586df27a8d6f782236ef8770bc98a530665e257edcf SHA512 1b7e2bd46c3c13a5305746d2d2810ec94a8660f561e4f679ee4779be1b22178f8ac7de42d626d649710509f7b087b9a2f94608bde203d1bcd6d353229ed9ff83 +DIST espeakup-0.90.tar.gz 25170 BLAKE2B f91a70bad0d985d313852b9e5f72dea4330ab23050ca6904ae5895d513088031f34d878cd64d97dcf2cf02dddc3e9fdabd0826cac98634829019ed3267e27bd8 SHA512 0731835a04063c5eac8ed0ed37cd92cc5d2dd1c58cbd94e158b7dfbb7bc0e2f84a6484fffd9009bf2920652a36fb737044b2e1fb67fb1679ee7150855bc9a15e diff --git a/app-accessibility/espeakup/espeakup-0.71-r1.ebuild b/app-accessibility/espeakup/espeakup-0.71-r1.ebuild deleted file mode 100644 index 4b3682500954..000000000000 --- a/app-accessibility/espeakup/espeakup-0.71-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit linux-info - -DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup" -HOMEPAGE="http://www.linux-speakup.org" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEPEND="|| ( - app-accessibility/espeak[portaudio] - app-accessibility/espeak[pulseaudio] )" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT" -ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!" -ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!" - -pkg_setup() { - if kernel_is -ge 2 6 37; then - check_extra_config - elif ! has_version app-accessibility/speakup; then - ewarn "Cannot find speakup on your system." - ewarn "Please upgrade your kernel to 2.6.37 or later and enable the" - ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options" - ewarn "or install app-accessibility/speakup." - fi -} - -src_compile() { - emake -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ChangeLog README ToDo - newconfd "${FILESDIR}"/espeakup.confd espeakup - newinitd "${FILESDIR}"/espeakup.rc espeakup -} - -pkg_postinst() { - elog "To get espeakup to start automatically, it is currently recommended" - elog "that you add it to the default run level, by giving the following" - elog "command as root." - elog - elog "rc-update add espeakup default" - elog - elog "You can also set a default voice now for espeakup." - elog "See /etc/conf.d/espeakup for how to do this." -} diff --git a/app-accessibility/espeakup/espeakup-0.80.ebuild b/app-accessibility/espeakup/espeakup-0.90-r1.ebuild index 95a1e0ea06b2..0cbdd061286c 100644 --- a/app-accessibility/espeakup/espeakup-0.80.ebuild +++ b/app-accessibility/espeakup/espeakup-0.90-r1.ebuild @@ -1,53 +1,49 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/williamh/espeakup.git" + EGIT_REPO_URI="https://github.com/linux-speakup/espeakup.git" inherit git-r3 else - EGIT_COMMIT=v${PV} - SRC_URI="https://github.com/williamh/espeakup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - inherit vcs-snapshot + SRC_URI="https://github.com/linux-speakup/espeakup/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~loong x86" fi -inherit linux-info +inherit linux-info meson DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup" HOMEPAGE="https://github.com/williamh/espeakup" LICENSE="GPL-3" SLOT="0" -IUSE="" +IUSE="man systemd" -COMMON_DEPEND="|| ( - app-accessibility/espeak[portaudio] - app-accessibility/espeak[pulseaudio] )" +COMMON_DEPEND="app-accessibility/espeak-ng[sound] + media-libs/alsa-lib" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" +BDEPEND="man? ( app-text/ronn-ng )" CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT" ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!" ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!" -pkg_setup() { - if kernel_is -ge 2 6 37; then - check_extra_config - elif ! has_version app-accessibility/speakup; then - ewarn "Cannot find speakup on your system." - ewarn "Please upgrade your kernel to 2.6.37 or later and enable the" - ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options" - ewarn "or install app-accessibility/speakup." - fi +src_configure() { + local emesonargs + emesonargs=( + $(meson_feature man) + $(meson_feature systemd) + ) + meson_src_configure } src_install() { - emake DESTDIR="${D}" PREFIX=/usr install + meson_src_install einstalldocs newconfd "${FILESDIR}"/espeakup.confd espeakup - newinitd "${FILESDIR}"/espeakup.rc espeakup + newinitd "${FILESDIR}"/espeakup.initd espeakup } pkg_postinst() { diff --git a/app-accessibility/espeakup/espeakup-9999.ebuild b/app-accessibility/espeakup/espeakup-9999.ebuild index 95a1e0ea06b2..503c5bd7ea0c 100644 --- a/app-accessibility/espeakup/espeakup-9999.ebuild +++ b/app-accessibility/espeakup/espeakup-9999.ebuild @@ -1,53 +1,47 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/williamh/espeakup.git" + EGIT_REPO_URI="https://github.com/linux-speakup/espeakup.git" inherit git-r3 else - EGIT_COMMIT=v${PV} - SRC_URI="https://github.com/williamh/espeakup/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - inherit vcs-snapshot + SRC_URI="https://github.com/linux-speakup/espeakup/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" fi -inherit linux-info +inherit linux-info meson DESCRIPTION="espeakup is a small lightweight connector for espeak and speakup" HOMEPAGE="https://github.com/williamh/espeakup" LICENSE="GPL-3" SLOT="0" -IUSE="" +IUSE="man systemd" -COMMON_DEPEND="|| ( - app-accessibility/espeak[portaudio] - app-accessibility/espeak[pulseaudio] )" +COMMON_DEPEND="app-accessibility/espeak-ng[sound] + media-libs/alsa-lib" DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" +BDEPEND="man? ( app-text/ronn-ng )" CONFIG_CHECK="~SPEAKUP ~SPEAKUP_SYNTH_SOFT" -ERROR_SPEAKUP="CONFIG_SPEAKUP is not enabled in this kernel!" -ERROR_SPEAKUP_SYNTH_SOFT="CONFIG_SPEAKUP_SYNTH_SOFT is not enabled in this kernel!" - -pkg_setup() { - if kernel_is -ge 2 6 37; then - check_extra_config - elif ! has_version app-accessibility/speakup; then - ewarn "Cannot find speakup on your system." - ewarn "Please upgrade your kernel to 2.6.37 or later and enable the" - ewarn "CONFIG_SPEAKUP and CONFIG_SPEAKUP_SYNTH_SOFT options" - ewarn "or install app-accessibility/speakup." - fi + +src_configure() { + local emesonargs + emesonargs=( + $(meson_feature man) + $(meson_feature systemd) + ) + meson_src_configure } src_install() { - emake DESTDIR="${D}" PREFIX=/usr install + meson_src_install einstalldocs newconfd "${FILESDIR}"/espeakup.confd espeakup - newinitd "${FILESDIR}"/espeakup.rc espeakup + newinitd "${FILESDIR}"/espeakup.initd espeakup } pkg_postinst() { diff --git a/app-accessibility/espeakup/files/espeakup.rc b/app-accessibility/espeakup/files/espeakup.initd index 2989a970874b..6ef0a339d1c9 100644 --- a/app-accessibility/espeakup/files/espeakup.rc +++ b/app-accessibility/espeakup/files/espeakup.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/bin/espeakup @@ -10,3 +10,9 @@ depend() { after modules use alsasound pulseaudio } + +start_pre() { + [ -f /sys/accessibility/speakup/synth ] && + echo soft > /sys/accessibility/speakup/synth + return 0 +} diff --git a/app-accessibility/espeakup/metadata.xml b/app-accessibility/espeakup/metadata.xml index af3734414e2f..c1f2c88df753 100644 --- a/app-accessibility/espeakup/metadata.xml +++ b/app-accessibility/espeakup/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> @@ -13,6 +13,6 @@ Espeakup is a small lightweight connector which makes it possible for speakup to use espeak as its synthesizer. </longdescription> <upstream> - <remote-id type="github">williamh/espeakup</remote-id> + <remote-id type="github">linux-speakup/espeakup</remote-id> </upstream> </pkgmetadata> diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest index afec3bc9b099..7fc37129768b 100644 --- a/app-accessibility/flite/Manifest +++ b/app-accessibility/flite/Manifest @@ -29,5 +29,4 @@ DIST cmu_us_rms.flitevox 12845352 BLAKE2B eb48a7bd29e70d9782e16de8ac28030639f336 DIST cmu_us_rxr.flitevox 7645602 BLAKE2B 532ce8a72455a3d15728b799b8d9c15fcc7bc06e14bc8559fe9f8ce5ff537bfb6465f3069083ce45ff023c413ae6e7b7f19c1b19e010900f60bbdfb427d2370f SHA512 6f742bf4a94f72fb1383c60b2917f8001638c8ec2696b989c5ab2dd192cf4a08256e54fd5f8431a10ba164272e5bbfab474213b09d2dd3a2acf4bb4bdaca554e DIST cmu_us_slp.flitevox 7280743 BLAKE2B 99d5270f55374cad466de01b1764d1ffd072cd770d0630f30f96c13af44ac02bc841be5c7aff3fe189e1089e24544363093f4cab481ed1c018bf49c621591b4f SHA512 f19997ab1293bac785f8a8334512ae20d5c1feb20adac40fdc71da125069dedd1a8dc3c69b9247e20bc3f4db307be779e260172f5239622425603684766a5c44 DIST cmu_us_slt.flitevox 11156032 BLAKE2B 909d4d2adf94d5b40aee4b85aefaf1e8383718f491f8cc9639e0a91baccdad42b1b8a91443e4faa51ad9e1c0e25b8474f9b97c5a8d792102f87815bcdabaf230 SHA512 a17994d46b910434803e185820ad27a18caa1195b61f64cdbba1d6992c1bd65b3425d9e4ba40c279bdb6bce53c6b3529496c28c631c1684808f6a83f10846c41 -DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0 SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112 -DIST flite-2.1-release.tar.bz2 14816327 BLAKE2B a23db51594ec94131112e0f007e1a9e4ee7170eaeda37ecc461c08a0e4defa0bfcde87ca01df765f0bc7b85cc6b3d4ec355830eae7dcb47d243d08b04772217b SHA512 e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2 +DIST flite-2.2.tar.gz 20233792 BLAKE2B c395c34d2739da523c4794da3a795f2febb7e9a26336c7688215f648c4aee03855c8ac7c9d3817efe3e3a41380a5e325aa8236d1b64af21f8100da3dbba2db23 SHA512 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72 diff --git a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch b/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch deleted file mode 100644 index 270395877c53..000000000000 --- a/app-accessibility/flite/files/flite-1.4-fix-parallel-builds.patch +++ /dev/null @@ -1,25 +0,0 @@ -From dec7aff03916dce6ba4c244314c60cc7b9359585 Mon Sep 17 00:00:00 2001 -From: William Hubbs <w.d.hubbs@gmail.com> -Date: Fri, 1 Jan 2010 12:59:59 -0600 -Subject: [PATCH] fix parallel builds - ---- - main/Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/main/Makefile b/main/Makefile -index 0513e59..e4d04fe 100644 ---- a/main/Makefile -+++ b/main/Makefile -@@ -81,6 +81,8 @@ else - shared_libs: nothing - endif - -+.NOTPARALLEL: $(ALL) -+ - $(BINDIR)/flite$(EXEEXT): flite_main.o $(flite_LIBS_deps) - $(TOP)/tools/make_voice_list $(VOICES) - rm -f flite_voice_list.o --- -1.6.4.4 - diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch deleted file mode 100644 index fd8f49059e76..000000000000 --- a/app-accessibility/flite/files/flite-1.4-ldflags.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/config/common_make_rules -+++ b/config/common_make_rules -@@ -68,7 +68,7 @@ - - FLITELIBS = $(BUILDDIR)/lib/libflite.a - FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite --LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS) -+LDLIBS += -lm $(AUDIOLIBS) $(OTHERLIBS) - - FULLOBJS = $(OBJS:%=$(OBJDIR)/%) - ifdef SHFLAGS -@@ -123,7 +123,7 @@ - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) -- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -+ @ (cd shared_os && $(CC) ${LDFLAGS} -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDLIBS)) - @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) - @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) - @ rm -rf shared_os ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -62,9 +62,9 @@ - LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort - - $(BINDIR)/find_sts: find_sts_main.o $(FLITELIBS) -- $(CC) $(CFLAGS) -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDFLAGS) -+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ find_sts_main.o $(FLITELIBFLAGS) $(LDLIBS) - $(BINDIR)/flite_sort: flite_sort_main.o $(FLITELIBS) -- $(CC) $(CFLAGS) -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDFLAGS) -+ $(CC) $(CFLAGS) ${LDFLAGS} -o $@ flite_sort_main.o $(FLITELIBFLAGS) $(LDLIBS) - makescripts: - @ cp -p $(SCRIPTS) $(TOP)/bin - diff --git a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch b/app-accessibility/flite/files/flite-1.4-respect-destdir.patch deleted file mode 100644 index d54771423e1f..000000000000 --- a/app-accessibility/flite/files/flite-1.4-respect-destdir.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001 -From: William Hubbs <w.d.hubbs@gmail.com> -Date: Thu, 31 Dec 2009 12:57:18 -0600 -Subject: [PATCH] respect destdir - ---- - Makefile | 10 +++++----- - main/Makefile | 10 +++++----- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Makefile b/Makefile -index 2d3ff09..26b2386 100644 ---- a/Makefile -+++ b/Makefile -@@ -106,11 +106,11 @@ tags: - - install: - @echo Installing -- mkdir -p $(INSTALLBINDIR) -- mkdir -p $(INSTALLLIBDIR) -- mkdir -p $(INSTALLINCDIR) -- $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR) -- @ $(MAKE) -C main --no-print-directory install -+ mkdir -p $(DESTDIR)$(INSTALLBINDIR) -+ mkdir -p $(DESTDIR)$(INSTALLLIBDIR) -+ mkdir -p $(DESTDIR)$(INSTALLINCDIR) -+ $(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR) -+ @ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install - - time-stamp : - @ echo $(PROJECT_NAME) >.time-stamp -diff --git a/main/Makefile b/main/Makefile -index 8163e40..0513e59 100644 ---- a/main/Makefile -+++ b/main/Makefile -@@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps) - - install: - # The basic binaries -- @ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR) -+ @ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR) - @ for i in $(VOICES) ; \ - do \ -- $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \ -+ $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \ - done -- $(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR) -+ $(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR) - # The libraries: static and shared (if built) -- cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR) -+ cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR) - ifdef SHFLAGS -- cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR) -+ cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR) - endif - --- -1.6.4.4 - diff --git a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch b/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch deleted file mode 100644 index 4b377e80c331..000000000000 --- a/app-accessibility/flite/files/flite-2.1-Improve-internal-linking.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 6e3c1a2fa29c066f7d1a25037a1f61cd295ac3af Mon Sep 17 00:00:00 2001 -From: Paul Gevers <elbrus@debian.org> -Date: Tue, 2 Jan 2018 19:58:18 +0100 -Subject: [PATCH] Improve internal linking - -Building packages in Debian uses a tool to link libraries together at the -package level. It emits warnings when unknonw symbols are found. E.g: - -dpkg-shlibdeps: warning: symbol us_tokentowords used by debian/libflite1/usr/lib/x86_64-linux-gnu/libflite_cmu_indic_lang.so.2.0.0 found in none of the libraries ---- - config/common_make_rules | 2 +- - main/Makefile | 16 ++++++++++++++-- - 2 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/config/common_make_rules b/config/common_make_rules -index 7a03785..34434fd 100644 ---- a/config/common_make_rules -+++ b/config/common_make_rules -@@ -123,7 +123,7 @@ $(LIBDIR)/%.so: $(LIBDIR)/%.shared.a - @ rm -rf shared_os && mkdir shared_os - @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<) -- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) -+ @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os $(LDFLAGS)) - @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` ) - @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` ) - @ rm -rf shared_os -diff --git a/main/Makefile b/main/Makefile -index ff422e0..47b6344 100644 ---- a/main/Makefile -+++ b/main/Makefile -@@ -54,7 +54,8 @@ ALL = shared_libs \ - VOICES=$(VOXES) - VOICELIBS=$(VOICES:%=flite_%) - --flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite -+flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) -+flite_LIBS = flite $(flite_MODS) - - flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) - flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) -@@ -65,6 +66,10 @@ include $(TOP)/config/common_make_rules - # so make clean can remove them - SHAREDARLIBS= $(flite_LIBS:%=$(LIBDIR)/lib%.shared.a) - SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so) -+SHAREDMODS = $(flite_MODS:%=$(LIBDIR)/lib%.so) -+SHAREDusenMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lang.so -+SHAREDcmulexMODS = $(LIBDIR)/libflite_cmu_time_awb.so $(LIBDIR)/libflite_cmu_us_awb.so $(LIBDIR)/libflite_cmu_us_kal16.so $(LIBDIR)/libflite_cmu_us_kal.so $(LIBDIR)/libflite_cmu_us_rms.so $(LIBDIR)/libflite_cmu_us_slt.so $(LIBDIR)/libflite_cmu_indic_lex.so -+SHAREDindicMODS = $(LIBDIR)/libflite_cmu_indic_lex.so - VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \ - $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION}) - -@@ -79,7 +84,14 @@ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \ - flite_voice_list.c - - ifdef SHFLAGS --flite_LIBS_flags += -Wl,-rpath $(LIBDIR) -+$(SHAREDMODS): $(LIBDIR)/libflite.so -+$(SHAREDMODS): LDFLAGS+=-L../$(LIBDIR) -lflite -+$(SHAREDusenMODS): $(LIBDIR)/libflite_usenglish.so -+$(SHAREDusenMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_usenglish -+$(SHAREDcmulexMODS): $(LIBDIR)/libflite_cmulex.so -+$(SHAREDcmulexMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmulex -+$(SHAREDindicMODS): $(LIBDIR)/libflite_cmu_indic_lang.so -+$(SHAREDindicMODS): LDFLAGS+=-L../$(LIBDIR) -lflite_cmu_indic_lang - shared_libs: $(SHAREDLIBS) - else - shared_libs: nothing --- -2.24.1 - -From d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e Mon Sep 17 00:00:00 2001 -From: Alan W Black <awb@cs.cmu.edu> -Date: Sun, 4 Mar 2018 08:55:40 -0500 -Subject: [PATCH] get libs in the right order - ---- - main/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main/Makefile b/main/Makefile -index 47b6344..1da18a8 100644 ---- a/main/Makefile -+++ b/main/Makefile -@@ -55,7 +55,7 @@ VOICES=$(VOXES) - VOICELIBS=$(VOICES:%=flite_%) - - flite_MODS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) --flite_LIBS = flite $(flite_MODS) -+flite_LIBS = $(flite_MODS) flite - - flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) - flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a) --- -2.24.1 diff --git a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch b/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch deleted file mode 100644 index 5ddaecd65903..000000000000 --- a/app-accessibility/flite/files/flite-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a3ff166a5a99ea97f9037a82f5c2a578348291ac Mon Sep 17 00:00:00 2001 -From: Paul Gevers <elbrus@debian.org> -Date: Tue, 2 Jan 2018 06:20:03 +0100 -Subject: [PATCH] Only write audio data to a temporariy file in debug builds - -This isn't useful in regular builds and is actually a security concern, -although it seems (see discussion in [Bug-Debian]) that this is most likely -only reached during testsuite calls. - -CVE-2014-0027 - -Original patch from Rui Matos <tiagomatos@gmail.com> -Date: Mon, 6 Jan 2014 13:45:00 +0000 -Bug-Debian: http://bugs.debian.org/734746 -Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1048678 -Source: https://bugzilla.redhat.com/attachment.cgi?id=846118 ---- - src/audio/auserver.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/audio/auserver.c b/src/audio/auserver.c -index 800c27d..cfcad7d 100644 ---- a/src/audio/auserver.c -+++ b/src/audio/auserver.c -@@ -67,9 +67,11 @@ static int play_wave_from_socket(snd_header *header,int audiostream) - int q,i,n,r; - unsigned char bytes[CST_AUDIOBUFFSIZE]; - short shorts[CST_AUDIOBUFFSIZE]; -+#ifdef DEBUG - cst_file fff; - - fff = cst_fopen("/tmp/awb.wav",CST_OPEN_WRITE|CST_OPEN_BINARY); -+#endif - - if ((audio_device = audio_open(header->sample_rate,1, - (header->encoding == CST_SND_SHORT) ? -@@ -116,7 +118,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) - for (q=r; q > 0; q-=n) - { - n = audio_write(audio_device,shorts,q); -+#ifdef DEBUG - cst_fwrite(fff,shorts,2,q); -+#endif - if (n <= 0) - { - audio_close(audio_device); -@@ -125,7 +129,9 @@ static int play_wave_from_socket(snd_header *header,int audiostream) - } - } - audio_close(audio_device); -+#ifdef DEBUG - cst_fclose(fff); -+#endif - - return CST_OK_FORMAT; - --- -2.24.1 - diff --git a/app-accessibility/flite/files/flite-2.1-prototype.patch b/app-accessibility/flite/files/flite-2.1-prototype.patch deleted file mode 100644 index 2fe301774d0c..000000000000 --- a/app-accessibility/flite/files/flite-2.1-prototype.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lang/cmu_indic_lex/cmu_indic_lex.c b/lang/cmu_indic_lex/cmu_indic_lex.c -index e0ae73f..f48ffe6 100644 ---- a/lang/cmu_indic_lex/cmu_indic_lex.c -+++ b/lang/cmu_indic_lex/cmu_indic_lex.c -@@ -283,6 +283,8 @@ static int cmu_indic_get_char_type(const cst_val *indic_char) - return cmu_indic_offset_char[c].type; - } - -+int indic_digit_to_offset(const char *ind_digit); -+ - static int indic_text_splitable(const char *s,int i,int len1) - { - /* Returns true only if this and next chars are not both digits */ diff --git a/app-accessibility/flite/files/flite-2.2-backport-pr30.patch b/app-accessibility/flite/files/flite-2.2-backport-pr30.patch new file mode 100644 index 000000000000..074dd857076f --- /dev/null +++ b/app-accessibility/flite/files/flite-2.2-backport-pr30.patch @@ -0,0 +1,91 @@ +https://bugs.gentoo.org/896106 +https://github.com/festvox/flite/pull/90 + +From 1f26195418fbe8915f48bb51e1e6126f531ecc25 Mon Sep 17 00:00:00 2001 +From: matoro <matoro@users.noreply.github.com> +Date: Fri, 24 Feb 2023 14:25:16 -0500 +Subject: [PATCH] Expose automated tests under "make check" + +The following unit tests can be run automatically without specifying any +user-provided arguments: +hrg_test lex_test multi_thread nums_test regex_test token_test + +Fix up the Makefiles to expose the ability to run these tests via "make +check" or "make test", since it is currently broken (exposed at the top +level, but missing the "test" target in testsuite/). +--- + Makefile | 2 +- + testsuite/Makefile | 22 ++++++++++++---------- + 2 files changed, 13 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 511f8cf..1b627b2 100644 +--- a/Makefile ++++ b/Makefile +@@ -129,6 +129,6 @@ voices: ./bin/flite_cmu_us_awb ./bin/flite_cmu_us_rms ./bin/flite_cmu_us_rms + ./bin/flite_cmu_us_rms -voicedump voices/cmu_us_rms.flitevox + ./bin/flite_cmu_us_slt -voicedump voices/cmu_us_slt.flitevox + +-test: ++check test: + @ $(MAKE) --no-print-directory -C testsuite test + +diff --git a/testsuite/Makefile b/testsuite/Makefile +index b60e98a..8b1163c 100644 +--- a/testsuite/Makefile ++++ b/testsuite/Makefile +@@ -49,15 +49,17 @@ SRCS = token_test_main.c hrg_test_main.c \ + bin2ascii_main.c record_in_noise_main.c \ + compare_wave_main.c rfc_main.c lpc_resynth_main.c \ + by_word_main.c flite_test_main.c \ +- dcoffset_wave_main.c tris1_main.c ++ dcoffset_wave_main.c tris1_main.c \ ++ multi_thread_main.c + FC = us.flitecheck indic_hin.flitecheck indic_tam.flitecheck +-OTHERS = kal_test_main.c multi_thread_main.c ++OTHERS = kal_test_main.c + + FILES = Makefile $(SRCS) $(DATAFILES) $(OTHERS) $(FC) + + LOCAL_INCLUDES = -I$(TOP)/lang/usenglish + + MAIN_EXECS = $(SRCS:_main.c=$(EXEEXT)) ++AUTO_EXECS = hrg_test lex_test multi_thread nums_test regex_test token_test + lex_test_LIBS = -lflite_cmulex + nums_test_LIBS = -lflite_usenglish + utt_test_LIBS = -lflite_cmulex +@@ -65,6 +67,7 @@ lex_lookup_LIBS = -lflite_cmulex + ldom_time_LIBS = -L/home/awb/data/ldom/time_flite/flite/lib -lcmu_time_awb -lflite_usenglish -lflite_cmulex + flite_test_LIBS = -lflite_usenglish -lflite_cmulex + by_word_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex ++multi_thread_LIBS = -lflite_cmu_us_slt -lflite_cmulex -lflite_usenglish -lflite -lm -lasound -lgomp + #kal_test_LIBS = -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex \ + # /home/awb/src/malloc/gmalloc.o + +@@ -73,19 +76,18 @@ LOCAL_CLEAN = $(MAIN_EXECS) + + include $(TOP)/config/common_make_rules + ++multi_thread : CFLAGS += -fopenmp ++ + MAIN_O = $(SRCS:%=%_main.o) + $(MAIN_O) : %_main.o : %_main.c + $(CC) $(CFLAGS) -o $@ $< + $(MAIN_EXECS) : %$(EXEEXT) : %_main.o $(FLITELIBS) + $(CC) $(CFLAGS) -o $@ $@_main.o $($(@:=_LIBS)) $(FLITELIBFLAGS) $(LDFLAGS) + +-multi_thread: multi_thread_main.c +- gcc -fopenmp -o multi_thread multi_thread_main.c \ +- $(CFLAGS) -I$(TOP)/include $(FLITELIBFLAGS) $(LDFLAGS) \ +- -l flite_cmu_us_slt -lflite_cmulex -lflite_usenglish \ +- -lflite -lm -lasound -lgomp +-do_thread_test: multi_thread +-# This shouldn't segfault +- export OMP_NUM_THREADS=100 && ./multi_thread ++check test: $(patsubst %, run_%, $(AUTO_EXECS)) + ++run_%: % ++ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(LIBDIR)" ./$< + ++run_multi_thread: multi_thread ++ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(LIBDIR)" OMP_NUM_THREADS=100 ./$< diff --git a/app-accessibility/flite/files/flite-2.2-make-4.4.patch b/app-accessibility/flite/files/flite-2.2-make-4.4.patch new file mode 100644 index 000000000000..21c2f866f5fc --- /dev/null +++ b/app-accessibility/flite/files/flite-2.2-make-4.4.patch @@ -0,0 +1,60 @@ +https://github.com/festvox/flite/issues/86 +https://github.com/festvox/flite/pull/92 + +From 14aa28529357ba13994a2bd90cfd11bfceeffcce Mon Sep 17 00:00:00 2001 +From: Moritz Barsnick <barsnick@gmx.net> +Date: Thu, 23 Mar 2023 14:53:08 +0100 +Subject: [PATCH] fix implicit dependency on flite_voice_list.c + +Also make flite_lang_list a proper rule, so that it only builds once. + +Both C files were repeatedly being clobbered, as were their respective +object files. + +Convert flite_voice_list.c is into an explicit dependency with a creation +rule. flite_voice_list.o continues to be implicit from flite_voice_list.c. + +Convert flite_lang_list into a similar, proper object rule. + +Fixes https://github.com/festvox/flite/issues/86 +--- a/main/Makefile ++++ b/main/Makefile +@@ -106,21 +106,16 @@ endif + + .NOTPARALLEL: $(ALL) + +-flite_lang_list: +- rm -f flite_lang_list.c ++flite_lang_list.c: + $(TOP)/tools/make_lang_list $(LANGS) $(LEXES) +- $(MAKE) flite_lang_list.o + +-$(BINDIR)/flite$(EXEEXT): flite_main.o flite_lang_list $(flite_LIBS_deps) ++flite_voice_list.c: + $(TOP)/tools/make_voice_list $(VOICES) +- rm -f flite_voice_list.o +- $(MAKE) flite_voice_list.o ++ ++$(BINDIR)/flite$(EXEEXT): flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps) + $(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS) + +-$(BINDIR)/flitevox_info$(EXEEXT): flitevox_info_main.o flite_lang_list $(flite_LIBS_deps) +- $(TOP)/tools/make_voice_list $(VOICES) +- rm -f flite_voice_list.o +- $(MAKE) flite_voice_list.o ++$(BINDIR)/flitevox_info$(EXEEXT): flitevox_info_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps) + $(CC) $(CFLAGS) -o $@ flitevox_info_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS) + + $(BINDIR)/world$(EXEEXT): world_main.c +@@ -144,10 +139,7 @@ each: + $(MAKE) VOICE=$$i $(BINDIR)/flite_$$i ; \ + done + +-$(BINDIR)/flite_${VOICE}: flite_main.o flite_lang_list $(flite_LIBS_deps) +- $(TOP)/tools/make_voice_list $(VOICE) +- rm -f flite_voice_list.o +- $(MAKE) flite_voice_list.o ++$(BINDIR)/flite_${VOICE}: flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps) + $(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS) + + install: diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild deleted file mode 100644 index 7ba4e221b442..000000000000 --- a/app-accessibility/flite/flite-1.4-r4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib-minimal toolchain-funcs - -DESCRIPTION="Flite text to speech engine" -HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html" -SRC_URI=" http://www.speech.cs.cmu.edu/${PN}/packed/${P}/${P}-release.tar.bz2" - -LICENSE="BSD freetts public-domain regexp-UofT BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 sparc x86" -IUSE="alsa oss" - -DEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-release - -PATCHES=( - "${FILESDIR}"/${PN}-2.1-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch - "${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch - "${FILESDIR}"/${PN}-1.4-respect-destdir.patch - "${FILESDIR}"/${PN}-1.4-ldflags.patch - "${FILESDIR}"/${PN}-1.4-audio-interface.patch -) - -get_audio() { - if use alsa; then - echo alsa - elif use oss; then - echo oss - else - echo none - fi -} - -src_prepare() { - default - - sed -i main/Makefile \ - -e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \ - || die - eautoreconf - - # custom makefiles - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - --enable-shared - --with-audio=$(get_audio) - ) - econf "${myconf[@]}" -} - -multilib_src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" -} - -multilib_src_install_all() { - dodoc ACKNOWLEDGEMENTS README - - find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die -} - -pkg_postinst() { - if [[ "$(get_audio)" = "none" ]]; then - ewarn "you have built flite without audio support." - ewarn "If you want audio support, re-emerge" - ewarn "flite with alsa or oss in your use flags." - fi -} diff --git a/app-accessibility/flite/flite-2.1.ebuild b/app-accessibility/flite/flite-2.2-r1.ebuild index 0ecace3285d0..835c173da379 100644 --- a/app-accessibility/flite/flite-2.1.ebuild +++ b/app-accessibility/flite/flite-2.2-r1.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools multilib-minimal +EAPI=8 + +inherit autotools flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="Flite text to speech engine" HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite" -SRC_URI=" http://www.festvox.org/${PN}/packed/${P}/${P}-release.tar.bz2 +SRC_URI="https://github.com/festvox/flite/archive/v${PV}.tar.gz -> ${P}.tar.gz voices? ( http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_ben_rm.flitevox http://www.festvox.org/${PN}/packed/${P}/voices/cmu_indic_guj_ad.flitevox @@ -43,24 +44,23 @@ SRC_URI=" http://www.festvox.org/${PN}/packed/${P}/${P}-release.tar.bz2 LICENSE="BSD freetts public-domain regexp-UofT BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa oss pulseaudio voices" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +IUSE="alsa oss pulseaudio test voices" +REQUIRED_USE="test? ( alsa )" +RESTRICT="!test? ( test )" DEPEND=" - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) !pulseaudio? ( alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) ) " RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${P}-Only-write-audio-data-to-a-temporariy-file-in-debug-.patch - "${FILESDIR}"/${P}-Improve-internal-linking.patch "${FILESDIR}"/${PN}-1.4-audio-interface.patch - "${FILESDIR}"/${P}-prototype.patch + "${FILESDIR}"/${PN}-2.2-backport-pr30.patch + "${FILESDIR}"/${PN}-2.2-make-4.4.patch ) -S=${WORKDIR}/${P}-release - get_audio() { if use pulseaudio; then echo pulseaudio @@ -73,6 +73,14 @@ get_audio() { fi } +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp +} + src_unpack() { for file in ${A}; do case "${file}" in @@ -98,6 +106,13 @@ src_prepare() { multilib_copy_sources } +src_configure() { + # lto-type-mismatch + filter-lto + + multilib-minimal_src_configure +} + multilib_src_configure() { local myconf=( --enable-shared @@ -107,7 +122,7 @@ multilib_src_configure() { } multilib_src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } multilib_src_install_all() { diff --git a/app-accessibility/flite/metadata.xml b/app-accessibility/flite/metadata.xml index e128f807497d..b82cd9d8714b 100644 --- a/app-accessibility/flite/metadata.xml +++ b/app-accessibility/flite/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> 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-r2.ebuild index 3e352ae6f055..b56e09fbc7e3 100644 --- a/app-accessibility/freetts/freetts-1.2.2.ebuild +++ b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild @@ -1,34 +1,36 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 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 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.io/" 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" - +KEYWORDS="amd64 ~arm64 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." @@ -36,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 } @@ -58,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" @@ -68,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 html + dodoc -r docs/* java-pkg_dojavadoc javadoc fi @@ -81,6 +81,6 @@ src_install() { fi if use source ; then - java-pkg-dosrc src/* + java-pkg_dosrc src/* fi } diff --git a/app-accessibility/freetts/metadata.xml b/app-accessibility/freetts/metadata.xml index c7177e539175..adfcb2a95b87 100644 --- a/app-accessibility/freetts/metadata.xml +++ b/app-accessibility/freetts/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> diff --git a/app-accessibility/julius/julius-4.2.2.ebuild b/app-accessibility/julius/julius-4.2.2-r1.ebuild index b26cdb8dfc2c..11e80caf7033 100644 --- a/app-accessibility/julius/julius-4.2.2.ebuild +++ b/app-accessibility/julius/julius-4.2.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -22,10 +22,10 @@ RDEPEND=" sys-libs/zlib alsa? ( media-libs/alsa-lib ) portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) + pulseaudio? ( media-libs/libpulse ) sndfile? ( media-libs/libsndfile )" DEPEND="${RDEPEND} - sys-devel/flex" + app-alternatives/lex" PATCHES=( "${FILESDIR}"/${PN}-4.2.2-install.patch diff --git a/app-accessibility/julius/metadata.xml b/app-accessibility/julius/metadata.xml index 1631e86a2744..637efed0390e 100644 --- a/app-accessibility/julius/metadata.xml +++ b/app-accessibility/julius/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://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-jp">julius</remote-id> + <remote-id type="osdn">julius</remote-id> </upstream> </pkgmetadata> diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest new file mode 100644 index 000000000000..6e467525d1c8 --- /dev/null +++ b/app-accessibility/kontrast/Manifest @@ -0,0 +1,2 @@ +DIST kontrast-23.08.5.tar.xz 211984 BLAKE2B f1c50f90031615bc9a3ddd00155f40fed2244994de309385e386fae7e21dddb7bd1dfa5a722050dcf67c7ad3def6d1979efc8623a18bcc21b6438178d15fc116 SHA512 e70d5bdc5a7363358f8d09c6a2bafda9645bcb5f9acc0fa4e51ed836e87baa92b3f9e6c4a81bd3d1050de152100426e714c6dd8d46459aa0d81949776880f9ae +DIST kontrast-24.02.2.tar.xz 213068 BLAKE2B e0d47077d647f751683d49cf717b9aba45777079d2913c7e60fa21ef80441c51a07f45d47b2c9192a9976af4d2f2eb31e1da43f844da8dbda08b64236b334e1e SHA512 4a925a6b370820bc9d51352e81758059dd4cc8f4ac38f6cb6db5cf587653b4eb5599baa289fe22019e3a1314b05b979b950a7f34655901499d354a3cfab6d94f diff --git a/app-accessibility/kontrast/kontrast-23.08.5.ebuild b/app-accessibility/kontrast/kontrast-23.08.5.ebuild new file mode 100644 index 000000000000..1d879fc0f11f --- /dev/null +++ b/app-accessibility/kontrast/kontrast-23.08.5.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible" +HOMEPAGE="https://apps.kde.org/kontrast/" + +LICENSE="GPL-3+" +SLOT="5" +KEYWORDS="amd64 arm64 ~riscv x86" +IUSE="" + +DEPEND=" + dev-db/futuresql5 + dev-libs/qcoro5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 +" +RDEPEND="${DEPEND} + kde-plasma/xdg-desktop-portal-kde +" diff --git a/app-accessibility/kontrast/kontrast-24.02.2.ebuild b/app-accessibility/kontrast/kontrast-24.02.2.ebuild new file mode 100644 index 000000000000..b7102e0c087d --- /dev/null +++ b/app-accessibility/kontrast/kontrast-24.02.2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible" +HOMEPAGE="https://apps.kde.org/kontrast/" + +LICENSE="GPL-3+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-db/futuresql + dev-libs/qcoro + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 +" +RDEPEND="${DEPEND} + kde-plasma/xdg-desktop-portal-kde:* +" diff --git a/app-accessibility/kontrast/metadata.xml b/app-accessibility/kontrast/metadata.xml new file mode 100644 index 000000000000..2fe731d24020 --- /dev/null +++ b/app-accessibility/kontrast/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">accessibility/kontrast</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-accessibility/mbrola-voices/Manifest b/app-accessibility/mbrola-voices/Manifest new file mode 100644 index 000000000000..d3392217fd37 --- /dev/null +++ b/app-accessibility/mbrola-voices/Manifest @@ -0,0 +1 @@ +DIST mbrola-voices-0_pre20200331.tar.gz 583211254 BLAKE2B c8cb55597759a65f0e5f1be6197575b424ec4831444acfcb42fa17b8eb98672990195dd9305e93c66d488fb2b6c492286970e953c198c2038ea23c5b71d75ba2 SHA512 8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585 diff --git a/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild b/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild new file mode 100644 index 000000000000..34eb83a5677f --- /dev/null +++ b/app-accessibility/mbrola-voices/mbrola-voices-0_pre20200331.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GIT_COMMIT=fe05a0ccef6a941207fd6aaad0b31294a1f93a51 + +DESCRIPTION="mbrola speech synthesizer voices database" +HOMEPAGE="https://github.com/numediart/mbrola-voices" +SRC_URI="https://github.com/numediart/mbrola-voices/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MBROLA-VOICES" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" + +# This maps the l10n values to the appropriate voices +declare -A voicemap +voicemap=( + [af]="af1" + [ar]="ar1 ar2" + [br]="bz1" +[cs]="cz1 cz2" + [de]="de1 de2 de3 de4 de5 de6 de7 de8" + [el]="gr1 gr2" + [en-GB]="en1" + [en-US]="mx1 us1 us2 us3" + [es]="es1 es2 es3 es4 vz1" + [es-MX]="mx2" +[et]="ee1" + [fa]="ir1" + [fr-CA]="ca1 ca2" + [fr]="fr1 fr2 fr3 fr4 fr5 fr6 fr7" + [he]="hb1 hb2" + [hi]="in1 in2" + [hr]="cr1" + [hu]="hu1" + [id]="id1" + [is]="ic1" + [it]="it1 it2 it3 it4" + [ja]="jp1 jp2 jp3" + [ko]="hn1" + [la]="la1" +[lt]="lt1 lt2" + [mi]="nz1" + [ms]="ma1" + [nl]="nl1 nl2 nl3" + [pl]="pl1" + [pt-BR]="br1 br2 br3 br4" + [pt-PT]="pt1" + [ro]="ro1" + [sv]="sw1 sw2" + [te]="tl1" + [tr]="tr1 tr2" + [zh-CN]="cn1" +) +for l in "${!voicemap[@]}"; do + if [[ ${l} == en-US ]]; then + u="+l10n_${l}" + else + u="l10n_${l}" + fi + IUSE+=" ${u}" +done +unset l u + +S=${WORKDIR}/MBROLA-voices-${GIT_COMMIT} + +src_install() { + dodoc README.md + insinto /usr/share/mbrola + cd data || die + local l + for l in "${!voicemap[@]}"; do + use l10n_${l} && doins -r ${voicemap[${l}]} + done +} diff --git a/app-accessibility/sphinx3/metadata.xml b/app-accessibility/mbrola-voices/metadata.xml index b41f634a646d..f2bb5bdd2d69 100644 --- a/app-accessibility/sphinx3/metadata.xml +++ b/app-accessibility/mbrola-voices/metadata.xml @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://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> + <stabilize-allarches/> </pkgmetadata> diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest index f69ec54ac514..8ebacce40441 100644 --- a/app-accessibility/mbrola/Manifest +++ b/app-accessibility/mbrola/Manifest @@ -1,24 +1 @@ -DIST de1-980227.zip 9946342 BLAKE2B f14c2baef6cfdd66004a2d64e0623c347b8a1116cfb6441729cf9089eef2c67bc9c1cbf3db2679d43c4b407d4a8b73d2905fb8c547777ba1dc461bf8a603a9c3 SHA512 df9027ee1a1bd32542d02bb851bff54379a9526f3d52429786e51c4a96b9de9cb1b8e1e7d66d4c6c77a13e285311c62fa0a13e0e749c8590c7292121e231fb47 -DIST de2-990106.zip 9463658 BLAKE2B db52832db05ed81b1abe43972fc6497b8ea2a93c157fb4c5a641fb9fef0fe70d3ac8139c76b1dba00a58e722e3afdb2629979581731a48d706bdda85414061d4 SHA512 9d2dfb685c71d4348bad142035152c6c4bfb60f98121ea1be4e51adfb078137aa93c0b8b4c1e43c9aaee51e0d3bad4a6c7a2f6ffc019e0cb34ac853cddd8b7be -DIST de3-000307.zip 10486554 BLAKE2B 019fd652fb173e6ff492467eef35d4d45ed89ae04a39785c1ddaa59d32d16cf6779d80b9812368540398e19416e280041671c2d74577e7727d0a12f6c5c3e3d0 SHA512 32bbf8d19d2f1032429b1f777c43d49746c45d5c150258f08a1533f7681df973483ac96f3db8c6bfff0481f7558853b749ee7c024410237982e712880935ccb9 -DIST de4.zip 19520969 BLAKE2B c8598846b30583f7d187be0a0ef11b45bbbd537d4df3a8a571929ed7498abd58274769eb1d7d39dfd6e30397981119e94657cc5bef41852ce38cee56764135a4 SHA512 ea8ab4192c68b9ad6c4f4c02500015449fc332c22f811cdeee8956a85c347bb48fa263082495f5cd20c0b3641b67673acb7b3da081cb15863271d988b238b4d7 -DIST de5.zip 13134662 BLAKE2B 7c755a75ce66c6c964e23ba3e5db4981137f7d8c12bf3087f14737c285f9c76e664fcdd60a8c25abc9fc006872d40d14d0a82035700841e2bf6f9f8040855303 SHA512 652110430f13cb81420ffa08d368d7992a5ce814c9682d5ab90ec1cd43aa631b6cae9df918171864184efdda0ad804ca4560ede6d048ef3067332f712f72cc19 -DIST de8.zip 9693603 BLAKE2B 714d9cf965f334cd78fad9678b211b9774e82bddfab15a8f9a277a6a1a47ed5e27c4bb49393c500e78c21577a248888c05ec3a4bb36e48cc4c5d60c30ec9c150 SHA512 6e8d1be85eb8c24d5c38c1c102cecca4af9538a55b75b78ef62bccf0761a431beb0ed3d31e4aea271c29037631ed4b00763aea90c06dffddb3b52cbe8d65b3d7 -DIST es1-980610.zip 2110022 BLAKE2B ca03827f5db08e7489f7d7526e0a5607a1d8e06d1936984dbf6cce044731ad80acdf8674b07b4efb48be27f036b5e4b4abf189e4bf85885d0cf3ed59a873443d SHA512 1459a346c66133e70eeb1cec057b762e6f22d11472c33c732cd45b92afecb8628de861992abb07c3272ee640bb023154b838d1648b6541228256e57206216ed5 -DIST es2-989825.zip 5111601 BLAKE2B f97a09006ee4e676d1b2e271330c46f989fc9df429a8b38240cee2240b4a0d667e37afdae9d14db86e0eecb99beba9b61a26350205589cde4231c5bd77ad7018 SHA512 69d9bb62b42607714ea692a3570c70ddbe32590f2dd6c0466f6cad685a292c74ade693af7fead0d4bbdf12a70a36e06e3205bd07854855b628f59d7bc1d1be3a -DIST es4.zip 2804262 BLAKE2B 52f7d37ffafefecc82235bc9fc75e18d2beb123b1aeedcb9e2b1dae57fa97ef2bcd5d9b594f320a26b6fa8e30ad4e6d036ace9e34297166ac17f5142ce63d571 SHA512 b5ce924fc894a3e186cf06feb3afc0f8ce2805310e1da34c4a74b52100d2ecfbb073d63c87c5809e05e89b47b57fa32bc0edd44ad7477aa92facc9ac041cd349 -DIST fr1-990204.zip 4694334 BLAKE2B a47befd6d661a497072dea2d693bf20be00eda72f64d7670588692acfb3304f9cf10973e99cb6455b919c2adc89bb597ea1c78c04573b60eb5f1c0a916833054 SHA512 1a24326f6f9989d88f8a8447ebb1d9f8fbfd49f909a28d456c170bc8615b9385be678202e0d6d5c867d3a50ca68ca16f85ea5410d16fd2c70e4f9b6f7b115afb -DIST fr2-980806.zip 5744598 BLAKE2B 21006b4b236ec05df964832eb3487b55ac447c199fa544143fadb18bb57214e7278c119f4a7566e089666e2b2562c5f1899f85b37bb746d75a8c68adc4d990ea SHA512 cca19bc7db0118e6a09f203346f355e87b2a75902e06ee7d82c2379a4ebaa8144f64ae79b5ff6cd9c49e0d46a26d2a05109f325bda78e1b0462089b6d03a104c -DIST fr3-990324.zip 4702681 BLAKE2B 8a9078bee17f488f43225bad2aff93e94e8d6c29f2b1b291f7e651376da7ca1595d16b66360b02e429b16428aa9bbe485c44e151d9ff8a8920b11aafa6a16215 SHA512 24a715b5913ca931624f5c079d7027d3c84543c6044ab49283550dd7d0158d19c610d2ee9ebb055d8de14f9b817aac1d4b32599729b17838d5f914ec3bf50439 -DIST fr6-010330.zip 4610252 BLAKE2B 37242228b5722a5f1a9962492e9d927d8e25c54abc499f2d11f5fe6e1007c7609aca0733f40edb81fd73f8a42c443b5124398a3292a21d718dec10c4e3687588 SHA512 41bfba97e6b06a987a691a7dbb6e6a5bc00c7a6e4576215297e1db974a8efd06fc7e960fc0c83f024852c195c7f4c0da5e8d3ac6f5ad3f641193ee1d65679879 -DIST it3-010304.zip 5349273 BLAKE2B 7f1c98945c213b738eaacbf4164bb18cc44cef0b12a64f1ee2ced92e0cf468bfcebefa83307d31e5695f3580d57b06d0bf43397bd524a28825163f38aa75507a SHA512 cb179430b93cef676d4e3f792d453f2dc3a34ad0f5bd0a36e97ded98b17c0dc5cad1622f7bb7e7f4f6b26d944573b906b33eb519bc19d0bcec01ea4810d8f71c -DIST it4-010926.zip 5044168 BLAKE2B e2e63f85f13f0d8667a46e5c78e9e449ffe32cf798d8e46b942af390b60bf636cf1d23520c5e13d180b2dcfe80040ae87616726bf1db818f2aad31d8b9a48e4f SHA512 a7fcdff5b30e213bf9f043c2323e73a769357a46ce6df9114579cc62392fe2394ce472120c73018a1a71870c7565d18bb912ba7650a267f8779e18c12f260113 -DIST la1.zip 7627631 BLAKE2B 7361fdf7fe072d6e9e71e8f41e3874023c6368d47e1fb8853578774b8df61b90e9ba6b38921f5286fd7c5ba9bfdf9056b6cdab9546e162f78f0d6082a7148a88 SHA512 5a367ede393feb28b587a380975baa84ca1840dfc5479f938de1588954f3ae23b06e0214b854e1f0137f178d197e4999e8e8750b136d964797116d53e49ec6cb -DIST mbr301h.zip 309820 BLAKE2B 4c311e700e8ab0af7da9a33da6f57ac5fa2328f4049f703669fb03e4e468e578b5df5fa9b4cd468a74ad62a70330378f8127637e850e3f1ce3a8e1a979a6dc1d SHA512 24b522092ff8f18ab606ed9cae609a69ce8ae9ea56228468dfc3c4c6c114bc65ce9d69f420cddbdff75f1200dbed1edb667e8d84937a73218542dea25a88b848 -DIST pl1.zip 4050906 BLAKE2B ed60926ed95949e3e92313863d7e3c84c853347123ac93d54e042fc995e311d0db7afb19603f89b410ec544f0ea56d3eea1f094b45ea82c789325c09776642e8 SHA512 e42d4208719798512c5296e89defa59b46719c787bd352503f6377b185e817b709a27228a8fd2e70536632f68dff81aac9e145902e2a17fe95a366b0d4d03478 -DIST ro1-980317.zip 3222054 BLAKE2B b19e3ec147e7650fc0475dafb63af8c2d09da7f21f6536617fbaa73d4dc95431895bbe134f39daa3078e01a6620d91bc22e162401b3be42e731592c627a540e6 SHA512 06075426f3befde1a4a2c589f92340c964b22fc1cf54d34d1808d6ab8ba0d50a57f4a96e1c68ba06badee466d11bb46db6c929ce974ea25212ffb1987468b9a1 -DIST sw1-980623.zip 9386828 BLAKE2B 89a03aa3491efaf188b70d4cdeafa071dee86faefc45ecdbd6b26e10a60619a02e79874b86f67c6e2217c7592c5afaaadf4757eab6b94c1924546f1b7800ec8e SHA512 c3b2493f5ba6f91983bd6e2d821cce741d427886cdfa17f1f3ea58197445229fcaca05bd09f531c3166360f77232d04ef61290a5f2a2bbba22587d689d821484 -DIST sw2-140102.zip 5629399 BLAKE2B ea0b340dc4b0cf3fa7cbb170d2eb51d7a3f1c383de1ea2c2a397426f460eacf2f032e0e68170f98d43e5f869a5ab89cac71e867ae0b142f44b2794e8330fd145 SHA512 eedfe81cd37e3cbd022b3e2be5878d165cf29fb0cee36ddc700ba567c92181eaec0e48699fedffdd780f2205ab3e1ddd9a9426a88b0e6f02992de1639e4ce0b3 -DIST us1-980512.zip 6562915 BLAKE2B 72d884f6f8a83a07786363be8cd919748334bae52637e18b7970eebc53c3f267b3f65ff16f4440298c2a166733a38585ad498c40a2bedd7ddf793ce75d044a9e SHA512 e2b1eb7325e9fe0b58f3b0e265899b0da1cf5ec1cb183f241bf73ba670528b56cd091277f432446e6651d81dca21f2b2ea8a84622dd655d125cedda0447cdb62 -DIST us2-980812.zip 6387442 BLAKE2B 73502264a3900255f91edf5e3b92baff706205a72002faaed6b3a8eb0a7e0e32c21e14870cfa07a546c8bea6112b5433ca64b09b455070c49aaf2f059591025f SHA512 a8aea10bc08f6c66e863994a5238fc2caba1d308f5c9ef35ccd18d01eb92a38fcbc0b96593a56bd7abd2f714fe722aa6b3e2c3141da92a4c8c06e81efb843ac6 -DIST us3-990208.zip 6195800 BLAKE2B cf58531738ed412f75ff3c6d9788db8afd3468c10e5c07775b893516f399e3d14ef2bd5ebc5bb57ebb363d3c077924a496984f680e2ab9c45d05efc70642df19 SHA512 dbc6b0cdc3040ec3747f25a15dd17f35f0e97c40a153ae44e43a7e8030302e7e7c8710b10fe8184cc38f907de07a187ac0a7e3816be2230ce969aa014641d0ae +DIST mbrola-3.3.tar.gz 345444 BLAKE2B e41d28e16d7792e91405d8449845f7f3e7a53b5176e1076a4a63e62f7f53f70fb955925762bb6c7c9560ff033530d8b20df6a0c580bc07758194982d6130e669 SHA512 4c15481d2afc7f459c511d2f2791ae1f0f89893ea86fcde113c73f9b5509b893bc7beac8ec5fa76ca0f4e0aca35982ff1db15e8611514d91991608aee004c3f2 diff --git a/app-accessibility/mbrola/files/mbrola-3.3-Makefile.patch b/app-accessibility/mbrola/files/mbrola-3.3-Makefile.patch new file mode 100644 index 000000000000..291735c69be5 --- /dev/null +++ b/app-accessibility/mbrola/files/mbrola-3.3-Makefile.patch @@ -0,0 +1,87 @@ +diff --git a/Makefile b/Makefile +index 47cf410..ac3eac5 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,14 +3,20 @@ + # Mbrola Speech Synthesize Makefile ( tune the #define and type "make" ) + VERSION=3.3 + ++# set CC ++CC = gcc ++ + # To test strict C ANSI compliance +-CC = gcc -ansi -pedantic ++ANSIFLAGS = -ansi -pedantic + LIB= -lm + + # This allow you to write commands like "make PURE=purify demo1" + # or "make PURE=quantify lib2" + CCPURE = $(PURE) $(CC) + ++# To test strict C ANSI compliance ++CFLAGS += $(ANSIFLAGS) ++ + ######################## + # Machine specific #define, uncomment as needed + # If your OS is not here, may be it provides some __linux or __sunos +@@ -33,7 +39,7 @@ CFLAGS += -DLITTLE_ENDIAN + # GENERAL FLAGS FOR GCC + + # Optimized code +-CFLAGS += -O6 ++#CFLAGS += -O6 + + # Debug mode with gdb + #CFLAGS += -g +@@ -128,7 +134,7 @@ BINOBJS = $(BINSRCS:%.c=Bin/Standalone/%.o) + PROJ = mbrola + + $(PROJ): install_dir $(BINOBJS) +- $(CCPURE) $(CFLAGS) -o $(MBRDIR)/$(PROJ) $(BINOBJS) $(LIB) ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o $(MBRDIR)/$(PROJ) $(BINOBJS) $(LIB) + + clean: + \rm -f $(MBRDIR)/$(PROJ) $(PROJ).a core demo* TAGS $(BIN)/lib*.o $(BINOBJS) +@@ -147,7 +153,7 @@ net: + \rm -f *~ */*~ + + $(BINDIR)/%.o: %.c +- $(CCPURE) $(CFLAGS) -o $@ -c $< ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< + + # to create the compilation directory, if necessary + install_dir: +@@ -156,25 +162,25 @@ install_dir: + fi + + lib1 : LibOneChannel/lib1.c +- $(CCPURE) $(CFLAGS) -o Bin/LibOneChannel/lib1.o -c LibOneChannel/lib1.c ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -o Bin/LibOneChannel/lib1.o -c LibOneChannel/lib1.c + + demo1: install_dir lib1 LibOneChannel/demo1.c +- $(CCPURE) $(CFLAGS) -c -o Bin/LibOneChannel/demo1.o LibOneChannel/demo1.c +- $(CCPURE) $(CFLAGS) -o demo1 Bin/LibOneChannel/demo1.o Bin/LibOneChannel/lib1.o $(LIB) ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -c -o Bin/LibOneChannel/demo1.o LibOneChannel/demo1.c ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o demo1 Bin/LibOneChannel/demo1.o Bin/LibOneChannel/lib1.o $(LIB) + + # END_WWW + + demo1b: install_dir lib1 LibOneChannel/demo1b.c +- $(CCPURE) $(CFLAGS) -c -o Bin/LibOneChannel/demo1b.o LibOneChannel/demo1b.c +- $(CCPURE) $(CFLAGS) -o demo1b Bin/LibOneChannel/demo1b.o Bin/LibOneChannel/lib1.o $(LIB) ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -c -o Bin/LibOneChannel/demo1b.o LibOneChannel/demo1b.c ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o demo1b Bin/LibOneChannel/demo1b.o Bin/LibOneChannel/lib1.o $(LIB) + + + lib2 : LibMultiChannel/lib2.c +- $(CCPURE) $(CFLAGS) -o Bin/LibMultiChannel/lib2.o -c LibMultiChannel/lib2.c ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -o Bin/LibMultiChannel/lib2.o -c LibMultiChannel/lib2.c + + demo2: install_dir lib2 LibMultiChannel/demo2.c +- $(CCPURE) $(CFLAGS) -c -o Bin/LibMultiChannel/demo2.o LibMultiChannel/demo2.c +- $(CCPURE) $(CFLAGS) -o demo2 Bin/LibMultiChannel/demo2.o Bin/LibMultiChannel/lib2.o $(LIB) ++ $(CCPURE) $(CPPFLAGS) $(CFLAGS) -c -o Bin/LibMultiChannel/demo2.o LibMultiChannel/demo2.c ++ $(CCPURE) $(CFLAGS) $(LDFLAGS) -o demo2 Bin/LibMultiChannel/demo2.o Bin/LibMultiChannel/lib2.o $(LIB) + # END_COMM + + # Check the integrity of the new Mbrola version by comparing the output diff --git a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild deleted file mode 100644 index 730368dddfd7..000000000000 --- a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -IUSE="l10n_de l10n_es l10n_fr l10n_it l10n_la l10n_pl l10n_ro l10n_sv" - -DESCRIPTION="Speech synthesizer based on the concatenation of diphones. Includes samples" -HOMEPAGE="http://tcts.fpms.ac.be/synthesis/mbrola.html" -MY_PV=${PV//./} -TCTS="http://tcts.fpms.ac.be/synthesis" -SRC_URI="http://tcts.fpms.ac.be/synthesis/${PN}/bin/pclinux/mbr${MY_PV}.zip - ${TCTS}/mbrola/dba/us1/us1-980512.zip - ${TCTS}/mbrola/dba/us1/us2-980812.zip - ${TCTS}/mbrola/dba/us3/us3-990208.zip - l10n_de? ( ${TCTS}/mbrola/dba/de1/de1-980227.zip - ${TCTS}/mbrola/dba/de2/de2-990106.zip - ${TCTS}/mbrola/dba/de3/de3-000307.zip - ${TCTS}/mbrola/dba/de4/de4.zip - ${TCTS}/mbrola/dba/de5/de5.zip - ${TCTS}/mbrola/dba/de8/de8.zip ) - l10n_es? ( ${TCTS}/mbrola/dba/es1/es1-980610.zip - ${TCTS}/mbrola/dba/es2/es2-989825.zip - ${TCTS}/mbrola/dba/es4/es4.zip ) - l10n_fr? ( ${TCTS}/mbrola/dba/fr1/fr1-990204.zip - ${TCTS}/mbrola/dba/fr2/fr2-980806.zip - ${TCTS}/mbrola/dba/fr3/fr3-990324.zip - ${TCTS}/mbrola/dba/fr6/fr6-010330.zip ) - l10n_it? ( ${TCTS}/mbrola/dba/it3/it3-010304.zip - ${TCTS}/mbrola/dba/it4/it4-010926.zip ) - l10n_la? ( ${TCTS}/mbrola/dba/la1/la1.zip ) - l10n_pl? ( ${TCTS}/mbrola/dba/pl1/pl1.zip ) - l10n_ro? ( ${TCTS}/mbrola/dba/ro1/ro1-980317.zip ) - l10n_sv? ( ${TCTS}/mbrola/dba/sw1/sw1-980623.zip - ${TCTS}/mbrola/dba/sw2/sw2-140102.zip )" -S=${WORKDIR} - -LICENSE="MBROLA" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86" -RESTRICT="strip" - -DEPEND="app-arch/unzip" - -QA_PREBUILT="/usr/bin/mbrola" - -src_unpack() { - default - - if [[ -f pl1 ]]; then - mkdir pl1DIR || die - mv pl1 pl1.txt pl1DIR || die - mv test pl1DIR/TEST || die - mv pl1DIR pl1 || die - fi - - case ${ARCH} in - x86|amd64) - cp mbrola-linux-i386 mbrola || die - ;; - ppc) - cp mbrola302b-linux-ppc mbrola || die - ;; - sparc) - cp mbrola-SuSElinux-ultra1.dat mbrola || die - ;; - alpha) - cp mbrola-linux-alpha mbrola || die - ;; - *) - elog "mbrola binary not available on this architecture. Still installing voices." - esac -} - -src_install() { - # Take care of main binary - if [[ -f mbrola ]]; then - dobin mbrola - dosym ../../bin/mbrola "/usr/share/${PN}/mbrola" - fi - - dodoc readme.txt - - for voice in ??[0-9]; do - insinto /usr/share/${PN}/${voice} - [[ -f "${voice}/license.txt" ]] && doins ${voice}/license.txt - [[ -f "${voice}/${voice}" ]] && doins ${voice}/${voice} - [[ -f "${voice}/${voice}mrpa" ]] && doins ${voice}/${voice}mrpa - [[ -d "${voice}/TEST" ]] && doins -r ${voice}/TEST - [[ -f "${voice}/${voice}.txt" ]] && dodoc ${voice}/${voice}.txt - done -} diff --git a/app-accessibility/mbrola/mbrola-3.3-r1.ebuild b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild new file mode 100644 index 000000000000..03426abc085c --- /dev/null +++ b/app-accessibility/mbrola/mbrola-3.3-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Speech synthesizer based on the concatenation of diphones" +HOMEPAGE="https://github.com/numediart/MBROLA" +SRC_URI="https://github.com/numediart/MBROLA/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" + +RDEPEND="app-accessibility/mbrola-voices" + +S="${WORKDIR}/MBROLA-${PV}" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch +) + +src_compile() { + emake -j1 CC="$(tc-getCC)" +} + +src_install() { + dobin Bin/mbrola + DOCS=( README.md Documentation/*.txt ) + einstalldocs +} diff --git a/app-accessibility/mbrola/metadata.xml b/app-accessibility/mbrola/metadata.xml index 1dacdab965c1..0ffb3e4615bb 100644 --- a/app-accessibility/mbrola/metadata.xml +++ b/app-accessibility/mbrola/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>accessibility@gentoo.org</email> - <name>Gentoo Accessibility Project</name> -</maintainer> -<maintainer type="project"> - <email>sound@gentoo.org</email> - <name>Gentoo Sound project</name> -</maintainer> + <maintainer type="project"> + <email>accessibility@gentoo.org</email> + <name>Gentoo Accessibility Project</name> + </maintainer> + <maintainer type="project"> + <email>sound@gentoo.org</email> + <name>Gentoo Sound project</name> + </maintainer> + <upstream> + <remote-id type="github">numediart/MBROLA</remote-id> + </upstream> </pkgmetadata> diff --git a/app-accessibility/metadata.xml b/app-accessibility/metadata.xml index e76c80d9abf1..6bad12f92d8a 100644 --- a/app-accessibility/metadata.xml +++ b/app-accessibility/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The app-accessibility category contains packages which help with @@ -36,4 +36,3 @@ komputera osobom niepełnosprawnym. </longdescription> </catmetadata> - diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch index 7040de343db0..5dbdcd504fd7 100644 --- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch +++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-gentoo-fix.patch @@ -1,5 +1,5 @@ ---- a/nfbtrans.c 2004-09-21 19:52:34.341784094 -0500 -+++ b/nfbtrans.c 2004-09-21 19:54:07.005727168 -0500 +--- a/NFBTRANS.C ++++ b/NFBTRANS.C @@ -6,7 +6,7 @@ #define LINT_ARGS #define DOS diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch index 14c13c063246..fba828479ed0 100644 --- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch +++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-getline-fix.patch @@ -1,7 +1,5 @@ -diff --git a/nfbtrans.c.orig b/nfbtrans.c -index e697393..9a2944e 100644 ---- a/nfbtrans.c.orig -+++ b/nfbtrans.c +--- a/NFBTRANS.C ++++ b/NFBTRANS.C @@ -534,7 +534,7 @@ void compact_line(char *); void length_error(char *); void do_lop_op(foptype *); diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-modern-c.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-modern-c.patch new file mode 100644 index 000000000000..7752655138fe --- /dev/null +++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-modern-c.patch @@ -0,0 +1,98 @@ +https://bugs.gentoo.org/874390 + +Fix -Wimplicit-function-declaration and -Wformat-security. +--- a/NFBTRANS.C ++++ b/NFBTRANS.C +@@ -8,10 +8,12 @@ + #else + #define UNIX_PATH "/etc/nfbtrans/" + #endif /* unix */ +-#include <stdio.h> ++#include <ctype.h> ++#include <stdio.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <stdlib.h> ++#include <unistd.h> + #ifdef DOS + #include <io.h> + #include <string.h> +@@ -132,6 +134,12 @@ char *output_extension[2] = {".brf", ".txt"}; + int paramcount; + char **paramstr; + ++void strnset(char *string, char c, short n); ++int strcmpi(char *s1, char *s2); ++void unbuf_stdin(); ++void restore_stdin(); ++void save_stdin(); ++ + typedef struct + { + char *name; +@@ -5130,7 +5138,7 @@ void insert_hyphen_word(int date_only) + field[l - 1] = 0; /* remove lf */ + if (!lines) + { /* first line */ +- fprintf(tempfile, date_string); ++ fprintf(tempfile, "%s", date_string); + cptr = strchr(field, 'A'); + if (cptr) + strcpy(field, cptr); /* get rid of date */ +@@ -5341,7 +5349,7 @@ void test_hyphen_dictionary(int mode) + /* open for r+ */ + open_hyp_dictionary(hyphen_dic_name, 3, 1); + rewind(hyp_dic_ptr); +- fprintf(hyp_dic_ptr, date_string); ++ fprintf(hyp_dic_ptr, "%s", date_string); + open_hyp_dictionary(hyphen_dic_name, 3, 2); + } /* date found on first line */ + else +@@ -6511,7 +6519,7 @@ void translate_file() + { /* no file args */ + if (!indirect_ptr) + { +- fprintf(stderr, menu[10]); ++ fprintf(stderr, "%s", menu[10]); + get_input(temp, 80); + if (!temp[0]) + exit_program(0); +@@ -6709,9 +6717,9 @@ void translate_file() + if (!trans_mode1) + { /* get secondary translation mode */ + i = (trans_default / 10); +- fprintf(stderr, menu[0]); ++ fprintf(stderr, "%s", menu[0]); + for (j = 5; j < 8; j++) +- fprintf(stderr, menu[j]); ++ fprintf(stderr, "%s", menu[j]); + backspace_int(i); + do + { +@@ -6744,7 +6752,7 @@ void translate_file() + } /* construct output name */ + else + { /* prompt */ +- fprintf(stderr, menu[11]); ++ fprintf(stderr, "%s", menu[11]); + get_input(outf_name, MAXPATHLEN - 1); + } /* prompt */ + if (!outf_name[0]) +@@ -7110,7 +7118,7 @@ void get_page_range() + if (pageend < pagestart) + { /* pageend */ + pageend = 9999; +- fprintf(stderr, menu[9]); ++ fprintf(stderr, "%s", menu[9]); + backspace_int(pageend); + get_input(temp, 5); + get_end_page(temp); +@@ -7481,7 +7489,7 @@ int main(int argc, char *argv[]) + { /* choose mode */ + j = (trans_default % 10); + for (i = 0; i < 4; i++) +- fprintf(stderr, menu[i]); ++ fprintf(stderr, "%s", menu[i]); + while (trans_mode < 1 || trans_mode > 3) + { + fprintf(stderr, "\n%s", menu[4]); diff --git a/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch index 61c991c8a368..37434681833a 100644 --- a/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch +++ b/app-accessibility/nfbtrans/files/nfbtrans-7.74-respect-ldflags.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2017-06-13 11:08:23.428114301 -0500 -+++ b/Makefile 2017-06-13 11:09:01.084376256 -0500 +--- a/Makefile ++++ b/Makefile @@ -28,10 +28,10 @@ djgppall: nfbtrans.exe
diff --git a/app-accessibility/nfbtrans/metadata.xml b/app-accessibility/nfbtrans/metadata.xml index 8fb4aba1043e..2195ded73a78 100644 --- a/app-accessibility/nfbtrans/metadata.xml +++ b/app-accessibility/nfbtrans/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild index c458fcee9dcd..8559b3ff195b 100644 --- a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild +++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild @@ -1,41 +1,43 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="braille translator from the National Federation of the Blind" -HOMEPAGE="http://www.nfb.org/nfbtrans" -SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip" +DESCRIPTION="Braille translator from the National Federation of the Blind" +HOMEPAGE="http://www.nfbnet.org/download/nfbtrans.htm" +SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr$(ver_rs 1-2 '').zip" +S="${WORKDIR}" LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -DEPEND=" >=app-arch/unzip-5.50-r2" -RDEPEND="" - -S=${WORKDIR} +BDEPEND=" >=app-arch/unzip-5.50-r2" PATCHES=( -"${FILESDIR}"/${P}-gentoo-fix.patch -"${FILESDIR}"/${P}-getline-fix.patch -"${FILESDIR}"/${P}-respect-ldflags.patch + "${FILESDIR}"/${P}-gentoo-fix.patch + "${FILESDIR}"/${P}-getline-fix.patch + "${FILESDIR}"/${P}-respect-ldflags.patch ) src_prepare() { mv MAKEFILE Makefile || die mv SPANISH.ZIP spanish.zip || die - emake lowercase + default + + emake lowercase } src_compile() { - emake CC=$(tc-getCC) \ + emake \ + CC="$(tc-getCC)" \ LIBS= \ - CFLAGS="${CFLAGS} -DLINUX" LDFLAGS="${LDFLAGS}" all + CFLAGS="${CFLAGS} -DLINUX" \ + LDFLAGS="${LDFLAGS}" \ + all } src_install() { diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r3.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r3.ebuild new file mode 100644 index 000000000000..725d8e586b12 --- /dev/null +++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Braille translator from the National Federation of the Blind" +HOMEPAGE="http://www.nfbnet.org/download/nfbtrans.htm" +SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr$(ver_rs 1-2 '').zip" +S="${WORKDIR}" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +BDEPEND=">=app-arch/unzip-5.50-r2" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo-fix.patch + "${FILESDIR}"/${P}-getline-fix.patch + "${FILESDIR}"/${P}-respect-ldflags.patch + "${FILESDIR}"/${P}-modern-c.patch +) + +src_prepare() { + mv MAKEFILE Makefile || die + mv SPANISH.ZIP spanish.zip || die + + default + + emake lowercase +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + LIBS= \ + CFLAGS="${CFLAGS} -DLINUX" \ + LDFLAGS="${LDFLAGS}" \ + all +} + +src_install() { + dobin nfbtrans + dodoc *fmt readme.txt makedoc + insinto /etc/nfbtrans + doins *cnf *tab *dic spell.dat *zip +} diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest index d14d49288610..75f961df094e 100644 --- a/app-accessibility/orca/Manifest +++ b/app-accessibility/orca/Manifest @@ -1 +1,2 @@ -DIST orca-3.34.2.tar.xz 3509556 BLAKE2B 4e73517660b837cec6d4dc12e3b2e57dec526f22aa407ababee2cb12c3aa8807184649b6962f26551926b1b3f8c49230054b4ef5583e15eeeb94685aaaf3ca13 SHA512 b685bd8e417d74ccc0d0ce6b15b3220e5079320198886f568147480f107f7d0273cbd412fdc2c6cc509d3210b36c40aecb50e167d43120f6770ce02a0891ad20 +DIST orca-45.1.tar.xz 3966196 BLAKE2B 5d78e228c480e880ca62f5e6b35d5394cbe41b67dc14f7158ca3dcadcd9721bb6e37f2054c1fa3375019351fc609d1ab4268becede10b60fbc67051c5e67539f SHA512 581126ced85943c916d9b2c0a55c12fe16344c9d6501be0290698c0668909faab4c1f539ffd856c82d0b386cfa8ca00ba5176ff5b9c5c1176cc30faededb411a +DIST orca-45.2.tar.xz 3997024 BLAKE2B dfdf113694127323a92450b04b20fcc5655be0236c0173167d5d15478703b676c3fd8c1de0e75783875c5d2d40541c764fb002314d66c7570475cd63f6bfa473 SHA512 57eee451cf0da52e1297beae6c6d527886721b23c3415a5e046f3431876fdf1603dbd81ca763ed614ace68e7db96d90b413c663f113d0033ec1f2797df7bf589 diff --git a/app-accessibility/orca/metadata.xml b/app-accessibility/orca/metadata.xml index 81828abc6360..576805b0538e 100644 --- a/app-accessibility/orca/metadata.xml +++ b/app-accessibility/orca/metadata.xml @@ -1,18 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="braille">Enable braille support</flag> -</use> -<longdescription> - Orca is a flexible, extensible, and powerful assistive technology - for people with visual impairments. Using various combinations of - speech synthesis, braille, and magnification, Orca helps provide - access to applications and toolkits that support the AT-SPI (e.g., - the GNOME desktop). -</longdescription> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="braille">Enable braille support</flag> + </use> + <longdescription> + Orca is a flexible, extensible, and powerful assistive technology + for people with visual impairments. Using various combinations of + speech synthesis, braille, and magnification, Orca helps provide + access to applications and toolkits that support the AT-SPI (e.g., + the GNOME desktop). + </longdescription> + <upstream> + <remote-id type="gnome-gitlab">GNOME/orca</remote-id> + </upstream> </pkgmetadata> diff --git a/app-accessibility/orca/orca-3.34.2.ebuild b/app-accessibility/orca/orca-3.34.2.ebuild deleted file mode 100644 index 6e340c68a246..000000000000 --- a/app-accessibility/orca/orca-3.34.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="threads" - -inherit gnome2 python-single-r1 - -DESCRIPTION="Extensible screen reader that provides access to the desktop" -HOMEPAGE="https://wiki.gnome.org/Projects/Orca" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - -IUSE="+braille" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - >=app-accessibility/at-spi2-atk-2.32:2 - >=app-accessibility/at-spi2-core-2.32:2[introspection] - >=dev-libs/atk-2.32 - >=dev-libs/glib-2.28:2 - media-libs/gstreamer:1.0[introspection] - >=x11-libs/gtk+-3.6.2:3[introspection] - $(python_gen_cond_dep ' - dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}] - ') - braille? ( - $(python_gen_cond_dep ' - >=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}] - dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}] - ') - ) -" -RDEPEND="${COMMON_DEPEND} - dev-libs/atk[introspection] - $(python_gen_cond_dep ' - >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}] - >=dev-python/pyatspi-2.32[${PYTHON_MULTI_USEDEP}] - dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] - ') - x11-libs/libwnck:3[introspection] - x11-libs/pango[introspection] -" -DEPEND="${COMMON_DEPEND} - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" -# app-text/yelp-tools - -src_configure() { - gnome2_src_configure \ - $(use_with braille liblouis) -} diff --git a/app-accessibility/orca/orca-3.34.2-r1.ebuild b/app-accessibility/orca/orca-45.1.ebuild index e0429a50fec0..69045598a323 100644 --- a/app-accessibility/orca/orca-3.34.2-r1.ebuild +++ b/app-accessibility/orca/orca-45.1.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_REQ_USE="threads(+)" +EAPI=8 +PYTHON_COMPAT=( python3_{10..11} ) inherit gnome2 python-single-r1 @@ -13,40 +11,37 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca" LICENSE="LGPL-2.1+ CC-BY-SA-3.0" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="+braille" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -COMMON_DEPEND="${PYTHON_DEPS} - >=app-accessibility/at-spi2-atk-2.32:2 - >=app-accessibility/at-spi2-core-2.32:2[introspection] - >=dev-libs/atk-2.32 +DEPEND="${PYTHON_DEPS} + >=app-accessibility/at-spi2-core-2.48:2[introspection] >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] $(python_gen_cond_dep ' - dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}] - >=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}] + dev-python/gst-python:1.0[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}] ') braille? ( $(python_gen_cond_dep ' - >=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}] - dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}] + >=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}] + dev-libs/liblouis[python,${PYTHON_USEDEP}] ') ) " -RDEPEND="${COMMON_DEPEND} - dev-libs/atk[introspection] +RDEPEND="${DEPEND} $(python_gen_cond_dep ' - >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}] - >=dev-python/pyatspi-2.32[${PYTHON_MULTI_USEDEP}] - dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] + >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}] + >=dev-python/pyatspi-2.46[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] ') x11-libs/libwnck:3[introspection] x11-libs/pango[introspection] " -DEPEND="${COMMON_DEPEND} +BDEPEND=" dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig diff --git a/app-accessibility/orca/orca-45.2.ebuild b/app-accessibility/orca/orca-45.2.ebuild new file mode 100644 index 000000000000..69045598a323 --- /dev/null +++ b/app-accessibility/orca/orca-45.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..11} ) + +inherit gnome2 python-single-r1 + +DESCRIPTION="Extensible screen reader that provides access to the desktop" +HOMEPAGE="https://wiki.gnome.org/Projects/Orca" + +LICENSE="LGPL-2.1+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" + +IUSE="+braille" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + >=app-accessibility/at-spi2-core-2.48:2[introspection] + >=dev-libs/glib-2.28:2 + media-libs/gstreamer:1.0[introspection] + >=x11-libs/gtk+-3.6.2:3[introspection] + $(python_gen_cond_dep ' + dev-python/gst-python:1.0[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}] + ') + braille? ( + $(python_gen_cond_dep ' + >=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}] + dev-libs/liblouis[python,${PYTHON_USEDEP}] + ') + ) +" +RDEPEND="${DEPEND} + $(python_gen_cond_dep ' + >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}] + >=dev-python/pyatspi-2.46[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + ') + x11-libs/libwnck:3[introspection] + x11-libs/pango[introspection] +" +BDEPEND=" + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" +# app-text/yelp-tools + +src_configure() { + gnome2_src_configure \ + $(use_with braille liblouis) +} + +src_install() { + gnome2_src_install + python_optimize +} diff --git a/app-accessibility/powiedz/metadata.xml b/app-accessibility/powiedz/metadata.xml index 2cb7080a0514..d44f4d8244c5 100644 --- a/app-accessibility/powiedz/metadata.xml +++ b/app-accessibility/powiedz/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> <name>Gentoo Accessibility Project</name> </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>sound@gentoo.org</email> <name>Gentoo Sound project</name> </maintainer> diff --git a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild index fc5fe347bd92..4372509bec17 100644 --- a/app-accessibility/powiedz/powiedz-1.0-r2.ebuild +++ b/app-accessibility/powiedz/powiedz-1.0-r2.ebuild @@ -1,27 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit toolchain-funcs +inherit desktop toolchain-funcs DESCRIPTION="Polish speech synthesizer based on rsynth" HOMEPAGE="http://kadu.net/index.php?page=download&lang=en" -SRC_URI="http://kadu.net/download/additions/powiedz-1.0.tgz" +SRC_URI="http://kadu.net/download/additions/${P}.tgz" +S="${WORKDIR}/${PN}" LICENSE="GPL-1" SLOT="0" KEYWORDS="amd64 ppc ~sparc x86" -IUSE="" - -S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${PN}-1.0-dsp-handle-fix.patch ) src_compile() { - emake -f Makefile_plain LDLIBS="-lm" CFLAGS="${CFLAGS}" DEFS="" CC=$(tc-getCC) + emake -f Makefile_plain LDLIBS="-lm" CFLAGS="${CFLAGS}" DEFS="" CC="$(tc-getCC)" } src_install() { diff --git a/app-accessibility/simon/metadata.xml b/app-accessibility/simon/metadata.xml deleted file mode 100644 index 923816d1f30f..000000000000 --- a/app-accessibility/simon/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?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> - <use> - <flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag> - <flag name="pim">Enable support for KDE PIM resources integration</flag> - <flag name="sphinx">Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag> - </use> -</pkgmetadata> diff --git a/app-accessibility/simon/simon-9999.ebuild b/app-accessibility/simon/simon-9999.ebuild deleted file mode 100644 index 3115d4658433..000000000000 --- a/app-accessibility/simon/simon-9999.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_BRANCH="kf5" -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -inherit ecm kde.org - -DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard" -HOMEPAGE="https://simon-listens.org/" - -if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz" - KEYWORDS="" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="libsamplerate opencv pim sphinx" - -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsql:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtx11extras:5 - kde-apps/okular:5 - kde-frameworks/karchive:5 - kde-frameworks/kcmutils:5 - kde-frameworks/kcompletion:5 - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kcrash:5 - kde-frameworks/kdbusaddons:5 - kde-frameworks/kdelibs4support:5 - kde-frameworks/kguiaddons:5 - kde-frameworks/khtml:5 - kde-frameworks/ki18n:5 - kde-frameworks/kiconthemes:5 - kde-frameworks/kio:5 - kde-frameworks/kparts:5 - kde-frameworks/ktexteditor:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - media-libs/alsa-lib - media-libs/libqaccessibilityclient:5 - x11-libs/libX11 - x11-libs/libXtst - x11-libs/qwt:6= -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package pim KF5CalendarCore) - $(cmake-utils_use_find_package pim KF5Akonadi) - -DWITH_LibSampleRate=$(usex libsamplerate) - -DWITH_OpenCV=$(usex opencv) - -DBackendType=$(usex sphinx "both" "jhtk") - $(cmake-utils_use_find_package sphinx Sphinxbase) - $(cmake-utils_use_find_package sphinx Pocketsphinx) - -DQWT_INCLUDE_DIR=/usr/include/qwt6 - -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - - elog "Optional dependency:" - use sphinx && elog " app-accessibility/julius (alternative backend)" -} diff --git a/app-accessibility/sound-icons/metadata.xml b/app-accessibility/sound-icons/metadata.xml index 4e89c04468b7..2195ded73a78 100644 --- a/app-accessibility/sound-icons/metadata.xml +++ b/app-accessibility/sound-icons/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> @@ -8,7 +8,4 @@ <email>accessibility@gentoo.org</email> <name>Gentoo Accessibility Project</name> </maintainer> -<longdescription lang="en"> -This is a collection of sound icons which can be used by speech dispatcher. -</longdescription> </pkgmetadata> diff --git a/app-accessibility/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild index 30a81fbc310e..294d6b7afb58 100644 --- a/app-accessibility/sound-icons/sound-icons-0.1.ebuild +++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -DESCRIPTION="a collection of Sound Icons for speech-dispatcher" -HOMEPAGE="http://www.freebsoft.org" -SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz" +DESCRIPTION="Collection of Sound Icons for speech-dispatcher" +HOMEPAGE="https://www.freebsoft.org" +SRC_URI="https://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -22,9 +22,9 @@ src_install() { dodoc README insinto /usr/share/sounds/sound-icons doins "${S}"/*.wav - links="`find ${S} -type l -print`" - for link in $links; do - target=`readlink -n $link` - dosym $target /usr/share/sounds/sound-icons/`basename $link` + local links=$(find "${S}" -type l -print) + for link in ${links}; do + target=$(readlink -n "${link}") + dosym "${target}" /usr/share/sounds/sound-icons/$(basename "${link}") done } diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest index 94ba6ca07649..6ddff1958c95 100644 --- a/app-accessibility/speech-dispatcher/Manifest +++ b/app-accessibility/speech-dispatcher/Manifest @@ -1,2 +1 @@ -DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375 -DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2 +DIST speech-dispatcher-0.11.4.tar.gz 7127323 BLAKE2B 651a20ec403c6158756ab6ff7fbedb38ce1cec413be49367128274c8d20ccc7080a2dccd68cb7ebbec6bab05599f06a4aafc561e4e5e53cf52d19fa1b94fa286 SHA512 d0ebe832e2586abdb1284be36f8427cfbbd94f1a2dead1b74526b151e9529f9e61679339274b73afab5f829d184337372ba0aad93d880c42d2a6a1bcb2b7afef diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.4-GNU_SOURCE.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.4-GNU_SOURCE.patch new file mode 100644 index 000000000000..9f08e5a863a4 --- /dev/null +++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.4-GNU_SOURCE.patch @@ -0,0 +1,103 @@ +https://github.com/brailcom/speechd/pull/789 + +From da19d096901466e5ff395846405547d422c90b4c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 31 Oct 2022 18:33:17 +0000 +Subject: [PATCH] Use AC_USE_SYSTEM_EXTENSIONS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We already set _GNU_SOURCE in various places but not consistently. Let's +just use autoconf's AC_USE_SYSTEM_EXTENSIONS to ensure it's always set. + +Fixes failure when building tests: +``` +x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -I../../src/api/c -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -O2 -pipe -march=native -fdiagnostics-color=always -frecord-gcc-switches -Wreturn-type -ggdb3 -Werror=format-security -Werror=implicit-function-declaration -Wimplicit-int -Wformat -c -o run_test.o run_test.c +run_test.c: In function ‘wait_for’: +run_test.c:93:21: error: implicit declaration of function ‘strcasestr’; did you mean ‘strcasecmp’? [-Werror=implicit-function-declaration] + 93 | while (0 == strcasestr(reply, event)) { + | ^~~~~~~~~~ + | strcasecmp +cc1: some warnings being treated as errors +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -68,6 +68,8 @@ AC_PROG_LN_S + AC_CHECK_PROGS([HELP2MAN], [help2man]) + AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$HELP2MAN" != "x"]) + ++AC_USE_SYSTEM_EXTENSIONS ++ + # Checks for libraries. + AC_SEARCH_LIBS([sqrt], [m], [], + [AC_MSG_FAILURE([Math library missing])]) +--- a/src/api/c/Makefile.am ++++ b/src/api/c/Makefile.am +@@ -24,7 +24,7 @@ BUILT_SOURCES = libspeechd_version.h + lib_LTLIBRARIES = libspeechd.la + libspeechd_la_SOURCES = libspeechd.c + libspeechd_la_CFLAGS = $(ERROR_CFLAGS) +-libspeechd_la_CPPFLAGS = $(inc_local) -D_GNU_SOURCE $(GLIB_CFLAGS) -DSPD_SPAWN_CMD=\""$(prefix)/bin/speech-dispatcher"\" ++libspeechd_la_CPPFLAGS = $(inc_local) $(GLIB_CFLAGS) -DSPD_SPAWN_CMD=\""$(prefix)/bin/speech-dispatcher"\" + libspeechd_la_LDFLAGS = -version-info $(LIB_SPD_CURRENT):$(LIB_SPD_REVISION):$(LIB_SPD_AGE) + libspeechd_la_LIBADD = $(GLIB_LIBS) + +--- a/src/api/guile/gssip.c ++++ b/src/api/guile/gssip.c +@@ -24,8 +24,6 @@ + #include <config.h> + #endif + +-#define _GNU_SOURCE +- + #include <stdio.h> + #include <string.h> + +--- a/src/audio/pulse.c ++++ b/src/audio/pulse.c +@@ -34,8 +34,6 @@ + * + */ + +-#define _GNU_SOURCE +- + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif +--- a/src/clients/spdsend/spdsend.h ++++ b/src/clients/spdsend/spdsend.h +@@ -24,8 +24,6 @@ + + #define __SPDSEND_H + +-#define _GNU_SOURCE +- + #include <stddef.h> + + /* Configuration */ +--- a/src/modules/Makefile.am ++++ b/src/modules/Makefile.am +@@ -32,7 +32,7 @@ common_LDADD = $(DOTCONF_LIBS) $(GLIB_LIBS) $(audio_dlopen) -lpthread + + AM_CFLAGS = $(ERROR_CFLAGS) + AM_CXXFLAGS = $(ERROR_CFLAGS) +-AM_CPPFLAGS = $(inc_local) -DDATADIR=\"$(snddatadir)\" -D_GNU_SOURCE $(GLIB_CFLAGS) ++AM_CPPFLAGS = $(inc_local) -DDATADIR=\"$(snddatadir)\" $(GLIB_CFLAGS) + + module_utils_CPPFLAGS = $(AM_CPPFLAGS) \ + $(DOTCONF_CFLAGS) +--- a/src/server/Makefile.am ++++ b/src/server/Makefile.am +@@ -35,7 +35,7 @@ speech_dispatcher_CPPFLAGS = $(inc_local) $(DOTCONF_CFLAGS) $(GLIB_CFLAGS) \ + -DMODULEBINDIR=\"$(modulebindir)\" \ + -DOLDMODULEBINDIR=\"$(oldmodulebindir)\" \ + -DLOCALE_DATA=\"$(localedatadir)\" \ +- -D_GNU_SOURCE -DDEFAULT_AUDIO_METHOD=\"$(default_audio_method)\" ++ -DDEFAULT_AUDIO_METHOD=\"$(default_audio_method)\" + speech_dispatcher_LDFLAGS = $(RDYNAMIC) + speech_dispatcher_LDADD = $(lib_common) $(DOTCONF_LIBS) $(GLIB_LIBS) \ + $(SNDFILE_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) $(EXTRA_SOCKET_LIBS) \ + diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.9.1-fno-common.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.9.1-fno-common.patch deleted file mode 100644 index 0914566a8a35..000000000000 --- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.9.1-fno-common.patch +++ /dev/null @@ -1,466 +0,0 @@ -From f1c01ccc0ca3f82313ebff3f336d808acee225c8 Mon Sep 17 00:00:00 2001 -From: Samuel Thibault <samuel.thibault@ens-lyon.org> -Date: Fri, 6 Dec 2019 10:27:39 +0100 -Subject: [PATCH] Fix global varibles definitions - ---- - src/clients/say/options.c | 24 +++++++++++++++++++ - src/clients/say/options.h | 42 ++++++++++++++++----------------- - src/modules/festival_client.c | 2 ++ - src/modules/festival_client.h | 2 +- - src/modules/module_utils.c | 20 ++++++++++++++++ - src/modules/module_utils.h | 24 +++++++++---------- - src/server/compare.c | 1 + - src/server/compare.h | 4 ++-- - src/server/configuration.c | 3 +++ - src/server/configuration.h | 4 ++-- - src/server/speaking.c | 10 ++++++++ - src/server/speaking.h | 14 +++++------ - src/server/speechd.c | 33 ++++++++++++++++++++++++++ - src/server/speechd.h | 44 +++++++++++++++++------------------ - 14 files changed, 160 insertions(+), 67 deletions(-) - -diff --git a/src/clients/say/options.c b/src/clients/say/options.c -index f75ec7de..cb937d37 100644 ---- a/src/clients/say/options.c -+++ b/src/clients/say/options.c -@@ -33,6 +33,30 @@ - #include "options.h" - #include <i18n.h> - -+signed int rate; -+signed int pitch; -+signed int pitch_range; -+signed int volume; -+ -+int list_output_modules; -+char *output_module; -+char *sound_icon; -+char *language; -+char *voice_type; -+char *punctuation_mode; -+char *priority; -+int pipe_mode; -+SPDDataMode ssml_mode; -+int spelling; -+int wait_till_end; -+int stop_previous; -+int cancel_previous; -+int list_synthesis_voices; -+char *synthesis_voice; -+ -+char *application_name; -+char *connection_name; -+ - void options_print_help(char *argv[]) - { - assert(argv); -diff --git a/src/clients/say/options.h b/src/clients/say/options.h -index 2fdd3b96..dede6dcc 100644 ---- a/src/clients/say/options.h -+++ b/src/clients/say/options.h -@@ -22,29 +22,29 @@ - #include <getopt.h> - #include "speechd_types.h" - --signed int rate; --signed int pitch; --signed int pitch_range; --signed int volume; -+extern signed int rate; -+extern signed int pitch; -+extern signed int pitch_range; -+extern signed int volume; - --int list_output_modules; --char *output_module; --char *sound_icon; --char *language; --char *voice_type; --char *punctuation_mode; --char *priority; --int pipe_mode; --SPDDataMode ssml_mode; --int spelling; --int wait_till_end; --int stop_previous; --int cancel_previous; --int list_synthesis_voices; --char *synthesis_voice; -+extern int list_output_modules; -+extern char *output_module; -+extern char *sound_icon; -+extern char *language; -+extern char *voice_type; -+extern char *punctuation_mode; -+extern char *priority; -+extern int pipe_mode; -+extern SPDDataMode ssml_mode; -+extern int spelling; -+extern int wait_till_end; -+extern int stop_previous; -+extern int cancel_previous; -+extern int list_synthesis_voices; -+extern char *synthesis_voice; - --char *application_name; --char *connection_name; -+extern char *application_name; -+extern char *connection_name; - - static struct option long_options[] = { - {"rate", 1, 0, 'r'}, -diff --git a/src/modules/festival_client.c b/src/modules/festival_client.c -index bb15cb86..f8327d46 100644 ---- a/src/modules/festival_client.c -+++ b/src/modules/festival_client.c -@@ -75,6 +75,8 @@ - /* For testing endianness */ - int fapi_endian_loc = 1; - -+int festival_connection_crashed; -+ - static char *socket_receive_file_to_buff(int fd, int *size); - - /* --- MANAGING FT STRUCTURES --- */ -diff --git a/src/modules/festival_client.h b/src/modules/festival_client.h -index 21acdda2..dfbaac15 100644 ---- a/src/modules/festival_client.h -+++ b/src/modules/festival_client.h -@@ -44,7 +44,7 @@ - #define FESTIVAL_DEFAULT_SERVER_PORT 1314 - #define FESTIVAL_DEFAULT_TEXT_MODE "fundamental" - --int festival_connection_crashed; -+extern int festival_connection_crashed; - - typedef struct FT_Info { - int encoding; -diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c -index 0a3d3308..99e71fcb 100644 ---- a/src/modules/module_utils.c -+++ b/src/modules/module_utils.c -@@ -35,6 +35,26 @@ extern char *module_index_mark; - - pthread_mutex_t module_stdout_mutex = PTHREAD_MUTEX_INITIALIZER; - -+int log_level; -+ -+AudioID *module_audio_id; -+ -+SPDMsgSettings msg_settings; -+SPDMsgSettings msg_settings_old; -+ -+int current_index_mark; -+ -+int Debug; -+FILE *CustomDebugFile; -+ -+configfile_t *configfile; -+configoption_t *module_dc_options; -+int module_num_dc_options; -+ -+const char *module_name; -+ -+char *module_index_mark; -+ - char *do_message(SPDMessageType msgtype) - { - int ret; -diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h -index 12382d3b..87c5f813 100644 ---- a/src/modules/module_utils.h -+++ b/src/modules/module_utils.h -@@ -49,23 +49,23 @@ typedef struct SPDMarks { - gboolean stop; - } SPDMarks; - --int log_level; -+extern int log_level; - --AudioID *module_audio_id; -+extern AudioID *module_audio_id; - --SPDMsgSettings msg_settings; --SPDMsgSettings msg_settings_old; -+extern SPDMsgSettings msg_settings; -+extern SPDMsgSettings msg_settings_old; - --int current_index_mark; -+extern int current_index_mark; - --int Debug; --FILE *CustomDebugFile; -+extern int Debug; -+extern FILE *CustomDebugFile; - --configfile_t *configfile; --configoption_t *module_dc_options; --int module_num_dc_options; -+extern configfile_t *configfile; -+extern configoption_t *module_dc_options; -+extern int module_num_dc_options; - --const char *module_name; -+extern const char *module_name; - - #define CLEAN_OLD_SETTINGS_TABLE() do { \ - msg_settings_old.rate = -101;\ -@@ -395,7 +395,7 @@ configoption_t *add_config_option(configoption_t * options, - #define INDEX_MARK_BODY_LEN 6 - #define INDEX_MARK_BODY "__spd_" - --char *module_index_mark; -+extern char *module_index_mark; - - /* This macro must be placed at the initialization of the module so that the - later functions are possible to use */ -diff --git a/src/server/compare.c b/src/server/compare.c -index aa08ed79..8d36c39d 100644 ---- a/src/server/compare.c -+++ b/src/server/compare.c -@@ -29,6 +29,7 @@ - #include "compare.h" - - /* Pointer to compare_message_uid */ -+gint(*p_msg_lc) (); - gint(*p_msg_uid_lc) () = compare_message_uid; - - gint compare_message_uid(gconstpointer element, gconstpointer value, gpointer x) -diff --git a/src/server/compare.h b/src/server/compare.h -index f0c730c5..380c9ed2 100644 ---- a/src/server/compare.h -+++ b/src/server/compare.h -@@ -27,7 +27,7 @@ gint compare_message_uid(gconstpointer element, gconstpointer value, - gpointer x); - - /* Pointer to function compare_message_uid */ --gint(*p_msg_lc) (); --gint(*p_msg_uid_lc) (); -+extern gint(*p_msg_lc) (); -+extern gint(*p_msg_uid_lc) (); - - #endif /* COMPARE_H */ -diff --git a/src/server/configuration.c b/src/server/configuration.c -index a21b60c9..ba145995 100644 ---- a/src/server/configuration.c -+++ b/src/server/configuration.c -@@ -33,6 +33,9 @@ - #include "symbols.h" - #include <fdsetconv.h> - -+configoption_t *spd_options; -+int spd_num_options; -+ - static TFDSetClientSpecific *cl_spec_section; - - /* So that gcc doesn't comply about casts to char* */ -diff --git a/src/server/configuration.h b/src/server/configuration.h -index 5850c63b..bd87a0d5 100644 ---- a/src/server/configuration.h -+++ b/src/server/configuration.h -@@ -29,8 +29,8 @@ - #define SPEECHD_DEFAULT_PORT 6560 - - /* Loading options from DotConf */ --configoption_t *spd_options; --int spd_num_options; -+extern configoption_t *spd_options; -+extern int spd_num_options; - - configoption_t *load_config_options(int *num_options); - void free_config_options(configoption_t * opts, int *num); -diff --git a/src/server/speaking.c b/src/server/speaking.c -index 2160c250..61463f3f 100644 ---- a/src/server/speaking.c -+++ b/src/server/speaking.c -@@ -46,6 +46,16 @@ static SPDPriority highest_priority = 0; - int SPEAKING = 0; - int poll_count; - -+OutputModule *speaking_module; -+int speaking_uid; -+int speaking_gid; -+ -+/* Pause and resume handling */ -+int pause_requested; -+int pause_requested_fd; -+int pause_requested_uid; -+int resume_requested; -+ - /* - Speak() is responsible for getting right text from right - queue in right time and saying it loud through the corresponding -diff --git a/src/server/speaking.h b/src/server/speaking.h -index 690db600..48752dfa 100644 ---- a/src/server/speaking.h -+++ b/src/server/speaking.h -@@ -26,15 +26,15 @@ - - #include <speechd_types.h> - --OutputModule *speaking_module; --int speaking_uid; --int speaking_gid; -+extern OutputModule *speaking_module; -+extern int speaking_uid; -+extern int speaking_gid; - - /* Pause and resume handling */ --int pause_requested; --int pause_requested_fd; --int pause_requested_uid; --int resume_requested; -+extern int pause_requested; -+extern int pause_requested_fd; -+extern int pause_requested_uid; -+extern int resume_requested; - - /* Speak() is responsible for getting right text from right - * queue in right time and saying it loud through corresponding -diff --git a/src/server/speechd.c b/src/server/speechd.c -index 8d3c1de4..6f6e51a5 100644 ---- a/src/server/speechd.c -+++ b/src/server/speechd.c -@@ -65,6 +65,39 @@ gint server_timeout_source = 0; - - int client_count = 0; - -+struct SpeechdOptions SpeechdOptions; -+struct SpeechdStatus SpeechdStatus; -+ -+pthread_t speak_thread; -+pthread_mutex_t logging_mutex; -+pthread_mutex_t element_free_mutex; -+pthread_mutex_t output_layer_mutex; -+pthread_mutex_t socket_com_mutex; -+ -+GHashTable *fd_settings; -+GHashTable *language_default_modules; -+GHashTable *fd_uid; -+ -+TSpeechDQueue *MessageQueue; -+GList *MessagePausedList; -+ -+GList *client_specific_settings; -+ -+GList *last_p5_block; -+ -+TFDSetElement GlobalFDSet; -+ -+int speaking_pipe[2]; -+ -+GHashTable *speechd_sockets_status; -+ -+FILE *logfile; -+FILE *custom_logfile; -+char *custom_log_kind; -+FILE *debug_logfile; -+ -+TSpeechDMode spd_mode; -+ - static gboolean speechd_client_terminate(gpointer key, gpointer value, gpointer user); - static gboolean speechd_reload_dead_modules(gpointer user_data); - static gboolean speechd_load_configuration(gpointer user_data); -diff --git a/src/server/speechd.h b/src/server/speechd.h -index c0730b76..b23bbb69 100644 ---- a/src/server/speechd.h -+++ b/src/server/speechd.h -@@ -123,7 +123,7 @@ typedef enum { - SPD_MODE_SINGLE /* */ - } TSpeechDMode; - --TSpeechDMode spd_mode; -+extern TSpeechDMode spd_mode; - - /* TSpeechDQueue is a queue for messages. */ - typedef struct { -@@ -148,7 +148,7 @@ typedef struct { - #include "alloc.h" - #include "speaking.h" - --struct { -+extern struct SpeechdOptions { - char *communication_method; - int communication_method_set; - char *socket_path; -@@ -172,48 +172,48 @@ struct { - int server_timeout_set; - } SpeechdOptions; - --struct { -+extern struct SpeechdStatus { - int max_uid; /* The largest assigned uid + 1 */ - int max_gid; /* The largest assigned gid + 1 */ - int max_fd; - } SpeechdStatus; - - /* speak() thread defined in speaking.c */ --pthread_t speak_thread; --pthread_mutex_t logging_mutex; --pthread_mutex_t element_free_mutex; --pthread_mutex_t output_layer_mutex; --pthread_mutex_t socket_com_mutex; -+extern pthread_t speak_thread; -+extern pthread_mutex_t logging_mutex; -+extern pthread_mutex_t element_free_mutex; -+extern pthread_mutex_t output_layer_mutex; -+extern pthread_mutex_t socket_com_mutex; - - /* Table of all configured (and succesfully loaded) output modules */ - extern GList *output_modules; - - /* Table of settings for each active client (=each active socket)*/ --GHashTable *fd_settings; -+extern GHashTable *fd_settings; - /* Table of default output modules for different languages */ --GHashTable *language_default_modules; -+extern GHashTable *language_default_modules; - /* Table of relations between client file descriptors and their uids */ --GHashTable *fd_uid; -+extern GHashTable *fd_uid; - - /* Speech Dispatcher main priority queue for messages */ --TSpeechDQueue *MessageQueue; -+extern TSpeechDQueue *MessageQueue; - /* List of messages from paused clients waiting for resume */ --GList *MessagePausedList; -+extern GList *MessagePausedList; - - /* List of different entries of client-specific configuration */ --GList *client_specific_settings; -+extern GList *client_specific_settings; - - /* Saves the last received priority progress message */ --GList *last_p5_block; -+extern GList *last_p5_block; - - /* Global default settings */ --TFDSetElement GlobalFDSet; -+extern TFDSetElement GlobalFDSet; - - /* Inter thread comm pipe */ --int speaking_pipe[2]; -+extern int speaking_pipe[2]; - - /* Managing sockets communication */ --GHashTable *speechd_sockets_status; -+extern GHashTable *speechd_sockets_status; - typedef struct { - int awaiting_data; - int inside_block; -@@ -234,10 +234,10 @@ void MSG2(int level, char *kind, char *format, ...); - #define FATAL(msg) do { fatal_error(); MSG(-1,"Fatal error [%s:%d]:"msg, __FILE__, __LINE__); exit(EXIT_FAILURE); } while (0) - #define DIE(msg) do { MSG(0,"Error [%s:%d]:"msg, __FILE__, __LINE__); exit(EXIT_FAILURE); } while (0) - --FILE *logfile; --FILE *custom_logfile; --char *custom_log_kind; --FILE *debug_logfile; -+extern FILE *logfile; -+extern FILE *custom_logfile; -+extern char *custom_log_kind; -+extern FILE *debug_logfile; - - /* For debugging purposes, does nothing */ - void fatal_error(void); diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml index 3b8394dd85b4..506de2e0ba7d 100644 --- a/app-accessibility/speech-dispatcher/metadata.xml +++ b/app-accessibility/speech-dispatcher/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> @@ -13,7 +13,10 @@ <name>Gentoo Sound project</name> </maintainer> <use> - <flag name="espeak">Adds support for espeak speech engine</flag> + <flag name="espeak">Adds support for espeak-ng speech engine</flag> <flag name="flite">Adds support for flite speech engine</flag> </use> + <upstream> + <remote-id type="github">brailcom/speechd</remote-id> + </upstream> </pkgmetadata> diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4-r2.ebuild index 082ac0dcff85..7dd7e2f86301 100644 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4-r2.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-r1 systemd +PYTHON_COMPAT=( python3_{9..11} ) +# TODO: drop autotools + eautoreconf after 0.11.4 +inherit autotools python-r1 systemd DESCRIPTION="Speech synthesis interface" HOMEPAGE="https://freebsoft.org/speechd" @@ -12,43 +13,55 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="alsa ao +espeak flite nas pulseaudio python" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="alsa ao +espeak flite nas pulseaudio +python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DEPEND="python? ( ${PYTHON_DEPS} ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.36:2 - dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) - espeak? ( app-accessibility/espeak ) + espeak? ( app-accessibility/espeak-ng ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) - pulseaudio? ( media-sound/pulseaudio )" + pulseaudio? ( media-libs/libpulse )" RDEPEND="${DEPEND} python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" BDEPEND=" + sys-apps/help2man >=sys-devel/gettext-0.19.8 virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-fno-common.patch" ) +PATCHES=( + "${FILESDIR}"/${PN}-0.11.4-GNU_SOURCE.patch +) + +src_prepare() { + default + + eautoreconf +} src_configure() { # bug 573732 export GIT_CEILING_DIRECTORIES="${WORKDIR}" local myeconfargs=( + --disable-ltdl --disable-python --disable-static --with-baratinoo=no --with-ibmtts=no --with-kali=no + --with-pico=no + --with-voxin=no + --with-espeak=no $(use_with alsa) $(use_with ao libao) - $(use_with espeak) + $(use_with espeak espeak-ng) $(use_with flite) $(use_with nas) $(use_with pulseaudio pulse) @@ -87,6 +100,7 @@ src_install() { } python_foreach_impl run_in_build_dir installation python_replicate_script "${ED}"/usr/bin/spd-conf + python_foreach_impl python_optimize fi find "${D}" -name '*.la' -type f -delete || die @@ -95,7 +109,7 @@ src_install() { pkg_postinst() { local editconfig="n" if ! use espeak; then - ewarn "You have disabled espeak, which is speech-dispatcher's" + ewarn "You have disabled espeak-ng, which is speech-dispatcher's" ewarn "default speech synthesizer." ewarn editconfig="y" @@ -111,6 +125,4 @@ pkg_postinst() { ewarn "and make sure the settings there match your system." ewarn fi - elog "For festival support, you need to" - elog "install app-accessibility/festival-freebsoft-utils." } diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild deleted file mode 100644 index 3cdd6a3eb2a7..000000000000 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r3.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit eutils python-r1 - -DESCRIPTION="Speech synthesis interface" -HOMEPAGE="http://www.freebsoft.org/speechd" -SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="alsa ao +espeak flite nas pulseaudio python" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND="python? ( ${PYTHON_DEPS} ) - >=dev-libs/dotconf-1.3 - >=dev-libs/glib-2.28:2 - dev-libs/libltdl:0 - >=media-libs/libsndfile-1.0.2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - espeak? ( app-accessibility/espeak ) - flite? ( app-accessibility/flite ) - nas? ( media-libs/nas ) - pulseaudio? ( media-sound/pulseaudio )" -RDEPEND="${DEPEND} - python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" -BDEPEND=" - >=dev-util/intltool-0.40.0 - virtual/pkgconfig" - -src_configure() { - # bug 573732 - export GIT_CEILING_DIRECTORIES="${WORKDIR}" - - local myeconfargs=( - --disable-python - --disable-static - $(use_with alsa) - $(use_with ao libao) - $(use_with espeak) - $(use_with flite) - $(use_with pulseaudio pulse) - $(use_with nas) - ) - econf ${myeconfargs[@]} -} - -src_compile() { - use python && python_copy_sources - - emake - - if use python; then - building() { - cd src/api/python || die - emake \ - pyexecdir="$(python_get_sitedir)" \ - pythondir="$(python_get_sitedir)" - } - python_foreach_impl run_in_build_dir building - fi -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ANNOUNCE AUTHORS BUGS FAQ NEWS README* - - if use python; then - installation() { - cd src/api/python || die - emake \ - DESTDIR="${D}" \ - pyexecdir="$(python_get_sitedir)" \ - pythondir="$(python_get_sitedir)" \ - install - } - python_foreach_impl run_in_build_dir installation - python_replicate_script "${ED}"/usr/bin/spd-conf - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - local editconfig="n" - if ! use espeak; then - ewarn "You have disabled espeak, which is speech-dispatcher's" - ewarn "default speech synthesizer." - ewarn - editconfig="y" - fi - if ! use pulseaudio; then - ewarn "You have disabled pulseaudio support." - ewarn "pulseaudio is speech-dispatcher's default audio subsystem." - ewarn - editconfig="y" - fi - if [[ "${editconfig}" == "y" ]]; then - ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf" - ewarn "and make sure the settings there match your system." - ewarn - fi - elog "For festival support, you need to" - elog "install app-accessibility/festival-freebsoft-utils." -} diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest index 3f3053884aad..359cc88438c6 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -1,2 +1,2 @@ DIST speech_tools-2.1-r3-patches.tar.gz 6876 BLAKE2B 84ddc30de90459f913cc32d4338097feb35dc08c48cbda7fc47a78ee0384668828d7166a5ebb1264272a6c326afd4ff2efdf1d793bb8f33937c09d2c7cd9a2b5 SHA512 db4d656a77e3fcfc43447c11b160cf9b45f0c4ec10f2697e4357f0ec86ea56e2841f1b887493a781406975003f5d8065ffbb75eeebb79fcd9873055b52c248e3 -DIST speech_tools-2.1-release.tar.gz 1681999 BLAKE2B 572e7877e195c098dd2df03cda86fe58b7a55379cd01adcc22faf5e12b8c004e8c006b852cfe88c5c20df4a0e54e357b445050cdb63088edd55714a98e3eda90 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 +DIST speech_tools-2.5.0-release.tar.gz 1328624 BLAKE2B 445dd5a5e39c02352a850fd92de5b3852ae382a4bd013dccb3fdd46b0b22ce0bd10d089f9e860ae3d3e73a489b20b7c8b78335e57a49e40ae01b0f4997d55315 SHA512 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7 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 deleted file mode 100644 index 9e1067fa1dc1..000000000000 --- a/app-accessibility/speech-tools/files/speech-tools-2.1-gcc7.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/files/speech-tools-2.5.0-drop-curses.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch new file mode 100644 index 000000000000..30b5448e820a --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-drop-curses.patch @@ -0,0 +1,43 @@ +We already force in the correct detection via another patch and this +logic (being dropped in this patch) assumes no -ltinfo. + +https://bugs.gentoo.org/837800 +--- a/configure.in ++++ b/configure.in +@@ -42,12 +42,6 @@ AC_CHECK_TOOL(AR, ar) + + AC_C_BIGENDIAN + +-AC_CHECK_LIB(ncurses, tputs, [TERMCAPLIB=-lncurses], [TERMCAPLIB=-lcurses]) +-dnl if test "$TERMCAPLIB" != "-ltermcap"; then +-dnl AC_CHECK_LIB(termcap, tputs, [TERMCAPLIB=-ltermcap], [TERMCAPLIB=-lncurses]) +-dnl +-AC_SUBST(TERMCAPLIB) +- + dnl Which version of GCC do we have here + COMPILERTYPE=gcc + AC_TRY_COMPILE([#include <stdio.h>], +diff --git a/config/config.in b/config/config.in +index c7a268a..6c7f16a 100644 +--- a/config/config.in ++++ b/config/config.in +@@ -98,7 +98,6 @@ LINUXAUDIO = @LINUXAUDIO@ + ## It may not work under all systems, so may be optionally omitted. + INCLUDE_MODULES += EDITLINE + +-TERMCAPLIB = @TERMCAPLIB@ + # speech recognition + #INCLUDE_MODULES += ASR + +diff --git a/config/modules/editline.mak b/config/modules/editline.mak +index fe83c37..2d48b39 100644 +--- a/config/modules/editline.mak ++++ b/config/modules/editline.mak +@@ -43,7 +43,6 @@ INCLUDE_EDITLINE=1 + MOD_DESC_EDITLINE=Use editline for command line editing and history + + IO_DEFINES += -DSUPPORT_EDITLINE $(MODULE_EDITLINE_OPTIONS:%=-DEDITLINE_%) +-MODULE_LIBS += $(TERMCAPLIB) + + ifeq ($(DIRNAME),siod) + CSRCS := $(CSRCS) el_complete.c editline.c el_sys_unix.c diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch new file mode 100644 index 000000000000..de34f4fdbc76 --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-fno-common.patch @@ -0,0 +1,22 @@ +From b3a1f6e778c0dad12ce65f9f1fb25354e2667ef6 Mon Sep 17 00:00:00 2001 +From: Peter Levine <plevine457@gmail.com> +Date: Fri, 29 May 2020 21:18:55 -0400 +Subject: [PATCH] Remove erroneous declaration of editline_history_file + +An extern qualified forward declaration of editline_history_file is supplied in editline.h and its definition/initialization is supplied in siodeditline.c. +--- + siod/editline.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/siod/editline.c b/siod/editline.c +index f6eb5c6..138f476 100644 +--- a/siod/editline.c ++++ b/siod/editline.c +@@ -73,7 +73,6 @@ + /* modified by awb to allow specifcation of history size at run time */ + /* (though only once) */ + int editline_histsize=256; +-char *editline_history_file; + /* If this is defined it'll be called for completion first, before the */ + /* internal file name completion will be */ + EL_USER_COMPLETION_FUNCTION_TYPE*el_user_completion_function = NULL; diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch new file mode 100644 index 000000000000..da0077313abd --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch @@ -0,0 +1,65 @@ +See https://bugs.openjdk.org/browse/JDK-8178689 for some analysis - we can +safely replace the deprecated/obsolete isnanf (which musl doesn't immplement) +with isnan. + +https://bugs.gentoo.org/896170 +https://bugs.gentoo.org/829344 +--- a/intonation/tilt/tilt_utils.cc ++++ b/intonation/tilt/tilt_utils.cc +@@ -133,7 +133,7 @@ float rfc_to_t_tilt(EST_Features &e) + { + float t_tilt; + t_tilt = (rfc_to_a_tilt(e) + rfc_to_d_tilt(e)) / 2; +- if (isnanf(t_tilt)) ++ if (isnan(t_tilt)) + t_tilt = 0.0; + return t_tilt; + } +--- a/sigpr/pda/smooth_pda.cc ++++ b/sigpr/pda/smooth_pda.cc +@@ -112,7 +112,7 @@ void smooth_portion(EST_Track &c, EST_Features &op) + + for (i = 0; i < c.num_frames(); ++i) + { // occasionally NaNs result... +- if (isnanf(a[i])) ++ if (isnan(a[i])) + { + c.set_break(i); + c.a(i) = 0.0; +--- a/sigpr/sigpr_frame.cc ++++ b/sigpr/sigpr_frame.cc +@@ -314,7 +314,7 @@ void lpc2cep(const EST_FVector &lpc, EST_FVector &cep) + for (n = 0; n < cep.length(); n++) + { + // check if NaN -- happens on some frames of silence +- if (isnanf(cep[n]) ) cep[n] = 0.0; ++ if (isnan(cep[n]) ) cep[n] = 0.0; + + if (cep[n] > MAX_ABS_CEPS){ + cerr << "WARNING : cepstral coeff " << n << " was " << +--- a/stats/confusion.cc ++++ b/stats/confusion.cc +@@ -138,7 +138,7 @@ void print_confusion(const EST_FMatrix &a, EST_StrStr_KVL &list, + cout.precision(3); + cout.setf(ios::right); + // cout.setf(ios::fixed, ios::floatfield); +- if (isnanf(correct(i))) ++ if (isnan(correct(i))) + cout << endl; + else + cout << correct(i) << endl; +--- a/include/EST_math.h ++++ b/include/EST_math.h +@@ -81,12 +81,6 @@ extern "C" { + #define isnanf(X) isnan(X) + #endif + +-/* Linux (and presumably Hurd too as Linux is GNU libc based) */ +-/* Sorry I haven't confirmed this cpp symbol yet */ +-#if defined(linux) +-#define isnanf(X) __isnanf(X) +-#endif +- + /* OS/2 with gcc EMX */ + #if defined(__EMX__) + #define isnanf(X) isnan(X) diff --git a/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch b/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch new file mode 100644 index 000000000000..4242700e6c2d --- /dev/null +++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-warnings.patch @@ -0,0 +1,35 @@ +https://github.com/festvox/speech_tools/commit/4b677d6f3bc560248da369a86d5f2ec17c116da5 +(Just the strict aliasing hunk.) + +From 4b677d6f3bc560248da369a86d5f2ec17c116da5 Mon Sep 17 00:00:00 2001 +From: Sergio Oller <sergioller@gmail.com> +Date: Sat, 29 Aug 2020 19:14:47 +0200 +Subject: [PATCH] Compile with gcc-9 without warnings (-Wall) + +--- a/speech_class/esps_utils.cc ++++ b/speech_class/esps_utils.cc +@@ -1050,7 +1050,7 @@ enum EST_read_status read_esps_hdr(esps_hdr *uhdr,FILE *fd) + hdr->field_name[0] = wstrdup("samples"); + fseek(fd,hdr->hdr_size,SEEK_SET); + /* In this cases its just in the header as a float */ +- sd_sample_rate = *((float *)(void *)&fhdr.fil4[0]); ++ memcpy(&sd_sample_rate, &fhdr.fil4[0], sizeof(float)); + add_fea_d(hdr,"record_freq",0,(double)sd_sample_rate); + *uhdr = hdr; + return format_ok; +@@ -1215,11 +1215,13 @@ enum EST_write_status write_esps_hdr(esps_hdr hdr,FILE *fd) + fhdr.thirteen = 13; /* must be for luck */ + fhdr.sdr_size = 0; + fhdr.magic = ESPS_MAGIC; +- strncpy(fhdr.date,ctime(&tx),26); ++ strncpy(fhdr.date,ctime(&tx),25); ++ fhdr.date[25] = 0; + sprintf(fhdr.version,"1.91"); /* that's what all the others have */ + sprintf(fhdr.prog,"EDST"); + sprintf(fhdr.vers,"0.1"); +- strncpy(fhdr.progcompdate,ctime(&tx),26); ++ strncpy(fhdr.progcompdate,ctime(&tx),25); ++ fhdr.progcompdate[25] = 0; + fhdr.num_samples = hdr->num_records; + fhdr.filler = 0; + /* in each record */ diff --git a/app-accessibility/speech-tools/metadata.xml b/app-accessibility/speech-tools/metadata.xml index 587a705d02c9..904973efe33a 100644 --- a/app-accessibility/speech-tools/metadata.xml +++ b/app-accessibility/speech-tools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> @@ -9,8 +9,4 @@ <email>sound@gentoo.org</email> <name>Gentoo Sound project</name> </maintainer> -<maintainer type="person"> - <email>bircoph@gentoo.org</email> - <name>Andrew Savchenko</name> -</maintainer> </pkgmetadata> diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild deleted file mode 100644 index 4a54649722d2..000000000000 --- a/app-accessibility/speech-tools/speech-tools-2.1-r4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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" -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:0= -" -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 -} diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild new file mode 100644 index 000000000000..90155ff033cd --- /dev/null +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +MY_P=${P/speech-/speech_} +PATCHSET="r3" + +DESCRIPTION="Speech tools for Festival Text to Speech engine" +HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/" +SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz + https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz" +S="${WORKDIR}/speech_tools" + +LICENSE="FESTIVAL HPND BSD rc regexp-UofT" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +IUSE="nas openmp X" + +RDEPEND=" + media-libs/alsa-lib + sys-libs/ncurses:= + nas? ( media-libs/nas ) + X? ( + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( README.md lib/cstrutt.dtd lib/example_data ) + +PATCHES=( + "${WORKDIR}/patch/02_all_gcc42.patch" + "${WORKDIR}/patch/03_all_GentooLinux.patch" + "${WORKDIR}/patch/05_all_sharedlib.patch" + "${WORKDIR}/patch/06_all_gcc43-include.patch" + "${WORKDIR}/patch/09_all_remove-shared-refs.patch" + "${WORKDIR}/patch/10_all_base_class.patch" + "${WORKDIR}/patch/81_all_etcpath.patch" + "${WORKDIR}/patch/91_all_gentoo-config.patch" + "${WORKDIR}/patch/92_all_ldflags_fix.patch" + "${WORKDIR}/patch/94_all_ncurses_tinfo.patch" + + # Fix underlinking, bug #493204 + "${FILESDIR}/${PN}-2.1-underlinking.patch" + "${FILESDIR}/${PN}-2.5.0-fno-common.patch" + "${FILESDIR}/${PN}-2.5.0-drop-curses.patch" + "${FILESDIR}/${P}-warnings.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + sed -i -e '/^CXXFLAGS =/s|CC_OTHER_FLAGS|CXX_OTHER_FLAGS|' \ + config/compilers/gcc_defaults.mak || die + + sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ + main/siod_main.cc || die + + # bug #309983 + sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ + "${S}"/config/systems/sparc_SunOS5.mak || die + + sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \ + -e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \ + -e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \ + config/compilers/gcc_defaults.mak || die + + eautoreconf +} + +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() { + # Lacks prototypes, bug #881863 + append-cflags -std=gnu89 + # Uses 'register' keyword removed in C++17, bug #894184 + append-cxxflags -std=c++14 + + emake -j1 \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + CC_OTHER_FLAGS="${CFLAGS}" \ + CXX_OTHER_FLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + default + + dolib.so lib/libest*.so* + + insinto /usr/share/speech-tools + doins -r config base_class + + insinto /usr/share/speech-tools/lib + doins -r lib/siod + + mv include speech-tools || die + doheader -r speech-tools + dosym ../../include/speech-tools /usr/share/speech-tools/include + + for file in bin/*; do + [ "${file}" = "bin/Makefile" ] && continue + dobin ${file} + dstfile="${ED}/usr/${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 + + exeinto /usr/$(get_libdir)/speech-tools + for file in `find main -perm /111 -type f`; do + doexe ${file} + done + + # Remove bcat (only useful for testing on windows, see bug #418301). + rm "${ED}/usr/bin/bcat" || die + rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die +} diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild new file mode 100644 index 000000000000..76971ff3cc3e --- /dev/null +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +MY_P=${P/speech-/speech_} +PATCHSET="r3" + +DESCRIPTION="Speech tools for Festival Text to Speech engine" +HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/" +SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz + https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz" +S="${WORKDIR}/speech_tools" + +LICENSE="FESTIVAL HPND BSD rc regexp-UofT" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86" +IUSE="nas openmp X" + +RDEPEND=" + media-libs/alsa-lib + sys-libs/ncurses:= + nas? ( media-libs/nas ) + X? ( + x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( README.md lib/cstrutt.dtd lib/example_data ) + +PATCHES=( + "${WORKDIR}/patch/02_all_gcc42.patch" + "${WORKDIR}/patch/03_all_GentooLinux.patch" + "${WORKDIR}/patch/05_all_sharedlib.patch" + "${WORKDIR}/patch/06_all_gcc43-include.patch" + "${WORKDIR}/patch/09_all_remove-shared-refs.patch" + "${WORKDIR}/patch/10_all_base_class.patch" + "${WORKDIR}/patch/81_all_etcpath.patch" + "${WORKDIR}/patch/91_all_gentoo-config.patch" + "${WORKDIR}/patch/92_all_ldflags_fix.patch" + "${WORKDIR}/patch/94_all_ncurses_tinfo.patch" + + # Fix underlinking, bug #493204 + "${FILESDIR}/${PN}-2.1-underlinking.patch" + "${FILESDIR}/${PN}-2.5.0-fno-common.patch" + "${FILESDIR}/${PN}-2.5.0-drop-curses.patch" + "${FILESDIR}/${P}-warnings.patch" + "${FILESDIR}/${P}-musl-isnan.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + sed -i -e '/^CXXFLAGS =/s|CC_OTHER_FLAGS|CXX_OTHER_FLAGS|' \ + config/compilers/gcc_defaults.mak || die + + sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \ + main/siod_main.cc || die + + # bug #309983 + sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \ + "${S}"/config/systems/sparc_SunOS5.mak || die + + sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \ + -e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \ + -e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \ + config/compilers/gcc_defaults.mak || die + + eautoreconf +} + +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() { + # Lacks prototypes, bug #881863 + append-cflags -std=gnu89 + # Uses 'register' keyword removed in C++17, bug #894184 + append-cxxflags -std=c++14 + + emake -j1 \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + CC_OTHER_FLAGS="${CFLAGS}" \ + CXX_OTHER_FLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + default + + dolib.so lib/libest*.so* + + insinto /usr/share/speech-tools + doins -r config base_class + + insinto /usr/share/speech-tools/lib + doins -r lib/siod + + mv include speech-tools || die + doheader -r speech-tools + dosym ../../include/speech-tools /usr/share/speech-tools/include + + for file in bin/*; do + [ "${file}" = "bin/Makefile" ] && continue + dobin ${file} + dstfile="${ED}/usr/${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 + + exeinto /usr/$(get_libdir)/speech-tools + for file in `find main -perm /111 -type f`; do + doexe ${file} + done + + # Remove bcat (only useful for testing on windows, see bug #418301). + rm "${ED}/usr/bin/bcat" || die + rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die +} diff --git a/app-accessibility/speechd-el/Manifest b/app-accessibility/speechd-el/Manifest index 693febb323e3..13621cecb66c 100644 --- a/app-accessibility/speechd-el/Manifest +++ b/app-accessibility/speechd-el/Manifest @@ -1 +1,2 @@ -DIST speechd-el-2.5.tar.gz 183278 BLAKE2B 7ed220a742642d1d22a25ad247e7184183099e93cee37dc0309346d7ad41bd7d2a54e15bae49366af8b31925bfdac43173042ddb4a0851970ac0eaee07461977 SHA512 b4e5d00d3a86be9c42172ab48c5b0c0f5f25817cb542302f04e29f594422247e4b008428dfaaa1bb2e208a71f126b9c86d25186974606bf5764212a0d6a1a09f +DIST speechd-el-2.11.tar.gz 144000 BLAKE2B ab87885b9b0873a4f00f8a960d9a4c10321a88e1edd402bc92a45dd2fc631be2a17398d0995c4c9e8c88221727739c27b506cab9cafb3a9635193bd5b9b83a3a SHA512 fc6be9f9c6dbf34be559be3ceb38ecca0e94ed7230a8e738f3bdad4153e7443cdf72f34a229c6cb119cab627bc4cfcee0542817715d980e01ed2c776c23b1b6e +DIST speechd-el-2.8.tar.gz 474614 BLAKE2B 36ac862c2f14b3f9b5be25bf666c466093f8e5bf3d456058d73a4eef0cc766d9b36ce990d8a3ee8161edb4190637a199853ac77eaedc28afd101ebd95842c47f SHA512 1a34e433d5ae61c83dfb7d3a9f26e25210613355f3a71e7601f15865cd9693db81dd9f559aef41bd3142d25702db88006bb9fd2053b597799f1b68c48911a3d2 diff --git a/app-accessibility/speechd-el/files/50speechd-el-gentoo.el b/app-accessibility/speechd-el/files/50speechd-el-gentoo.el new file mode 100644 index 000000000000..d2614768a3cb --- /dev/null +++ b/app-accessibility/speechd-el/files/50speechd-el-gentoo.el @@ -0,0 +1,5 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'speechd-speak "speechd-speak" + "Start or restart speaking." t) +(autoload 'speechd-speak-mode "speechd-speak" + "Toggle speaking, the speechd-speak mode." t) diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml index 298ece6d7d62..690f1a3301a3 100644 --- a/app-accessibility/speechd-el/metadata.xml +++ b/app-accessibility/speechd-el/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> -<email>williamh@gentoo.org</email> + <email>williamh@gentoo.org</email> </maintainer> <maintainer type="project"> <email>accessibility@gentoo.org</email> @@ -12,7 +12,7 @@ <email>gnu-emacs@gentoo.org</email> <name>Gentoo GNU Emacs project</name> </maintainer> -<use> - <flag name="brltty">brltty support</flag> -</use> +<upstream> + <remote-id type="github">brailcom/speechd-el</remote-id> +</upstream> </pkgmetadata> diff --git a/app-accessibility/speechd-el/speechd-el-2.11.ebuild b/app-accessibility/speechd-el/speechd-el-2.11.ebuild new file mode 100644 index 000000000000..e183044a9320 --- /dev/null +++ b/app-accessibility/speechd-el/speechd-el-2.11.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature readme.gentoo-r1 elisp + +DESCRIPTION="Emacs speech support" +HOMEPAGE="https://www.freebsoft.org/speechd-el + https://github.com/brailcom/speechd-el" +SRC_URI="https://github.com/brailcom/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ppc x86" + +RDEPEND=">=app-accessibility/speech-dispatcher-0.7" + +DOC_CONTENTS="To get Emacs to speak execute: +M-x speechd-speak RET + +or add following to your initialization file (~/.emacs): +(speechd-speak)" +DISABLE_AUTOFORMATTING=YES + +SITEFILE="50${PN}-gentoo.el" + +src_compile() { + emake +} + +src_install() { + elisp_src_install + + dobin speechd-log-extractor + dodoc ANNOUNCE NEWS README speechd-speak.pdf + doinfo ${PN}.info +} + +pkg_postinst() { + elisp_pkg_postinst + + optfeature "braille support" "app-accessibility/brltty" +} diff --git a/app-accessibility/speechd-el/speechd-el-2.5.ebuild b/app-accessibility/speechd-el/speechd-el-2.8.ebuild index f01f6acc0a06..827b384d6a98 100644 --- a/app-accessibility/speechd-el/speechd-el-2.5.ebuild +++ b/app-accessibility/speechd-el/speechd-el-2.8.ebuild @@ -1,22 +1,19 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 inherit elisp DESCRIPTION="Emacs speech support" -HOMEPAGE="http://www.freebsoft.org/speechd-el" -SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz" +HOMEPAGE="https://www.freebsoft.org/speechd-el" +SRC_URI="https://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="brltty" -DEPEND="" -RDEPEND=">=app-accessibility/speech-dispatcher-0.7 - brltty? ( app-accessibility/brltty )" +RDEPEND=">=app-accessibility/speech-dispatcher-0.7" src_compile() { emake @@ -38,4 +35,7 @@ pkg_postinst() { elog elog "(autoload 'speechd-speak \"speechd-speak\" nil t)" elog '(speechd-speak)' + elog + elog "Also, if you nead braille support, you will need to install" + elog "app-accessibility/brltty" } diff --git a/app-accessibility/sphinx2/metadata.xml b/app-accessibility/sphinx2/metadata.xml index 5272aff94276..e0004c64f733 100644 --- a/app-accessibility/sphinx2/metadata.xml +++ b/app-accessibility/sphinx2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> diff --git a/app-accessibility/sphinx2/sphinx2-0.6.ebuild b/app-accessibility/sphinx2/sphinx2-0.6-r1.ebuild index 5a6921cdfb18..62369fd89d98 100644 --- a/app-accessibility/sphinx2/sphinx2-0.6.ebuild +++ b/app-accessibility/sphinx2/sphinx2-0.6-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools @@ -10,13 +10,16 @@ MY_P=${P/_/} DESCRIPTION="CMU Speech Recognition-engine" HOMEPAGE="https://cmusphinx.github.io" SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="static-libs" -S=${WORKDIR}/${MY_P} +DOCS=( AUTHORS ChangeLog README NEWS + doc/{README.{bin,lib},SCHMM_format,filler.dict,phoneset{,-old}} ) +HTML_DOCS=( doc/{phoneset_s2,sphinx2}.html ) + PATCHES=( "${FILESDIR}"/${P}-as-needed.patch ) src_prepare() { @@ -25,16 +28,9 @@ src_prepare() { eautoreconf } -src_configure() { - econf $(use_enable static-libs static) -} - src_install() { - HTML_DOCS=( doc/{phoneset_s2,sphinx2}.html ) default - dodoc doc/{README.{bin,lib},SCHMM_format,filler.dict,phoneset{,-old}} - if ! use static-libs; then - find "${D}" -name '*.la' -delete || die - fi + rm -r "${ED}/usr/share/${PN}/doc" || die + find "${ED}" -name '*.la' -delete || die } diff --git a/app-accessibility/sphinx3/Manifest b/app-accessibility/sphinx3/Manifest deleted file mode 100644 index 8740e318829a..000000000000 --- a/app-accessibility/sphinx3/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sphinx3-0.8.tar.gz 25226326 BLAKE2B 0eb2c6474ec32ef1aed277816b0b596ba561c1705b389b19de7dfd969212bc24e5eec0a920aaeb15ed3a90f464552b4e24e964b94380dc292a9299b4651793bc SHA512 85b8e574e2f92a758c8c56ef11b873c49ef8a376e964f30a12d75850d4a0db56e3108eaea25fa5587675ef2ffa4531a13f0f182a85cc8e434c6bcee42058e050 diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch b/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch deleted file mode 100644 index 0f7733154a53..000000000000 --- a/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index b7b71d974413..000000000000 --- a/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -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/sphinx3-0.8-r1.ebuild b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild deleted file mode 100644 index 42f44dfce588..000000000000 --- a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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 -} diff --git a/app-accessibility/sphinxbase/Manifest b/app-accessibility/sphinxbase/Manifest deleted file mode 100644 index fc2a99658ebe..000000000000 --- a/app-accessibility/sphinxbase/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sphinxbase-0.8.tar.gz 3313197 BLAKE2B ec2dcd232194d32d851924099ffb64fa9da6bdccb973fe1311d2b4b0506073cfd35b548ba8d8f64c2ee757f3b5ba87ae23c95d0f67c95be1110b7e2a995c9be2 SHA512 fdb13c07e591e868c395d5f8209ec389fb9d5a93d99104a00cb82382e84d320091ae7e74d53225706331d4959ab5e248fa622582a148bfdb6ab5c38470d1963c diff --git a/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch b/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch deleted file mode 100644 index 11031918ee68..000000000000 --- a/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur sphinxbase-0.8/test/regression/Makefile.am sphinxbase-0.8.new/test/regression/Makefile.am ---- sphinxbase-0.8/test/regression/Makefile.am 2012-12-05 06:05:39.000000000 -0800 -+++ sphinxbase-0.8.new/test/regression/Makefile.am 2013-10-08 13:05:15.498853962 -0700 -@@ -33,9 +33,19 @@ - - # Disable sphinx_fe tests for now if fixed-point due to imprecision - if FIXED_POINT --TESTS = $(srcdir)/test-cepview.sh $(srcdir)/test-sphinx_pitch.sh -+TESTS = test-cepview.sh test-sphinx_pitch.sh - else --TESTS = $(srcdir)/test-*.sh -+TESTS = \ -+ test-cepview.sh \ -+ test-sphinx_fe-ctl.sh \ -+ test-sphinx_fe-dct.sh \ -+ test-sphinx_fe-dither-seed.sh \ -+ test-sphinx_fe-logspec2cep.sh \ -+ test-sphinx_fe-logspec.sh \ -+ test-sphinx_fe.sh \ -+ test-sphinx_fe-smoothspec.sh \ -+ test-sphinx_jsgf2fsg.sh \ -+ test-sphinx_pitch.sh - endif - - EXTRA_DIST += $(TESTS) diff --git a/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch b/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch deleted file mode 100644 index 70beae05de7e..000000000000 --- a/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch +++ /dev/null @@ -1,85 +0,0 @@ - configure.in | 40 +++++++++++++++++++++------------------- - src/libsphinxbase/Makefile.am | 1 + - 2 files changed, 22 insertions(+), 19 deletions(-) - -diff --git a/configure.in b/configure.in -index e10629c..b5d6ea9 100644 ---- a/configure.in -+++ b/configure.in -@@ -62,13 +62,15 @@ if test x$withval = xno; then - use_lapack=false - fi - ]) --if test x$use_lapack = xtrue; then -- AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true) -- if test x$use_internal_lapack != xtrue; then -- AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true) -- fi -+AS_IF([test "x$with_lapack" = "xyes"], [ -+ PKG_CHECK_MODULES([LAPACK], [lapack],, -+ AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true)) -+ AS_IF([test "x$use_internal_lapack" != "xtrue"], [ -+ PKG_CHECK_MODULES([BLAS], [blas],, -+ AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true)) -+ ]) - AC_DEFINE(WITH_LAPACK, [], [Enable matrix algebra with LAPACK]) --fi -+]) - AM_CONDITIONAL(LAPACK_LITE, test x$use_internal_lapack = xtrue) - AM_CONDITIONAL(USE_LAPACK, test x$use_lapack = xtrue) - -@@ -208,9 +210,15 @@ AM_PROG_LIBTOOL - dnl - dnl Check for Doxygen, and build dox if present - dnl --AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no) -+AC_ARG_ENABLE([doc], -+ AS_HELP_STRING([--enable-doc], [Build docs using doxygen])) -+AS_IF([test "x$enable_doc" = "xyes"], [ -+ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no) -+ AS_IF([test "x$HAVE_DOXYGEN" != "xyes"], [ -+ AC_MSG_ERROR([--enable-doc given, but doxygen not found.]); exit 1 -+ ]) -+]) - AM_CONDITIONAL(BUILD_DOXYGEN, test "x$HAVE_DOXYGEN" = "xyes") -- - dnl - dnl Check for Python, and build python module if present - dnl -@@ -260,19 +268,13 @@ fi - AM_CONDITIONAL(BUILD_CYTHON, test "x$HAVE_CYTHON" = "xyes") - - dnl --dnl Check for pkgconfig --dnl --AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) -- --dnl - dnl Check for libsndfile - dnl --if test "x$HAVE_PKGCONFIG" = "xyes"; then -- PKG_CHECK_MODULES(SNDFILE,sndfile,,true) -- AC_CHECK_HEADERS([sndfile.h]) -- PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true) -- AC_CHECK_HEADERS([samplerate.h]) --fi -+PKG_CHECK_MODULES(SNDFILE,sndfile,,true) -+AC_CHECK_HEADERS([sndfile.h]) -+PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true) -+AC_CHECK_HEADERS([samplerate.h]) -+ - AC_SUBST(SNDFILE_LIBS) - AC_SUBST(SNDFILE_CFLAGS) - AC_SUBST(SAMPLERATE_LIBS) -diff --git a/src/libsphinxbase/Makefile.am b/src/libsphinxbase/Makefile.am -index 52ee3e1..f4efd8a 100644 ---- a/src/libsphinxbase/Makefile.am -+++ b/src/libsphinxbase/Makefile.am -@@ -8,6 +8,7 @@ libsphinxbase_la_SOURCES = - # This is API version 2, software release 1, which also supports API version 1 - libsphinxbase_la_LDFLAGS = -version-info 2:1:1 - libsphinxbase_la_LIBADD = $(LTLIBICONV) \ -+ @LAPACK_LIBS@ \ - util/libsphinxutil.la \ - fe/libsphinxfe.la \ - feat/libsphinxfeat.la \ diff --git a/app-accessibility/sphinxbase/metadata.xml b/app-accessibility/sphinxbase/metadata.xml deleted file mode 100644 index c381beacd5fe..000000000000 --- a/app-accessibility/sphinxbase/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?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/sphinxbase/sphinxbase-0.8.ebuild b/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild deleted file mode 100644 index b52de17feda6..000000000000 --- a/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils distutils-r1 - -DESCRIPTION="Support library required by the Sphinx Speech Recognition Engine" -HOMEPAGE="http://cmusphinx.sourceforge.net/" -SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz" - -LICENSE="BSD-2 HPND MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc lapack python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# automagic dep on pulseaudio -RDEPEND=" - media-sound/pulseaudio - lapack? ( virtual/lapack ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - doc? ( >=app-doc/doxygen-1.4.7 )" - -# Due to generated Python setup.py. -AUTOTOOLS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-unbundle-lapack.patch - "${FILESDIR}"/${P}-automake113.patch -) - -src_configure() { - local myeconfargs=( - $(use_with lapack) - $(use_enable doc) - # python modules are built through distutils - # so disable the ugly wrapper - --without-python - ) - autotools-utils_src_configure -} - -run_distutils() { - if use python; then - pushd python > /dev/null || die - distutils-r1_"${@}" - popd > /dev/null || die - fi -} - -src_compile() { - autotools-utils_src_compile - - run_distutils ${FUNCNAME} -} - -python_test() { - LD_LIBRARY_PATH="${S}"/src/lib${PN}/.libs \ - "${PYTHON}" sb_test.py || die "Tests fail with ${EPYTHON}" -} - -src_test() { - autotools-utils_src_test - - run_distutils ${FUNCNAME} -} - -src_install() { - run_distutils ${FUNCNAME} - - use doc && local HTML_DOCS=( doc/html/. ) - autotools-utils_src_install -} diff --git a/app-accessibility/yasr/metadata.xml b/app-accessibility/yasr/metadata.xml index 57bad5623af8..f1c1da923413 100644 --- a/app-accessibility/yasr/metadata.xml +++ b/app-accessibility/yasr/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>accessibility@gentoo.org</email> diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild index b9e8c1573d6e..9730215c65cd 100644 --- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild +++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -11,11 +11,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~riscv x86" IUSE="nls" -RDEPEND="" -DEPEND="nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext )" PATCHES=( "${FILESDIR}"/${PN}-0.6.9-automake113.patch @@ -26,8 +25,12 @@ PATCHES=( src_prepare() { default - local x=/usr/share/gettext/po/Makefile.in.in - [[ -e $x ]] && cp -f $x po/ || die #330879 + + if use nls ; then + local x="${BROOT}"/usr/share/gettext/po/Makefile.in.in + # bug 330879 + [[ -e $x ]] && cp -f $x po/ || die + fi rm -r "${S}"/m4 || die @@ -50,5 +53,5 @@ src_configure() { pkg_postinst() { elog elog "Speech-dispatcher is configured as the default synthesizer for yasr." - elog "If this is not what you want, edit /etc/yasr/yasr.conf." + elog "If this is not what you want, edit ${EROOT}/etc/yasr/yasr.conf." } |