diff options
Diffstat (limited to 'app-accessibility')
41 files changed, 172 insertions, 1511 deletions
diff --git a/app-accessibility/accerciser/accerciser-3.40.0.ebuild b/app-accessibility/accerciser/accerciser-3.40.0.ebuild index 803f1ccca367..376e8ee4db01 100644 --- a/app-accessibility/accerciser/accerciser-3.40.0.ebuild +++ b/app-accessibility/accerciser/accerciser-3.40.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" inherit gnome2 python-single-r1 diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest deleted file mode 100644 index 27483b5554c1..000000000000 --- a/app-accessibility/at-spi2-atk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST at-spi2-atk-2.38.0.tar.xz 97464 BLAKE2B c5a62bd157ac6dcbf19495eb8f92bd6346651b8df64e15acf4d25c1ab35790f154bead1e012714da36c700e58e164527755137a33812f3a1844aa34f0293ebf5 SHA512 2f40ecbc55b0fbaa57ade952a75583bc8fbfde234cce9248489e9ae06e0597d98c2f4c77d8279758dec29da97e06cde5708d30a1238d91bebd023b2320f38528 diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild deleted file mode 100644 index 9049aca81d4b..000000000000 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org meson-multilib 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-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.36.0[${MULTILIB_USEDEP}] - >=app-accessibility/at-spi2-core-2.33.2[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND=" - gnome-base/gsettings-desktop-schemas - virtual/pkgconfig - test? ( >=dev-libs/libxml2-2.9.1 ) -" - -multilib_src_configure() { - local emesonargs=( - $(meson_use test tests) - ) - meson_src_configure -} - -multilib_src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest index b9d0169a190c..48830e5b2039 100644 --- a/app-accessibility/at-spi2-core/Manifest +++ b/app-accessibility/at-spi2-core/Manifest @@ -1,2 +1 @@ -DIST at-spi2-core-2.44.1.tar.xz 209780 BLAKE2B e76f0b0c478564181db774633dfc9613bdfa6c74c5c52878d877723e37605b7b7169fee45a9025b331e84bf5af8132eed50b388db9ac1aee0fec7776a633628a SHA512 8d85df75f886c4a19d829d14e5a9412b607b9cbe2d1b7ecb95b4082602f0624e90747fe955f96d378c3a52bc0e732074b97008bb34e6acc2722c7056b2c0504e DIST at-spi2-core-2.46.0.tar.xz 540600 BLAKE2B e3ed9915c39a9f71b64a9753c7f91208d15289fe09a9505b4766df7fa04c3e6e5cdc7b3702315eabbdf70f9fc08b4cca4546353485328ab101e2950a672885d6 SHA512 633af2c02fab3b8cb02e37f929ce80dd5ce28ca5641046ef5e25cb29299530b90028e6c6f318a0c098a4270bed3eab48fb55d6967a76bfadd2520f49de47c770 diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild deleted file mode 100644 index 3d5837a0a1d6..000000000000 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -IUSE="X gtk-doc +introspection" -REQUIRED_USE="gtk-doc? ( X )" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -RDEPEND=" - >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.67.4: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/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)" - $(meson_native_use_bool gtk-doc docs) - -Dintrospection=$(multilib_native_usex introspection) - -Dx11=$(usex X) - ) - meson_src_configure -} - -multilib_src_test() { - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} 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/brltty/Manifest b/app-accessibility/brltty/Manifest index 447bf8b37e8f..aa6a15780e20 100644 --- a/app-accessibility/brltty/Manifest +++ b/app-accessibility/brltty/Manifest @@ -1,3 +1 @@ -DIST brltty-6.1.tar.xz 3394852 BLAKE2B 03e6358721dcd5c3bdee3301a1ed827a690128ec339669543279c7e9a115bef6c5d8630e4af2d0b214b9c7c3eaa9001ab4c54ae7fb899cb3bc675985f51d6933 SHA512 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf -DIST brltty-6.4.tar.xz 3669296 BLAKE2B 2824b212c7e4fea0f65c7ae111432071805aa63117a7e9a9932d7720ef2157f1e6fd33e3e91e4515c7131bd066db8f910969fb186d2007b63bc83efcbe2332b1 SHA512 384848d05f78732952079d6f5170046927fcb35f400ece71ca897415a793c0aa1047934f8cd5e9e781536fb0b7cb71273283f3bba21e59f082ba8f6f2416352e DIST brltty-6.5.tar.xz 3631628 BLAKE2B b2e5f82f15dff9a99bf3d75523f6ec48d531d413d860079af0023b9efdc07a93563226c6388cc89ce025f8d13b1635e883680f0ddb8a688ffcc4cd9c335d7aee SHA512 bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f70555596f4d9d35cd05616af2a8e101d4d56b4c471a6ad3 diff --git a/app-accessibility/brltty/brltty-6.1-r1.ebuild b/app-accessibility/brltty/brltty-6.1-r1.ebuild deleted file mode 100644 index ca9620c7607c..000000000000 --- a/app-accessibility/brltty/brltty-6.1-r1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -FINDLIB_USE="ocaml" -JAVA_PKG_WANT_SOURCE="1.8" -JAVA_PKG_WANT_TARGET="1.8" - -inherit findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript \ - autotools udev systemd python-r1 tmpfiles - -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 arm64 ~ia64 ppc ppc64 ~riscv x86" -IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu - java louis +midi ncurses nls ocaml +pcm policykit python - usb systemd +speech tcl xml X" -REQUIRED_USE="doc? ( api ) - java? ( api ) - ocaml? ( api ) - python? ( api ${PYTHON_REQUIRED_USE} ) - tcl? ( api )" - -DEPEND=" - app-accessibility/at-spi2-core:2 - dev-libs/libpcre2[pcre32] - sys-apps/dbus - bluetooth? ( net-wireless/bluez ) - gpm? ( >=sys-libs/gpm-1.20 ) - iconv? ( virtual/libiconv ) - icu? ( dev-libs/icu:= ) - louis? ( dev-libs/liblouis:= ) - midi? ( media-libs/alsa-lib ) - ncurses? ( sys-libs/ncurses:0= ) - pcm? ( media-libs/alsa-lib ) - policykit? ( sys-auth/polkit ) - python? ( ${PYTHON_DEPS} ) - speech? ( - app-accessibility/espeak - app-accessibility/flite - app-accessibility/speech-dispatcher - ) - systemd? ( sys-apps/systemd ) - tcl? ( >=dev-lang/tcl-8.4.15:0= ) - usb? ( virtual/libusb:0 ) - xml? ( dev-libs/expat ) - X? ( - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXfixes - x11-libs/libXt - x11-libs/libXtst - )" -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.8:* ) -" -BDEPEND=" - virtual/pkgconfig - java? ( >=virtual/jdk-1.8:* ) - nls? ( virtual/libintl ) - python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] ) -" - -HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.0-udev.patch - "${FILESDIR}"/${PN}-5.2-respect-AR.patch -) - -src_prepare() { - default - - java-pkg-opt-2_src_prepare - - # We run eautoconf instead of using eautoreconf because brltty uses - # a custom build system that uses autoconf without the rest of the - # autotools. - eautoconf - use python && python_copy_sources -} - -src_configure() { - tc-export AR LD PKG_CONFIG - - export JAVAC="" - export JAVA_JNI_FLAGS="" - if use java; then - export JAVA_HOME="$(java-config -g JAVA_HOME)" - export JAVAC_HOME="${JAVA_HOME}/bin" - export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)" - 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 - # 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 - --localstatedir="${EPREFIX}"/var - --disable-stripping - --with-writable-directory="${EPREFIX}"/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_enable louis liblouis) - $(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) - $(use_enable xml expat) - $(use_enable X x) - $(use_with bluetooth bluetooth-package) - $(use_with ncurses curses) - $(use_with usb usb-package) ) - - econf "${myconf[@]}" - - if use python; then - python_configure() { - econf "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure - fi -} - -src_compile() { - emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" - - 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 INSTALL_ROOT="${D}" OCAML_LDCONF= install - - if use python; then - python_install() { - cd "Bindings/Python" || die - emake INSTALL_ROOT="${D}" install - } - python_foreach_impl run_in_build_dir python_install - fi - - if use java; then - 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/rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - systemd_dounit Autostart/Systemd/brltty@.service - dotmpfiles "${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 - - 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 "${ED}/run/brltty" || die - rmdir "${ED}/run" || die -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - elog - elog "please be sure ${EROOT}/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.1.ebuild b/app-accessibility/brltty/brltty-6.1.ebuild deleted file mode 100644 index 648e42c44bc4..000000000000 --- a/app-accessibility/brltty/brltty-6.1.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -FINDLIB_USE="ocaml" -JAVA_PKG_WANT_SOURCE="1.8" -JAVA_PKG_WANT_TARGET="1.8" - -inherit findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript \ - autotools udev systemd python-r1 tmpfiles - -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 arm64 ~ia64 ppc ppc64 x86" -IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu - java louis +midi ncurses nls ocaml +pcm policykit python - usb systemd +speech tcl xml X" -REQUIRED_USE="doc? ( api ) - java? ( api ) - ocaml? ( api ) - python? ( api ${PYTHON_REQUIRED_USE} ) - tcl? ( api )" - -DEPEND=" - app-accessibility/at-spi2-core:2 - dev-libs/libpcre2[pcre32] - sys-apps/dbus - bluetooth? ( net-wireless/bluez ) - gpm? ( >=sys-libs/gpm-1.20 ) - iconv? ( virtual/libiconv ) - icu? ( dev-libs/icu:= ) - louis? ( dev-libs/liblouis:= ) - midi? ( media-libs/alsa-lib ) - ncurses? ( sys-libs/ncurses:0= ) - pcm? ( media-libs/alsa-lib ) - policykit? ( sys-auth/polkit ) - python? ( ${PYTHON_DEPS} ) - speech? ( - app-accessibility/espeak - app-accessibility/flite - app-accessibility/speech-dispatcher - ) - systemd? ( sys-apps/systemd ) - tcl? ( >=dev-lang/tcl-8.4.15:0= ) - usb? ( virtual/libusb:0 ) - xml? ( dev-libs/expat ) - X? ( - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXfixes - x11-libs/libXt - x11-libs/libXtst - )" -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.4 ) -" -BDEPEND=" - virtual/pkgconfig - java? ( >=virtual/jdk-1.4 ) - nls? ( virtual/libintl ) - python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] ) -" - -HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) - -PATCHES=( - "${FILESDIR}"/${PN}-6.0-udev.patch - "${FILESDIR}"/${PN}-5.2-respect-AR.patch -) - -src_prepare() { - default - - java-pkg-opt-2_src_prepare - - # We run eautoconf instead of using eautoreconf because brltty uses - # a custom build system that uses autoconf without the rest of the - # autotools. - eautoconf - use python && python_copy_sources -} - -src_configure() { - tc-export AR LD PKG_CONFIG - - export JAVAC="" - export JAVA_JNI_FLAGS="" - if use java; then - export JAVA_HOME="$(java-config -g JAVA_HOME)" - export JAVAC_HOME="${JAVA_HOME}/bin" - export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)" - 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 - # 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 - --localstatedir="${EPREFIX}"/var - --disable-stripping - --with-writable-directory="${EPREFIX}"/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_enable louis liblouis) - $(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) - $(use_enable xml expat) - $(use_enable X x) - $(use_with bluetooth bluetooth-package) - $(use_with ncurses curses) - $(use_with usb usb-package) ) - - econf "${myconf[@]}" - - if use python; then - python_configure() { - econf "${myconf[@]}" - } - python_foreach_impl run_in_build_dir python_configure - fi -} - -src_compile() { - emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" - - 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 INSTALL_ROOT="${D}" OCAML_LDCONF= install - - if use python; then - python_install() { - cd "Bindings/Python" || die - emake INSTALL_ROOT="${D}" install - } - python_foreach_impl run_in_build_dir python_install - fi - - if use java; then - 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/rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - systemd_dounit Autostart/Systemd/brltty@.service - dotmpfiles "${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 - - 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 "${ED}/run/brltty" || die - rmdir "${ED}/run" || die -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - elog - elog "please be sure ${EROOT}/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.4.ebuild b/app-accessibility/brltty/brltty-6.4.ebuild deleted file mode 100644 index 0eaf71123bbd..000000000000 --- a/app-accessibility/brltty/brltty-6.4.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) -FINDLIB_USE="ocaml" -JAVA_PKG_WANT_SOURCE="1.8" -JAVA_PKG_WANT_TARGET="1.8" - -inherit findlib toolchain-funcs java-pkg-opt-2 autotools systemd \ - python-r1 tmpfiles - -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="~amd64 ~arm ~arm64 ~ia64 ~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 ) - java? ( api ) - ocaml? ( api ) - python? ( api ${PYTHON_REQUIRED_USE} ) - tcl? ( api )" - -DEPEND=" - app-accessibility/at-spi2-core:2 - dev-libs/libpcre2[pcre32] - sys-apps/dbus - bluetooth? ( net-wireless/bluez ) - gpm? ( >=sys-libs/gpm-1.20 ) - iconv? ( virtual/libiconv ) - icu? ( dev-libs/icu:= ) - louis? ( dev-libs/liblouis:= ) - midi? ( media-libs/alsa-lib ) - ncurses? ( sys-libs/ncurses:0= ) - pcm? ( media-libs/alsa-lib ) - policykit? ( sys-auth/polkit ) - python? ( ${PYTHON_DEPS} ) - speech? ( - 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 ) - xml? ( dev-libs/expat ) - X? ( - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXfixes - x11-libs/libXt - x11-libs/libXtst - )" -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.8:* ) -" -BDEPEND=" - virtual/pkgconfig - java? ( >=virtual/jdk-1.8:* ) - nls? ( virtual/libintl ) - python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] ) -" - -HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) - -PATCHES=( - "${FILESDIR}"/${PN}-5.2-respect-AR.patch -) - -src_prepare() { - default - - java-pkg-opt-2_src_prepare - - # We run eautoconf instead of using eautoreconf because brltty uses - # a custom build system that uses autoconf without the rest of the - # autotools. - eautoconf - use python && python_copy_sources -} - -src_configure() { - tc-export AR LD PKG_CONFIG - - export JAVAC="" - export JAVA_JNI_FLAGS="" - if use java; then - export JAVA_HOME="$(java-config -g JAVA_HOME)" - export JAVAC_HOME="${JAVA_HOME}/bin" - export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)" - 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 - # 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 - --localstatedir="${EPREFIX}"/var - --disable-stripping - --with-writable-directory="${EPREFIX}"/run/brltty - $(use_enable api) - $(use_with beeper beep-package) - $(use_with fm fm-package) - $(use_enable gpm) - $(use_enable iconv) - $(use_enable icu) - $(use_enable java java-bindings) - $(use_enable louis liblouis) - $(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) - $(use_enable xml expat) - $(use_enable X x) - $(use_with bluetooth bluetooth-package) - $(use_with ncurses curses) - $(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[@]}" - } - python_foreach_impl run_in_build_dir python_configure - fi -} - -src_compile() { - emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" - - if use python; then - python_build() { - cd "Bindings/Python" || die - emake -j1 - } - python_foreach_impl run_in_build_dir python_build - fi -} - -src_install() { - if use ocaml; then - findlib_src_preinst - fi - - emake -j1 INSTALL_ROOT="${D}" OCAML_LDCONF= install - - if use python; then - python_install() { - cd "Bindings/Python" || die - emake -j1 INSTALL_ROOT="${D}" install - } - python_foreach_impl run_in_build_dir python_install - fi - - if use java; then - java-pkg_doso Bindings/Java/libbrlapi_java.so - java-pkg_dojar Bindings/Java/brlapi.jar - fi - - insinto /etc - doins Documents/brltty.conf - newinitd "${FILESDIR}"/brltty.rc brltty - systemd_dounit Autostart/Systemd/brltty@.service - dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" - - mv doc/Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die - mv doc/Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die - mv doc/Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die - dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO} BRLTTY-*.txt - if use doc; then - dodoc BrlAPI-*.txt - HTML_DOCS="doc/Manual-BRLTTY" einstalldocs - fi - - keepdir /var/lib/BrlAPI - rm -fr "${ED}/run" || die - find "${ED}" -name '*.a' -delete || die -} - -pkg_postinst() { - tmpfiles_process ${PN}.tmpfiles.conf - - elog - elog "please be sure ${EROOT}/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.4-r1.ebuild b/app-accessibility/brltty/brltty-6.5-r1.ebuild index 19adda670e69..8bb86f80887c 100644 --- a/app-accessibility/brltty/brltty-6.4-r1.ebuild +++ b/app-accessibility/brltty/brltty-6.5-r1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2022 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_{7..10} ) +PYTHON_COMPAT=( python3_{9..11} ) FINDLIB_USE="ocaml" JAVA_PKG_WANT_SOURCE="1.8" JAVA_PKG_WANT_TARGET="1.8" -inherit findlib toolchain-funcs java-pkg-opt-2 autotools systemd \ - python-r1 tmpfiles +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,7 +16,7 @@ SRC_URI="https://brltty.app/archive/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" +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" @@ -50,11 +49,11 @@ DEPEND=" 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 + app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw @@ -75,7 +74,7 @@ BDEPEND=" HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) PATCHES=( - "${FILESDIR}"/${P}-respect-AR.patch + "${FILESDIR}"/${PN}-6.4-respect-AR.patch ) src_prepare() { @@ -110,18 +109,24 @@ src_configure() { --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 --disable-stripping --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 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) @@ -187,14 +192,11 @@ src_install() { newinitd "${FILESDIR}"/brltty.initd brltty pushd Autostart/Systemd 1> /dev/null || die emake -j1 INSTALL_ROOT="${ED}" install - popd + popd || die pushd Autostart/Udev 1> /dev/null || die emake -j1 INSTALL_ROOT="${ED}" install - popd + popd || die - newdoc doc/Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt - newdoc doc/Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt - newdoc doc/Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO} if use doc; then HTML_DOCS="doc/Manual-BRLTTY" einstalldocs diff --git a/app-accessibility/brltty/brltty-6.5.ebuild b/app-accessibility/brltty/brltty-6.5.ebuild index f6f250a5b92b..211efd5c394f 100644 --- a/app-accessibility/brltty/brltty-6.5.ebuild +++ b/app-accessibility/brltty/brltty-6.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) FINDLIB_USE="ocaml" JAVA_PKG_WANT_SOURCE="1.8" JAVA_PKG_WANT_TARGET="1.8" @@ -53,7 +53,7 @@ DEPEND=" usb? ( virtual/libusb:1 ) xml? ( dev-libs/expat ) X? ( - app-accessibility/at-spi2-core:2 + app-accessibility/at-spi2-core:2 sys-apps/dbus x11-libs/libX11 x11-libs/libXaw @@ -192,10 +192,10 @@ src_install() { newinitd "${FILESDIR}"/brltty.initd brltty pushd Autostart/Systemd 1> /dev/null || die emake -j1 INSTALL_ROOT="${ED}" install - popd + popd || die pushd Autostart/Udev 1> /dev/null || die emake -j1 INSTALL_ROOT="${ED}" install - popd + popd || die dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO} if use doc; then diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch deleted file mode 100644 index c5698a2b9399..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Programs/Makefile.in -+++ b/Programs/Makefile.in -@@ -434,7 +434,7 @@ - [ ! -f lib.def ] || mv lib.def $(API_DEF) - - $(API_ARC): $(API_CLIENT_OBJECTS) -- ar rc $@ $(API_CLIENT_OBJECTS) -+ $(AR) rc $@ $(API_CLIENT_OBJECTS) - $(RANLIB) $@ - - brlapi_client.$O: 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.rc b/app-accessibility/brltty/files/brltty.rc deleted file mode 100644 index 100dd29b778a..000000000000 --- a/app-accessibility/brltty/files/brltty.rc +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -command=/bin/brltty -pidfile=/var/run/brltty.pid -command_args="-P ${pidfile} -q" - -depend() { - before * - after clock -} 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 80c6f6744309..cd468c588aa1 100644 --- a/app-accessibility/brltty/metadata.xml +++ b/app-accessibility/brltty/metadata.xml @@ -8,7 +8,6 @@ <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 translator <pkg>dev-libs/liblouis</pkg></flag> <flag name="midi">support the musical instrument digital interface</flag> diff --git a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild b/app-accessibility/caribou/caribou-0.4.21-r4.ebuild deleted file mode 100644 index 24394a7692dd..000000000000 --- a/app-accessibility/caribou/caribou-0.4.21-r4.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -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 ~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-r5.ebuild b/app-accessibility/caribou/caribou-0.4.21-r5.ebuild index 36e2ad773a6f..b4ffe1753fea 100644 --- a/app-accessibility/caribou/caribou-0.4.21-r5.ebuild +++ b/app-accessibility/caribou/caribou-0.4.21-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) PYTHON_REQ_USE="xml(+)" inherit autotools gnome.org gnome2-utils python-single-r1 vala diff --git a/app-accessibility/epos/epos-2.5.37-r3.ebuild b/app-accessibility/epos/epos-2.5.37-r3.ebuild index 81187ea939bf..5e37997d1ed0 100644 --- a/app-accessibility/epos/epos-2.5.37-r3.ebuild +++ b/app-accessibility/epos/epos-2.5.37-r3.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 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="" +RESTRICT="test" # needs running eposd -RESTRICT=test # needs running eposd - -DEPEND="dev-util/byacc" -RDEPEND="" +BDEPEND="dev-util/byacc" PATCHES=( "${FILESDIR}"/${PN}-2.5.37-gcc43.patch @@ -36,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/espeak/espeak-1.48.04-r1.ebuild b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild index 083d363b1b10..eebc2c473640 100644 --- a/app-accessibility/espeak/espeak-1.48.04-r1.ebuild +++ b/app-accessibility/espeak/espeak-1.48.04-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs MY_P="${P}-source" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" @@ -46,6 +46,9 @@ src_prepare() { } src_compile() { + # Uses removed 'register' keyword, bug #894180 + append-cxxflags -std=c++14 + emake \ PREFIX="${EPREFIX}/usr" \ CC="$(tc-getCC)" \ 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..7c859a5bb03e --- /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 56ef01e5a7cd8d8606b4ccd13b4366039269f9d7 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..275a3e8 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_%: % ++ ./$< + ++run_multi_thread: multi_thread ++ OMP_NUM_THREADS=100 ./$< diff --git a/app-accessibility/flite/flite-2.2.ebuild b/app-accessibility/flite/flite-2.2.ebuild index 0b4c34e70ff8..995b34efd8ea 100644 --- a/app-accessibility/flite/flite-2.2.ebuild +++ b/app-accessibility/flite/flite-2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -44,7 +44,9 @@ SRC_URI="https://github.com/festvox/flite/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD freetts public-domain regexp-UofT BSD-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" -IUSE="alsa oss pulseaudio voices" +IUSE="alsa oss pulseaudio test voices" +RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( alsa )" DEPEND=" pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) @@ -54,6 +56,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.4-audio-interface.patch + "${FILESDIR}"/${PN}-2.2-backport-pr30.patch ) get_audio() { @@ -68,6 +71,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 diff --git a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild index 4322b03c1b15..38b75456e0e4 100644 --- a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild +++ b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc examples source" inherit java-pkg-2 java-ant-2 DESCRIPTION="A speech synthesis system written entirely in Java" -HOMEPAGE="https://freetts.sourceforge.net/" +HOMEPAGE="https://freetts.sourceforge.io/" SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip" LICENSE="jsapi? ( sun-bcla-jsapi ) freetts" diff --git a/app-accessibility/kontrast/Manifest b/app-accessibility/kontrast/Manifest index bc460e178ce2..913652abca70 100644 --- a/app-accessibility/kontrast/Manifest +++ b/app-accessibility/kontrast/Manifest @@ -1,2 +1,2 @@ -DIST kontrast-22.04.3.tar.xz 125860 BLAKE2B 78b87ebfb0958ce7bf2abf7a70ada000f959aa2cd648ebaf70ffef5500458bf1f9c42433176caa1ac29ab5b0ed51452092c796f679d7c56e4188e2a746169a05 SHA512 e77b2b129f115d2cf319a2a5f6b56bc576c00c506b542cc6239098245da17b966a71caf05f0868af7d5f3807be033bfc552b9fd1856046889363d1012bf13efe DIST kontrast-22.08.3.tar.xz 128100 BLAKE2B c30380c716ace5f9d1987a9244350fb58592babc963d3b0bf312ca75e966fd9abe254898bd80b4f7bfdeb1d7bccc7424781ccdb0cd1b28784add6bf4edafe764 SHA512 18a1df4c888457f42c9a7273d6462479b8c44d87529b54868ea80c8fd8d9a8a20a96c25b9508a8cb4e93e94d6dd23d7251af1ca908d81a588002d1a29410d843 +DIST kontrast-22.12.3.tar.xz 201576 BLAKE2B 9a5e931e6654ba45952b5b1be1290643b45f7e9ac5de3ef540812d8a58348f770d24c3df5aaf491a3ba8dd83a2e1582d7b6d7f334f6212629c51b943f2f9acc6 SHA512 e60a60866d805c7d0934257892da4e4a8176d776c20a06fa50ae9931dc2b7e620d32ba076e10d5e8a3a0bd1b04ede48100b45bbf4d64c97f977bd320cb1a2396 diff --git a/app-accessibility/kontrast/kontrast-22.08.3.ebuild b/app-accessibility/kontrast/kontrast-22.08.3.ebuild index 9937c36c412f..93c573f2113c 100644 --- a/app-accessibility/kontrast/kontrast-22.08.3.ebuild +++ b/app-accessibility/kontrast/kontrast-22.08.3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/" LICENSE="GPL-3+" SLOT="5" -KEYWORDS="~amd64 arm64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~riscv x86" IUSE="" DEPEND=" diff --git a/app-accessibility/kontrast/kontrast-22.04.3.ebuild b/app-accessibility/kontrast/kontrast-22.12.3.ebuild index f81ac73ff101..19ba0c513d4a 100644 --- a/app-accessibility/kontrast/kontrast-22.04.3.ebuild +++ b/app-accessibility/kontrast/kontrast-22.12.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.92.0 -QTMIN=5.15.4 +KFMIN=5.101.0 +QTMIN=5.15.5 inherit ecm gear.kde.org DESCRIPTION="Tool to check contrast for colors to verify they are correctly accessible" @@ -12,7 +12,7 @@ HOMEPAGE="https://apps.kde.org/kontrast/" LICENSE="GPL-3+" SLOT="5" -KEYWORDS="amd64 arm64 ~riscv x86" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" IUSE="" DEPEND=" diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest index db9eb9f9fb97..bbf049a49f6d 100644 --- a/app-accessibility/orca/Manifest +++ b/app-accessibility/orca/Manifest @@ -1,2 +1 @@ -DIST orca-42.3.tar.xz 3707048 BLAKE2B b1a03cee97ba2ad17e32b863effba46974f86e5cbdcea72235085e369189e8e92cba8b83931fd83a7b859edfc8da9236f462e250c468ad1533768479eb25aad0 SHA512 59d9d61af2e385d8e356f825fc1733d73d136f89a3a06c352eaf1e7b05cd6ebf5bd13282afb478adb4ea7981398db0138324c3e275eb372b99ba648d9fafeab6 -DIST orca-43.0.tar.xz 3758480 BLAKE2B 05c31777c1c88452e165bd7fb6fe75fe727149f5337828b5f4e7679430ed5065a03de7074536c4433bedd81c3090c72e02a775db46f4673d6e3264a57732ad7a SHA512 20248e6065c1daa9c3d6ba37515bab60a3ceb14065b862d6d0610a7659bddc04f49a1cda7850646b45bb0afb5c2a89f1894de96f505831b11b77d332adb747d3 +DIST orca-43.1.tar.xz 3761604 BLAKE2B 924fce7c03abe51b46c406f9627f78a18700ad980adc52d9b522cecf73d07a978f4546fd3aec77ab92217627642928ba2ffb2ee73bb7a25163fb3610fa57cb9b SHA512 5d3ade5ae3c4f9b7ed8dfcabddbf7bcf5e2e15e731e0d9c1c69da692e9ce70d270aedcbfc8557a56ca0f2935b2c0c84e21fa4c6db64ec1c01c78dda7a429623f diff --git a/app-accessibility/orca/orca-42.3.ebuild b/app-accessibility/orca/orca-42.3.ebuild deleted file mode 100644 index 3e8ea706bcd3..000000000000 --- a/app-accessibility/orca/orca-42.3.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -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 ~riscv ~sparc x86" - -IUSE="+braille" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - >=app-accessibility/at-spi2-atk-2.34:2 - >=app-accessibility/at-spi2-core-2.36:2[introspection] - >=dev-libs/atk-2.36 - >=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} - dev-libs/atk[introspection] - $(python_gen_cond_dep ' - >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}] - >=dev-python/pyatspi-2.36[${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/orca/orca-43.0.ebuild b/app-accessibility/orca/orca-43.1.ebuild index 676403c2e47a..068d0153e6ca 100644 --- a/app-accessibility/orca/orca-43.0.ebuild +++ b/app-accessibility/orca/orca-43.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit gnome2 python-single-r1 @@ -11,15 +11,13 @@ 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 ~riscv ~sparc x86" +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-atk-2.34:2 - >=app-accessibility/at-spi2-core-2.36:2[introspection] - >=dev-libs/atk-2.36 + >=app-accessibility/at-spi2-core-2.46:2[introspection] >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] @@ -35,7 +33,6 @@ DEPEND="${PYTHON_DEPS} ) " RDEPEND="${DEPEND} - dev-libs/atk[introspection] $(python_gen_cond_dep ' >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}] >=dev-python/pyatspi-2.36[${PYTHON_USEDEP}] diff --git a/app-accessibility/powiedz/metadata.xml b/app-accessibility/powiedz/metadata.xml index c874fbabc777..d44f4d8244c5 100644 --- a/app-accessibility/powiedz/metadata.xml +++ b/app-accessibility/powiedz/metadata.xml @@ -5,7 +5,7 @@ <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/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild index 2582afeca261..294d6b7afb58 100644 --- a/app-accessibility/sound-icons/sound-icons-0.1.ebuild +++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild @@ -3,9 +3,9 @@ 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" diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest index 6fb24297eea4..6ddff1958c95 100644 --- a/app-accessibility/speech-dispatcher/Manifest +++ b/app-accessibility/speech-dispatcher/Manifest @@ -1,3 +1 @@ -DIST speech-dispatcher-0.11.2.tar.gz 7147526 BLAKE2B 6b11949736275d900e5e1d3909fab51fc04fbb45baf470a4c98aed19f61b7adb8cedf6b11f1a1aa69d9625383627beab4122c74ec78d9c07a5d0ddf4646669d6 SHA512 038ecaa5b9d56e3f915ec49fe7768cb4eebe1c8be79b95635f09fb3f6067e4c0ade13d2dd355e0b326579dcdf509dd180889b27282410b6bb252a2f642f028d4 -DIST speech-dispatcher-0.11.3.tar.gz 7150632 BLAKE2B 92bad589e453a243362a9e0142d2897b9651fa648012f2bd7ef00bc1ded389fd2c01b6f38f19002289357f7aa6361a6e7fa3ee35ec2ad7c044f34d87e7f2c409 SHA512 e9f5b862066c0292230fda32f16782f9a2d66e8d0c0e3aa0ccdb4628c1182661d2f40894f480ae5206af7fbbc49338189312afe02092f5d472095b053afd75c7 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.1-include-pthread_h.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch deleted file mode 100644 index 3575e2c54c99..000000000000 --- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch +++ /dev/null @@ -1,14 +0,0 @@ -This fixes pthread_mutex_t being undefined on musl libc. - -https://github.com/brailcom/speechd/commit/17e4038948f01e389cbd7fedbe3f0eb54ad3292d -https://bugs.gentoo.org/833347 ---- a/src/modules/module_main.h -+++ b/src/modules/module_main.h -@@ -31,6 +31,7 @@ - - #include <speechd_types.h> - #include <spd_audio.h> -+#include <pthread.h> - - #ifdef __cplusplus - extern "C" { diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch deleted file mode 100644 index f520fdc6adfb..000000000000 --- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch +++ /dev/null @@ -1,93 +0,0 @@ -https://github.com/brailcom/speechd/commit/db21e5fe4b3155734f60a67c8ab5da6b53174e1b -https://github.com/brailcom/speechd/pull/783 -https://bugs.gentoo.org/877339 - -From db21e5fe4b3155734f60a67c8ab5da6b53174e1b Mon Sep 17 00:00:00 2001 -From: Bernard Cafarelli <bernard.cafarelli@gmail.com> -Date: Mon, 17 Oct 2022 15:28:37 +0200 -Subject: [PATCH] Fix audio plugin loading with dlopen - -dlopen needs the full name including .so extension -Set SPD_AUDIO_PLUGIN_ENTRY to correct name (ltdl adds a prefix) ---- a/src/audio/alsa.c -+++ b/src/audio/alsa.c -@@ -37,7 +37,11 @@ - #include <alsa/asoundlib.h> - #include <alsa/pcm.h> - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_alsa_LTX_spd_audio_plugin_get -+#endif - #include <spd_audio_plugin.h> - - typedef struct { ---- a/src/audio/libao.c -+++ b/src/audio/libao.c -@@ -32,7 +32,11 @@ - #include <glib.h> - #include <ao/ao.h> - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_libao_LTX_spd_audio_plugin_get -+#endif - #include <spd_audio_plugin.h> - - /* send a packet of XXX bytes to the sound device */ ---- a/src/audio/nas.c -+++ b/src/audio/nas.c -@@ -32,7 +32,11 @@ - - #include <pthread.h> - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_nas_LTX_spd_audio_plugin_get -+#endif - #include <spd_audio_plugin.h> - - typedef struct { ---- a/src/audio/oss.c -+++ b/src/audio/oss.c -@@ -39,7 +39,11 @@ - - #include <sys/soundcard.h> - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_oss_LTX_spd_audio_plugin_get -+#endif - #include <spd_audio_plugin.h> - - typedef struct { ---- a/src/audio/pulse.c -+++ b/src/audio/pulse.c -@@ -51,7 +51,11 @@ - #include <pulse/simple.h> - #include <pulse/error.h> - -+#ifdef USE_DLOPEN -+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get -+#else - #define SPD_AUDIO_PLUGIN_ENTRY spd_pulse_LTX_spd_audio_plugin_get -+#endif - #include <spd_audio_plugin.h> - - typedef struct { ---- a/src/common/spd_audio.c -+++ b/src/common/spd_audio.c -@@ -120,7 +120,7 @@ AudioID *spd_audio_open(const char *name, void **pars, char **error) - plugin_dir = PLUGIN_DIR; - - #ifdef USE_DLOPEN -- libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s", plugin_dir, name); -+ libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s.so", plugin_dir, name); - dlhandle = dlopen(libname, RTLD_NOW | RTLD_GLOBAL); - - g_free(libname); - diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild deleted file mode 100644 index e2948724ba0f..000000000000 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit python-r1 systemd - -DESCRIPTION="Speech synthesis interface" -HOMEPAGE="https://freebsoft.org/speechd" -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 ~loong ppc ppc64 ~riscv sparc x86" -IUSE="alsa ao espeak +espeak-ng 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 - >=media-libs/libsndfile-1.0.2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - espeak? ( app-accessibility/espeak ) - espeak-ng? ( app-accessibility/espeak-ng ) - flite? ( app-accessibility/flite ) - nas? ( media-libs/nas ) - pulseaudio? ( media-sound/pulseaudio )" -RDEPEND="${DEPEND} - python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" -BDEPEND=" - sys-apps/help2man - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch -) - -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 - $(use_with alsa) - $(use_with ao libao) - $(use_with espeak) - $(use_with espeak-ng) - $(use_with flite) - $(use_with nas) - $(use_with pulseaudio pulse) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - 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() { - default - - 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 - python_foreach_impl python_optimize - fi - - find "${D}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - local editconfig="n" - if ! use espeak-ng; then - ewarn "You have disabled espeak-ng, 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 -} diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild deleted file mode 100644 index 889db1da776b..000000000000 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit python-r1 systemd - -DESCRIPTION="Speech synthesis interface" -HOMEPAGE="https://freebsoft.org/speechd" -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 ~loong ppc ppc64 ~riscv sparc x86" -IUSE="alsa ao espeak +espeak-ng 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 - >=media-libs/libsndfile-1.0.2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - espeak? ( app-accessibility/espeak ) - espeak-ng? ( app-accessibility/espeak-ng ) - flite? ( app-accessibility/flite ) - nas? ( media-libs/nas ) - pulseaudio? ( media-sound/pulseaudio )" -RDEPEND="${DEPEND} - python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" -BDEPEND=" - sys-apps/help2man - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch - "${FILESDIR}"/${P}-fix-dlopen.patch -) - -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 - $(use_with alsa) - $(use_with ao libao) - $(use_with espeak) - $(use_with espeak-ng) - $(use_with flite) - $(use_with nas) - $(use_with pulseaudio pulse) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - 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() { - default - - 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 - python_foreach_impl python_optimize - fi - - find "${D}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - local editconfig="n" - if ! use espeak-ng; then - ewarn "You have disabled espeak-ng, 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 -} diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3.ebuild deleted file mode 100644 index c55d7ced1ded..000000000000 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit python-r1 systemd - -DESCRIPTION="Speech synthesis interface" -HOMEPAGE="https://freebsoft.org/speechd" -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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="alsa ao espeak +espeak-ng 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 - >=media-libs/libsndfile-1.0.2 - alsa? ( media-libs/alsa-lib ) - ao? ( media-libs/libao ) - espeak? ( app-accessibility/espeak ) - espeak-ng? ( app-accessibility/espeak-ng ) - flite? ( app-accessibility/flite ) - nas? ( media-libs/nas ) - pulseaudio? ( media-sound/pulseaudio )" -RDEPEND="${DEPEND} - python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" -BDEPEND=" - sys-apps/help2man - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch -) - -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 - $(use_with alsa) - $(use_with ao libao) - $(use_with espeak) - $(use_with espeak-ng) - $(use_with flite) - $(use_with nas) - $(use_with pulseaudio pulse) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - ) - 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() { - default - - 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 - python_foreach_impl python_optimize - fi - - find "${D}" -name '*.la' -type f -delete || die -} - -pkg_postinst() { - local editconfig="n" - if ! use espeak-ng; then - ewarn "You have disabled espeak-ng, 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 -} diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild index aa87c946a7c6..95fa8f646009 100644 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{9..11} ) # TODO: drop autotools + eautoreconf after 0.11.4 inherit autotools python-r1 systemd @@ -13,7 +13,7 @@ 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" 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 index 5e3d29432faa..90155ff033cd 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic 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/" +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" @@ -99,6 +99,11 @@ src_configure() { } 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)" \ diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml index f3c777252cb3..424096f611d6 100644 --- a/app-accessibility/speechd-el/metadata.xml +++ b/app-accessibility/speechd-el/metadata.xml @@ -2,7 +2,7 @@ <!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> |