[gentoo-commits] repo/gentoo:master commit in: app-accessibility/brltty/

[William Hubbs]

commit:     31649e33ddddd946f09371dff3d14bc942f98dc2
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 29 19:25:02 2022 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 19:25:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31649e33

app-accessibility/brltty: 6.4 build fixes

- disable espeak driver
- work around parallel build failures
- drop static libraries

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>

 app-accessibility/brltty/brltty-6.4.ebuild | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/app-accessibility/brltty/brltty-6.4.ebuild 
b/app-accessibility/brltty/brltty-6.4.ebuild
index 8dc1efa0bfbe..e5a7f0d48519 100644
--- a/app-accessibility/brltty/brltty-6.4.ebuild
+++ b/app-accessibility/brltty/brltty-6.4.ebuild
@@ -8,8 +8,8 @@ FINDLIB_USE="ocaml"
 JAVA_PKG_WANT_SOURCE="1.8"
 JAVA_PKG_WANT_TARGET="1.8"
 
-inherit findlib toolchain-funcs java-pkg-opt-2 usr-ldscript autotools  \
-       systemd python-r1 tmpfiles
+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/";
@@ -109,7 +109,6 @@ src_configure() {
                --includedir="${EPREFIX}"/usr/include
                --localstatedir="${EPREFIX}"/var
                --disable-stripping
-               --with-speech-driver=-es
                --with-writable-directory="${EPREFIX}"/run/brltty
                $(use_enable api)
                $(use_with beeper beep-package)
@@ -132,7 +131,10 @@ src_configure() {
                $(use_enable X x)
                $(use_with bluetooth bluetooth-package)
                $(use_with ncurses curses)
-               $(use_with usb usb-package) )
+               $(use_with usb usb-package)
+       )
+       # disable espeak since we use espeak-ng
+       use speech && myconf+=( --with-speech-driver=-es )
 
        econf "${myconf[@]}"
 
@@ -145,7 +147,7 @@ src_configure() {
 }
 
 src_compile() {
-       emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
+       emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
 
        if use python; then
                python_build() {
@@ -182,13 +184,6 @@ src_install() {
        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
-
        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
@@ -200,6 +195,7 @@ src_install() {
 
        keepdir /var/lib/BrlAPI
        rm -fr "${ED}/run" || die
+       find "${ED}" -name '*.a' -delete || die
 }
 
 pkg_postinst() {