Fix documentation Makefile in the same way as llvm

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

4 files changed, 67 insertions, 5 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index faab150a8a0e..7edc75dcf372 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.2 2009/10/25 20:21:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.3 2009/10/26 17:26:41 voyageur Exp $
+
+  26 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> clang-2.6.ebuild,
+  +files/clang-2.6-fixdoc.patch:
+  Fix documentation Makefile in the same way as llvm
 
 *clang-2.6 (25 Oct 2009)
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 48b065567d7e..aead5cdb52ef 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,5 +1,6 @@
+AUX clang-2.6-fixdoc.patch 1885 RMD160 40512b1dcbb245c959b77408bcb7c02a590ac7d9 SHA1 67be72160a5733c251bcf9cead453353e0359394 SHA256 b0f5bf5de8af96ea92ee39701feb5131e7c98a21ccf52be53650cce63d1af052
 DIST clang-2.6.tar.gz 3857138 RMD160 b7e44abbf28902ff8e3fd4578a5ff9dd34f40817 SHA1 188f29ad3b2c64fcdc791aa34b323ed06452d7ae SHA256 98e22f4f5877fb3c73abb9ddcb3065ba9c94a21146387da7f905e6fd559d39ea
 DIST llvm-2.6.tar.gz 7790380 RMD160 24d58cb052ab5879aae59eaf4885ec41186ee22a SHA1 547471147cbf6d3e49539e01196ffada2c79c250 SHA256 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84
-EBUILD clang-2.6.ebuild 2976 RMD160 055175029c46603293bbd4e9542e7552c7eb0894 SHA1 e4a6ad3acf25ae5acbcd4cb200fdbc4da05e4a9e SHA256 5f919f0c1f37d6dbc103115324ed207bbc65ffe0875d610775634985a87a6ffc
-MISC ChangeLog 575 RMD160 3582ecad76a482cf05d3399f3e92d9571c316741 SHA1 edab1380779026c51f05f0f47dbdae05f837c99f SHA256 c913e42cbda5550f8d8c587d758cf67570361decddbfc3e45e91243d2a365153
+EBUILD clang-2.6.ebuild 3057 RMD160 24df9c60fb327da6254141fd2948f4d993446967 SHA1 ddc246e1e1fd144952c52ab3d5ceb14db7818d67 SHA256 b9ecd122ea988dc125ecd162a81cfd6d7ca8c1e5f5e4f1d2e26025416b1d652f
+MISC ChangeLog 735 RMD160 99fbaac80aaf6ab82043365fb8093f9cac8d043b SHA1 2dfd479d912a13883c210760fdb9fc8824544df9 SHA256 97b0d26e1988fae8e6aa5cb7d8fc6098dd686cb00e57a02ed3b575ffd8a54dd5
 MISC metadata.xml 1098 RMD160 472ed702bea452e68447b59908bc9279bbb890dd SHA1 ef26faea642b17778814391ccd3016f933ec8e12 SHA256 2d18687396a420ad6aa7179f1104b90962514d2fcf94e3838ce82cd109b359c0
diff --git a/sys-devel/clang/clang-2.6.ebuild b/sys-devel/clang/clang-2.6.ebuild
index e3870f3f8ed8..69c3bc0ae430 100644
--- a/sys-devel/clang/clang-2.6.ebuild
+++ b/sys-devel/clang/clang-2.6.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/clang/clang-2.6.ebuild,v 1.1 2009/10/25 20:21:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.6.ebuild,v 1.2 2009/10/26 17:26:41 voyageur Exp $
 
 EAPI=2
 inherit eutils python
@@ -15,7 +15,7 @@ SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+static-analyzer test"
+IUSE="debug +static-analyzer test"
 
 # Note: for LTO support, clang will depend on binutils with gold plugins, and LLVM built after that - http://llvm.org/docs/GoldPlugin.html
 DEPEND="static-analyzer? ( dev-lang/perl )
@@ -26,6 +26,10 @@ S="${WORKDIR}/llvm-2.6"
 
 src_prepare() {
 	mv "${WORKDIR}"/clang-2.6 "${S}"/tools/clang || die "clang source directory not found"
+
+	# Same as llvm doc patches
+	epatch "${FILESDIR}"/${PN}-2.6-fixdoc.patch
+
 	sed -e "s#lib/clang/1.0#$(get_libdir)/clang/1.0#" \
 		-i "${S}"/tools/clang/lib/Headers/Makefile \
 		|| die "clang Makefile failed"
diff --git a/sys-devel/clang/files/clang-2.6-fixdoc.patch b/sys-devel/clang/files/clang-2.6-fixdoc.patch
new file mode 100644
index 000000000000..d0d392c87ac1
--- /dev/null
+++ b/sys-devel/clang/files/clang-2.6-fixdoc.patch
@@ -0,0 +1,53 @@
+diff -Naur llvm-2.6.orig/tools/clang/docs/Makefile llvm-2.6/tools/clang/docs/Makefile
+--- llvm-2.6.orig/tools/clang/docs/Makefile	2009-10-26 18:09:24.000000000 +0100
++++ llvm-2.6/tools/clang/docs/Makefile	2009-10-26 18:17:29.000000000 +0100
+@@ -46,13 +46,12 @@
+ # 'make generated BUILD_FOR_WEBSITE=1'
+ generated:: doxygen
+ 
+-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
+diff -Naur llvm-2.6.orig/tools/clang/docs/tools/Makefile llvm-2.6/tools/clang/docs/tools/Makefile
+--- llvm-2.6.orig/tools/clang/docs/tools/Makefile	2009-10-26 18:09:24.000000000 +0100
++++ llvm-2.6/tools/clang/docs/tools/Makefile	2009-10-26 18:16:06.000000000 +0100
+@@ -23,7 +23,7 @@
+ DST_PS_DIR=ps/
+ 
+ # If we are in BUILD_FOR_WEBSITE mode, default to the all target.
+-all:: html man ps
++all:: html man
+ 
+ clean:
+ 	rm -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
+@@ -55,7 +55,7 @@
+ ifdef ONLY_MAN_DOCS
+ INSTALL_TARGETS := install-man
+ else
+-INSTALL_TARGETS := install-html install-man install-ps
++INSTALL_TARGETS := install-html install-man
+ endif
+ 
+ .SUFFIXES: