Provided pre-generated manpages with USE=-doc, fixes bug #448250 by Duncan

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 27 insertions, 14 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 633ce2d51d4c..224329a3ef11 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.104 2013/01/07 20:22:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.105 2013/01/17 13:44:07 voyageur Exp $
+
+  17 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.2.ebuild,
+  metadata.xml:
+  Provided pre-generated manpages with USE=-doc, fixes bug #448250 by Duncan
 
   07 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.2.ebuild,
   llvm-9999.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index d067a7f19790..62d7a4e195da 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -23,19 +23,20 @@ DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee0
 DIST llvm-2.9.tgz 9574781 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 SHA512 9cb0fa0bb8ac02661fd6f926001a15e0ad4a9660683421dc86b03f1cf5184142c5815f9f9283ee7cdf8d474e01177f83406122253342e0e95ddc878821660070 WHIRLPOOL f7b445b6b5d455f29ca68c342511b8b5e6eedec525af1cc60440c4de544df2332aa241bffca29eda5d2428a3f518e093a626bd45c7f8a9e0656d0f68aef5d9d1
 DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440
 DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef
+DIST llvm-3.2-manpages.tar.bz2 25962 SHA256 159eaaaf59a2cee66f6aa0bbc93ca4c9fa37a9a25d4116f085556cdbc32f75ca SHA512 75ce41827f99b9e08f0c3e374c49f8a231653bca28bea158ece551e5934bc61ae21bfaf158490f83b05c1a7926b95c8832c0eb023280dcafa671e7d551efa17e WHIRLPOOL 58382b3e92b2ef8b1f5a7ebf2d893852253976b781b2b2acd11dfd914fad9776f59ddc5559d3986832a00fde88539db6a5882aa69a6f3ceca90337a59420acc1
 DIST llvm-3.2.src.tar.gz 12275252 SHA256 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 SHA512 cc66171322dbbe40bcac0e0ea5b09df8ff52df63ded304f841f32f702270d6ab1512216413ee52498c3ebee8cd39c4cd23e3855d591944bc2ac0ae76f5be62cc WHIRLPOOL c3a39b2426293d0251b7769607ade873bb6bf8d54e7c8055773a9b75742bc8e39049fb71409a258c6f3d98775b78c280d4bfe4223ba91e5ed6ecae0eddf910e5
 EBUILD llvm-2.8-r2.ebuild 6185 SHA256 36149148c4abaeda3a1dce91e74149e2843eb2b2a761792e9da55badb33d2251 SHA512 a87364380901fb752d74fa9c9420912eccf0c85e020f2d8eb88eb647d58eb2766efdc6970ab7c7a4cf8fbd7a3e2ea86f3ea42d93841a3413ad718b4b6ad4d490 WHIRLPOOL 9a0dd101b466fa8339b3dd9eef01b2551bf8a4f33f4098c42bff3f09084757b856bebf2f062d07eeae99bcdb402cd842b5292b5a44fa1b3f40badae1a15bc51a
 EBUILD llvm-2.9-r2.ebuild 6350 SHA256 3698f309f1251961a3a285fe18a140f636f20b3afbb19a8ce8d1a18baee34298 SHA512 a0cc3c13e5ea41abcca7afc4d1b10dd66f3df7c79105bcf2a56a1d219ed044073478974788cb57a7ec72d2763eadf3740e57586c3f65de8e2d4f4234b0e9aab4 WHIRLPOOL 3fd49852d0af405c42cd82a97f3a15db357aecef051b9259a3919aa02ccd39ec372fd9607179b096b774fe7d46ee766df120784f9fcf05a8742d94f2372c658b
 EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
 EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
-EBUILD llvm-3.2.ebuild 6289 SHA256 698098d525d65ac066ac529025e84eb3a5a39403f0272e1dfa5ccb8fb6acc6f3 SHA512 e9cc06fd3e5587efc7948947030b3a64c13cb5377e94bfdb3cf42db90e8f6b6f788be5d35f8740254993dece91792c580337c5315a0c50480900ac78a8a10f65 WHIRLPOOL 8db37fcf4ae30f56e333ee173403ae0ff0e33346ab96b64dac8d617bb9ef94b641c973a5dee76c4340b4e924176b0626aa05c380dd8c84735f7eb151be1b4070
+EBUILD llvm-3.2.ebuild 6450 SHA256 57d1ba4df27d7f15c26d1acb60cc4d5daa4d319d99221bc16c68b439f4b62b66 SHA512 97ffb0b34e806069728765160dd3194d0f28607ec78273aec1cdc28ebec813604e96b346b742c70710b3505c00b9a473bccf94e6e763826d07e1a2ee977b48e2 WHIRLPOOL fbf424deee9b4f4dc04b4c8599b5473c1465b7e66ed2cf43cb02a8eed3693c95edbad30bc4b8b6ed93cc0ca03716f77b9807c8d0935645ed6ee1b7ed25415299
 EBUILD llvm-9999.ebuild 6191 SHA256 258b93fa8d7c43bbf03d841a4d721b621842376d72c37fc336ccdf4646b9efca SHA512 e66b6718ba4bdfb63925b50183ecf8bb4168b3a59fdb0217c41153e27918657423a57f6ff54a573cc67b810fdca250442339bde835939ef364aa82ce7eaad473 WHIRLPOOL 196a457905530e3fe8ade2dae5915efebc34f78fc6e05ff8ab10b86cd097e3ef480d4cb7101bdc45a62352478ca6365b7766c3c53f4ec77868008076a249271c
-MISC ChangeLog 17091 SHA256 5643f31a1df0b4f2f7d4f2c018d1de018ce8a2db2ee1906599a2c55f980bdff8 SHA512 c499366d073a46604648daa0460789ff7183814f91dcf34476e1396dcf6e7c0a100a1555e117780cdf7b9ba8955dafd208fc75f099ee8e6d91b1263e051f3f6b WHIRLPOOL 2a638ed700589157221247b0378d6960296d16e90e1b47a52faa91092eac7083e77c996f4671f604d905632cb262b89214e8781f8f6e6dba3bbf138607e29726
-MISC metadata.xml 2384 SHA256 c0f936ccdd15b17a06d712f1d7a58ff0fec818ee618279778fbc37abd50f76d6 SHA512 c51f223cac8c190251ae90403c7e86df616b1a9258d1fee349d044dc175eb0a0ea78fd42bf7ab036e0189434311a286399487aa28a4cb867a3f94fd1c4f27f3b WHIRLPOOL b33d5a0b2e856f24ac584ab141f075ce132ea1df3292548833c3fd23c2ca7c5f1ce82434edd8e8c97295d5d1963a2bf9cf212ed0f00a47f295b2fbe74d7f4294
+MISC ChangeLog 17257 SHA256 34d1c19922a861aa8c95b7e69a8593af7375a365050919e557a161d1219dc57d SHA512 e7a45ab31cc857eabb3037333d9fae01fd35dcc3b5b57c152a527bfb01dba475a74c3961ac048d0028720b0ba92d5567ba9cad15231d8498ab86f627bd81882b WHIRLPOOL ce1b3c4fb87d01613e8105c726022b086503f3742a8569497379f7f260cd3d85aca3f9bf4835f914af5418c6cb4b188fbcf3372d27a2ce94a2acf9175478f310
+MISC metadata.xml 2480 SHA256 7900bb9405502b6fca3ddf84e4927a9353d2f70fa7be4a32b674cad604e01c24 SHA512 42093ff40389c310ca3e316d8ea63d751e530f7af4efa7820f14a8979d337dcedaa61ef35f2e8dc226d7c55177c70e0bb8512e434e8d4b1c050aefd2914dcb02 WHIRLPOOL 695127371c9fa28f1b44517d8b6b123e1479048578adb84673f41b1a1fa5bdb7a3d424635ace6f08ad41eda1207a6d46ebe03f4b1be604adf2947af155bef3bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDrLnoACgkQFYEBGcdFJfKS/gD+JIdFLwaQoKOP/x7ClPgrBo8L
-Y2IzgyttkRenzaCbhDsA/ilMfqQnMi3tiGF8AwxOpRpDTP8a3JTviKM2ARIu9sJw
-=Eqz2
+iF4EAREIAAYFAlD4AE4ACgkQFYEBGcdFJfJmfQD/RI6EanXfMvsEnP8Z+e0Bd/Th
+6cjpitf2471pLcNpCTAA/jsan4bzVZ8LtLINK84JiX/PjA9PQw2xkQnlUwVoFQoh
+=DkDA
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-3.2.ebuild b/sys-devel/llvm/llvm-3.2.ebuild
index 936283120df7..8140d14cc211 100644
--- a/sys-devel/llvm/llvm-3.2.ebuild
+++ b/sys-devel/llvm/llvm-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.2.ebuild,v 1.3 2013/01/07 20:22:12 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.2.ebuild,v 1.4 2013/01/17 13:44:07 voyageur Exp $
 
 EAPI=5
 PYTHON_DEPEND="2"
@@ -8,7 +8,8 @@ inherit eutils flag-o-matic multilib toolchain-funcs python pax-utils
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
+	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
@@ -16,12 +17,12 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux
 IUSE="debug doc gold +libffi multitarget ocaml test udis86 vim-syntax"
 
 DEPEND="dev-lang/perl
-	dev-python/sphinx
 	>=sys-devel/make-3.79
 	>=sys-devel/flex-2.5.4
 	>=sys-devel/bison-1.875d
 	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 )
 	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	doc? ( dev-python/sphinx )
 	gold? ( >=sys-devel/binutils-2.22[cxx] )
 	libffi? ( virtual/pkgconfig
 		virtual/libffi )
@@ -148,8 +149,10 @@ src_configure() {
 src_compile() {
 	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1
 
-	emake -C docs -f Makefile.sphinx man
-	use doc && emake -C docs -f Makefile.sphinx html
+	if use doc; then
+		emake -C docs -f Makefile.sphinx man html
+	fi
+	#	emake -C docs -f Makefile.sphinx html
 
 	pax-mark m Release/bin/lli
 	if use test; then
@@ -162,8 +165,12 @@ src_compile() {
 src_install() {
 	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
 
-	doman docs/_build/man/*.1
-	use doc && dohtml -r docs/_build/html/
+	if use doc; then
+		doman docs/_build/man/*.1
+		dohtml -r docs/_build/html/
+	else
+		doman "${WORKDIR}"/${P}-manpages/*.1
+	fi
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index e5a362b5c5b3..4428300ba5df 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -15,6 +15,7 @@
    3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures.
    4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
 	<use>
+		<flag name='doc'>Build and install the HTML documentation and regenerate the man pages</flag>
 		<flag name='gold'>Build the gold linker plugin</flag>
 		<flag name='llvm-gcc'>Build LLVM with <pkg>sys-devel/llvm-gcc</pkg></flag>
 		<flag name='multitarget'>Build all host targets (default: host only)</flag>