From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 41D1F158087 for ; Sat, 29 Jan 2022 19:26:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6DE22BC00E; Sat, 29 Jan 2022 19:26:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70DC12BC00E for ; Sat, 29 Jan 2022 19:26:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0EB4A3431F0 for ; Sat, 29 Jan 2022 19:26:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8074B233 for ; Sat, 29 Jan 2022 19:26:23 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1643484349.31649e33ddddd946f09371dff3d14bc942f98dc2.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-accessibility/brltty/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-accessibility/brltty/brltty-6.4.ebuild X-VCS-Directories: app-accessibility/brltty/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 31649e33ddddd946f09371dff3d14bc942f98dc2 X-VCS-Branch: master Date: Sat, 29 Jan 2022 19:26:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 605a6cc0-2ba6-4cd4-8929-03b64a2c3920 X-Archives-Hash: 670553417f84b9a72d726646917d33df commit: 31649e33ddddd946f09371dff3d14bc942f98dc2 Author: William Hubbs gentoo org> AuthorDate: Sat Jan 29 19:25:02 2022 +0000 Commit: William Hubbs gentoo 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 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() {