Fixed building with the ocaml use flag -- bug #204789.

Package-Manager: portage-2.1.4_rc14

3 files changed, 46 insertions, 11 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index fcb64aa46ad0..c59a6deaeee2 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.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@gentoo.org> brltty-3.9.ebuild:
+  Fixed building with the ocaml use flag -- bug #204789.
 
 *brltty-3.9 (05 Jan 2008)
 
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index ab5c6c55aae5..0458882034b1 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -8,14 +8,14 @@ EBUILD brltty-3.8.ebuild 1557 RMD160 eacb996269aaeca9ebb58e03e92b0caf8a11579b SH
 MD5 462622e66e6c5f1bd4b6be4eb76a9181 brltty-3.8.ebuild 1557
 RMD160 eacb996269aaeca9ebb58e03e92b0caf8a11579b brltty-3.8.ebuild 1557
 SHA256 86aa4e4fb516409f9fce56f4521e1762a637f63c1b0cdcfce12db49293eefa8e brltty-3.8.ebuild 1557
-EBUILD brltty-3.9.ebuild 2076 RMD160 7d779d50cb78ac027c1c1b35dad9e16c1859cc5b SHA1 158f6438a859bd265651b855f8fb189e57de4dfe SHA256 4674905eb5b94adeedd83959015d4a2d5f04da278a08eda430e31687149f9a24
-MD5 faecd7fcfb27872718c95f677778e10f brltty-3.9.ebuild 2076
-RMD160 7d779d50cb78ac027c1c1b35dad9e16c1859cc5b brltty-3.9.ebuild 2076
-SHA256 4674905eb5b94adeedd83959015d4a2d5f04da278a08eda430e31687149f9a24 brltty-3.9.ebuild 2076
-MISC ChangeLog 8343 RMD160 871f1cc42ecba5c415eef12bd8084f1991bb1c3a SHA1 dcbfac3e2bc1adcdf18f5e791d0e45d7561d8b30 SHA256 647f944fa6efa088fc46bbc3843cd1f9296f5be724c89c35fd8338c26bf30b95
-MD5 3f8dbabee1037d356d526a8e45817e08 ChangeLog 8343
-RMD160 871f1cc42ecba5c415eef12bd8084f1991bb1c3a ChangeLog 8343
-SHA256 647f944fa6efa088fc46bbc3843cd1f9296f5be724c89c35fd8338c26bf30b95 ChangeLog 8343
+EBUILD brltty-3.9.ebuild 2940 RMD160 cf5728985ea6d3878f79859cd57484a22ebdfc92 SHA1 7536edb00137348c7973c40fbe2849b70e3091aa SHA256 a3cbb1d2c741cb00c9e6d7aef5ce824ac1d549c71632ae98769f9651a924b90c
+MD5 ea975cafc09215f03d3f642c6b852ff7 brltty-3.9.ebuild 2940
+RMD160 cf5728985ea6d3878f79859cd57484a22ebdfc92 brltty-3.9.ebuild 2940
+SHA256 a3cbb1d2c741cb00c9e6d7aef5ce824ac1d549c71632ae98769f9651a924b90c brltty-3.9.ebuild 2940
+MISC ChangeLog 8471 RMD160 610190dd37221b4e9659d8c17d3857801262e5d9 SHA1 3b04bf0301fe48d31630b670937cd51c7d4c755e SHA256 96226368a13b961cfcea49e9a8306e1da5c9df1cf5559be04ab20e49450184e8
+MD5 5ccf253b89c4ed02f3cd46e0adc274da ChangeLog 8471
+RMD160 610190dd37221b4e9659d8c17d3857801262e5d9 ChangeLog 8471
+SHA256 96226368a13b961cfcea49e9a8306e1da5c9df1cf5559be04ab20e49450184e8 ChangeLog 8471
 MISC metadata.xml 1369 RMD160 f0aa05366cea60a6c6fcf6c571d092c4ed90b79a SHA1 0b429c95350460c3a22ba05c7894b519e7a046dc SHA256 66e8c95b51326f8a993ce54b41590035e01d1e81438f6f187ccccb9392cbedf9
 MD5 d04dec3d252ee51559c6ba1c80a0fcf3 metadata.xml 1369
 RMD160 f0aa05366cea60a6c6fcf6c571d092c4ed90b79a metadata.xml 1369
diff --git a/app-accessibility/brltty/brltty-3.9.ebuild b/app-accessibility/brltty/brltty-3.9.ebuild
index b3bceebfb61f..44c73cb06e32 100644
--- a/app-accessibility/brltty/brltty-3.9.ebuild
+++ b/app-accessibility/brltty/brltty-3.9.ebuild
@@ -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 @@ DEPEND="bluetooth? ( net-wireless/bluez-libs )
 	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 @@ src_compile() {
 	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
+}
+
 src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
 	make INSTALL_PROGRAM="\${INSTALL_SCRIPT}" INSTALL_ROOT="${D}" install || die
 
 	cd Documents