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

[William Hubbs (williamh)]

williamh    08/01/11 03:42:03

  Modified:             brltty-3.9.ebuild ChangeLog
  Log:
  Fixed building with the ocaml use flag -- bug #204789.
  (Portage version: 2.1.4_rc14)

Revision  Changes    Path
1.3                  app-accessibility/brltty/brltty-3.9.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild?r1=1.2&r2=1.3

Index: brltty-3.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- brltty-3.9.ebuild	6 Jan 2008 07:05:20 -0000	1.2
+++ brltty-3.9.ebuild	11 Jan 2008 03:42:02 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.2 2008/01/06 07:05:20 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-3.9.ebuild,v 1.3 2008/01/11 03:42:02 williamh Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -18,7 +18,7 @@
 	iconv? ( virtual/libiconv )
 	java? ( virtual/jdk )
 	nls? ( virtual/libintl )
-	ocaml? ( >=dev-lang/ocaml-3.09.3-r1 )
+	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 )
@@ -40,7 +40,39 @@
 	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@g.o"
+		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
+}
+
 src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
 	make INSTALL_PROGRAM="\${INSTALL_SCRIPT}" INSTALL_ROOT="${D}" install || die
 
 	cd Documents



1.68                 app-accessibility/brltty/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.68&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/ChangeLog?rev=1.68&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/brltty/ChangeLog?r1=1.67&r2=1.68

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ChangeLog	5 Jan 2008 22:46:49 -0000	1.67
+++ ChangeLog	11 Jan 2008 03:42:02 -0000	1.68
@@ -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.67 2008/01/05 22:46:49 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.68 2008/01/11 03:42:02 williamh Exp $
+
+  11 Jan 2008; William Hubbs <williamh@g.o> brltty-3.9.ebuild:
+  Fixed building with the ocaml use flag -- bug #204789.
 
 *brltty-3.9 (05 Jan 2008)
 



-- 
gentoo-commits@l.g.o mailing list