Bug 208538 -- fixed java and ocaml support, thanks to Betelgeuse and Caster.

Package-Manager: portage-2.1.4.1

3 files changed, 28 insertions, 38 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 9d122171a2bb..82c31e58604b 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.70 2008/02/02 14:10:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.71 2008/02/02 21:35:18 williamh Exp $
+
+  02 Feb 2008; William Hubbs <williamh@gentoo.org> brltty-3.9.ebuild:
+  Bug #208538 -- fixed java and ocaml support, thanks to Betelgeuse and Caster
 
   02 Feb 2008; Brent Baude <ranger@gentoo.org> brltty-3.9.ebuild:
   Marking brltty-3.9 ppc64 for bug 208536
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 1ea14739fd7d..b47bf49d8c08 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -2,6 +2,6 @@ AUX brltty.rc 535 RMD160 495be64b538963fe2cc7e85123a1d02a88078583 SHA1 faa41ace7
 DIST brltty-3.8.tar.gz 1641781 RMD160 c7c5447b10dee9aa4636473c133be4eba8603cae SHA1 d6d12254aa9a01fb34d1665027bc894c28e75e79 SHA256 9c230a8f35486fbdecb54745c88ee1c1cb2fb5baf6b403dcc0108936349b7f8b
 DIST brltty-3.9.tar.gz 1869403 RMD160 dedbd6fb268edab076c453015c43f9db242c62f1 SHA1 0d72c70e2effb2fbbc718b8a29348fe85e216e61 SHA256 d6889e11ef303c41ab599415771d550ef585de6c87842e56557e081651acbe89
 EBUILD brltty-3.8.ebuild 1557 RMD160 eacb996269aaeca9ebb58e03e92b0caf8a11579b SHA1 91b887056df4d96311a2888274c52a7b042b4146 SHA256 86aa4e4fb516409f9fce56f4521e1762a637f63c1b0cdcfce12db49293eefa8e
-EBUILD brltty-3.9.ebuild 2936 RMD160 f7b67256e37978937fbdf081423f74eafef2e6e8 SHA1 61bb6982726f60794371b5c211b7fe48d0cd7345 SHA256 c2e72c5d23c8f426827ef023843a5a4c53c1fdcecc8347110f78a7b3d8663918
-MISC ChangeLog 8679 RMD160 e58005bf9e4038b9c8bd225c1aff018d74d2dfb5 SHA1 1681afd4de5c42ece91d81dc3e4fd199d8011562 SHA256 a5e92354bfaa45cbf774e2daee87e45f563e9fb735d894919d892a18d582c8ab
+EBUILD brltty-3.9.ebuild 2611 RMD160 90e7e6a4ec1d5cb2cbcb79ba21c12a4c2ff39e57 SHA1 6f85d278f6959630145d000daffe1681bd079b4e SHA256 b0a85665b18dce6993972f9a9b114421f6593f526edb9f38ae36ffbc91c7a02d
+MISC ChangeLog 8831 RMD160 d88deb013c840739156e4f58fadaf0ec50e4afe9 SHA1 fe85a32bd31973454d803b8c0726e825a5571d59 SHA256 32217210dc3c8221abba27a9a885150ae822c713377c8a0a951bc4659c9844cd
 MISC metadata.xml 1369 RMD160 f0aa05366cea60a6c6fcf6c571d092c4ed90b79a SHA1 0b429c95350460c3a22ba05c7894b519e7a046dc SHA256 66e8c95b51326f8a993ce54b41590035e01d1e81438f6f187ccccb9392cbedf9
diff --git a/app-accessibility/brltty/brltty-3.9.ebuild b/app-accessibility/brltty/brltty-3.9.ebuild
index 26c656272c4e..13af64bf99ee 100644
--- a/app-accessibility/brltty/brltty-3.9.ebuild
+++ b/app-accessibility/brltty/brltty-3.9.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild,v 1.5 2008/02/02 14:10:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild,v 1.6 2008/02/02 21:35:18 williamh Exp $
 
-inherit eutils multilib toolchain-funcs
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic
 
 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
 HOMEPAGE="http://mielke.cc/brltty/"
@@ -13,18 +15,25 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 x86"
 IUSE="bluetooth doc gpm iconv java nls ocaml python usb tcl X"
 
-DEPEND="bluetooth? ( net-wireless/bluez-libs )
+COMMON_DEP="bluetooth? ( net-wireless/bluez-libs )
 	gpm? ( >=sys-libs/gpm-1.20 )
 	iconv? ( virtual/libiconv )
-	java? ( virtual/jdk )
 	nls? ( virtual/libintl )
-	ocaml? ( >=dev-ml/findlib-1.0.4-r1 )
 	python? ( >=dev-python/pyrex-0.9.4.1 )
 	tcl? ( >=dev-lang/tcl-8.4.15 )
 	usb? ( >=dev-libs/libusb-0.1.12-r1 )
 	X? ( x11-libs/libXaw )"
+DEPEND="java? ( >=virtual/jdk-1.4 )
+	${COMMON_DEP}"
+RDEPEND="java? ( >=virtual/jre-1.4 )
+	${COMMON_DEP}"
 
 src_compile() {
+	local JAVAC_CONF=""
+	if use java; then
+		append-flags "$(java-pkg_get-jni-cflags)"
+		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
 	econf --prefix=/ \
 		$(use_enable bluetooth) \
 		$(use_enable gpm) \
@@ -37,36 +46,7 @@ src_compile() {
 		$(use_enable tcl tcl-bindings) \
 		$(use_with X x) \
 		--includedir=/usr/include || die
-	emake || die
-}
-
-# The following was copied from findlib.eclass so that we don't force a
-# dependency on dev-ml/findlib unless the ml use flag is on.
-
-check_ocamlfind() {
-	if [ ! -x /usr/bin/ocamlfind ]
-	then
-		ewarn "In findlib.eclass: could not find the ocamlfind executable"
-		ewarn "Please report this bug on gentoo's bugzilla, assigning to ml@gentoo.org"
-		exit 1
-	fi
-}
-
-# Prepare the image for a findlib installation.
-# We use the stublibs style, so no ld.conf needs to be
-# updated when a package installs C shared libraries.
-findlib_src_preinst() {
-	check_ocamlfind
-
-	# destdir is the ocaml sitelib
-	local destdir=`ocamlfind printconf destdir`
-
-	dodir ${destdir} || die "dodir failed"
-	export OCAMLFIND_DESTDIR=${D}${destdir}
-
-	# stublibs style
-	dodir ${destdir}/stublibs || die "dodir failed"
-	export OCAMLFIND_LDCONF=ignore
+	emake JAVAC="${JAVAC_CONF}" || die
 }
 
 src_install() {
@@ -75,6 +55,13 @@ src_install() {
 	fi
 	make INSTALL_PROGRAM="\${INSTALL_SCRIPT}" INSTALL_ROOT="${D}" install || die
 
+	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
+
 	cd Documents
 	rm *.made
 	dodoc ChangeLog README* Manual.* TODO