[gentoo-commits] gentoo-x86 commit in app-accessibility/brltty: ChangeLog brltty-4.2.ebuild

["William Hubbs (williamh)" <williamh@gentoo.org>]

williamh    11/03/30 18:24:44

  Modified:             ChangeLog brltty-4.2.ebuild
  Log:
  finish conversion to eapi4 and fix java build failure, thanks to serkan
  and cbrannon this closes bug #361341.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux i686)

Revision  Changes    Path
1.113                app-accessibility/brltty/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?r1=1.112&r2=1.113

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog	30 Mar 2011 18:05:22 -0000	1.112
+++ ChangeLog	30 Mar 2011 18:24:44 -0000	1.113
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.112 2011/03/30 18:05:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.113 2011/03/30 18:24:44 williamh Exp $
+
+  30 Mar 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild:
+  finish conversion to eapi4 and fix java build failure, thanks to serkan
+  and cbrannon this closes bug #361341.
 
   30 Mar 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild:
   Migrate to eapi 4, remove the static use flag, and fix #361327.



1.8                  app-accessibility/brltty/brltty-4.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild?r1=1.7&r2=1.8

Index: brltty-4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- brltty-4.2.ebuild	30 Mar 2011 18:05:22 -0000	1.7
+++ brltty-4.2.ebuild	30 Mar 2011 18:24:44 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.7 2011/03/30 18:05:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.8 2011/03/30 18:24:44 williamh Exp $
 
 EAPI="4"
 FINDLIB_USE="ocaml"
@@ -83,19 +83,19 @@
 		$(use_enable tcl tcl-bindings) \
 		$(use_enable X x) \
 		$(use_with bluetooth bluetooth-package) \
-		$(use_with usb usb-package) \
-		|| die
+		$(use_with usb usb-package)
 }
 
 src_compile() {
 	local JAVAC_CONF=""
+	local OUR_JNI_FLAGS=""
 	if use java; then
-		append-flags "$(java-pkg_get-jni-cflags)"
+		OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
 		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
 	fi
 
 	# workaround for parallel build failure, bug #340903.
-	emake -j1 JAVAC="${JAVAC_CONF}" || die
+	emake -j1 JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
 }
 
 src_install() {
@@ -103,7 +103,7 @@
 		findlib_src_preinst
 	fi
 
-	emake OCAML_LDCONF= install || die
+	emake OCAML_LDCONF= install
 
 	if use java; then
 		# make install puts the _java.so there, and no it's not $(get_libdir)