app-accessibility/brltty: Revbump for various fixes

- Fixed build with USE="java"
- Added "louis", "policykit", "systemd" and "xml" USE flags
- Added various missing dependencies
- Improved python build handling

Closes: https://bugs.gentoo.org/681644
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

2 files changed, 47 insertions, 26 deletions

diff --git a/app-accessibility/brltty/brltty-6.0.ebuild b/app-accessibility/brltty/brltty-6.0-r1.ebuild
index badd7a116780..992de9ab91d7 100644
--- a/app-accessibility/brltty/brltty-6.0.ebuild
+++ b/app-accessibility/brltty/brltty-6.0-r1.ebuild
@@ -5,6 +5,8 @@ EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 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 \
 	autotools udev systemd python-r1
@@ -15,30 +17,50 @@ SRC_URI="http://brltty.com/archive/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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 )
+COMMON_DEP="
+	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 )"
+	xml? ( dev-libs/expat )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
 DEPEND="${COMMON_DEP}"
 BDEPEND="
 	virtual/pkgconfig
 	java? ( >=virtual/jdk-1.4 )
+	nls? ( virtual/libintl )
 	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
 "
 RDEPEND="java? ( >=virtual/jre-1.4 )
@@ -56,21 +78,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() {
 	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
@@ -93,12 +119,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)
@@ -107,8 +138,6 @@ src_configure() {
 	econf "${myconf[@]}"
 
 	if use python; then
-		myconf+=( $(use_enable python python-bindings ) )
-
 		python_configure() {
 			econf "${myconf[@]}"
 		}
@@ -117,14 +146,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() {
@@ -151,8 +173,6 @@ src_install() {
 	fi
 
 	if use java; then
-		# make install puts the _java.so there, and no it's not $(get_libdir)
-		rm -r "${ED}/usr/lib/java" || die
 		java-pkg_doso Bindings/Java/libbrlapi_java.so
 		java-pkg_dojar Bindings/Java/brlapi.jar
 	fi
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index 53e30d6595d9..b05083dfd091 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -10,6 +10,7 @@
   <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 tranlator <pkg>dev-libs/liblouis</pkg></flag>
   <flag name="midi">support the musical instrument digital interface</flag>
   <flag name="pcm">support for sound card digital audio</flag>
   <flag name="speech">speech support</flag>