| 1 |
williamh 11/03/30 18:24:44 |
| 2 |
|
| 3 |
Modified: ChangeLog brltty-4.2.ebuild |
| 4 |
Log: |
| 5 |
finish conversion to eapi4 and fix java build failure, thanks to serkan |
| 6 |
and cbrannon this closes bug #361341. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha29/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.113 app-accessibility/brltty/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.113&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.113&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/ChangeLog?r1=1.112&r2=1.113 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v |
| 20 |
retrieving revision 1.112 |
| 21 |
retrieving revision 1.113 |
| 22 |
diff -u -r1.112 -r1.113 |
| 23 |
--- ChangeLog 30 Mar 2011 18:05:22 -0000 1.112 |
| 24 |
+++ ChangeLog 30 Mar 2011 18:24:44 -0000 1.113 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for app-accessibility/brltty |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.112 2011/03/30 18:05:22 williamh Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.113 2011/03/30 18:24:44 williamh Exp $ |
| 30 |
+ |
| 31 |
+ 30 Mar 2011; William Hubbs <williamh@g.o> brltty-4.2.ebuild: |
| 32 |
+ finish conversion to eapi4 and fix java build failure, thanks to serkan |
| 33 |
+ and cbrannon this closes bug #361341. |
| 34 |
|
| 35 |
30 Mar 2011; William Hubbs <williamh@g.o> brltty-4.2.ebuild: |
| 36 |
Migrate to eapi 4, remove the static use flag, and fix #361327. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.8 app-accessibility/brltty/brltty-4.2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild?rev=1.8&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild?rev=1.8&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild?r1=1.7&r2=1.8 |
| 45 |
|
| 46 |
Index: brltty-4.2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v |
| 49 |
retrieving revision 1.7 |
| 50 |
retrieving revision 1.8 |
| 51 |
diff -u -r1.7 -r1.8 |
| 52 |
--- brltty-4.2.ebuild 30 Mar 2011 18:05:22 -0000 1.7 |
| 53 |
+++ brltty-4.2.ebuild 30 Mar 2011 18:24:44 -0000 1.8 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.7 2011/03/30 18:05:22 williamh Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.8 2011/03/30 18:24:44 williamh Exp $ |
| 59 |
|
| 60 |
EAPI="4" |
| 61 |
FINDLIB_USE="ocaml" |
| 62 |
@@ -83,19 +83,19 @@ |
| 63 |
$(use_enable tcl tcl-bindings) \ |
| 64 |
$(use_enable X x) \ |
| 65 |
$(use_with bluetooth bluetooth-package) \ |
| 66 |
- $(use_with usb usb-package) \ |
| 67 |
- || die |
| 68 |
+ $(use_with usb usb-package) |
| 69 |
} |
| 70 |
|
| 71 |
src_compile() { |
| 72 |
local JAVAC_CONF="" |
| 73 |
+ local OUR_JNI_FLAGS="" |
| 74 |
if use java; then |
| 75 |
- append-flags "$(java-pkg_get-jni-cflags)" |
| 76 |
+ OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)" |
| 77 |
JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)" |
| 78 |
fi |
| 79 |
|
| 80 |
# workaround for parallel build failure, bug #340903. |
| 81 |
- emake -j1 JAVAC="${JAVAC_CONF}" || die |
| 82 |
+ emake -j1 JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}" |
| 83 |
} |
| 84 |
|
| 85 |
src_install() { |
| 86 |
@@ -103,7 +103,7 @@ |
| 87 |
findlib_src_preinst |
| 88 |
fi |
| 89 |
|
| 90 |
- emake OCAML_LDCONF= install || die |
| 91 |
+ emake OCAML_LDCONF= install |
| 92 |
|
| 93 |
if use java; then |
| 94 |
# make install puts the _java.so there, and no it's not $(get_libdir) |
Archives