1 |
williamh 08/02/02 21:35:18 |
2 |
|
3 |
Modified: brltty-3.9.ebuild ChangeLog |
4 |
Log: |
5 |
Bug 208538 -- fixed java and ocaml support, thanks to Betelgeuse and Caster. |
6 |
(Portage version: 2.1.4.1) |
7 |
|
8 |
Revision Changes Path |
9 |
1.6 app-accessibility/brltty/brltty-3.9.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild?rev=1.6&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild?rev=1.6&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild?r1=1.5&r2=1.6 |
14 |
|
15 |
Index: brltty-3.9.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild,v |
18 |
retrieving revision 1.5 |
19 |
retrieving revision 1.6 |
20 |
diff -u -r1.5 -r1.6 |
21 |
--- brltty-3.9.ebuild 2 Feb 2008 14:10:44 -0000 1.5 |
22 |
+++ brltty-3.9.ebuild 2 Feb 2008 21:35:18 -0000 1.6 |
23 |
@@ -1,8 +1,10 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild,v 1.5 2008/02/02 14:10:44 ranger Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild,v 1.6 2008/02/02 21:35:18 williamh Exp $ |
28 |
|
29 |
-inherit eutils multilib toolchain-funcs |
30 |
+FINDLIB_USE="ocaml" |
31 |
+ |
32 |
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic |
33 |
|
34 |
DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" |
35 |
HOMEPAGE="http://mielke.cc/brltty/" |
36 |
@@ -13,18 +15,25 @@ |
37 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 x86" |
38 |
IUSE="bluetooth doc gpm iconv java nls ocaml python usb tcl X" |
39 |
|
40 |
-DEPEND="bluetooth? ( net-wireless/bluez-libs ) |
41 |
+COMMON_DEP="bluetooth? ( net-wireless/bluez-libs ) |
42 |
gpm? ( >=sys-libs/gpm-1.20 ) |
43 |
iconv? ( virtual/libiconv ) |
44 |
- java? ( virtual/jdk ) |
45 |
nls? ( virtual/libintl ) |
46 |
- ocaml? ( >=dev-ml/findlib-1.0.4-r1 ) |
47 |
python? ( >=dev-python/pyrex-0.9.4.1 ) |
48 |
tcl? ( >=dev-lang/tcl-8.4.15 ) |
49 |
usb? ( >=dev-libs/libusb-0.1.12-r1 ) |
50 |
X? ( x11-libs/libXaw )" |
51 |
+DEPEND="java? ( >=virtual/jdk-1.4 ) |
52 |
+ ${COMMON_DEP}" |
53 |
+RDEPEND="java? ( >=virtual/jre-1.4 ) |
54 |
+ ${COMMON_DEP}" |
55 |
|
56 |
src_compile() { |
57 |
+ local JAVAC_CONF="" |
58 |
+ if use java; then |
59 |
+ append-flags "$(java-pkg_get-jni-cflags)" |
60 |
+ JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)" |
61 |
+ fi |
62 |
econf --prefix=/ \ |
63 |
$(use_enable bluetooth) \ |
64 |
$(use_enable gpm) \ |
65 |
@@ -37,36 +46,7 @@ |
66 |
$(use_enable tcl tcl-bindings) \ |
67 |
$(use_with X x) \ |
68 |
--includedir=/usr/include || die |
69 |
- emake || die |
70 |
-} |
71 |
- |
72 |
-# The following was copied from findlib.eclass so that we don't force a |
73 |
-# dependency on dev-ml/findlib unless the ml use flag is on. |
74 |
- |
75 |
-check_ocamlfind() { |
76 |
- if [ ! -x /usr/bin/ocamlfind ] |
77 |
- then |
78 |
- ewarn "In findlib.eclass: could not find the ocamlfind executable" |
79 |
- ewarn "Please report this bug on gentoo's bugzilla, assigning to ml@g.o" |
80 |
- exit 1 |
81 |
- fi |
82 |
-} |
83 |
- |
84 |
-# Prepare the image for a findlib installation. |
85 |
-# We use the stublibs style, so no ld.conf needs to be |
86 |
-# updated when a package installs C shared libraries. |
87 |
-findlib_src_preinst() { |
88 |
- check_ocamlfind |
89 |
- |
90 |
- # destdir is the ocaml sitelib |
91 |
- local destdir=`ocamlfind printconf destdir` |
92 |
- |
93 |
- dodir ${destdir} || die "dodir failed" |
94 |
- export OCAMLFIND_DESTDIR=${D}${destdir} |
95 |
- |
96 |
- # stublibs style |
97 |
- dodir ${destdir}/stublibs || die "dodir failed" |
98 |
- export OCAMLFIND_LDCONF=ignore |
99 |
+ emake JAVAC="${JAVAC_CONF}" || die |
100 |
} |
101 |
|
102 |
src_install() { |
103 |
@@ -75,6 +55,13 @@ |
104 |
fi |
105 |
make INSTALL_PROGRAM="\${INSTALL_SCRIPT}" INSTALL_ROOT="${D}" install || die |
106 |
|
107 |
+ if use java; then |
108 |
+ # make install puts the _java.so there, and no it's not $(get_libdir) |
109 |
+ rm -rf "${D}/usr/lib/java" |
110 |
+ java-pkg_doso Bindings/Java/libbrlapi_java.so |
111 |
+ java-pkg_dojar Bindings/Java/brlapi.jar |
112 |
+ fi |
113 |
+ |
114 |
cd Documents |
115 |
rm *.made |
116 |
dodoc ChangeLog README* Manual.* TODO |
117 |
|
118 |
|
119 |
|
120 |
1.71 app-accessibility/brltty/ChangeLog |
121 |
|
122 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.71&view=markup |
123 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.71&content-type=text/plain |
124 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/ChangeLog?r1=1.70&r2=1.71 |
125 |
|
126 |
Index: ChangeLog |
127 |
=================================================================== |
128 |
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v |
129 |
retrieving revision 1.70 |
130 |
retrieving revision 1.71 |
131 |
diff -u -r1.70 -r1.71 |
132 |
--- ChangeLog 2 Feb 2008 14:10:44 -0000 1.70 |
133 |
+++ ChangeLog 2 Feb 2008 21:35:18 -0000 1.71 |
134 |
@@ -1,6 +1,9 @@ |
135 |
# ChangeLog for app-accessibility/brltty |
136 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
137 |
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.70 2008/02/02 14:10:44 ranger Exp $ |
138 |
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.71 2008/02/02 21:35:18 williamh Exp $ |
139 |
+ |
140 |
+ 02 Feb 2008; William Hubbs <williamh@g.o> brltty-3.9.ebuild: |
141 |
+ Bug #208538 -- fixed java and ocaml support, thanks to Betelgeuse and Caster |
142 |
|
143 |
02 Feb 2008; Brent Baude <ranger@g.o> brltty-3.9.ebuild: |
144 |
Marking brltty-3.9 ppc64 for bug 208536 |
145 |
|
146 |
|
147 |
|
148 |
-- |
149 |
gentoo-commits@l.g.o mailing list |