fix ocaml install failure, bug #344425.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux i686

4 files changed, 34 insertions, 7 deletions

diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 0f523721872b..b8831f0f1664 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/brltty
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.107 2010/10/05 17:19:34 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.108 2011/03/24 14:13:17 williamh Exp $
+
+  24 Mar 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild,
+  +files/brltty-4.2-fix-ocaml-install.patch:
+  Fix ocaml bindings install failure, bug #344425.
 
   05 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> brltty-4.2.ebuild,
   +files/brltty-4.2-glibc-212.patch:
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 9444b9091120..4f6caa057bbf 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,8 +1,9 @@
+AUX brltty-4.2-fix-ocaml-install.patch 842 RMD160 72835d59022dc0fb2e865d7dab21a8b8f6427e40 SHA1 598e78ca4573eb75c4a8092afde12bf6494efb65 SHA256 4b9e48655afb62b758f72e49bc05ad6feb3ea0839bbac7ef5b4757b116f1b284
 AUX brltty-4.2-glibc-212.patch 287 RMD160 7d12d6e7b0311d9e205b5619d08cf27095322828 SHA1 c3ad4b457acad0808b8aa68ad1a05ad6f8a9247f SHA256 6fb14f246788b6668b0442201144a31dcae003f5e70185e643e14e3f01ce1516
 AUX brltty.rc 530 RMD160 60f5f91fbdba71954685330b9e2c4db1e2c1090f SHA1 5e4ddda21ef8d3eb04199f262006a589e8d08c2f SHA256 c6899cab19f94feb83030c9df4541a025891869d72009bac944b3cd3535a24c2
 DIST brltty-4.1.tar.gz 2169303 RMD160 a46c0e42dd3504b6b3ef24309042d2915dee770a SHA1 3e81746cb1e455ca5116d11fcce1e158371146df SHA256 29d0bd271ed3b8ec92c378bdf90489936c26d375515aa326f74bd515dfcb36a4
 DIST brltty-4.2.tar.gz 2234191 RMD160 f099f92c8e44f1cedf20a70e8b874796bae9daab SHA1 d25802d08599b75841e7bb2f29bc88737f2992d2 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2
 EBUILD brltty-4.1.ebuild 3594 RMD160 0e6b376b8d516c81478fe75c42cb922b9e6caad2 SHA1 6cd75f7ca050e3edca3a39b224cc0a7d226b0862 SHA256 8a4798cd09531abf24a8ff2677e9b9a94338c1ab297a839bf2b53f468f8500f9
-EBUILD brltty-4.2.ebuild 3678 RMD160 54934c13848d1e2980f6ea56665c934eb4904bfe SHA1 3710322482239affbfad7686c54fc9126516bdf7 SHA256 a221baa7b0db0060c144d31d40ca68505971f963023ede1538817ef08ece78e6
-MISC ChangeLog 13030 RMD160 1d863e538c84fc509153a2bcbe84c95bb62e63ed SHA1 8da032570c5cb9fccdc43d88c93d4f2324cef301 SHA256 de84f56bbf40f0c2da7f27e0face41e362da9a83a22c59fdeb4aea1de5a8edc6
+EBUILD brltty-4.2.ebuild 3742 RMD160 ccfb3191ef76218947dbf1c1e4876b373a62b5d5 SHA1 95f5e699af306b9dbf7ce4a4030b18b9c4507684 SHA256 6e2a22e9b9c57a4f81dfd27a54f68ca292d959d46d177e8e9c3e8336d5537d67
+MISC ChangeLog 13196 RMD160 6de36c17fb1b21f2362cc95588c651dfa3b7b465 SHA1 afd0375691c9926d338cca64925ba7bb5572dc01 SHA256 0140f824f0f35762ac41cf8bc60ee395ef5a95e4dae1c8bef5c63db5d287f3cc
 MISC metadata.xml 1982 RMD160 3d40e297c89d9229fc36ec438b768f4332758e83 SHA1 5dff738da647498e9db6429d7b83aee9bd580a44 SHA256 7ac0165ae761e7474b97c5c89c798dcb7a7f365db1f06f52085dfee70a915e43
diff --git a/app-accessibility/brltty/brltty-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild
index f405484fe84c..152d2abf363e 100644
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ b/app-accessibility/brltty/brltty-4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2 2010/10/05 17:19:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.3 2011/03/24 14:13:17 williamh Exp $
 
 EAPI="2"
 FINDLIB_USE="ocaml"
@@ -34,6 +34,7 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-glibc-212.patch
+	epatch "${FILESDIR}"/${P}-fix-ocaml-install.patch
 
 	java-pkg-opt-2_src_prepare
 }
@@ -90,7 +91,7 @@ src_install() {
 		findlib_src_preinst
 	fi
 
-	emake install || die
+	emake OCAML_LDCONF= install || die
 
 	if use java; then
 		# make install puts the _java.so there, and no it's not $(get_libdir)
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch b/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch
new file mode 100644
index 000000000000..24d7b012d03a
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch
@@ -0,0 +1,21 @@
+Index: Bindings/Caml/Makefile.in
+===================================================================
+--- Bindings/Caml/Makefile.in	(revision 5474)
++++ Bindings/Caml/Makefile.in	(working copy)
+@@ -31,6 +31,7 @@
+ OCAMLFIND = @OCAMLFIND@
+ OCAML_INSTALL_TARGET = @OCAML_INSTALL_TARGET@
+ OCAML_UNINSTALL_TARGET = @OCAML_UNINSTALL_TARGET@
++OCAML_LDCONF = -ldconf "$(OCAML_DESTDIR)/ld.conf"
+ 
+ OCAML_LIB = $(API_NAME)
+ OCAML_BCLIB = $(OCAML_LIB).cma
+@@ -102,7 +103,7 @@
+ install-with-findlib:
+ 	$(INSTALL_DIRECTORY) $(OCAML_DESTDIR)
+ 	$(OCAMLFIND) remove -destdir "$(OCAML_DESTDIR)" $(OCAML_LIB)
+-	$(OCAMLFIND) install -destdir "$(OCAML_DESTDIR)" -ldconf "$(OCAML_DESTDIR)/ld.conf" $(OCAML_LIB) $(OCAML_FILES) 
++	$(OCAMLFIND) install -destdir "$(OCAML_DESTDIR)" $(OCAML_LDCONF) $(OCAML_LIB) $(OCAML_FILES) 
+ 
+ uninstall: $(OCAML_UNINSTALL_TARGET)
+