diff options
Diffstat (limited to 'app-accessibility')
26 files changed, 798 insertions, 463 deletions
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz Binary files differindex dd3b698539e8..324e1ec7db28 100644 --- a/app-accessibility/Manifest.gz +++ b/app-accessibility/Manifest.gz diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest index 73369056820a..a4f60b1bdb28 100644 --- a/app-accessibility/accerciser/Manifest +++ b/app-accessibility/accerciser/Manifest @@ -1,3 +1,3 @@ -DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1 -EBUILD accerciser-3.22.0.ebuild 1431 BLAKE2B ff37785fb67fb66c82d04b93d6c08953cabdd67d84e86a36ec69b30a99a1d6aa6a62812deb1a6d020b1e87ed31d818fe051e313684ed2b22c52a32f4e9d08384 SHA512 96f8f708ec564fef31f3ef0c0234cf94d1883a38c8327795fd534df5738b3135fbab2a70e1f15c4c43575ee689b39dfb16f468859ac19daa8fedb756da47db1f +DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268 +EBUILD accerciser-3.36.2.ebuild 1144 BLAKE2B d54d49f4837aa5bb830cedb649e9007904cf8b510bdab8bd8c617e5297b68ca3a2fc3421fd8ea52c6043a4ead7311a72177d16e05081f8fecc569ac20338621b SHA512 c8ace1376b7f20148a22b2c2d10bc32d306b18def85366bb0a6e9f4d34851850b8190f465d375969ae7799d97f44099ef8c809e3039ed181b82716db944a00c3 MISC metadata.xml 738 BLAKE2B 916b10f5cb4aba612767ff5a617c091a36573681418c15973fbbff3328e00311306b162f504e9a12e17f04dc582f72bae21508847fec79a8d8cad4f3e18c9cb5 SHA512 78780d3254a608f95d3532de8a7438e891bd2e194ac8a255f2d224e8f4b41c2928b2efe04ae16050d0092f9e25f77800728f0be9b7cb3bcb955455532d4154e6 diff --git a/app-accessibility/accerciser/accerciser-3.22.0.ebuild b/app-accessibility/accerciser/accerciser-3.22.0.ebuild deleted file mode 100644 index 9acb9c3494a6..000000000000 --- a/app-accessibility/accerciser/accerciser-3.22.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="xml" - -inherit gnome2 python-r1 - -DESCRIPTION="Interactive Python accessibility explorer" -HOMEPAGE="https://wiki.gnome.org/Apps/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 - >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] - >=x11-libs/gtk+-3.1.13:3[introspection] - - dev-libs/atk[introspection] - >=dev-libs/glib-2.28:2 - dev-libs/gobject-introspection:= - >=dev-python/ipython-0.11[${PYTHON_USEDEP}] - >=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - x11-libs/gdk-pixbuf[introspection] - x11-libs/libwnck:3[introspection] - x11-libs/pango[introspection] - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND} - app-text/yelp-tools - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - gnome2_src_prepare - - # Leave shebang alone - sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die - - python_copy_sources -} - -src_configure() { - python_foreach_impl run_in_build_dir gnome2_src_configure -} - -src_compile() { - python_foreach_impl run_in_build_dir gnome2_src_compile -} - -src_install() { - installing() { - gnome2_src_install - python_doscript src/accerciser - } - python_foreach_impl run_in_build_dir installing -} diff --git a/app-accessibility/accerciser/accerciser-3.36.2.ebuild b/app-accessibility/accerciser/accerciser-3.36.2.ebuild new file mode 100644 index 000000000000..b0b41bfafe3e --- /dev/null +++ b/app-accessibility/accerciser/accerciser-3.36.2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_REQ_USE="xml" + +inherit gnome2 python-single-r1 + +DESCRIPTION="Interactive Python accessibility explorer" +HOMEPAGE="https://wiki.gnome.org/Apps/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] + $(python_gen_cond_dep ' + >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] + >=dev-python/ipython-0.11[${PYTHON_USEDEP}] + >=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/python-xlib[${PYTHON_USEDEP}] + ') + + dev-libs/atk[introspection] + >=dev-libs/glib-2.28:2 + dev-libs/gobject-introspection:= + x11-libs/gdk-pixbuf[introspection] + x11-libs/libwnck:3[introspection] + x11-libs/pango[introspection] + gnome-base/librsvg[introspection] + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND} + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_install() { + gnome2_src_install + python_optimize +} diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest index a88b9670f934..ed5f5b75b1c1 100644 --- a/app-accessibility/at-spi2-atk/Manifest +++ b/app-accessibility/at-spi2-atk/Manifest @@ -1,5 +1,3 @@ -DIST at-spi2-atk-2.32.0.tar.xz 94952 BLAKE2B 972bb32590a51549eb8b0b3c46a068e95cc43783f0f0e31ca3663ff1669196a88def63342c01d056d45d6f4fb4bcc2127b50a49be37fd45d33aa1daeadca5172 SHA512 095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393 DIST at-spi2-atk-2.34.2.tar.xz 96608 BLAKE2B 4a3ef71580f4eaf3ea0846c8a6909b686f7ae0c7202918f3e11de019fa7290dada5a2eb3f495ce476bb56a28787967fa87fe74d422d4144e7555541ef99911da SHA512 59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4 -EBUILD at-spi2-atk-2.32.0.ebuild 970 BLAKE2B 0ed0f3f8cb636bccb8eecde2d0cd316375ff3c12036d16a8e20086ebdc9ac016ea39e27b984991b089b96f9767c96f2616094302d6232fcfe231b8c164acdb39 SHA512 a8293ddeb1e6db75ed90377e79bedb04da80c955db423f7e5e8253314839546aaf3d001686e4bb38fcaa7871b1373cb5842ed039b5601c999d4dba4b17d24539 -EBUILD at-spi2-atk-2.34.2.ebuild 973 BLAKE2B 393171df6713c09e9b21e88006484e5b89d3457584eefd96162cf6af43e65b1035d225cefd76640d2b011f763d57a9baf7d9e73f8db50b6285e601065df87910 SHA512 95aca0fc954d372c2263a68c6a1053e3c73a80c0174efe8d0258f115d0809bcead23ce9d4fb0a1c1070639703d7b94439bc606372c28d319b8e15332df9a4f57 +EBUILD at-spi2-atk-2.34.2.ebuild 972 BLAKE2B 8081c29129cac36f0ff7e4abf951df2a688299efb4ab1cadf33fc0a41505f0c226db35d936ebc4c759c39f0d74891c6ad51ec81abd335be6f32791d6239b88e5 SHA512 b5e60ef3dea514fe999abb5ef8c4fe23715259bd02166a6e30a1eac4540936fcb2bb2a9e98b747d51099190e44746c46cf8cd35ed5ef819b3533242beaff9eca MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild deleted file mode 100644 index 0d83856cb014..000000000000 --- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.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+" -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.31.1[${MULTILIB_USEDEP}] - >=app-accessibility/at-spi2-core-2.31.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.34.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.2.ebuild index 1311786dc54c..ad9aefc468a2 100644 --- 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 @@ -10,7 +10,7 @@ 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" +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 )" diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest index 3f00d5272d94..fd8cde93eb27 100644 --- a/app-accessibility/at-spi2-core/Manifest +++ b/app-accessibility/at-spi2-core/Manifest @@ -1,8 +1,6 @@ AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753 -DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc538b38831cc22bbafc7f5d499082007909a82e785184d052f3a62853474cbc4838125540026a6d0e2ac2181e98a6a4c SHA512 cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca 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 -EBUILD at-spi2-core-2.32.1.ebuild 1467 BLAKE2B 7c10743b23c67dcc13fbd479ac73294126b0414b1611416ea882f68044107378049becc7711f3afa8ebec5edf06d9d7849a6af2ebeb867c514c056a44e1a44dc SHA512 5bf9f249b7b2f13efa2ccf50d2bae0787fdbcfa8b7ad20fd8143c015b60631a41d363c096c6e0fd572a9dcd27161b84a390d523842d2a38cebdab23869b1bed3 -EBUILD at-spi2-core-2.34.0.ebuild 1495 BLAKE2B 39633e978ce9b9da13222cba1e060a5d5cb13309b9cd17f5a2f18487ed8436a62bb8f683fc160b9e0bccd9059134146da522b84d47b3680b70a61bbad610f1ec SHA512 5d7ce682c0e212fb3793244be920dff5c32a344e517b3b0dfec9a51562c68fffa49e118ec244d1bc24f86e08eb624258ff728428f20bf6d99cffe3ae36b66836 +EBUILD at-spi2-core-2.34.0.ebuild 1494 BLAKE2B fcfe3a4189bffa7b38e2afda0be25768bf01d96c676d1c5e0dce1c65c0f0288e1671ba35ed3b9b3949608b522a7bbe0673fdb4e7b30e10ae1984716480a779a6 SHA512 5feab1f5765de39d657396a56ad7042b65b2047dd330aa39d72e821106b627569844a7602646d08db65ecfaea23eabee780c45141793745af9f73d406c1d6219 EBUILD at-spi2-core-2.36.0.ebuild 1533 BLAKE2B 40384334dbbba70ade39e7a58110d94691d7671a4e9d9b9f11366585b5c80186003f3b876e5ba2a125eb9e5bbcbbe87a9046f758ea20e2a562c29518bb4e1ce1 SHA512 32152365ebcfb96b71abfae8056f52f0a7a79a253a0b9ca87215c10ba59b552b7b1f8ed9f1af19661b3ed28a3d44f1d36dae751c604b05e469f69f9b131b7212 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild deleted file mode 100644 index d3a01c29e026..000000000000 --- a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild +++ /dev/null @@ -1,61 +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+" -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/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.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild index d60fccdd5d6a..f5923810c5ec 100644 --- 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 @@ -11,7 +11,7 @@ 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" +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}] diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest index 67018e686c61..888ff2c56469 100644 --- a/app-accessibility/brltty/Manifest +++ b/app-accessibility/brltty/Manifest @@ -1,12 +1,9 @@ -AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef857122795ff1a28c5d8fd654849cd4fe25a436b72aa851cb746f6eea52e7c2a52f5ba40f3d64797341678b4035070f SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 AUX brltty-5.2-respect-AR.patch 260 BLAKE2B 4bdf1c41a881e59477e9472a8e9f691bccce5c837b1d1358f405df9e485aab9041b8612dfffa78d30cf90814668e8234b947b43f933d80e8e00e5c618ae8e768 SHA512 2b8de99e98e257041d7a2131775a936166f183197dc02a242cb9efaebebc19afed45292defa9567f86f8ce71e32458743b8c2d3361b1b290f6c93df88e83b1ff -AUX brltty-5.2-sysmacros.patch 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392 -AUX brltty-5.2-udev.patch 1025 BLAKE2B 8c83d2cf3dd09f4ee73d1dad104518449ca1136768945c879dfffa1774f7d11fac14dad53f3da840bebd77d72f10c2ed9ed6ebb69ab1ffb17bc69cc226296501 SHA512 3ef8e8ea2f7e03c88079b7cf91930ca0a86c0b383202d5e70c63419ead9e2e607812ad966e0eccce90615b3eed8600d71c63a0eabc1a01587ca959a29a484d8c AUX brltty-6.0-udev.patch 1033 BLAKE2B d5220b3351af4191ab78f122265296ed802209d0320ebde04c3e947ba736132f5c16db8be18f3e1964c39fe61aadb535d4f84f75d070f68caeea4ca3b3c3ee05 SHA512 0512fbfcd9e9085e37b3b935f8f5a002e82fb514aa56ad807819a39d9da16fbf3bc5f45540ae1ca754160a81957f62d5c5bc8acc6295ee1af971aa9acf5b915a AUX brltty.rc 241 BLAKE2B 873b1344cc6dee3aa6272d9c8857b58a751200e77d7fa0d96f9ff992f2825267503db5fc11ea07d7064a0fa4fe78af637c41ced04212d063efb92183bb936c9f SHA512 d3b91fddbfa61e212537c58444585262d2781fa97ff7f8f4e9ab3c3ad937c680b230d805f7541e2701050e2b001d7d11f7e5937476568a3459d73bb36026f847 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7 -DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f DIST brltty-6.0.tar.xz 2879976 BLAKE2B 31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265 SHA512 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06 -EBUILD brltty-5.2-r1.ebuild 5215 BLAKE2B ad5879f375ea36d40a0316c8b5ab300b3c600e802cc3cafbef79072e199c3700c569a7d7c2570d4c3a2c5dedac610bfb179abaa61c04f16da0d33e40efcd3ec6 SHA512 af1e9eb9635767db69a1c1ce028ec22ca2889e5195e66900e284d1722c8daec99c4954741e504f1080a6096eef6974766eb5b850230a009952686b53612b41ab -EBUILD brltty-6.0-r1.ebuild 5566 BLAKE2B c6f501c95f62c9723685986557fc591e440a0123800dad043eb5404e3658f234aa1e40f5c0da0c0f027e1ecd6bdcaccc7e732a137cf193bdf81c369aab2695bd SHA512 380df94c3370fb96ad680e866b2f16b03d21a8e5cc2fb908cfbbd199cf8bfae50d18e82140136e76948f6d52bb37750af99d166c76b9b74911d7041b9a56be65 +DIST brltty-6.1.tar.xz 3394852 BLAKE2B 03e6358721dcd5c3bdee3301a1ed827a690128ec339669543279c7e9a115bef6c5d8630e4af2d0b214b9c7c3eaa9001ab4c54ae7fb899cb3bc675985f51d6933 SHA512 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf +EBUILD brltty-6.0-r1.ebuild 5565 BLAKE2B db02667b4dcdf3487fcc5349f703c76c1856516b8d8f5bb4d947a9cd628af64b85a4c6b2070aabe6c58587fb7094ff2a6e1124ff3a225ea4bfb835129b7e0156 SHA512 f903d60af1501e7c89d2a653fa4bd0d32adb6fa3f5e5e26b553912e0d86377e5644ee76d5991d2192d45ad4ada389e91063f45fcfea7e4a1b222b0a31d4e017e +EBUILD brltty-6.1.ebuild 5563 BLAKE2B 6dac94d48fe6ff1b420f425d5cb5d51a3e0e2316c120cb0e1909f2b87bfec90cdc8b638f21e51daaa910e0263054136b8262054980a1c15baa0a6d5dcd20075f SHA512 7baba4098609459e319e315fd22b0eeb2b4bb4866410fbb7ae647d028ebbfb27aca2c80238fb9e5231d5d12f85d069a3a2c3e24ef4ceee24bf75d57b235564e2 MISC metadata.xml 1661 BLAKE2B a4687ddd715019cf8273353b4a70a4981e4925f5e931859280b2f836b8f56f82708b82a1cc184a3e056febb15649987650e1312a00ac8a35efa833ae2e4d1f7d SHA512 c7904bf90031faaa478456e3f3e6c59f969e9abba2cee33ac7ad7041edaaab8ea89ca3301f4bd7a7f385507623f316fa4908ac2c6e66a94ac108bce2aad87936 diff --git a/app-accessibility/brltty/brltty-6.0-r1.ebuild b/app-accessibility/brltty/brltty-6.0-r1.ebuild index 1983c84f60b1..b6798c7faed6 100644 --- a/app-accessibility/brltty/brltty-6.0-r1.ebuild +++ b/app-accessibility/brltty/brltty-6.0-r1.ebuild @@ -17,7 +17,7 @@ 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" +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" diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-6.1.ebuild index 64b28132085c..3940a5d9c5fb 100644 --- a/app-accessibility/brltty/brltty-5.2-r1.ebuild +++ b/app-accessibility/brltty/brltty-6.1.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) 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 @@ -15,40 +17,61 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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" + 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 )" -COMMON_DEP="bluetooth? ( net-wireless/bluez ) +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:= ) - python? ( ${PYTHON_DEPS} ) + louis? ( dev-libs/liblouis:= ) + midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) - nls? ( virtual/libintl ) + 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 ) - X? ( x11-libs/libXaw )" -DEPEND="virtual/pkgconfig + 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}] ) - ${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}-6.0-udev.patch "${FILESDIR}"/${PN}-5.2-respect-AR.patch - "${FILESDIR}"/${PN}-5.2-sysmacros.patch ) src_prepare() { @@ -56,24 +79,25 @@ src_prepare() { 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 + use python && 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 + + 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 @@ -81,13 +105,13 @@ src_configure() { # correctly. # Disable stripping since we do that ourselves. local myconf=( - --prefix=/ - --localedir=/usr/share/locale - --includedir=/usr/include - --localstatedir=/var + --prefix="${EPREFIX}"/ + --localedir="${EPREFIX}"/usr/share/locale + --includedir="${EPREFIX}"/usr/include + --localstatedir="${EPREFIX}"/var --disable-stripping --with-install-root="${D}" - --with-writable-directory="/run/brltty" + --with-writable-directory="${EPREFIX}"/run/brltty $(use_enable api) $(use_with beeper beep-package) $(use_enable contracted-braille) @@ -96,12 +120,17 @@ src_configure() { $(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) @@ -110,8 +139,6 @@ src_configure() { econf "${myconf[@]}" if use python; then - myconf+=( $(use_enable python python-bindings ) ) - python_configure() { econf "${myconf[@]}" } @@ -120,14 +147,7 @@ src_configure() { } 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}" + emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" if use python; then python_build() { @@ -154,23 +174,23 @@ src_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 + udev_newrules Autostart/Udev/rules 70-brltty.rules newinitd "${FILESDIR}"/brltty.rc brltty - systemd_dounit Autostart/Systemd/brltty.service + 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 + 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 @@ -183,13 +203,13 @@ src_install() { fi keepdir /var/lib/BrlAPI - rmdir "${D}/run/brltty" || die - rmdir "${D}/run" || die + rmdir "${ED}/run/brltty" || die + rmdir "${ED}/run" || die } pkg_postinst() { elog - elog "please be sure ${ROOT}etc/brltty.conf is correct for your system." + 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 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/caribou/Manifest b/app-accessibility/caribou/Manifest index 66d61b8b1ca7..f6bd0c1c49d2 100644 --- a/app-accessibility/caribou/Manifest +++ b/app-accessibility/caribou/Manifest @@ -1,4 +1,3 @@ DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da EBUILD caribou-0.4.21-r1.ebuild 2394 BLAKE2B dcabee7b5b8c6c4042317ea0a88b598302425cb30145b17abeaddf23dd7d6a3c7d5323dda88d0fe8b8833862eb7af724599957a72210beac622b0a09a0ba8934 SHA512 092856b7226b9c88a9128f863ce8686bedb2b3f2b794a4632bc2c316586f3609d9e4720019cc8e53eb8b2ca74a9680dc253fb0a0c343cdf8fa3ca62a8c59d3e7 -EBUILD caribou-0.4.21.ebuild 2390 BLAKE2B 8c45fca89ee00bd730bf14d06d3360e3cfeef63ba639ef559f741e7b0c981b16348e1c44832f83a525ddbbc5c00bb849a8828015a96f84e9ec6b749a950d9b50 SHA512 5a3a0d68a3323b2e96395f5a20b697e52eaf312469a30d66ff7e06e8226a314a68db344b387782e17d0dc2790d12ec3d889290620937996e3a5dd1103e9fa3ac MISC metadata.xml 682 BLAKE2B 4ff796697db62d8c6a21ff62794c5fef391691685cece76ee7b8c38178f775a145b9a457df9bf959ab6af03559ceb4d9ad97a2ab835d63b70e58b4894f71fa5d SHA512 bec00e1cbb64bfec610e3f4e724e8afb8539a4b676b1e443a17b7eaf2263bef1fbf5787d77de253d84ebb0a54b3ca4bd386ba421826c0bb903164bb7ecf5223d diff --git a/app-accessibility/caribou/caribou-0.4.21.ebuild b/app-accessibility/caribou/caribou-0.4.21.ebuild deleted file mode 100644 index f0844ec4d4ac..000000000000 --- a/app-accessibility/caribou/caribou-0.4.21.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 ) -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/orca/Manifest b/app-accessibility/orca/Manifest index 5de90f466101..2aed2f4f3430 100644 --- a/app-accessibility/orca/Manifest +++ b/app-accessibility/orca/Manifest @@ -1,4 +1,5 @@ DIST orca-3.34.2.tar.xz 3509556 BLAKE2B 4e73517660b837cec6d4dc12e3b2e57dec526f22aa407ababee2cb12c3aa8807184649b6962f26551926b1b3f8c49230054b4ef5583e15eeeb94685aaaf3ca13 SHA512 b685bd8e417d74ccc0d0ce6b15b3220e5079320198886f568147480f107f7d0273cbd412fdc2c6cc509d3210b36c40aecb50e167d43120f6770ce02a0891ad20 +DIST orca-3.36.5.tar.xz 3578288 BLAKE2B d9711720b7a104bc86c97f1821566dd710f0bd318a5409fc5bd5624e7f35a81e9cd0a3d9fd1337c58b09d1ed8fe1c9eeb5b0822e45f7a711a44405bcb8f54db6 SHA512 87756ab5ea962c715f1a00ba80a30cf2e812bab87cf6f13b437b45b39bb763b684fe69b8847a3ed543c398f79a4d2d3ed33b61f88414f432b473c0892453a4f0 EBUILD orca-3.34.2-r1.ebuild 1646 BLAKE2B 20c5c2562a7b40f25dbc21695abbcf46257156ca142b8f1def2aa65a0708b1d2a756043a69fcd100f53a7fae5d8243adcb38d1465ac8654e1e1134a51318e1fd SHA512 8f6aaff881cacb820a77ab193dd82ac63f17e11b4a6708e8278b97f2b878ea92fadeaf021681174247d74c5f27c72482ded48aa87e7d66aae6f6bf7731e818f1 -EBUILD orca-3.34.2.ebuild 1583 BLAKE2B 92b4250edf57cd01805625aa5965b158bd5e143a7d307830a69a87ea64797f581d294bb47eea914b88ffad299c40df9b1e05293bf32096aa2e5c8a020061b7da SHA512 517284b7fc517e8268fa3122cfdefe6d1a4a5434a60e7eed0209b2f22dbb9f3f0e6c51cca320dbcb963fa655e2b3069f98dd36a6f55e3f91deddf6bd74fbe9e2 +EBUILD orca-3.36.5.ebuild 1650 BLAKE2B d61b4eaaa388fc1a6a6b915db0983773899354e387bf193d34b905a974a67217d37b2ee261d1e94c57edcfa8cd78e332e1f348ae15ff39de637a0de05a4df5bf SHA512 a614dad534582560dc6b44f370e63d6a439e0ee863d88edbcd925c5d0e815ea5db4b3de66ee744e9750857752f3d09de9d2c29e9cd20f6c3a7a8bc12c2fb5edc MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8 diff --git a/app-accessibility/orca/orca-3.34.2.ebuild b/app-accessibility/orca/orca-3.36.5.ebuild index 6e340c68a246..7e5ba2f05844 100644 --- a/app-accessibility/orca/orca-3.34.2.ebuild +++ b/app-accessibility/orca/orca-3.36.5.ebuild @@ -3,8 +3,8 @@ EAPI=6 GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="threads" +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="threads(+)" inherit gnome2 python-single-r1 @@ -13,15 +13,15 @@ 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 ~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 + >=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] @@ -40,7 +40,7 @@ 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/pyatspi-2.36[${PYTHON_MULTI_USEDEP}] dev-python/setproctitle[${PYTHON_MULTI_USEDEP}] ') x11-libs/libwnck:3[introspection] @@ -57,3 +57,8 @@ src_configure() { gnome2_src_configure \ $(use_with braille liblouis) } + +src_install() { + gnome2_src_install + python_optimize +} diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest index 961ac236e3b4..bb416e8fcac4 100644 --- a/app-accessibility/speech-dispatcher/Manifest +++ b/app-accessibility/speech-dispatcher/Manifest @@ -1,4 +1,6 @@ +AUX speech-dispatcher-0.9.1-fno-common.patch 13112 BLAKE2B 6a4125117852cfe250bed1a9936af67a2a83303ecced615febd89b9b14918dda94a78862cdcceb95fcea3ea7ed30a12d799afbc21264ff386c94f9f867eb8136 SHA512 b957ebbfd8a6a9cfe2b85cba85b77dc813e76212721d63d42b3881ed17993d7b4a8c720d4c431c8e2eb3ea60996e411402732c735948f37fa84a9fdcfa2683fc DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375 -EBUILD speech-dispatcher-0.8.7-r2.ebuild 2685 BLAKE2B 22ae5148d6c3c4b9a19acc2427b15911cf1e9cf67f59d0e29e01b3a10e923f570850e40f126bf5f2239724c616cead6839f06b09f8972472e843ddeab188cc8b SHA512 4b5ecf6786ec702f7eebc80f6107e12b277cc1bdaa9f185e86046d5b2655b9364d281d77039c9b6291f2c340d5e103a0015e6713c1c67cd11462e3973929489e +DIST speech-dispatcher-0.9.1.tar.gz 1662222 BLAKE2B 03c3d79a9cbbe7e549f638992fb276ab2270a45a057708721666257699479b3feb81daddf26d8032ba3f7b9ab6b836c7f582ee22a532ff018c99820af3864d87 SHA512 35adb353d22b8dff8884cb20f3836f96f4f74b272bbd442d522a10a3d3b91a0da6705e6c216764f295208b5446c2077da620de2a81cafe5a0c4dd826e33753c2 EBUILD speech-dispatcher-0.8.7-r3.ebuild 2667 BLAKE2B f060b83425cdcade72424fd4ba45cb7f853bdd98585bdd11836ea9d273c725867798abc6fc7772054ba62926544e6bd8a43598651f937c0592b14193e8c671ae SHA512 a9a2a4974d51741ae01217e413af49b01ddf388eafea99668e8f43111275cceeaf8860c1a7d0abe7ad0baf1fdb91326e426734985652d47f66895d72bd5ed274 +EBUILD speech-dispatcher-0.9.1.ebuild 2796 BLAKE2B 1f8785b6c2f04e3f920b75901f6e50914ce52bb9ca666c827d8e83ce739d3fc2cb96b87cb9899b482fd35be0ce3a4d795384051a51f4e9ed0227d1347b93d3d6 SHA512 5bc3b4d391cb3a60c2679f0239be240ba5b881e68a386f9c91fcb8bf4ce089d7e26ab715d438694aa71ba5d6f5072895466cdb67d3ec32dca1ef9407e01867a2 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a 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 new file mode 100644 index 000000000000..0914566a8a35 --- /dev/null +++ b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.9.1-fno-common.patch @@ -0,0 +1,466 @@ +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/speech-dispatcher-0.8.7-r2.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild index 9ab5bb701011..52ea0cd451a2 100644 --- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7-r2.ebuild +++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild @@ -1,26 +1,25 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_6 ) - -inherit eutils ltprune python-r1 +PYTHON_COMPAT=( python3_{6,7,8} ) +inherit python-r1 systemd DESCRIPTION="Speech synthesis interface" -HOMEPAGE="http://www.freebsoft.org/speechd" -SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz" +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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +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} )" -COMMON_DEPEND="python? ( ${PYTHON_DEPS} ) +DEPEND="python? ( ${PYTHON_DEPS} ) >=dev-libs/dotconf-1.3 - >=dev-libs/glib-2.28:2 + >=dev-libs/glib-2.36:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) @@ -29,11 +28,13 @@ COMMON_DEPEND="python? ( ${PYTHON_DEPS} ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio )" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.40.0 - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-fno-common.patch" ) src_configure() { # bug 573732 @@ -42,14 +43,18 @@ src_configure() { local myeconfargs=( --disable-python --disable-static + --with-baratinoo=no + --with-ibmtts=no + --with-kali=no $(use_with alsa) $(use_with ao libao) $(use_with espeak) $(use_with flite) - $(use_with pulseaudio pulse) $(use_with nas) + $(use_with pulseaudio pulse) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" ) - econf ${myeconfargs[@]} + econf "${myeconfargs[@]}" } src_compile() { @@ -69,10 +74,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install - dodoc ANNOUNCE AUTHORS BUGS FAQ NEWS README* - - prune_libtool_files --all + default if use python; then installation() { @@ -86,6 +88,8 @@ src_install() { python_foreach_impl run_in_build_dir installation python_replicate_script "${ED}"/usr/bin/spd-conf fi + + find "${D}" -name '*.la' -type f -delete || die } pkg_postinst() { @@ -103,7 +107,7 @@ pkg_postinst() { editconfig="y" fi if [[ "${editconfig}" == "y" ]]; then - ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf" + 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-tools/Manifest b/app-accessibility/speech-tools/Manifest index 0179460d073f..e989ac7810de 100644 --- a/app-accessibility/speech-tools/Manifest +++ b/app-accessibility/speech-tools/Manifest @@ -1,6 +1,9 @@ AUX speech-tools-2.1-gcc7.patch 612 BLAKE2B ded8216c1e7c49821fd1bd738f1c0d508afbd07115d98d3149d31eb402611c1dbe70c07d4885e82beef94bfdfe8a9261722eaf7ea43f3704cee27eb5055f7488 SHA512 6d4c9c43821f571b5fa8f476f740ee276b9a05dcb8a39cfc32f5b3a87548acf051a1abf75f3be5a8563b03c5302b9208ce894a5065899b0f43ba9d2ffe7a65db AUX speech-tools-2.1-underlinking.patch 565 BLAKE2B 1be43841d09fe456874323a02d63253dae37dfe6f6969f7d9941c8a39d0ad9127e8fd1b87f5b6e59fcc505f2c9e2bc988b4f572ccbb01418d11ca0fda88b262d SHA512 4091b64da995f2f859f8debd7c6b7c20bf3a788c91d8aa7651f3c6f89445c9fc60b60923a3056de678ec17faee41839917131b9a3176e53c0afc11e24fe92e47 +AUX speech-tools-2.5.0-fno-common.patch 1003 BLAKE2B 6b4dcdf205f2e986e659efda4d52c447b0183cc59146ec892b86d360f16fccab0a85667743c6e0f31a07f20983cce604d3202756c16eae4eff2eb88b1079407c SHA512 ae34fadda5f92dfade923af07222c1ed35b8b39bafc7604a86cebd7196888b2cf9a41fe2686e5210a556309a9c2e71076d22e3f56f1ccec0aca3d4a7bd18f3c1 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 EBUILD speech-tools-2.1-r4.ebuild 3050 BLAKE2B 55f937d6a041b5008b7e182502fd9fbd325497219207c2ed90221629f848aaaa500e3310e190d9123c976d33bb0fe111ba6600de43b7cd2cb6905b80aec893ce SHA512 9ff9c6888c37d184eb3ce3bfab898579145e50d45e6624a1560ecfa0ecc479e24a8ec430e664cdcc62382b90843ae918059c4ec28526cc1286a477cc86a1466e +EBUILD speech-tools-2.5.0.ebuild 3711 BLAKE2B f3a9e139161f7c35e6159b4ba751e11958d269f18336bcb0576f3cc989ac54054e252d9be4b7461adf35f433ee314a7b2648a0f467856351969016d21b7b3d54 SHA512 1aed28cb7292d4a2e52bacb4ece1667ae9bebc123bf7c9f14b1bfe588a04fe3b139dd06fe2d630b6daa2cf2d334c70d6e25031332d187b9093a8d8d2dee3f575 MISC metadata.xml 482 BLAKE2B 2638ba066698967011156e0333f367bed8b4a6ffcf765afe64d976724264db09fa2dfb8c6a10f35e3bc298d0b1e9604f8081a74d130a7afbf4ddd019dfffab8b SHA512 1752986ddb186ab10d069dce7ee81c7d0077673a06682e15f4e66a5a87cb29ba4e126a2a627f5f43e388a1d180e243d5362cceae943b1f90b35f54c19de1d2ee 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/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild new file mode 100644 index 000000000000..184920c28003 --- /dev/null +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit 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/$(ver_cut 1-2)/${MY_P}-release.tar.gz + https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${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 openmp X" + +RDEPEND=" + media-libs/alsa-lib + sys-libs/ncurses:0= + nas? ( media-libs/nas ) + X? ( x11-libs/libX11 + x11-libs/libXt + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/speech_tools" + +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" +) + +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 + + #WRT 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 +} + +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() { + 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 "${D}/usr/bin/bcat" || die + rm "${D}/usr/$(get_libdir)/speech-tools/bcat" || die +} |