Fix ocaml bindings installation, thanks everyone in bug #393023

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 3a820cebdaafc584663d2fa9919cc3098752b0ed..9bc8b8668760e426a192398d49c007cefa294231 100644 (file)
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.56 2011/12/05 11:05:18 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.57 2011/12/05 18:39:36 voyageur Exp $
+
+  05 Dec 2011; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0.ebuild,
+  +files/llvm-3.0-ocaml_install.patch:
+  Fix ocaml bindings installation, thanks everyone in bug #393023
 
   02 Dec 2011; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild:
   Drop llvm-config sed in live ebuild, bug #392715. Also add USE=gold handling

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index b6e7ddd8b44d847de4fb3b1aada0aeb3351cf4f2..1ca231f2305c3900910eb9ef799928859b9cb327 100644 (file)
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -7,19 +7,20 @@ AUX llvm-2.8-alignof.patch 2522 RMD160 6a359ba15b1943929541c5e7bbd6a2a6480e85bc
 AUX llvm-2.8-darwin8.patch 576 RMD160 ed1d9c8d9eda3fecf55b7848eee76cdd92a59a13 SHA1 60d0772513d66e7a79d70f0a98f03c67ab1d1d0f SHA256 6db04d9bb5fe65f8a92972988477328a7358e325abca32f30a716ff454d0fe21
 AUX llvm-2.9-Operator.h-c++0x.patch 2062 RMD160 3f137dc80cac2d77b978a332a731e443a15e6a7c SHA1 8bc7357b793cb5cc83e54f056d54d311ec93853d SHA256 1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7
 AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bcdc SHA1 19795ec9c34e6ec5539ec6a77944ceb51abdef72 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84
+AUX llvm-3.0-ocaml_install.patch 664 RMD160 c439931f952e7e053b726435ae0a8e502ebe5080 SHA1 15c8a81baa0e6e78d734f5451b319bf6d896eb2a SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694
 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b
 DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779
 DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SHA1 b683e7294fcf69887c0d709025d4640f5dca755b SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
 EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852
 EBUILD llvm-2.9-r2.ebuild 6172 RMD160 f96a803b218716bc4ad4ed3c09584e6744b45053 SHA1 578b0ec8c1154248713741df543dff9af11dffcd SHA256 fea90f5535a6be11f643d18e2a29cb8b04db64d461ace2eebb1028ca18aafe2a
-EBUILD llvm-3.0.ebuild 5369 RMD160 2d30ba09646251db515888448f717f1bcfbbb77d SHA1 0af7bf2b31a856290522b9456e7ac8972e4529a8 SHA256 c421f7927d1c15a7fd042eb11601531392c7bef3b11a65a4eaa2e3226aed0478
+EBUILD llvm-3.0.ebuild 5416 RMD160 3f3e4845a4ef0df6568d3ddd32c6390a3da690ac SHA1 dddcbf15f92e75f09bbfaae20d7887e2ac358bc2 SHA256 9ff80f9204a7ea0a0d4b12dc5704f1723f4f4a3d1c7d67692492a5a258cfb4d3
 EBUILD llvm-9999.ebuild 5184 RMD160 413e27866ed87928a727d60dfa403f1e6ff58c47 SHA1 2dfc8d3d7d591c619aad9887221426b14d569fb5 SHA256 36c309bc87075c3763a79f98011e90ed00e67f15343be8303c29dd52eb2c7bc3
-MISC ChangeLog 9467 RMD160 0e5acd37ac44a6ccfdd5eaeb9b3d6a2c6adb274a SHA1 98802402f4dd0abea42640ab33f13797d0d274c7 SHA256 9f17a2e2e72b3f1afee47c80375ca0ec8cae9fe7c103c8f1edb0bf0c14753126
+MISC ChangeLog 9645 RMD160 3b4f4040c6567dbc6b13a2f1ae4fe94bb4c77a51 SHA1 b504526901a6b8a3998143366c708c5f65f22dbc SHA256 99ef55468f7a7ce15b8e65ab25770df09a16185377ec831413b1568550b7907c
 MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7cpXkACgkQFYEBGcdFJfJ4jAD/a1YAWZGd6XC5nRmo0dqaK7Eo
-GZIxg2Hvs+nk5e+6dHkBAKVLQG420jgAtUH/bufkavnIzu8btd2F4Z/btj6dce7r
-=pJRq
+iF4EAREIAAYFAk7dD/QACgkQFYEBGcdFJfI78QD/dj2899Z6I8hEkzOlI/rYJaco
+NpDIcev8uAMRe+ouj2IA/0scD8sg1mSeVR4mxIepr2QVQYrkaXGjsCohFJc6xM2r
+=C/jP
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch b/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch
new file mode 100644 (file)
index 0000000..18f5cf6
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/show_bug.cgi?id=393023
+http://llvm.org/bugs/show_bug.cgi?id=11177
+
+Index: llvm-3.0-3.0/bindings/ocaml/llvm/Makefile
+===================================================================
+--- llvm-3.0-3.0.orig/bindings/ocaml/llvm/Makefile     2011-11-15 12:17:02.785987852 +0100
++++ llvm-3.0-3.0/bindings/ocaml/llvm/Makefile  2011-11-15 12:20:12.661983615 +0100
+@@ -30,7 +30,7 @@
+ $(OcamlDir)/META.llvm: META.llvm
+       $(Verb) $(CP) -f $< $@
+ 
+-install-meta:: $(ObjDir)/META.llvm
++install-meta:: $(ObjDir)/../META.llvm
+       $(Echo) "Install $(BuildMode) $(DestMETA)"
+       $(Verb) $(MKDIR) $(PROJ_libocamldir)
+       $(Verb) $(DataInstall) META.llvm "$(DestMETA)"

diff --git a/sys-devel/llvm/llvm-3.0.ebuild b/sys-devel/llvm/llvm-3.0.ebuild
index 2f1018075c4931bff27d938941aa51c55b1e74b5..91fe09ea5866c629af0ec82122f6fe08204c79d1 100644 (file)
--- a/sys-devel/llvm/llvm-3.0.ebuild
+++ b/sys-devel/llvm/llvm-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0.ebuild,v 1.1 2011/12/02 13:20:14 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0.ebuild,v 1.2 2011/12/05 18:39:36 voyageur Exp $
 
 EAPI="3"
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -88,6 +88,7 @@ src_prepare() {
 
        epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch
        epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
+       epatch "${FILESDIR}"/${P}-ocaml_install.patch
 }
 
 src_configure() {