| 1 |
commit: 31649e33ddddd946f09371dff3d14bc942f98dc2 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 29 19:25:02 2022 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 29 19:25:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31649e33 |
| 7 |
|
| 8 |
app-accessibility/brltty: 6.4 build fixes |
| 9 |
|
| 10 |
- disable espeak driver |
| 11 |
- work around parallel build failures |
| 12 |
- drop static libraries |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 15 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 16 |
|
| 17 |
app-accessibility/brltty/brltty-6.4.ebuild | 20 ++++++++------------ |
| 18 |
1 file changed, 8 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-accessibility/brltty/brltty-6.4.ebuild b/app-accessibility/brltty/brltty-6.4.ebuild |
| 21 |
index 8dc1efa0bfbe..e5a7f0d48519 100644 |
| 22 |
--- a/app-accessibility/brltty/brltty-6.4.ebuild |
| 23 |
+++ b/app-accessibility/brltty/brltty-6.4.ebuild |
| 24 |
@@ -8,8 +8,8 @@ FINDLIB_USE="ocaml" |
| 25 |
JAVA_PKG_WANT_SOURCE="1.8" |
| 26 |
JAVA_PKG_WANT_TARGET="1.8" |
| 27 |
|
| 28 |
-inherit findlib toolchain-funcs java-pkg-opt-2 usr-ldscript autotools \ |
| 29 |
- systemd python-r1 tmpfiles |
| 30 |
+inherit findlib toolchain-funcs java-pkg-opt-2 autotools systemd \ |
| 31 |
+ python-r1 tmpfiles |
| 32 |
|
| 33 |
DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" |
| 34 |
HOMEPAGE="https://brltty.app/" |
| 35 |
@@ -109,7 +109,6 @@ src_configure() { |
| 36 |
--includedir="${EPREFIX}"/usr/include |
| 37 |
--localstatedir="${EPREFIX}"/var |
| 38 |
--disable-stripping |
| 39 |
- --with-speech-driver=-es |
| 40 |
--with-writable-directory="${EPREFIX}"/run/brltty |
| 41 |
$(use_enable api) |
| 42 |
$(use_with beeper beep-package) |
| 43 |
@@ -132,7 +131,10 @@ src_configure() { |
| 44 |
$(use_enable X x) |
| 45 |
$(use_with bluetooth bluetooth-package) |
| 46 |
$(use_with ncurses curses) |
| 47 |
- $(use_with usb usb-package) ) |
| 48 |
+ $(use_with usb usb-package) |
| 49 |
+ ) |
| 50 |
+ # disable espeak since we use espeak-ng |
| 51 |
+ use speech && myconf+=( --with-speech-driver=-es ) |
| 52 |
|
| 53 |
econf "${myconf[@]}" |
| 54 |
|
| 55 |
@@ -145,7 +147,7 @@ src_configure() { |
| 56 |
} |
| 57 |
|
| 58 |
src_compile() { |
| 59 |
- emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" |
| 60 |
+ emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}" |
| 61 |
|
| 62 |
if use python; then |
| 63 |
python_build() { |
| 64 |
@@ -182,13 +184,6 @@ src_install() { |
| 65 |
systemd_dounit Autostart/Systemd/brltty@.service |
| 66 |
dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" |
| 67 |
|
| 68 |
- if use api ; then |
| 69 |
- local libdir="$(get_libdir)" |
| 70 |
- mkdir -p "${ED}"/usr/${libdir}/ || die |
| 71 |
- mv "${ED}"/${libdir}/*.a "${ED}"/usr/${libdir}/ || die |
| 72 |
- gen_usr_ldscript libbrlapi.so |
| 73 |
- fi |
| 74 |
- |
| 75 |
mv doc/Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die |
| 76 |
mv doc/Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die |
| 77 |
mv doc/Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die |
| 78 |
@@ -200,6 +195,7 @@ src_install() { |
| 79 |
|
| 80 |
keepdir /var/lib/BrlAPI |
| 81 |
rm -fr "${ED}/run" || die |
| 82 |
+ find "${ED}" -name '*.a' -delete || die |
| 83 |
} |
| 84 |
|
| 85 |
pkg_postinst() { |
Archives