Move docs cleaning to src_prepare

svn path=/overlay/; revision=414

4 files changed, 27 insertions, 161 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index ffa9385..402513d 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,4 +1,4 @@
-DIST llvm-2.6.tar.gz 7776874 RMD160 f8ddbb155ae479ebb51c05f281e16bff78d13590 SHA1 0196659ceaf81ef903b832de6a336c4924a79892 SHA256 fe463b3d74f4fecdbbcd2252024d0122464e1dd90ad63fd409c64010affa725e
+AUX llvm-2.6-nohtmltargz.patch 649 RMD160 be768d193d174df9ebfea94554525f38fde66ffd SHA1 a873ed000c90e6d58aef16f86a1ee1c1ac112d1a SHA256 b8628c865dc888dcb73a3548f91e1eefa71e49ed57d1e877f7b8e759f34e8109
 DIST llvm-2.6_pre2.tar.gz 7782489 RMD160 142751db6e0f130ef6e442c0fe9c5943cab47b9e SHA1 ec4d9ffa1d3dbd8a3f657006d5cc62c5548484ac SHA256 da24eda98e32512e432d6996ccd8007cd0a18b773075e453b7f8058ee33e8f04
-EBUILD llvm-2.6_pre.ebuild 4510 RMD160 8fb97ae76e864b7d24f7c66ad9a3e723e1019047 SHA1 7de28baa7deee08a2949922e72c893bb47410978 SHA256 8781093c437f4c26c58e6f6963e331fa82417d9af799ff34f97d776da2aed6fe
-EBUILD llvm-2.6_pre2.ebuild 4551 RMD160 4a3a9b5ba521214fb8b6c31f36f0027e810c9255 SHA1 db81e92fc3b754d1e7f0698d988e19d56dd8852d SHA256 bf97e921eb96995201c2a9ddd29bbe4480c36b838d1ce158a363bd59a96907fd
+EBUILD llvm-2.6_pre2.ebuild 4354 RMD160 af870cbe4f3381226ad2d8d8f66129e374040ca1 SHA1 fb802a01811af66f442468482ca75fa32630c20a SHA256 ae4c171a0e15fb06df9d1944a9f224964de3c5f9636c389a05829c514d7c0121
+MISC metadata.xml 523 RMD160 19c0a29049ecae730fb16dc9161e05ff1a13bd60 SHA1 9d7931376a2c091d3208ee61e41d41e90ae722e5 SHA256 037856297ac1050e850cc35423f243c504c594dc8846be2c39b6863a9fd8e729
diff --git a/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch b/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch
new file mode 100644
index 0000000..65209e6
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch
@@ -0,0 +1,17 @@
+--- 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_pre.ebuild b/sys-devel/llvm/llvm-2.6_pre.ebuild
deleted file mode 100644
index 76c5dea..0000000
--- a/sys-devel/llvm/llvm-2.6_pre.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-#SRC_URI="http://llvm.org/releases/${PV}/${P}.tar.gz"
-SRC_URI="http://llvm.org/prereleases/${PV/_pre}/${PN}-${PV/_pre}.tar.gz"
-
-LICENSE="Uoi-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alltargets debug test"
-
-DEPEND="dev-lang/perl
-	>=sys-devel/make-3.79
-	>=sys-devel/flex-2.5.4
-	>=sys-devel/bison-1.28
-	!~sys-devel/bison-1.85
-	!~sys-devel/bison-1.875
-	>=sys-devel/gcc-3.0
-	>=sys-devel/binutils-2.18
-	test? ( dev-util/dejagnu )"
-RDEPEND="dev-lang/perl"
-
-S=${WORKDIR}/${PN}-${PV/_pre}
-
-pkg_setup() {
-	# need to check if the active compiler is ok
-
-	broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 "
-	broken_gcc_x86=" 3.4.0 3.4.2 "
-	broken_gcc_amd64=" 3.4.6 "
-
-	gcc_vers=$(gcc-fullversion)
-
-	if [[ ${broken_gcc} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm."
-		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
-		elog "possible solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then
-		elog "Your version of gcc is known to miscompile llvm on x86"
-		elog "architectures.  Check"
-		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	fi
-
-	if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
-	then
-		 elog "Your version of gcc is known to miscompile llvm in amd64"
-		 elog "architectures.  Check"
-		 elog "http://www.llvm.org/docs/GettingStarted.html for possible"
-		 elog "solutions."
-		die "Your currently active version of gcc is known to miscompile llvm"
-	 fi
-}
-
-src_prepare() {
-	# unfortunately ./configure won't listen to --mandir and the-like, so take
-	# care of this.
-	einfo "Fixing install dirs"
-	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(DESTDIR)$(PROJ_prefix)/share/doc/'${PF}, \
-		-e 's,^PROJ_etcdir.*,PROJ_etcdir := $(DESTDIR)/etc/llvm,' \
-		-i Makefile.config.in || die "sed failed"
-
-	# point by default to the build directory
-	einfo "Fixing gccld and gccas"
-	sed -e 's,^TOOLDIR.*,TOOLDIR=/usr/bin,' \
-		-i tools/gccld/gccld.sh tools/gccas/gccas.sh || die "sed failed"
-
-	einfo "Fixing rpath"
-	sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules || die "sed failed"
-}
-
-src_configure() {
-	local CONF_FLAGS=""
-
-	if use debug; then
-		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
-		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
-		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
-	else
-		CONF_FLAGS="${CONF_FLAGS} \
-			--enable-optimized \
-			--disable-assertions \
-			--disable-expensive-checks"
-	fi
-
-	if use alltargets; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
-	else
-		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
-	fi
-
-	if use amd64; then
-		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
-	fi
-
-	# things would be built differently depending on whether llvm-gcc is
-	# already present on the system or not.
-	local LLVM_GCC_DIR=/dev/null
-	local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope
-	if has_version sys-devel/llvm-gcc ; then
-		LLVM_GCC_DIR=$(find /usr/$(get_libdir)/llvm-gcc/ -mindepth 1 -maxdepth 1 2> /dev/null)
-		LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null)
-
-		if [[ -z ${LLVM_GCC_DRIVER} ]] ; then
-			die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}"
-		fi
-
-		einfo "Using $LLVM_GCC_DRIVER"
-		LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++}
-	fi
-
-	CONF_FLAGS="${CONF_FLAGS} \
-		--with-llvmgccdir=${LLVM_GCC_DIR} \
-		--with-llvmgcc=${LLVM_GCC_DRIVER} \
-		--with-llvmgxx=${LLVM_GPP_DRIVER}"
-
-	econf ${CONF_FLAGS} || die "econf failed"
-}
-
-src_compile() {
-	emake VERBOSE=1 KEEP_SYMBOLS=1 || die "emake failed"
-}
-
-src_install() {
-	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-
-	# don't install html.tar.gz in /usr/share/doc -- FIXME: USE=doc
-	einfo "Removing archived html documentation"
-	rm "${D}"/usr/share/doc/${PF}/*tar.gz \
-		|| die "no such file ${D}/usr/share/doc/${PF}/*tar.gz"
-
-	# tblgen does not get installed, so remove its man page.
-	# llvmgcc.1 and llvmgxx.1 are present here for unknown reasons. But, since
-	# llvm-gcc installs bad man pages, keep the 2 files alive
-	rm "${D}"/usr/share/man/man1/tblgen.1
-}
diff --git a/sys-devel/llvm/llvm-2.6_pre2.ebuild b/sys-devel/llvm/llvm-2.6_pre2.ebuild
index d78c660..dc19dcd 100644
--- a/sys-devel/llvm/llvm-2.6_pre2.ebuild
+++ b/sys-devel/llvm/llvm-2.6_pre2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-inherit eutils toolchain-funcs multilib
+EAPI="2"
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -77,6 +77,11 @@ src_prepare() {
 
 	einfo "Fixing rpath"
 	sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules || die "sed failed"
+	
+	# 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
 }
 
 src_configure() {
@@ -133,14 +138,4 @@ src_compile() {
 
 src_install() {
 	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
-
-	# don't install html.tar.gz in /usr/share/doc -- FIXME: USE=doc
-	einfo "Removing archived html documentation"
-	rm "${D}"/usr/share/doc/${PF}/*tar.gz \
-		|| die "no such file ${D}/usr/share/doc/${PF}/*tar.gz"
-
-	# tblgen does not get installed, so remove its man page.
-	# llvmgcc.1 and llvmgxx.1 are present here for unknown reasons. But, since
-	# llvm-gcc installs bad man pages, keep the 2 files alive
-	rm "${D}"/usr/share/man/man1/tblgen.1
 }