Add USE flag for ocaml bindings, complete doc patch to fix ocmal doc failure, see bug #186279

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

5 files changed, 64 insertions, 25 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 2bf1786af2bd..d72298d6d911 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.2 2009/10/07 14:03:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.3 2009/10/07 15:16:59 voyageur Exp $
+
+  07 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.6_pre2.ebuild,
+  +files/llvm-2.6-nodoctargz.patch, -files/llvm-2.6-nohtmltargz.patch:
+  Add USE flag for ocaml bindings, complete doc patch to fix ocmal doc
+  failure, see bug #186279
 
   07 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.6_pre2.ebuild:
-  Fix llvm-gcc location, work with 
+  Fix llvm-gcc location, work with ${ROOT}
 
 *llvm-2.6_pre2 (05 Oct 2009)
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 2cbb551ae0a5..479fa01862d0 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,5 +1,5 @@
-AUX llvm-2.6-nohtmltargz.patch 649 RMD160 be768d193d174df9ebfea94554525f38fde66ffd SHA1 a873ed000c90e6d58aef16f86a1ee1c1ac112d1a SHA256 b8628c865dc888dcb73a3548f91e1eefa71e49ed57d1e877f7b8e759f34e8109
+AUX llvm-2.6-nodoctargz.patch 1602 RMD160 b4de7f5e68386bd9dab44a6d7addae0eb9d7f958 SHA1 5a2faf5d9c52f1eb1f1eac3aa69b6d0499c093a4 SHA256 503d31616ca7c76f6da1cd46d6e7c54241effbd11652ab568759350f0c21e473
 DIST llvm-2.6_pre2.tar.gz 7782489 RMD160 142751db6e0f130ef6e442c0fe9c5943cab47b9e SHA1 ec4d9ffa1d3dbd8a3f657006d5cc62c5548484ac SHA256 da24eda98e32512e432d6996ccd8007cd0a18b773075e453b7f8058ee33e8f04
-EBUILD llvm-2.6_pre2.ebuild 4616 RMD160 0e62c5bc18685d703890f295452ec0a25e1c03f6 SHA1 332387df012ea20b0a049d0d6d7f7bfb61396d42 SHA256 38898bfefdb52b4de4b9b36e79d17f56c2779b050473a30b0563209f59b628b2
-MISC ChangeLog 538 RMD160 9d6d2b67b95546184b8cfa425d58b49fe6587c80 SHA1 0d900f933aad668f60c9de512d3bdcf5553340e8 SHA256 4edffa12d6d96ad74fa8c51c4306713799b1c4474b7ce8be89dd31d2521d1436
+EBUILD llvm-2.6_pre2.ebuild 4783 RMD160 5fd515620999819c7d70578d412325c6a11b15e5 SHA1 c61baed5a3d991cc0dc595f30c19ea8d34daa9de SHA256 22806584d76fec087924de34cc7263c203c1d51a6f7130de71596f710a3abb5a
+MISC ChangeLog 792 RMD160 fa6c91347018f5fa2b524e13e1fe4b54dfebfb78 SHA1 b7774ef369e6e2a97fcabdfdfcf7e50981849d47 SHA256 1a5f7ba7d1386f20d0b552cdf7ec6ac416055f8a0e32caa476e7fc07fc217fba
 MISC metadata.xml 2159 RMD160 30145f0d3b8241dee5e6db79f86f0899cce412b9 SHA1 b2d0fea596fa2beb19ff83ee20b0a04e18f6079b SHA256 329f66555db96bd7100e69f5943e1604e882f896f007301eeac9265bc440a2ac
diff --git a/sys-devel/llvm/files/llvm-2.6-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.6-nodoctargz.patch
new file mode 100644
index 000000000000..3d775e0bcce8
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-2.6-nodoctargz.patch
@@ -0,0 +1,45 @@
+--- docs/Makefile.orig	2009-10-07 17:08:03.000000000 +0200
++++ docs/Makefile	2009-10-07 17:08:47.000000000 +0200
+@@ -46,13 +46,12 @@
+ # 'make generated BUILD_FOR_WEBSITE=1'
+ generated:: doxygen ocamldoc
+ 
+-install-html: $(PROJ_OBJ_DIR)/html.tar.gz
++install-html:
+ 	$(Echo) Installing HTML documentation
+ 	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
+ 	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
+ 	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
+ 	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+ 
+ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+ 	$(Echo) Packaging HTML documentation
+@@ -64,12 +63,11 @@
+ install-doxygen: doxygen
+ 	$(Echo) Installing doxygen documentation
+ 	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+ 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+ 	  $(FIND) . -type f -exec \
+ 	    $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
+ 
+-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
++doxygen: regendoc
+ 
+ regendoc:
+ 	$(Echo) Building doxygen documentation
+@@ -95,12 +93,11 @@
+ install-ocamldoc: ocamldoc
+ 	$(Echo) Installing ocamldoc documentation
+ 	$(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
+ 	$(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
+ 	  $(FIND) . -type f -exec \
+ 	    $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
+ 
+-ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
++ocamldoc: regen-ocamldoc
+ 
+ regen-ocamldoc:
+ 	$(Echo) Building ocamldoc documentation
diff --git a/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch b/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch
deleted file mode 100644
index 65209e6d0b95..000000000000
--- a/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- docs/Makefile.orig	2009-09-25 15:02:13.000000000 +0200
-+++ docs/Makefile	2009-09-25 15:02:47.000000000 +0200
-@@ -46,13 +46,12 @@
- # 'make generated BUILD_FOR_WEBSITE=1'
- generated:: doxygen ocamldoc
- 
--install-html: $(PROJ_OBJ_DIR)/html.tar.gz
-+install-html:
- 	$(Echo) Installing HTML documentation
- 	$(Verb) $(MKDIR) $(PROJ_docsdir)/html
- 	$(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
- 	$(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
- 	$(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
--	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
- 
- $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
- 	$(Echo) Packaging HTML documentation
diff --git a/sys-devel/llvm/llvm-2.6_pre2.ebuild b/sys-devel/llvm/llvm-2.6_pre2.ebuild
index c97c73b6508d..0f1c1c76ad62 100644
--- a/sys-devel/llvm/llvm-2.6_pre2.ebuild
+++ b/sys-devel/llvm/llvm-2.6_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6_pre2.ebuild,v 1.2 2009/10/07 14:03:08 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6_pre2.ebuild,v 1.3 2009/10/07 15:16:59 voyageur Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://llvm.org/prereleases/${PV/_pre*}/pre-release${PV/*_pre}/${PN}-${
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alltargets debug llvm-gcc test"
+IUSE="alltargets debug llvm-gcc ocaml test"
 
 DEPEND="dev-lang/perl
 	>=sys-devel/make-3.79
@@ -24,6 +24,7 @@ DEPEND="dev-lang/perl
 	>=sys-devel/gcc-3.0
 	>=sys-devel/binutils-2.18
 	llvm-gcc? ( sys-devel/llvm-gcc )
+	ocaml? ( dev-lang/ocaml )
 	test? ( dev-util/dejagnu )"
 RDEPEND="dev-lang/perl"
 
@@ -83,7 +84,7 @@ src_prepare() {
 	# Fix docs installation
 	sed -e '/^NO_INSTALL_MANS/s/$/$(DST_MAN_DIR)tblgen.1 $(DST_MAN_DIR)llvmgcc.1 $(DST_MAN_DIR)llvmgxx.1/' \
 		-i docs/CommandGuide/Makefile || die "manpages sed failed"
-	epatch "${FILESDIR}"/${PN}-2.6-nohtmltargz.patch
+	epatch "${FILESDIR}"/${PN}-2.6-nodoctargz.patch
 
 	# Buggy test, http://llvm.org/bugs/show_bug.cgi?id=5047
 	rm test/DebugInfo/2009-01-15-dbg_declare.ll
@@ -134,6 +135,11 @@ src_configure() {
 		--with-llvmgcc=${LLVM_GCC_DRIVER} \
 		--with-llvmgxx=${LLVM_GPP_DRIVER}"
 
+	if use ocaml; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
+	fi
 	econf ${CONF_FLAGS} || die "econf failed"
 }